[ros-diffs] [akhaldi] 73968: [MSVFW32] Sync with Wine Staging 2.2. CORE-12823 8b566b5 msvfw32: Fix some spec file entries. 15840d9 msvfw32: Remove duplicated debug. ca2420c msvfw32: Allow ICInfo to enumerate c...

Author: akhaldi
Date: Sun Feb 26 19:03:35 2017
New Revision: 73968

URL: http://svn.reactos.org/svn/reactos?rev=73968&view=rev
Log:
[MSVFW32] Sync with Wine Staging 2.2. CORE-12823

8b566b5 msvfw32: Fix some spec file entries.
15840d9 msvfw32: Remove duplicated debug.
ca2420c msvfw32: Allow ICInfo to enumerate codecs when fccType is zero.

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

Modified: trunk/reactos/dll/win32/msvfw32/msvfw32.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32.…
==============================================================================
--- trunk/reactos/dll/win32/msvfw32/msvfw32.spec	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msvfw32/msvfw32.spec	[iso-8859-1] Sun Feb 26 19:03:35 2017
@@ -34,13 +34,13 @@
 @ stdcall ICImageCompress(long long ptr ptr ptr long ptr)
 @ stdcall ICImageDecompress(long long ptr ptr ptr)
 @ stdcall ICInfo(long long ptr)
-@ stdcall ICInstall(long long ptr str long)
+@ stdcall ICInstall(long long long str long)
 @ stdcall ICLocate(long long ptr ptr long)
 @ stub    ICMThunk
 @ stdcall ICOpen(long long long)
 @ stdcall ICOpenFunction(long long long ptr)
 @ stdcall ICRemove(long long long)
-@ stdcall ICSendMessage(long long ptr ptr)
+@ stdcall ICSendMessage(long long long long)
 @ stdcall ICSeqCompressFrame(ptr long ptr ptr ptr)
 @ stdcall ICSeqCompressFrameEnd(ptr)
 @ stdcall ICSeqCompressFrameStart(ptr ptr)

Modified: trunk/reactos/dll/win32/msvfw32/msvideo_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvideo_…
==============================================================================
--- trunk/reactos/dll/win32/msvfw32/msvideo_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msvfw32/msvideo_main.c	[iso-8859-1] Sun Feb 26 19:03:35 2017
@@ -245,7 +245,7 @@
 	    lRet = RegEnumValueA(hKey, i++, buf, &name, 0, &type, (LPBYTE)(buf+name),
&data);
 	    if (lRet == ERROR_NO_MORE_ITEMS) break;
 	    if (lRet != ERROR_SUCCESS) continue;
-	    if (name != 9 || strncasecmp(buf, fccTypeStr, 5)) continue;
+	    if (fccType && (name != 9 || strncasecmp(buf, fccTypeStr, 5))) continue;
 	    buf[name] = '=';
 	    if ((result = handler(buf, cnt++, param))) break;
 	}
@@ -259,7 +259,7 @@
 	for (s = buf; *s; s += strlen(s) + 1)
 	{
             TRACE("got %s\n", s);
-	    if (strncasecmp(s, fccTypeStr, 5) || s[9] != '=') continue;
+	    if (fccType && (strncasecmp(s, fccTypeStr, 5) || s[9] != '='))
continue;
 	    if ((result = handler(s, cnt++, param))) break;
 	}
     }
@@ -618,7 +618,6 @@
         lstrcpyW(picinfo->szDriver, ii.szDriver);
     }
 
-    TRACE("	-> %s\n", wine_dbgstr_icerr(ret));
     return ret;
 }
 
@@ -866,8 +865,6 @@
 	icd.lpOutput	= lpBits;
 	icd.ckid	= 0;
 	ret = ICSendMessage(hic,ICM_DECOMPRESS,(DWORD_PTR)&icd,sizeof(ICDECOMPRESS));
-
-	TRACE("-> %s\n",wine_dbgstr_icerr(ret));
 
 	return ret;
 }

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sun Feb 26 19:03:35 2017
@@ -125,7 +125,7 @@
 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.23
+reactos/dll/win32/msvfw32             # Synced to WineStaging-2.2
 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