[PATCH 2/2] Fix some test failures on older gdiplus versions

Paul Vriens Paul.Vriens.Wine at gmail.com
Mon Sep 28 05:03:31 CDT 2009


---
 dlls/gdiplus/tests/image.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c
index e973186..cd761bd 100644
--- a/dlls/gdiplus/tests/image.c
+++ b/dlls/gdiplus/tests/image.c
@@ -828,10 +828,14 @@ static void test_getsetpixel(void)
     expect(InvalidParameter, stat);
 
     stat = GdipBitmapGetPixel(bitmap, 1, -1, &color);
-    expect(InvalidParameter, stat);
+    ok(stat == InvalidParameter ||
+       broken(stat == Ok), /* Older gdiplus */
+       "Expected InvalidParameter, got %.8x\n", stat);
 
     stat = GdipBitmapSetPixel(bitmap, 1, -1, 0);
-    expect(InvalidParameter, stat);
+    ok(stat == InvalidParameter ||
+       broken(stat == Ok), /* Older gdiplus */
+       "Expected InvalidParameter, got %.8x\n", stat);
 
     stat = GdipBitmapGetPixel(bitmap, 2, 1, &color);
     expect(InvalidParameter, stat);
-- 
1.6.2.5


--------------020502010008050809050000--



More information about the wine-patches mailing list