Paul Vriens : comctl32/tests: Fix some test failures on older comctl32.

[Alexandre Julliard]

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

Author: Paul Vriens 
Date:   Tue Oct 20 09:42:30 2009 +0200

comctl32/tests: Fix some test failures on older comctl32.

---

dlls/comctl32/tests/tooltips.c |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c
index 4014322..8ca3f7b 100644
--- a/dlls/comctl32/tests/tooltips.c
+++ b/dlls/comctl32/tests/tooltips.c
@@ -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);