[ros-diffs] [akhaldi] 67090: [MSVFW32] Sync with Wine Staging 1.7.37. CORE-9246

Author: akhaldi
Date: Wed Apr  8 17:13:34 2015
New Revision: 67090

URL: http://svn.reactos.org/svn/reactos?rev=67090&view=rev
Log:
[MSVFW32] Sync with Wine Staging 1.7.37. CORE-9246

Modified:
    trunk/reactos/dll/win32/msvfw32/drawdib.c
    trunk/reactos/dll/win32/msvfw32/mciwnd.c
    trunk/reactos/dll/win32/msvfw32/msvideo_main.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/msvfw32/drawdib.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/drawdib.c...
==============================================================================
--- trunk/reactos/dll/win32/msvfw32/drawdib.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msvfw32/drawdib.c	[iso-8859-1] Wed Apr  8 17:13:34 2015
@@ -462,7 +462,7 @@
     whdd = MSVIDEO_GetHddPtr(hdd);
     if (!whdd) return FALSE;

-    if (!whdd || !(whdd->begun)) 
+    if (!whdd->begun)
     {
         ret = 0;
         goto out;

Modified: trunk/reactos/dll/win32/msvfw32/mciwnd.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/mciwnd.c?...
==============================================================================
--- trunk/reactos/dll/win32/msvfw32/mciwnd.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msvfw32/mciwnd.c	[iso-8859-1] Wed Apr  8 17:13:34 2015
@@ -79,7 +79,7 @@
     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;

Modified: trunk/reactos/dll/win32/msvfw32/msvideo_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvideo_m...
==============================================================================
--- trunk/reactos/dll/win32/msvfw32/msvideo_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msvfw32/msvideo_main.c	[iso-8859-1] Wed Apr  8 17:13:34 2015
@@ -1439,7 +1439,7 @@
     }
     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);

Modified: trunk/reactos/media/doc/README.WINE
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=6...
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Wed Apr  8 17:13:34 2015
@@ -136,7 +136,7 @@
 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