Huw Davies : gdi32/tests: Win9x's GetDIBits() sets biSizeImage to zero for BI_RGB dibs.

[Alexandre Julliard]

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

Author: Huw Davies <huw at codeweavers.com>
Date:   Mon Mar  9 17:03:40 2009 +0000

gdi32/tests: Win9x's GetDIBits() sets biSizeImage to zero for BI_RGB dibs.

---

 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 f095d6a..ec466dd 100644
--- a/dlls/gdi32/tests/bitmap.c
+++ b/dlls/gdi32/tests/bitmap.c
@@ -1564,7 +1564,9 @@ static void test_GetDIBits(void)
     lines = GetDIBits(hdc, hbmp, 0, bm.bmHeight, buf, bi, DIB_RGB_COLORS);
     ok(lines == bm.bmHeight, "GetDIBits copied %d lines of %d, error %u\n",
        lines, bm.bmHeight, GetLastError());
-    ok(bi->bmiHeader.biSizeImage == sizeof(dib_bits_1), "expected 16*4, got %u\n", bi->bmiHeader.biSizeImage);
+    ok(bi->bmiHeader.biSizeImage == sizeof(dib_bits_1) ||
+       broken(bi->bmiHeader.biSizeImage == 0), /* win9x */
+       "expected 16*4, got %u\n", bi->bmiHeader.biSizeImage);
 
     /* the color table consists of black and white */
     ok(bi->bmiColors[0].rgbRed == 0 && bi->bmiColors[0].rgbGreen == 0 &&
@@ -1614,7 +1616,9 @@ static void test_GetDIBits(void)
     lines = GetDIBits(hdc, hbmp, 0, bm.bmHeight, buf, bi, DIB_RGB_COLORS);
     ok(lines == bm.bmHeight, "GetDIBits copied %d lines of %d, error %u\n",
        lines, bm.bmHeight, GetLastError());
-    ok(bi->bmiHeader.biSizeImage == sizeof(dib_bits_24), "expected 16*16*3, got %u\n", bi->bmiHeader.biSizeImage);
+    ok(bi->bmiHeader.biSizeImage == sizeof(dib_bits_24) ||
+       broken(bi->bmiHeader.biSizeImage == 0), /* win9x */
+       "expected 16*16*3, got %u\n", bi->bmiHeader.biSizeImage);
 
     /* the color table doesn't exist for 24-bit images */
     for (i = 0; i < 256; i++)
@@ -1675,7 +1679,9 @@ static void test_GetDIBits(void)
     lines = GetDIBits(hdc, hbmp, 0, bm.bmHeight, buf, bi, DIB_RGB_COLORS);
     ok(lines == bm.bmHeight, "GetDIBits copied %d lines of %d, error %u\n",
        lines, bm.bmHeight, GetLastError());
-    ok(bi->bmiHeader.biSizeImage == sizeof(dib_bits_1), "expected 16*4, got %u\n", bi->bmiHeader.biSizeImage);
+    ok(bi->bmiHeader.biSizeImage == sizeof(dib_bits_1) ||
+       broken(bi->bmiHeader.biSizeImage == 0), /* win9x */
+       "expected 16*4, got %u\n", bi->bmiHeader.biSizeImage);
 
     /* the color table consists of black and white */
     ok(bi->bmiColors[0].rgbRed == 0 && bi->bmiColors[0].rgbGreen == 0 &&
@@ -1726,7 +1732,9 @@ todo_wine
     lines = GetDIBits(hdc, hbmp, 0, bm.bmHeight, buf, bi, DIB_RGB_COLORS);
     ok(lines == bm.bmHeight, "GetDIBits copied %d lines of %d, error %u\n",
        lines, bm.bmHeight, GetLastError());
-    ok(bi->bmiHeader.biSizeImage == sizeof(dib_bits_24), "expected 16*16*3, got %u\n", bi->bmiHeader.biSizeImage);
+    ok(bi->bmiHeader.biSizeImage == sizeof(dib_bits_24) ||
+       broken(bi->bmiHeader.biSizeImage == 0), /* win9x */
+       "expected 16*16*3, got %u\n", bi->bmiHeader.biSizeImage);
 
     /* the color table doesn't exist for 24-bit images */
     for (i = 0; i < 256; i++)