[MSVFW32] Sync with Wine Staging 1.9.23. CORE-12409

svn path=/trunk/; revision=73283

diff --git a/reactos/dll/win32/msvfw32/msvideo_main.c b/reactos/dll/win32/msvfw32/msvideo_main.c
index 1247048..4aea48f 100644 (file)
--- a/reactos/dll/win32/msvfw32/msvideo_main.c
+++ b/reactos/dll/win32/msvfw32/msvideo_main.c
@@ -296,9 +296,8 @@ static BOOL ICInfo_enum_handler(const char *drv, unsigned int nr, void *param)
     ICINFO *lpicinfo = param;
     DWORD fccHandler = mmioStringToFOURCCA(drv + 5, 0);
 
-    /* exact match of fccHandler or nth driver found */
-    if ((lpicinfo->fccHandler != nr) && (lpicinfo->fccHandler != fccHandler))
-       return FALSE;
+    if (lpicinfo->fccHandler != nr && compare_fourcc(lpicinfo->fccHandler, fccHandler))
+        return FALSE;
 
     lpicinfo->fccHandler = fccHandler;
     lpicinfo->dwFlags = 0;

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index f5bf158..ba68172 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -125,7 +125,7 @@ reactos/dll/win32/mssip32             # Synced to WineStaging-1.9.11
 reactos/dll/win32/mstask              # Synced to WineStaging-1.9.11
 reactos/dll/win32/msvcrt20            # Out of sync
 reactos/dll/win32/msvcrt40            # Out of sync
-reactos/dll/win32/msvfw32             # Synced to WineStaging-1.9.16
+reactos/dll/win32/msvfw32             # Synced to WineStaging-1.9.23
 reactos/dll/win32/msvidc32            # Synced to WineStaging-1.9.11
 reactos/dll/win32/msxml               # Synced to WineStaging-1.9.11
 reactos/dll/win32/msxml2              # Synced to WineStaging-1.9.11