Paul Vriens : comctl32/tests: Fix some test failures ( MCM_SETUNICODEFORMAT and MCM_GETUNICODEFORMAT).

Alexandre Julliard julliard at winehq.org
Mon Oct 5 09:54:26 CDT 2009


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

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Sat Oct  3 15:10:40 2009 +0200

comctl32/tests: Fix some test failures (MCM_SETUNICODEFORMAT and MCM_GETUNICODEFORMAT).

---

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

diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c
index cb229e4..64a11b0 100644
--- a/dlls/comctl32/tests/monthcal.c
+++ b/dlls/comctl32/tests/monthcal.c
@@ -859,11 +859,17 @@ static void test_monthcal_unicode(void)
 
     /* current setting is 1, so, should return 1 */
     res = SendMessage(hwnd, MCM_GETUNICODEFORMAT, 0, 0);
-    todo_wine {expect(1, res);}
+    todo_wine
+    ok(1 == res ||
+       broken(0 == res), /* comctl32 <= 4.70 */
+       "Expected 1, got %d\n", res);
 
     /* setting to 0, should return previous settings */
     res = SendMessage(hwnd, MCM_SETUNICODEFORMAT, 0, 0);
-    todo_wine {expect(1, res);}
+    todo_wine
+    ok(1 == res ||
+       broken(0 == res), /* comctl32 <= 4.70 */
+       "Expected 1, got %d\n", res);
 
     /* current setting is 0, so, it should return 0 */
     res = SendMessage(hwnd, MCM_GETUNICODEFORMAT, 0, 0);




More information about the wine-cvs mailing list