Huw Davies : gdi32: Add more broken behaviour on nt4 sp3.

[Alexandre Julliard]

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

Author: Huw Davies 
Date:   Tue Jun 21 10:04:00 2011 +0100

gdi32: Add more broken behaviour on nt4 sp3.

---

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

diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c
index 619c761..ca53fc7 100644
--- a/dlls/gdi32/tests/bitmap.c
+++ b/dlls/gdi32/tests/bitmap.c
@@ -1874,7 +1874,8 @@ static void test_GetDIBits_BI_BITFIELDS(void)
     ok(ret == 1, "GetDIBits failed\n");
     ok( dibinfo->bmiHeader.biBitCount == 32, "wrong bit count %u\n", dibinfo->bmiHeader.biBitCount );

-    ok( dibinfo->bmiHeader.biCompression == BI_BITFIELDS,
+    ok( dibinfo->bmiHeader.biCompression == BI_BITFIELDS ||
+        broken( dibinfo->bmiHeader.biCompression == BI_RGB ), /* nt4 sp3 */
         "compression is %u\n", dibinfo->bmiHeader.biCompression );
     ok( !bitmasks[0], "red mask is set\n" );
     ok( !bitmasks[1], "green mask is set\n" );
@@ -1884,9 +1885,15 @@ static void test_GetDIBits_BI_BITFIELDS(void)
     ret = GetDIBits(hdc, hbm, 0, 1, bits, dibinfo, DIB_RGB_COLORS);
     ok(ret == 1, "GetDIBits failed\n");
     ok( dibinfo->bmiHeader.biBitCount == 32, "wrong bit count %u\n", dibinfo->bmiHeader.biBitCount );
-    ok( bitmasks[0] == 0xff0000, "wrong red mask %08x\n", bitmasks[0] );
-    ok( bitmasks[1] == 0x00ff00, "wrong green mask %08x\n", bitmasks[1] );
-    ok( bitmasks[2] == 0x0000ff, "wrong blue mask %08x\n", bitmasks[2] );
+    ok( dibinfo->bmiHeader.biCompression == BI_BITFIELDS ||
+        broken( dibinfo->bmiHeader.biCompression == BI_RGB ), /* nt4 sp3 */
+        "compression is %u\n", dibinfo->bmiHeader.biCompression );
+    if (dibinfo->bmiHeader.biCompression == BI_BITFIELDS)
+    {
+        ok( bitmasks[0] == 0xff0000, "wrong red mask %08x\n", bitmasks[0] );
+        ok( bitmasks[1] == 0x00ff00, "wrong green mask %08x\n", bitmasks[1] );
+        ok( bitmasks[2] == 0x0000ff, "wrong blue mask %08x\n", bitmasks[2] );
+    }
     ok( dibinfo->bmiHeader.biSizeImage != 0xdeadbeef, "size image not set\n" );

DeleteObject(hbm);