James Hawkins : comctl32: Fix several failing tests in win95.

Alexandre Julliard julliard at winehq.org
Wed Sep 24 08:49:30 CDT 2008


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

Author: James Hawkins <jhawkins at codeweavers.com>
Date:   Wed Sep 24 03:02:51 2008 -0500

comctl32: Fix several failing tests in win95.

---

 dlls/comctl32/tests/imagelist.c |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c
index 0d1770b..03aaca1 100644
--- a/dlls/comctl32/tests/imagelist.c
+++ b/dlls/comctl32/tests/imagelist.c
@@ -835,10 +835,18 @@ static void check_ilhead_data(const char *ilh_data, INT cx, INT cy, INT cur, INT
     ok(ilh->cy == cy, "wrong cy %d (expected %d)\n", ilh->cy, cy);
     ok(ilh->bkcolor == CLR_NONE, "wrong bkcolor %x\n", ilh->bkcolor);
     ok(ilh->flags == ILC_COLOR24, "wrong flags %04x\n", ilh->flags);
-    ok(ilh->ovls[0] == -1, "wrong ovls[0] %04x\n", ilh->ovls[0]);
-    ok(ilh->ovls[1] == -1, "wrong ovls[1] %04x\n", ilh->ovls[1]);
-    ok(ilh->ovls[2] == -1, "wrong ovls[2] %04x\n", ilh->ovls[2]);
-    ok(ilh->ovls[3] == -1, "wrong ovls[3] %04x\n", ilh->ovls[3]);
+    ok(ilh->ovls[0] == -1 ||
+       ilh->ovls[0] == 0, /* win95 */
+       "wrong ovls[0] %04x\n", ilh->ovls[0]);
+    ok(ilh->ovls[1] == -1 ||
+       ilh->ovls[1] == 0, /* win95 */
+       "wrong ovls[1] %04x\n", ilh->ovls[1]);
+    ok(ilh->ovls[2] == -1 ||
+       ilh->ovls[2] == 0, /* win95 */
+       "wrong ovls[2] %04x\n", ilh->ovls[2]);
+    ok(ilh->ovls[3] == -1 ||
+       ilh->ovls[3] == 0, /* win95 */
+       "wrong ovls[3] %04x\n", ilh->ovls[3]);
 }
 
 static HBITMAP create_bitmap(INT cx, INT cy, COLORREF color, const char *comment)




More information about the wine-cvs mailing list