From c678bdd718030da780ee1d778c3307119d7a4596 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20H=C3=B6hle?= Date: Tue, 8 Jun 2010 17:25:39 +0200 Subject: [PATCH] msvidc: ICDecompressQuery returns ICERR_BADFORMAT on error. --- dlls/msvfw32/tests/msvfw.c | 2 +- dlls/msvidc32/msvideo1.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 46aba3c881b..139c644326a 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -183,7 +183,7 @@ static void test_Locate(void) bi.biCompression = mmioFOURCC('m','s','v','c'); err = ICDecompressQuery(h, &bi, &bo); - todo_wine ok(err == ICERR_BADFORMAT, "Query msvc->RGB16: %d\n", err); + ok(err == ICERR_BADFORMAT, "Query msvc->RGB16: %d\n", err); ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); } diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index d01f07a9eea..7add314d8d3 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -308,26 +308,26 @@ CRAM_DecompressQuery( Msvideo1Context *info, LPBITMAPINFO in, LPBITMAPINFO out ) if( ( in->bmiHeader.biCompression != CRAM_MAGIC ) && ( in->bmiHeader.biCompression != MSVC_MAGIC ) && ( in->bmiHeader.biCompression != WHAM_MAGIC ) ) - return ICERR_UNSUPPORTED; + return ICERR_BADFORMAT; if( ( in->bmiHeader.biBitCount != 16 ) && ( in->bmiHeader.biBitCount != 8 ) ) { TRACE("can't do %d bpp\n", in->bmiHeader.biBitCount ); - return ICERR_UNSUPPORTED; + return ICERR_BADFORMAT; } /* output must be same dimensions as input */ if( out ) { if( in->bmiHeader.biBitCount != out->bmiHeader.biBitCount ) - return ICERR_UNSUPPORTED; + return ICERR_BADFORMAT; if( in->bmiHeader.biPlanes != out->bmiHeader.biPlanes ) - return ICERR_UNSUPPORTED; + return ICERR_BADFORMAT; if( in->bmiHeader.biHeight != out->bmiHeader.biHeight ) - return ICERR_UNSUPPORTED; + return ICERR_BADFORMAT; if( in->bmiHeader.biWidth != out->bmiHeader.biWidth ) - return ICERR_UNSUPPORTED; + return ICERR_BADFORMAT; } TRACE("OK!\n");