André Hentschel : imm32: Fix tests to apply to Vista+ as it does the same as Wine.
Alexandre Julliard
julliard at winehq.org
Thu Apr 29 14:45:07 CDT 2010
Module: wine
Branch: master
Commit: 3317fc38eebb0adbd0e001c6a22293dbd5bca003
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3317fc38eebb0adbd0e001c6a22293dbd5bca003
Author: André Hentschel <nerv at dawncrow.de>
Date: Wed Apr 28 17:24:51 2010 +0200
imm32: Fix tests to apply to Vista+ as it does the same as Wine.
---
dlls/imm32/tests/imm32.c | 25 +++++++++----------------
1 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c
index c68a17a..e35ef89 100644
--- a/dlls/imm32/tests/imm32.c
+++ b/dlls/imm32/tests/imm32.c
@@ -198,12 +198,9 @@ static void test_ImmNotifyIME(void) {
msg_spy_flush_msgs();
ret = ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0);
- todo_wine
- {
- ok(!ret ||
- broken(ret), /* Vista and W2K8 */
- "Canceling an empty composition string should fail.\n");
- }
+ ok(broken(!ret) ||
+ ret, /* Vista+ */
+ "Canceling an empty composition string should succeed.\n");
ok(!msg_spy_find_msg(WM_IME_COMPOSITION), "Windows does not post "
"WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if "
"the composition string being canceled is empty.\n");
@@ -223,12 +220,9 @@ static void test_ImmNotifyIME(void) {
msg_spy_flush_msgs();
ret = ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0);
- todo_wine
- {
- ok(!ret ||
- broken(ret), /* Vista and W2K8 */
- "Canceling an empty composition string should fail.\n");
- }
+ ok(broken(!ret) ||
+ ret, /* Vista+ */
+ "Canceling an empty composition string should succeed.\n");
ok(!msg_spy_find_msg(WM_IME_COMPOSITION), "Windows does not post "
"WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if "
"the composition string being canceled is empty.\n");
@@ -273,10 +267,9 @@ static void test_ImmSetCompositionString(void)
return;
ret = ImmSetCompositionStringW(imc, SCS_SETSTR, NULL, 0, NULL, 0);
- todo_wine
- ok(!ret ||
- broken(ret), /* Vista and W2K8 */
- "ImmSetCompositionStringW() succeeded.\n");
+ ok(broken(!ret) ||
+ ret, /* Vista+ */
+ "ImmSetCompositionStringW() failed.\n");
ret = ImmSetCompositionStringW(imc, SCS_SETSTR | SCS_CHANGEATTR,
NULL, 0, NULL, 0);
More information about the wine-cvs
mailing list