ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvfw32: Set fccType in ICInfo().

Browse Source 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2018-02-13 13:00:05 -06:00 committed by Alexandre Julliard
parent 3396ca87ae
commit 2068b95aba
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/msvfw32/msvideo_main.c
View File

@ -303,6 +303,7 @@ static BOOL ICInfo_enum_handler(const char *name, const char *driver, unsigned i
if (lpicinfo->fccHandler != nr && compare_fourcc(lpicinfo->fccHandler, fccHandler)) if (lpicinfo->fccHandler != nr && compare_fourcc(lpicinfo->fccHandler, fccHandler))
return FALSE; return FALSE;
lpicinfo->fccType = fccType;
lpicinfo->fccHandler = fccHandler; lpicinfo->fccHandler = fccHandler;
lpicinfo->dwFlags = 0; lpicinfo->dwFlags = 0;
lpicinfo->dwVersion = 0; lpicinfo->dwVersion = 0;

6
dlls/msvfw32/tests/msvfw.c
View File

@ -294,6 +294,7 @@ static void test_ICInfo(void)
for (i = found = 0; ICInfo(0, i, &info); i++) for (i = found = 0; ICInfo(0, i, &info); i++)
{ {
trace("Codec name: %s, fccHandler: 0x%08x\n", wine_dbgstr_w(info.szName), info.fccHandler); trace("Codec name: %s, fccHandler: 0x%08x\n", wine_dbgstr_w(info.szName), info.fccHandler);
ok(info.fccType, "expected nonzero fccType\n");
ok(ICInfo(info.fccType, info.fccHandler, &info2), ok(ICInfo(info.fccType, info.fccHandler, &info2),
"ICInfo failed on fcc 0x%08x\n", info.fccHandler); "ICInfo failed on fcc 0x%08x\n", info.fccHandler);
@ -308,6 +309,11 @@ static void test_ICInfo(void)
"ICInfo failed on fcc 0x%08x\n", info.fccHandler); "ICInfo failed on fcc 0x%08x\n", info.fccHandler);
} }
ok(found != 0, "expected at least one codec\n"); ok(found != 0, "expected at least one codec\n");
memset(&info, 0, sizeof(info));
ok(!ICInfo(ICTYPE_VIDEO, mmioFOURCC('f','a','k','e'), &info), "expected failure\n");
ok(info.fccType == ICTYPE_VIDEO, "got 0x%08x\n", info.fccType);
ok(info.fccHandler == mmioFOURCC('f','a','k','e'), "got 0x%08x\n", info.fccHandler);
} }
START_TEST(msvfw) START_TEST(msvfw)