From: Elizabeth Figura zfigura@codeweavers.com
--- dlls/ir50_32/ir50.c | 4 ++-- dlls/ir50_32/tests/ir50_32.c | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/dlls/ir50_32/ir50.c b/dlls/ir50_32/ir50.c index 69700359e99..ed57e135a2c 100644 --- a/dlls/ir50_32/ir50.c +++ b/dlls/ir50_32/ir50.c @@ -74,7 +74,7 @@ IV50_DecompressQuery( LPBITMAPINFO in, LPBITMAPINFO out ) TRACE("in->width = %ld\n", in->bmiHeader.biWidth); TRACE("in->compr = %#lx\n", in->bmiHeader.biCompression);
- if ( in->bmiHeader.biCompression != IV50_MAGIC ) + if (compare_fourcc(in->bmiHeader.biCompression, IV50_MAGIC)) { TRACE("can't do %#lx compression\n", in->bmiHeader.biCompression); return ICERR_BADFORMAT; @@ -123,7 +123,7 @@ IV50_DecompressGetFormat( LPBITMAPINFO in, LPBITMAPINFO out ) if ( !in ) return ICERR_BADPARAM;
- if ( in->bmiHeader.biCompression != IV50_MAGIC ) + if (compare_fourcc(in->bmiHeader.biCompression, IV50_MAGIC)) return ICERR_BADFORMAT;
size = in->bmiHeader.biSize; diff --git a/dlls/ir50_32/tests/ir50_32.c b/dlls/ir50_32/tests/ir50_32.c index 1321b8c877a..f68bf4ab590 100644 --- a/dlls/ir50_32/tests/ir50_32.c +++ b/dlls/ir50_32/tests/ir50_32.c @@ -33,9 +33,7 @@ static void test_formats(void) in.biCompression = mmioFOURCC('i','v','5','0');
hic = ICLocate(ICTYPE_VIDEO, mmioFOURCC('i','v','5','0'), &in, NULL, ICMODE_DECOMPRESS); - todo_wine ok(!!hic, "Failed to open codec.\n"); - if (!hic) - return; + ok(!!hic, "Failed to open codec.\n");
ret = ICGetInfo(hic, &info, sizeof(info)); ok(ret == sizeof(info), "Got %Id.\n", ret);