From ee4765946d733a1b1d13f262c8da59c5ab85b644 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 26 Feb 2017 19:03:35 +0000 Subject: [PATCH] [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. svn path=/trunk/; revision=73968 --- reactos/dll/win32/msvfw32/msvfw32.spec | 4 ++-- reactos/dll/win32/msvfw32/msvideo_main.c | 7 ++----- reactos/media/doc/README.WINE | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/reactos/dll/win32/msvfw32/msvfw32.spec b/reactos/dll/win32/msvfw32/msvfw32.spec index 3fdd2f63eea..f0c9e157fd0 100644 --- a/reactos/dll/win32/msvfw32/msvfw32.spec +++ b/reactos/dll/win32/msvfw32/msvfw32.spec @@ -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) diff --git a/reactos/dll/win32/msvfw32/msvideo_main.c b/reactos/dll/win32/msvfw32/msvideo_main.c index 4aea48fc634..931effee64d 100644 --- a/reactos/dll/win32/msvfw32/msvideo_main.c +++ b/reactos/dll/win32/msvfw32/msvideo_main.c @@ -245,7 +245,7 @@ static BOOL enum_drivers(DWORD fccType, enum_handler_t handler, void* param) 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 @@ static BOOL enum_drivers(DWORD fccType, enum_handler_t handler, void* param) 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 @@ LRESULT VFWAPI ICGetInfo(HIC hic, ICINFO *picinfo, DWORD cb) lstrcpyW(picinfo->szDriver, ii.szDriver); } - TRACE(" -> %s\n", wine_dbgstr_icerr(ret)); return ret; } @@ -867,8 +866,6 @@ DWORD VFWAPIV ICDecompress(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiFormat, icd.ckid = 0; ret = ICSendMessage(hic,ICM_DECOMPRESS,(DWORD_PTR)&icd,sizeof(ICDECOMPRESS)); - TRACE("-> %s\n",wine_dbgstr_icerr(ret)); - return ret; } diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 26a06864519..1ccd11123ce 100644 --- 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.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