20 Mar
2018
20 Mar
'18
11:21 a.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=48cc7814c261e6cee85fd…
commit 48cc7814c261e6cee85fdcfec90288176843b13a
Author: Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Tue Mar 20 12:21:40 2018 +0100
Commit: Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Tue Mar 20 12:21:40 2018 +0100
[MSVFW32_WINETEST] Sync with Wine Staging 3.3. CORE-14434
---
modules/rostests/winetests/msvfw32/msvfw.c | 395 ++++++++++++++++++++++++++++-
1 file changed, 383 insertions(+), 12 deletions(-)
diff --git a/modules/rostests/winetests/msvfw32/msvfw.c
b/modules/rostests/winetests/msvfw32/msvfw.c
index 3fe67026b5..c63039a092 100644
--- a/modules/rostests/winetests/msvfw32/msvfw.c
+++ b/modules/rostests/winetests/msvfw32/msvfw.c
@@ -25,6 +25,11 @@
#include "wine/test.h"
+static inline int get_stride(int width, int depth)
+{
+ return ((depth * width + 31) >> 3) & ~3;
+}
+
static void test_OpenCase(void)
{
HIC h;
@@ -88,6 +93,7 @@ static void test_Locate(void)
{
static BITMAPINFOHEADER bi = {sizeof(BITMAPINFOHEADER),32,8, 1,8, BI_RLE8,
0,100000,100000, 0,0};
static BITMAPINFOHEADER bo = {sizeof(BITMAPINFOHEADER),32,8, 1,8, BI_RGB,
0,100000,100000, 0,0};
+ BITMAPINFOHEADER tmp = {sizeof(BITMAPINFOHEADER)};
HIC h;
DWORD err;
@@ -123,6 +129,45 @@ static void test_Locate(void)
ok(err == ICERR_OK, "Query cvid->RGB32 height<0: %d\n", err);
bo.biHeight = -bo.biHeight;
+ bi.biWidth = 17;
+
+ bi.biBitCount = 8;
+ err = ICDecompressGetFormat(h, &bi, &tmp);
+ ok(err == ICERR_OK, "Query cvid output format: %d\n", err);
+ ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n",
tmp.biBitCount);
+ ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got
%d\n",
+ get_stride(17, 24) * 8, tmp.biSizeImage);
+
+ bi.biBitCount = 15;
+ err = ICDecompressGetFormat(h, &bi, &tmp);
+ ok(err == ICERR_OK, "Query cvid output format: %d\n", err);
+ ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n",
tmp.biBitCount);
+ ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got
%d\n",
+ get_stride(17, 24) * 8, tmp.biSizeImage);
+
+ bi.biBitCount = 16;
+ err = ICDecompressGetFormat(h, &bi, &tmp);
+ ok(err == ICERR_OK, "Query cvid output format: %d\n", err);
+ ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n",
tmp.biBitCount);
+ ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got
%d\n",
+ get_stride(17, 24) * 8, tmp.biSizeImage);
+
+ bi.biBitCount = 24;
+ err = ICDecompressGetFormat(h, &bi, &tmp);
+ ok(err == ICERR_OK, "Query cvid output format: %d\n", err);
+ ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n",
tmp.biBitCount);
+ ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got
%d\n",
+ get_stride(17, 24) * 8, tmp.biSizeImage);
+
+ bi.biBitCount = 32;
+ err = ICDecompressGetFormat(h, &bi, &tmp);
+ ok(err == ICERR_OK, "Query cvid output format: %d\n", err);
+ ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n",
tmp.biBitCount);
+ ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got
%d\n",
+ get_stride(17, 24) * 8, tmp.biSizeImage);
+
+ bi.biWidth = 32;
+
ok(ICClose(h) == ICERR_OK,"ICClose failed\n");
bo.biBitCount = bi.biBitCount = 8;
@@ -202,6 +247,50 @@ static void test_Locate(void)
todo_wine ok(err == ICERR_OK, "Query MSVC->RGB16 height<0: %d\n",
err);
bo.biHeight = -bo.biHeight;
+ bo.biBitCount = 24;
+ err = ICDecompressQuery(h, &bi, &bo);
+ ok(err == ICERR_OK, "Query MSVC 16->24: %d\n", err);
+ bo.biBitCount = 16;
+
+ bi.biWidth = 553;
+
+ bi.biBitCount = 8;
+ err = ICDecompressGetFormat(h, &bi, &tmp);
+ ok(err == ICERR_OK, "Query MSVC output format: %d\n", err);
+ ok(tmp.biBitCount == 8, "Expected 8 bit, got %d bit\n",
tmp.biBitCount);
+ ok(tmp.biWidth == 552, "Expected width 552, got %d\n", tmp.biWidth);
+ ok(tmp.biSizeImage == get_stride(552, 8) * 8, "Expected size %d, got
%d\n",
+ get_stride(552, 8) * 8, tmp.biSizeImage);
+
+ bi.biBitCount = 15;
+ err = ICDecompressGetFormat(h, &bi, &tmp);
+ ok(err == ICERR_BADFORMAT, "Query MSVC output format: %d\n", err);
+
+ bi.biBitCount = 16;
+ err = ICDecompressGetFormat(h, &bi, &tmp);
+ ok(err == ICERR_OK, "Query MSVC output format: %d\n", err);
+ ok(tmp.biBitCount == 16, "Expected 16 bit, got %d bit\n",
tmp.biBitCount);
+ ok(tmp.biWidth == 552, "Expected width 552, got %d\n", tmp.biWidth);
+ ok(tmp.biSizeImage == get_stride(552, 16) * 8, "Expected size %d, got
%d\n",
+ get_stride(552, 16) * 8, tmp.biSizeImage);
+
+ bi.biBitCount = 24;
+ err = ICDecompressGetFormat(h, &bi, &tmp);
+ ok(err == ICERR_BADFORMAT, "Query MSVC output format: %d\n", err);
+
+ bi.biBitCount = 32;
+ err = ICDecompressGetFormat(h, &bi, &tmp);
+ ok(err == ICERR_BADFORMAT, "Query MSVC output format: %d\n", err);
+
+ bi.biHeight = 17;
+ bi.biBitCount = 8;
+ err = ICDecompressGetFormat(h, &bi, &tmp);
+ ok(err == ICERR_OK, "Query MSVC output format: %d\n", err);
+ ok(tmp.biHeight == 16, "Expected height 16, got %d\n", tmp.biHeight);
+ bi.biHeight = 8;
+
+ bi.biWidth = 32;
+
bi.biCompression = mmioFOURCC('m','s','v','c');
err = ICDecompressQuery(h, &bi, &bo);
ok(err == ICERR_BADFORMAT, "Query msvc->RGB16: %d\n", err);
@@ -285,6 +374,290 @@ static void test_ICSeqCompress(void)
ok(err == ICERR_BADHANDLE, "Expected -8, got %d\n", err);
}
+struct msg_result
+{
+ int msg_index;
+ UINT msg;
+ BOOL output_format;
+ int width;
+ int height;
+ int bits;
+ int compression;
+ LRESULT result;
+ BOOL todo;
+};
+
+static struct msg_result expected_msgs[] =
+{
+ /* Wine bug - shouldn't be called */
+ { 0, DRV_LOAD, FALSE, 0, 0, 0, 0,
TRUE, TRUE},
+ { 0, DRV_ENABLE, FALSE, 0, 0, 0, 0,
0, TRUE},
+
+ { 0, DRV_OPEN, FALSE, 0, 0, 0, 0,
0xdeadbeef, FALSE},
+
+ /* test 1 */
+ { 1, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0,
ICERR_OK, FALSE},
+ { 2, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB,
ICERR_BADFORMAT, FALSE},
+ { 3, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 8, BI_RGB,
ICERR_BADFORMAT, FALSE},
+ { 4, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 16, BI_RGB,
ICERR_BADFORMAT, FALSE},
+ { 5, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 16, BI_BITFIELDS,
ICERR_BADFORMAT, FALSE},
+ { 6, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 24, BI_RGB,
ICERR_BADFORMAT, FALSE},
+ { 7, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 32, BI_RGB,
ICERR_BADFORMAT, FALSE},
+ { 8, ICM_DECOMPRESS_GET_FORMAT, TRUE, 640, 480, 32, BI_RGB,
ICERR_OK, FALSE},
+
+ /* test 2 */
+ { 9, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0,
ICERR_OK, FALSE},
+ {10, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB,
ICERR_BADFORMAT, FALSE},
+ {11, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 8, BI_RGB,
ICERR_BADFORMAT, FALSE},
+ {12, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 16, BI_RGB,
ICERR_OK, FALSE},
+
+ /* test 3 */
+ {13, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0,
ICERR_OK, FALSE},
+ {14, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB,
ICERR_OK, FALSE},
+ {15, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 8, BI_RGB,
ICERR_BADFORMAT, FALSE},
+ {16, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 16, BI_RGB,
ICERR_OK, FALSE},
+
+ /* test 4 */
+ {17, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0,
ICERR_OK, FALSE},
+ {18, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB,
ICERR_BADFORMAT, FALSE},
+ {19, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 24, BI_RGB,
ICERR_BADFORMAT, FALSE},
+ {20, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 32, BI_RGB,
ICERR_BADFORMAT, FALSE},
+ {21, ICM_DECOMPRESS_GET_FORMAT, TRUE, 640, 480, 32, BI_RGB,
ICERR_OK, FALSE},
+
+ /* test 5 */
+ {22, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0,
ICERR_OK, FALSE},
+ {23, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB,
ICERR_OK, FALSE},
+ {24, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 32, BI_RGB,
ICERR_OK, FALSE},
+
+ /* test 6 */
+ {25, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0,
ICERR_OK, FALSE},
+ {26, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB,
ICERR_OK, FALSE},
+ {27, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 32, BI_RGB,
ICERR_OK, FALSE},
+
+ /* test 7 */
+ {28, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0,
ICERR_OK, FALSE},
+ {29, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB,
ICERR_OK, FALSE},
+ {30, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 9, BI_RGB,
ICERR_BADFORMAT, FALSE},
+ {31, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 32, BI_RGB,
ICERR_BADFORMAT, FALSE},
+ {32, ICM_DECOMPRESS_GET_FORMAT, TRUE, 640, 480, 32, BI_RGB,
ICERR_OK, FALSE},
+
+ /* test 8 */
+ {33, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0,
ICERR_OK, FALSE},
+ {34, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB,
ICERR_OK, FALSE},
+ {35, ICM_DECOMPRESS_QUERY, TRUE, 800, 600, 32, BI_RGB,
ICERR_OK, FALSE},
+
+ /* test 9 */
+ {36, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0,
ICERR_OK, FALSE},
+ {37, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB,
ICERR_OK, FALSE},
+ {38, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 32, BI_RGB,
ICERR_OK, FALSE},
+
+ /* test 10 */
+ {39, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0,
ICERR_OK, FALSE},
+ {40, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB,
ICERR_OK, FALSE},
+ {41, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 32, BI_RGB,
ICERR_OK, FALSE},
+
+ /* test 11 */
+ {42, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0,
ICERR_OK, FALSE},
+ {43, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB,
ICERR_OK, FALSE},
+ {44, ICM_DECOMPRESS_QUERY, TRUE, 270, 270, 8, BI_RGB,
ICERR_OK, FALSE},
+ {45, ICM_DECOMPRESS_GET_PALETTE, FALSE, 0, 0, 0, 0,
ICERR_UNSUPPORTED, FALSE},
+
+ /* test 12 */
+ {46, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0,
ICERR_OK, FALSE},
+ {47, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB,
ICERR_OK, FALSE},
+ {48, ICM_DECOMPRESS_QUERY, TRUE, 270, 270, 16, BI_RGB,
ICERR_OK, FALSE},
+
+ /* test 13 */
+ {49, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0,
ICERR_OK, FALSE},
+ {50, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB,
ICERR_OK, FALSE},
+ {51, ICM_DECOMPRESS_QUERY, TRUE, 270, 270, 24, BI_RGB,
ICERR_OK, FALSE},
+
+ /* test 14 */
+ {52, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0,
ICERR_OK, FALSE},
+ {53, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB,
ICERR_OK, FALSE},
+ {54, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 4, BI_RGB,
ICERR_OK, FALSE},
+
+ /* Wine bug - shouldn't be called */
+ {55, DRV_DISABLE, FALSE, 0, 0, 0, 0,
ICERR_OK, TRUE},
+ {55, DRV_FREE, FALSE, 0, 0, 0, 0,
ICERR_OK, TRUE},
+};
+
+static int msg_index = 0;
+
+static struct msg_result *get_expected_msg(UINT msg)
+{
+ int i = 0;
+ for(; i < sizeof(expected_msgs) / sizeof(expected_msgs[0]); i++)
+ {
+ if (expected_msgs[i].msg_index == msg_index && expected_msgs[i].msg ==
msg)
+ return &expected_msgs[i];
+ }
+ return NULL;
+}
+
+LRESULT WINAPI driver_proc_test(DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg,
+ LPARAM lParam1, LPARAM lParam2)
+{
+ struct msg_result *expected = get_expected_msg(msg);
+ LRESULT res = expected ? expected->result : ICERR_UNSUPPORTED;
+
+ if (msg == DRV_CLOSE)
+ return ICERR_OK;
+
+ if (!expected)
+ {
+ ok(0, "unexpected message: %04x %ld %ld at msg index %d\n",
+ msg, lParam1, lParam2, msg_index);
+ return ICERR_UNSUPPORTED;
+ }
+ else if (expected->todo)
+ {
+ todo_wine ok(0, "unexpected message: %04x %ld %ld at msg index %d\n",
+ msg, lParam1, lParam2, msg_index);
+ return res;
+ }
+
+ switch (msg)
+ {
+ case ICM_DECOMPRESS_QUERY:
+ {
+ BITMAPINFOHEADER *out = (BITMAPINFOHEADER *)lParam2;
+
+ if (!lParam2)
+ {
+ trace("query -> without format\n");
+ ok(!expected->output_format, "Expected no output format
pointer\n");
+ break;
+ }
+
+ ok(expected->output_format, "Expected output format
pointer\n");
+ ok(out->biWidth == expected->width,
+ "Expected width %d, got %d\n", expected->width,
out->biWidth);
+ ok(out->biHeight == expected->height,
+ "Expected height %d, got %d\n", expected->height,
out->biHeight);
+ ok(out->biBitCount == expected->bits,
+ "Expected biBitCount %d, got %d\n", expected->bits,
out->biBitCount);
+ ok(out->biCompression == expected->compression,
+ "Expected compression %d, got %d\n", expected->compression,
out->biCompression);
+ ok(out->biSizeImage == get_stride(out->biWidth, out->biBitCount) *
out->biHeight,
+ "Expected biSizeImage %d, got %d\n", get_stride(out->biWidth,
out->biBitCount) * out->biHeight,
+ out->biSizeImage);
+
+ trace("query -> width: %d, height: %d, bit: %d, compression: %d,
size: %d\n",
+ out->biWidth, out->biHeight, out->biBitCount,
out->biCompression, out->biSizeImage);
+ break;
+ }
+
+ case ICM_DECOMPRESS_GET_FORMAT:
+ {
+ BITMAPINFOHEADER *out = (BITMAPINFOHEADER *)lParam2;
+
+ if (!lParam2)
+ {
+ trace("format -> without format\n");
+ ok(!expected->output_format, "Expected no output format
pointer\n");
+ break;
+ }
+
+ ok(expected->output_format, "Expected output format
pointer\n");
+ ok(out->biWidth == expected->width,
+ "Expected width %d, got %d\n", expected->width,
out->biWidth);
+ ok(out->biHeight == expected->height,
+ "Expected height %d, got %d\n", expected->height,
out->biHeight);
+ ok(out->biBitCount == expected->bits,
+ "Expected biBitCount %d, got %d\n", expected->bits,
out->biBitCount);
+ ok(out->biCompression == expected->compression,
+ "Expected compression %d, got %d\n", expected->compression,
out->biCompression);
+
+ trace("format -> width: %d, height: %d, bit: %d, compression: %d,
size: %d\n",
+ out->biWidth, out->biHeight, out->biBitCount,
out->biCompression, out->biSizeImage);
+
+ out->biBitCount = 64;
+ break;
+ }
+ }
+
+ msg_index++;
+ return res;
+}
+
+
+void test_ICGetDisplayFormat(void)
+{
+ static const struct
+ {
+ int bits_wanted;
+ int bits_expected;
+ int dx;
+ int width_expected;
+ int dy;
+ int height_expected;
+ int msg_index;
+ }
+ tests[] =
+ {
+ { 8, 64, 0, 640, 0, 480, 9},
+ { 8, 16, 0, 640, 0, 480, 13},
+ { 8, 16, 0, 640, 0, 480, 17},
+ {24, 64, 0, 640, 0, 480, 22},
+ {32, 32, 0, 640, 0, 480, 25},
+ { 0, 32, 0, 640, 0, 480, 28},
+ { 9, 64, 0, 640, 0, 480, 33},
+ {32, 32, 800, 800, 600, 600, 36},
+ {32, 32, -1, 640, -1, 480, 39},
+ {32, 32, -90, 640, -60, 480, 42},
+ { 8, 8, 270, 270, 270, 270, 46},
+ {16, 16, 270, 270, 270, 270, 49},
+ {24, 24, 270, 270, 270, 270, 52},
+ { 4, 4, 0, 640, 0, 480, 55},
+ };
+
+ HIC ic, ic2;
+ BITMAPINFOHEADER in;
+ BITMAPINFOHEADER out;
+ int real_depth;
+ int i;
+
+ ic = ICOpenFunction(ICTYPE_VIDEO, 0xdeadbeef, ICMODE_DECOMPRESS, driver_proc_test);
+ ok(!!ic, "Opening driver failed\n");
+
+ for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++)
+ {
+ memset(&in, 0, sizeof(in));
+ memset(&out, 0, sizeof(out));
+
+ in.biSize = sizeof(in);
+ in.biWidth = 640;
+ in.biHeight = 480;
+ in.biPlanes = 1;
+ in.biBitCount = 32;
+ in.biCompression = BI_PNG;
+ in.biSizeImage = 1024;
+
+ out.biBitCount = 16;
+ out.biWidth = 320;
+ out.biHeight = 240;
+
+ ic2 = ICGetDisplayFormat(ic, &in, &out, tests[i].bits_wanted,
tests[i].dx, tests[i].dy);
+ ok(!!ic2, "Expected ICGetDisplayFormat to succeeded\n");
+
+ ok(out.biBitCount == tests[i].bits_expected,
+ "Expected biBitCount %d, got %d\n", tests[i].bits_expected,
out.biBitCount);
+ ok(out.biWidth == tests[i].width_expected,
+ "Expected biWidth %d, got %d\n", tests[i].width_expected,
out.biWidth);
+ ok(out.biHeight == tests[i].height_expected,
+ "Expected biHeight %d, got %d\n", tests[i].height_expected,
out.biHeight);
+ real_depth = (out.biBitCount > 32) ? 32 : out.biBitCount;
+ ok(out.biSizeImage == get_stride(out.biWidth, real_depth) * out.biHeight,
+ "Expected biSizeImage %d, got %d\n", get_stride(out.biWidth,
real_depth) * out.biHeight,
+ out.biSizeImage);
+ ok(msg_index == tests[i].msg_index,
+ "Expected msg_index %d, got %d\n", tests[i].msg_index, msg_index);
+ }
+
+ ICClose(ic);
+}
+
static void test_ICInfo(void)
{
ICINFO info, info2;
@@ -294,6 +667,7 @@ static void test_ICInfo(void)
for (i = found = 0; ICInfo(0, i, &info); i++)
{
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),
"ICInfo failed on fcc 0x%08x\n", info.fccHandler);
@@ -303,20 +677,16 @@ static void test_ICInfo(void)
found++;
/* Test getting info with a different case - bug 41602 */
- if (fcc[0] & 0x20)
- {
- fcc[0] &= ~0x20;
- ok(ICInfo(info.fccType, info.fccHandler, &info2),
- "ICInfo failed on fcc 0x%08x using lowercase fccHandler\n",
info.fccHandler);
- }
- else
- {
- fcc[0] |= 0x20;
- ok(ICInfo(info.fccType, info.fccHandler, &info2),
- "ICInfo failed on fcc 0x%08x using uppercase fccHandler\n",
info.fccHandler);
- }
+ fcc[0] ^= 0x20;
+ ok(ICInfo(info.fccType, info.fccHandler, &info2),
+ "ICInfo failed on fcc 0x%08x\n", info.fccHandler);
}
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)
@@ -324,5 +694,6 @@ START_TEST(msvfw)
test_OpenCase();
test_Locate();
test_ICSeqCompress();
+ test_ICGetDisplayFormat();
test_ICInfo();
}