comctl32/tests: Fix some test failures on older comctl32.
authorPaul Vriens <Paul.Vriens.Wine@gmail.com>
Tue, 20 Oct 2009 07:42:30 +0000 (09:42 +0200)
committerAlexandre Julliard <julliard@winehq.org>
Tue, 20 Oct 2009 12:00:36 +0000 (14:00 +0200)
dlls/comctl32/tests/tooltips.c

index 4014322e503e3f37a4710f3f15998d8b7ef5720b..8ca3f7bb9034c6dee51022453a7f6eb39c3b5c20 100644 (file)
@@ -444,7 +444,9 @@ static void test_ttm_gettoolinfo(void)
     ti.lParam = 0xaaaaaaaa;
     r = SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&ti);
     ok(r, "Getting tooltip info failed\n");
-    ok(0xdeadbeef == ti.lParam, "Expected 0xdeadbeef, got %lx\n", ti.lParam);
+    ok(0xdeadbeef == ti.lParam ||
+       broken(0xdeadbeef != ti.lParam), /* comctl32 < 5.81 */
+       "Expected 0xdeadbeef, got %lx\n", ti.lParam);
 
     tiW.cbSize = TTTOOLINFOW_V2_SIZE;
     tiW.hwnd = NULL;
@@ -452,18 +454,22 @@ static void test_ttm_gettoolinfo(void)
     tiW.lParam = 0xaaaaaaaa;
     r = SendMessageA(hwnd, TTM_GETTOOLINFOW, 0, (LPARAM)&tiW);
     ok(r, "Getting tooltip info failed\n");
-    ok(0xdeadbeef == tiW.lParam, "Expected 0xdeadbeef, got %lx\n", tiW.lParam);
+    ok(0xdeadbeef == tiW.lParam ||
+       broken(0xdeadbeef != tiW.lParam), /* comctl32 < 5.81 */
+       "Expected 0xdeadbeef, got %lx\n", tiW.lParam);
 
     ti.cbSize = TTTOOLINFOA_V2_SIZE;
     ti.uId = 0x1234ABCD;
     ti.lParam = 0xaaaaaaaa;
-    r = SendMessageA(hwnd, TTM_SETTOOLINFOA, 0, (LPARAM)&ti);
+    SendMessageA(hwnd, TTM_SETTOOLINFOA, 0, (LPARAM)&ti);
 
     ti.cbSize = TTTOOLINFOA_V2_SIZE;
     ti.lParam = 0xdeadbeef;
     r = SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&ti);
     ok(r, "Getting tooltip info failed\n");
-    ok(0xaaaaaaaa == ti.lParam, "Expected 0xaaaaaaaa, got %lx\n", ti.lParam);
+    ok(0xaaaaaaaa == ti.lParam ||
+       broken(0xaaaaaaaa != ti.lParam), /* comctl32 < 5.81 */
+       "Expected 0xaaaaaaaa, got %lx\n", ti.lParam);
 
     DestroyWindow(hwnd);