Huw Davies : gdi32/tests: Add broken behaviour on nt4 sp1 and 2.

[Alexandre Julliard]

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

Author: Huw Davies 
Date:   Fri Jun 17 16:49:13 2011 +0100

gdi32/tests: Add broken behaviour on nt4 sp1 and 2.

---

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

diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c
index a67d781..5dedb1a 100644
--- a/dlls/gdi32/tests/bitmap.c
+++ b/dlls/gdi32/tests/bitmap.c
@@ -354,7 +354,9 @@ static void test_dib_info(HBITMAP hbm, const void *bits, const BITMAPINFOHEADER
     ok(ds.dsBmih.biHeight == abs(bmih->biHeight), "%d != %d\n", ds.dsBmih.biHeight, abs(bmih->biHeight));
     ok(ds.dsBmih.biPlanes == bmih->biPlanes, "%u != %u\n", ds.dsBmih.biPlanes, bmih->biPlanes);
     ok(ds.dsBmih.biBitCount == bmih->biBitCount, "%u != %u\n", ds.dsBmih.biBitCount, bmih->biBitCount);
-    ok(ds.dsBmih.biCompression == bmih->biCompression, "%u != %u\n", ds.dsBmih.biCompression, bmih->biCompression);
+    ok(ds.dsBmih.biCompression == bmih->biCompression ||
+       ((bmih->biBitCount == 32) && broken(ds.dsBmih.biCompression == BI_BITFIELDS)), /* nt4 sp1 and 2 */
+       "%u != %u\n", ds.dsBmih.biCompression, bmih->biCompression);
     ok(ds.dsBmih.biSizeImage == bmih->biSizeImage, "%u != %u\n", ds.dsBmih.biSizeImage, bmih->biSizeImage);
     ok(ds.dsBmih.biXPelsPerMeter == bmih->biXPelsPerMeter, "%d != %d\n", ds.dsBmih.biXPelsPerMeter, bmih->biXPelsPerMeter);
     ok(ds.dsBmih.biYPelsPerMeter == bmih->biYPelsPerMeter, "%d != %d\n", ds.dsBmih.biYPelsPerMeter, bmih->biYPelsPerMeter);
@@ -1786,7 +1788,7 @@ static void test_GetDIBits_BI_BITFIELDS(void)
     if (dibinfo->bmiHeader.biBitCount > 8)
     {
         ok( dibinfo->bmiHeader.biCompression == BI_BITFIELDS,
-            "compression is %u\n", dibinfo->bmiHeader.biCompression );
+            "compression is %u (%d bpp)\n", dibinfo->bmiHeader.biCompression, dibinfo->bmiHeader.biBitCount );

ok( !bitmasks[0], "red mask is set\n" );
         ok( !bitmasks[1], "green mask is set\n" );