From 3786bae790abb3d7c282546192d58fc38021137f Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Wed, 8 Apr 2015 17:13:34 +0000 Subject: [PATCH] [MSVFW32] Sync with Wine Staging 1.7.37. CORE-9246 svn path=/trunk/; revision=67090 --- reactos/dll/win32/msvfw32/drawdib.c | 2 +- reactos/dll/win32/msvfw32/mciwnd.c | 2 +- reactos/dll/win32/msvfw32/msvideo_main.c | 2 +- reactos/media/doc/README.WINE | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/reactos/dll/win32/msvfw32/drawdib.c b/reactos/dll/win32/msvfw32/drawdib.c index 9253278cc54..ba2c5d50d53 100644 --- a/reactos/dll/win32/msvfw32/drawdib.c +++ b/reactos/dll/win32/msvfw32/drawdib.c @@ -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; diff --git a/reactos/dll/win32/msvfw32/mciwnd.c b/reactos/dll/win32/msvfw32/mciwnd.c index 6138afb09bf..711cd9202a4 100644 --- a/reactos/dll/win32/msvfw32/mciwnd.c +++ b/reactos/dll/win32/msvfw32/mciwnd.c @@ -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; diff --git a/reactos/dll/win32/msvfw32/msvideo_main.c b/reactos/dll/win32/msvfw32/msvideo_main.c index f76b42aa2f1..19ff5752398 100644 --- a/reactos/dll/win32/msvfw32/msvideo_main.c +++ b/reactos/dll/win32/msvfw32/msvideo_main.c @@ -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); diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index bfe93799d1e..25756b33747 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -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