Paul Vriens : comctl32/tests: Fix test failures with comctl32 <= 5.80.
Alexandre Julliard
julliard at winehq.org
Wed Jul 8 14:35:55 CDT 2009
Module: wine
Branch: master
Commit: f88d9ab195c810d504a77c66fdd408fe1a601359
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f88d9ab195c810d504a77c66fdd408fe1a601359
Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date: Wed Jul 8 11:57:23 2009 +0200
comctl32/tests: Fix test failures with comctl32 <= 5.80.
---
dlls/comctl32/tests/datetime.c | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c
index 8fdbbe5..038a789 100644
--- a/dlls/comctl32/tests/datetime.c
+++ b/dlls/comctl32/tests/datetime.c
@@ -423,10 +423,13 @@ static void test_dtm_set_range_swap_min_max(HWND hWndDateTime)
r = SendMessage(hWndDateTime, DTM_GETRANGE, 0, (LPARAM)getSt);
ok(r == (GDTR_MIN | GDTR_MAX), "Expected %x, not %x(GDTR_MIN) or %x(GDTR_MAX), got %lx\n", (GDTR_MIN | GDTR_MAX), GDTR_MIN, GDTR_MAX, r);
todo_wine {
- expect_systime(&st[0], &getSt[0]);
- }
- todo_wine {
- expect_systime(&st[1], &getSt[1]);
+ ok(compare_systime(&st[0], &getSt[0]) == 1 ||
+ broken(compare_systime(&st[0], &getSt[1]) == 1), /* comctl32 version <= 5.80 */
+ "ST1 != ST2\n");
+
+ ok(compare_systime(&st[1], &getSt[1]) == 1 ||
+ broken(compare_systime(&st[1], &getSt[0]) == 1), /* comctl32 version <= 5.80 */
+ "ST1 != ST2\n");
}
fill_systime_struct(&st[0], 1980, 1, 3, 23, 14, 34, 37, 465);
@@ -439,7 +442,9 @@ static void test_dtm_set_range_swap_min_max(HWND hWndDateTime)
and doing DTM_SETSYSTEMTIME */
expect_systime_date(&st[0], &getSt[0]);
todo_wine {
- expect_systime_time(&origSt, &getSt[0]);
+ ok(compare_systime_time(&origSt, &getSt[0]) == 1 ||
+ broken(compare_systime_time(&st[0], &getSt[0]) == 1), /* comctl32 version <= 5.80 */
+ "ST1.time != ST2.time\n");
}
/* set st[0] to value higher than minimum */
@@ -455,10 +460,13 @@ static void test_dtm_set_range_swap_min_max(HWND hWndDateTime)
r = SendMessage(hWndDateTime, DTM_GETRANGE, 0, (LPARAM)getSt);
ok(r == (GDTR_MIN | GDTR_MAX), "Expected %x, not %x(GDTR_MIN) or %x(GDTR_MAX), got %lx\n", (GDTR_MIN | GDTR_MAX), GDTR_MIN, GDTR_MAX, r);
todo_wine {
- expect_systime(&st[0], &getSt[1]);
- }
- todo_wine {
- expect_systime(&st[1], &getSt[0]);
+ ok(compare_systime(&st[0], &getSt[1]) == 1 ||
+ broken(compare_systime(&st[0], &getSt[0]) == 1), /* comctl32 version <= 5.80 */
+ "ST1 != ST2\n");
+
+ ok(compare_systime(&st[1], &getSt[0]) == 1 ||
+ broken(compare_systime(&st[1], &getSt[1]) == 1), /* comctl32 version <= 5.80 */
+ "ST1 != ST2\n");
}
/* set st[0] to value higher than st[1] */
More information about the wine-cvs
mailing list