Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-04 05:20:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSVFW32] Sync with Wine Staging 1.7.37. CORE-9246

Browse source 
svn path=/trunk/; revision=67090
This commit is contained in:
Amine Khaldi 2015-04-08 17:13:34 +00:00
parent 4ff7f1b3ae
commit 3786bae790
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/msvfw32/drawdib.c
View file

@ -462,7 +462,7 @@ UINT VFWAPI DrawDibRealize(HDRAWDIB hdd, HDC hdc, BOOL fBackground)
whdd = MSVIDEO_GetHddPtr(hdd);
if (!whdd) return FALSE;
if (!whdd || !(whdd->begun))
if (!whdd->begun)
{
ret = 0;
goto out;

2
reactos/dll/win32/msvfw32/mciwnd.c
View file

@ -79,7 +79,7 @@ BOOL VFWAPIV MCIWndRegisterClass(void)
wc.cbWndExtra = sizeof(MCIWndInfo*);
wc.hInstance = MSVFW32_hModule;
wc.hIcon = 0;
wc.hCursor = LoadCursorW(0, MAKEINTRESOURCEW(IDC_ARROW));
wc.hCursor = LoadCursorW(0, (LPWSTR)IDC_ARROW);
wc.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
wc.lpszMenuName = NULL;
wc.lpszClassName = mciWndClassW;

2
reactos/dll/win32/msvfw32/msvideo_main.c
View file

@ -1439,7 +1439,7 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn)
}
pc->cbState = sizeof(ICCOMPRESS);
pc->lpBitsOut = HeapAlloc(GetProcessHeap(), 0, pc->lpbiOut->bmiHeader.biSizeImage);
pc->lpBitsOut = HeapAlloc(GetProcessHeap(), 0, pc->lpbiIn->bmiHeader.biSizeImage);
if (!pc->lpBitsOut)
{
HeapFree(GetProcessHeap(), 0, pc->lpbiIn);

2
reactos/media/doc/README.WINE
View file

@ -136,7 +136,7 @@ reactos/dll/win32/mssip32 # Synced to Wine-1.7.27
reactos/dll/win32/mstask # Synced to Wine-1.7.27
reactos/dll/win32/msvcrt20 # Out of sync
reactos/dll/win32/msvcrt40 # Out of sync
reactos/dll/win32/msvfw32 # Synced to Wine-1.7.27
reactos/dll/win32/msvfw32 # Synced to WineStaging-1.7.37
reactos/dll/win32/msvidc32 # Synced to Wine-1.7.27
reactos/dll/win32/msxml # Synced to Wine-1.7.27
reactos/dll/win32/msxml2 # Synced to Wine-1.7.27