Paul Vriens : gdi32/tests: Fix some test failures on Win9x.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ed4444dae595df8819db8f40e7f410a88bcf7e56
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ed4444dae595df8819db8f40e7...

Author: Paul Vriens 
Date:   Thu Dec 11 17:36:46 2008 +0100

gdi32/tests: Fix some test failures on Win9x.

---

dlls/gdi32/tests/bitmap.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c
index 7094f85..76547d3 100644
--- a/dlls/gdi32/tests/bitmap.c
+++ b/dlls/gdi32/tests/bitmap.c
@@ -339,7 +339,7 @@ static void test_dib_info(HBITMAP hbm, const void *bits, const BITMAPINFOHEADER

/* test various buffer sizes for GetObject */
     ret = GetObject(hbm, 0, NULL);
-    ok(ret == sizeof(bm), "wrong size %d\n", ret);
+    ok(ret == sizeof(bm) || broken(ret == sizeof(DIBSECTION) /* Win9x */), "wrong size %d\n", ret);

ret = GetObject(hbm, sizeof(*dsa) * 2, dsa);
     ok(ret == sizeof(*dsa) || broken(ret == sizeof(*dsa) * 2 /* Win9x */), "wrong size %d\n", ret);
@@ -367,7 +367,7 @@ static void test_dib_info(HBITMAP hbm, const void *bits, const BITMAPINFOHEADER

memset(&ds, 0xAA, sizeof(ds));
     ret = GetObject(hbm, sizeof(ds) - 4, &ds);
-    ok(ret == sizeof(ds.dsBm), "wrong size %d\n", ret);
+    ok(ret == sizeof(ds.dsBm) || broken(ret == (sizeof(ds) - 4) /* Win9x */), "wrong size %d\n", ret);
     ok(ds.dsBm.bmWidth == bmih->biWidth, "%u != %u\n", ds.dsBmih.biWidth, bmih->biWidth);
     ok(ds.dsBm.bmHeight == bmih->biHeight, "%u != %u\n", ds.dsBmih.biHeight, bmih->biHeight);
     ok(ds.dsBm.bmBits == bits, "%p != %p\n", ds.dsBm.bmBits, bits);
@@ -376,7 +376,7 @@ static void test_dib_info(HBITMAP hbm, const void *bits, const BITMAPINFOHEADER
     ok(ret == 0, "%d != 0\n", ret);

ret = GetObject(hbm, 1, &ds);
-    ok(ret == 0, "%d != 0\n", ret);
+    ok(ret == 0 || broken(ret == 1 /* Win9x */), "%d != 0\n", ret);
 }

#define test_color_todo(got, exp, txt, todo) \
@@ -2150,7 +2150,7 @@ void test_GdiAlphaBlend()

if (!pGdiAlphaBlend)
     {
-        skip("GdiAlphaBlend() is not implemented\n");
+        win_skip("GdiAlphaBlend() is not implemented\n");
         return;
     }