Paul Vriens : imm32/tests: Fix test failures on Vista/W2K8.
Alexandre Julliard
julliard at winehq.org
Thu Sep 10 09:07:56 CDT 2009
Module: wine
Branch: master
Commit: 7517135fe7c8f70adc897402f4c023a08bee481e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7517135fe7c8f70adc897402f4c023a08bee481e
Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date: Thu Sep 10 09:08:35 2009 +0200
imm32/tests: Fix test failures on Vista/W2K8.
---
dlls/imm32/tests/imm32.c | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c
index 1951242..edda55b 100644
--- a/dlls/imm32/tests/imm32.c
+++ b/dlls/imm32/tests/imm32.c
@@ -191,10 +191,12 @@ static void test_ImmNotifyIME(void) {
imc = ImmGetContext(hwnd);
msg_spy_flush_msgs();
+ ret = ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0);
todo_wine
{
- ok(!ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0), "Canceling an "
- "empty composition string should fail.\n");
+ ok(!ret ||
+ broken(ret), /* Vista and W2K8 */
+ "Canceling an empty composition string should fail.\n");
}
ok(!msg_spy_find_msg(WM_IME_COMPOSITION), "Windows does not post "
"WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if "
@@ -214,10 +216,12 @@ static void test_ImmNotifyIME(void) {
msg_spy_flush_msgs();
+ ret = ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0);
todo_wine
{
- ok(!ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0), "Canceling an "
- "empty composition string should fail.\n");
+ ok(!ret ||
+ broken(ret), /* Vista and W2K8 */
+ "Canceling an empty composition string should fail.\n");
}
ok(!msg_spy_find_msg(WM_IME_COMPOSITION), "Windows does not post "
"WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if "
@@ -264,7 +268,9 @@ static void test_ImmSetCompositionString(void)
ret = ImmSetCompositionStringW(imc, SCS_SETSTR, NULL, 0, NULL, 0);
todo_wine
- ok(!ret, "ImmSetCompositionStringW() succeeded.\n");
+ ok(!ret ||
+ broken(ret), /* Vista and W2K8 */
+ "ImmSetCompositionStringW() succeeded.\n");
ret = ImmSetCompositionStringW(imc, SCS_SETSTR | SCS_CHANGEATTR,
NULL, 0, NULL, 0);
More information about the wine-cvs
mailing list