[PATCH 3/3] Fix some test failures on older comctl32

Paul Vriens Paul.Vriens.Wine at gmail.com
Mon Dec 14 13:19:11 CST 2009


---
 dlls/comctl32/tests/treeview.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c
index f99da88..3b1fcf2 100644
--- a/dlls/comctl32/tests/treeview.c
+++ b/dlls/comctl32/tests/treeview.c
@@ -999,7 +999,9 @@ static void test_get_linecolor(void)
 
     /* newly created control has default color */
     clr = (COLORREF)SendMessage(hTree, TVM_GETLINECOLOR, 0, 0);
-    expect(CLR_DEFAULT, clr);
+    ok(clr == CLR_DEFAULT ||
+       broken(clr == 0), /* Older comctl32 (< 5.80) */
+       "Expected CLR_DEFAULT, got %d\n", clr);
 
     DestroyWindow(hTree);
 }
@@ -1013,7 +1015,9 @@ static void test_get_insertmarkcolor(void)
 
     /* newly created control has default color */
     clr = (COLORREF)SendMessage(hTree, TVM_GETINSERTMARKCOLOR, 0, 0);
-    expect(CLR_DEFAULT, clr);
+    ok(clr == CLR_DEFAULT ||
+       broken(clr == 0), /* Older comctl32 (< 5.80) */
+       "Expected CLR_DEFAULT, got %d\n", clr);
 
     DestroyWindow(hTree);
 }
-- 
1.6.2.5


--------------030603050005010806080000--



More information about the wine-patches mailing list