Huw Davies : gdi32/tests: Fix another case where win9x returns bmType equal to 0x5250.

Alexandre Julliard julliard at winehq.org
Mon Mar 9 09:40:41 CDT 2009


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

Author: Huw Davies <huw at codeweavers.com>
Date:   Mon Mar  9 12:14:53 2009 +0000

gdi32/tests: Fix another case where win9x returns bmType equal to 0x5250.

---

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

diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c
index d25352e..9e2f0c9 100644
--- a/dlls/gdi32/tests/bitmap.c
+++ b/dlls/gdi32/tests/bitmap.c
@@ -1906,7 +1906,9 @@ static void test_select_object(void)
         memset(&bm, 0xAA, sizeof(bm));
         bytes = GetObject(hbm, sizeof(bm), &bm);
         ok(bytes == sizeof(bm), "GetObject returned %d\n", bytes);
-        ok(bm.bmType == 0, "wrong bmType %d\n", bm.bmType);
+        ok(bm.bmType == 0 ||
+           broken(bm.bmType == 21072), /* win9x */
+           "wrong bmType %d\n", bm.bmType);
         ok(bm.bmWidth == 10, "wrong bmWidth %d\n", bm.bmWidth);
         ok(bm.bmHeight == 10, "wrong bmHeight %d\n", bm.bmHeight);
         ok(bm.bmWidthBytes == BITMAP_GetWidthBytes(bm.bmWidth, bm.bmBitsPixel), "wrong bmWidthBytes %d\n", bm.bmWidthBytes);




More information about the wine-cvs mailing list