ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

imm32: Fix tests to apply to Vista+ as it does the same as Wine.

This commit is contained in:
André Hentschel 2010-04-28 17:24:51 +02:00 committed by Alexandre Julliard
parent 8f1e00a17b
commit 3317fc38ee
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/imm32/tests/imm32.c
View File

@ -198,12 +198,9 @@ static void test_ImmNotifyIME(void) {
msg_spy_flush_msgs(); msg_spy_flush_msgs();
ret = ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0); ret = ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0);
todo_wine ok(broken(!ret) ||
{ ret, /* Vista+ */
ok(!ret || "Canceling an empty composition string should succeed.\n");
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 " ok(!msg_spy_find_msg(WM_IME_COMPOSITION), "Windows does not post "
"WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if " "WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if "
"the composition string being canceled is empty.\n"); "the composition string being canceled is empty.\n");
@ -223,12 +220,9 @@ static void test_ImmNotifyIME(void) {
msg_spy_flush_msgs(); msg_spy_flush_msgs();
ret = ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0); ret = ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0);
todo_wine ok(broken(!ret) ||
{ ret, /* Vista+ */
ok(!ret || "Canceling an empty composition string should succeed.\n");
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 " ok(!msg_spy_find_msg(WM_IME_COMPOSITION), "Windows does not post "
"WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if " "WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if "
"the composition string being canceled is empty.\n"); "the composition string being canceled is empty.\n");
@ -273,10 +267,9 @@ static void test_ImmSetCompositionString(void)
return; return;
ret = ImmSetCompositionStringW(imc, SCS_SETSTR, NULL, 0, NULL, 0); ret = ImmSetCompositionStringW(imc, SCS_SETSTR, NULL, 0, NULL, 0);
todo_wine ok(broken(!ret) ||
ok(!ret || ret, /* Vista+ */
broken(ret), /* Vista and W2K8 */ "ImmSetCompositionStringW() failed.\n");
"ImmSetCompositionStringW() succeeded.\n");
ret = ImmSetCompositionStringW(imc, SCS_SETSTR | SCS_CHANGEATTR, ret = ImmSetCompositionStringW(imc, SCS_SETSTR | SCS_CHANGEATTR,
NULL, 0, NULL, 0); NULL, 0, NULL, 0);