Alexandre Julliard : comctl32/tests: Fix a test failure on older Windows.

Alexandre Julliard julliard at winehq.org
Fri Dec 16 13:24:54 CST 2011


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Dec 16 19:47:27 2011 +0100

comctl32/tests: Fix a test failure on older Windows.

---

 dlls/comctl32/tests/imagelist.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c
index 85eb13e..588a5b3 100644
--- a/dlls/comctl32/tests/imagelist.c
+++ b/dlls/comctl32/tests/imagelist.c
@@ -771,7 +771,8 @@ static void check_ilhead_data(const char *ilh_data, INT cx, INT cy, INT cur, INT
     ok(ilh->cx == cx, "wrong cx %d (expected %d)\n", ilh->cx, cx);
     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 == flags, "wrong flags %04x\n", ilh->flags);
+    ok(ilh->flags == flags || broken(!(ilh->flags & 0xfe) && (flags & 0xfe) == ILC_COLOR4),  /* <= w2k */
+       "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]);




More information about the wine-cvs mailing list