Paul Vriens : gdi32/tests: Fix a few test failures on Win9x and WinMe.

[Alexandre Julliard]

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

Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com>
Date:   Thu Dec  4 14:44:08 2008 +0100

gdi32/tests: Fix a few test failures on Win9x and WinMe.

---

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

diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c
index a47dc38..7ab8323 100644
--- a/dlls/gdi32/tests/bitmap.c
+++ b/dlls/gdi32/tests/bitmap.c
@@ -2013,21 +2013,27 @@ static void test_bitmapinfoheadersize(void)
 
     SetLastError(0xdeadbeef);
     hdib = CreateDIBSection(hdc, &bmi, 0, NULL, NULL, 0);
-    ok(hdib != NULL, "CreateDIBSection error %d\n", GetLastError());
+    ok(hdib != NULL ||
+       broken(!hdib), /* Win98, WinMe */
+       "CreateDIBSection error %d\n", GetLastError());
     DeleteObject(hdib);
 
     bmi.bmiHeader.biSize = sizeof(BITMAPINFO);
 
     SetLastError(0xdeadbeef);
     hdib = CreateDIBSection(hdc, &bmi, 0, NULL, NULL, 0);
-    ok(hdib != NULL, "CreateDIBSection error %d\n", GetLastError());
+    ok(hdib != NULL ||
+       broken(!hdib), /* Win98, WinMe */
+       "CreateDIBSection error %d\n", GetLastError());
     DeleteObject(hdib);
 
     bmi.bmiHeader.biSize++;
 
     SetLastError(0xdeadbeef);
     hdib = CreateDIBSection(hdc, &bmi, 0, NULL, NULL, 0);
-    ok(hdib != NULL, "CreateDIBSection error %d\n", GetLastError());
+    ok(hdib != NULL ||
+       broken(!hdib), /* Win98, WinMe */
+       "CreateDIBSection error %d\n", GetLastError());
     DeleteObject(hdib);
 
     bmi.bmiHeader.biSize = sizeof(BITMAPV4HEADER);
@@ -2041,7 +2047,9 @@ static void test_bitmapinfoheadersize(void)
 
     SetLastError(0xdeadbeef);
     hdib = CreateDIBSection(hdc, &bmi, 0, NULL, NULL, 0);
-    ok(hdib != NULL, "CreateDIBSection error %d\n", GetLastError());
+    ok(hdib != NULL ||
+       broken(!hdib), /* Win95 */
+       "CreateDIBSection error %d\n", GetLastError());
     DeleteObject(hdib);
 
     memset(&bci, 0, sizeof(BITMAPCOREINFO));