[PATCH] Fix a few test failures on Win9x and WinMe

Paul Vriens Paul.Vriens.Wine at gmail.com
Thu Dec 4 07:44:08 CST 2008


---
 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));
-- 
1.6.0.4


--------------050806040204040502010304--



More information about the wine-patches mailing list