Vincent Povirk : windowscodecs: Fix the bmpformat test on Windows 7.
Alexandre Julliard
julliard at winehq.org
Tue Sep 8 08:54:13 CDT 2009
Module: wine
Branch: master
Commit: 5a1fb6bd9c332e43da02effbbec88aeb25511409
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a1fb6bd9c332e43da02effbbec88aeb25511409
Author: Vincent Povirk <vincent at codeweavers.com>
Date: Fri Sep 4 16:40:01 2009 -0500
windowscodecs: Fix the bmpformat test on Windows 7.
---
dlls/windowscodecs/tests/bmpformat.c | 2 +-
include/wincodec.idl | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c
index 39bb3b4..c793dd7 100644
--- a/dlls/windowscodecs/tests/bmpformat.c
+++ b/dlls/windowscodecs/tests/bmpformat.c
@@ -108,7 +108,7 @@ static void test_decode_24bpp(void)
ok(count == 1, "unexpected count %u\n", count);
hr = IWICBitmapDecoder_GetFrame(decoder, 1, &framedecode);
- ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %x\n", hr);
+ ok(hr == E_INVALIDARG || hr == WINCODEC_ERR_FRAMEMISSING, "GetFrame returned %x\n", hr);
hr = IWICBitmapDecoder_GetFrame(decoder, 0, &framedecode);
ok(SUCCEEDED(hr), "GetFrame failed, hr=%x\n", hr);
diff --git a/include/wincodec.idl b/include/wincodec.idl
index 06475b0..8e8dfe6 100644
--- a/include/wincodec.idl
+++ b/include/wincodec.idl
@@ -164,6 +164,7 @@ cpp_quote("#define WINCODEC_ERR_NOTINITIALIZED 0x88982f0c")
cpp_quote("#define WINCODEC_ERR_CODECNOTHUMBNAIL 0x88982f44")
cpp_quote("#define WINCODEC_ERR_PALETTEUNAVAILABLE 0x88982f45")
cpp_quote("#define WINCODEC_ERR_COMPONENTNOTFOUND 0x88982f50")
+cpp_quote("#define WINCODEC_ERR_FRAMEMISSING 0x88982f62")
cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT 0x88982f80")
cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDOPERATION 0x88982f81")
cpp_quote("#define WINCODEC_ERR_INSUFFICIENTBUFFER 0x88982f8c")
More information about the wine-cvs
mailing list