From: Paul Gofman <pgofman@codeweavers.com> --- dlls/imm32/ime.c | 2 +- dlls/imm32/tests/imm32.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/imm32/ime.c b/dlls/imm32/ime.c index 253ce2c3610..96be851f5a7 100644 --- a/dlls/imm32/ime.c +++ b/dlls/imm32/ime.c @@ -687,7 +687,7 @@ BOOL WINAPI ImeSetCompositionString( HIMC himc, DWORD index, const void *comp, D if (len && comp && !((WCHAR *)comp)[len - 1]) --len; input_context_set_comp_str( ctx, comp, len ); - if ((msg = ime_set_composition_status( himc, TRUE ))) ime_send_message( himc, msg, 0, 0 ); + if ((msg = ime_set_composition_status( himc, !!len ))) ime_send_message( himc, msg, 0, 0 ); ime_send_message( himc, WM_IME_COMPOSITION, wparam, flags ); } diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index f5b87d328c4..2a9e945e2e3 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -1108,7 +1108,7 @@ static void test_SCS_SETSTR(void) ret = ImmSetCompositionStringW(imc, SCS_SETSTR, NULL, 128, NULL, 128); ok(ret, "got error %lu.\n", GetLastError()); msg = msg_spy_find_msg(WM_IME_ENDCOMPOSITION); - todo_wine ok(!!msg || broken(ends_comp_in_set && !msg), "did not find WM_IME_ENDCOMPOSITION.\n"); + ok(!!msg || broken(ends_comp_in_set && !msg), "did not find WM_IME_ENDCOMPOSITION.\n"); alen = ImmGetCompositionStringA(imc, GCS_COMPSTR, cstring, 20); ok(!alen, "got %ld.\n", alen); @@ -1119,7 +1119,7 @@ static void test_SCS_SETSTR(void) ret = ImmSetCompositionStringW(imc, SCS_SETSTR, string, sizeof(string), NULL, 0); ok(ret, "got error %lu.\n", GetLastError()); msg = msg_spy_find_msg(WM_IME_STARTCOMPOSITION); - todo_wine ok(!!msg, "did not find WM_IME_STARTCOMPOSITION.\n"); + ok(!!msg, "did not find WM_IME_STARTCOMPOSITION.\n"); msg = msg_spy_find_msg(WM_IME_COMPOSITION); ok(!!msg, "did not find WM_IME_COMPOSITION.\n"); @@ -1138,7 +1138,7 @@ static void test_SCS_SETSTR(void) ret = ImmSetCompositionStringW(imc, SCS_SETSTR, L"", 2, NULL, 0); ok(ret, "got error %lu.\n", GetLastError()); msg = msg_spy_find_msg(WM_IME_ENDCOMPOSITION); - todo_wine ok(!!msg || broken(ends_comp_in_set && !msg), "did not find WM_IME_ENDCOMPOSITION.\n"); + ok(!!msg || broken(ends_comp_in_set && !msg), "did not find WM_IME_ENDCOMPOSITION.\n"); alen = ImmGetCompositionStringA(imc, GCS_COMPSTR, cstring, 20); ok(!alen, "got %ld.\n", alen); @@ -1149,7 +1149,7 @@ static void test_SCS_SETSTR(void) ret = ImmSetCompositionStringW(imc, SCS_SETSTR, string, sizeof(string), NULL, 2); ok(ret, "got error %lu.\n", GetLastError()); msg = msg_spy_find_msg(WM_IME_STARTCOMPOSITION); - todo_wine ok(!!msg, "did not find WM_IME_STARTCOMPOSITION.\n"); + ok(!!msg, "did not find WM_IME_STARTCOMPOSITION.\n"); msg = msg_spy_find_msg(WM_IME_COMPOSITION); ok(!!msg, "did not find WM_IME_COMPOSITION.\n"); msg = msg_spy_find_msg(WM_IME_ENDCOMPOSITION); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/11193