Skip to content

W
wine-winehq
Commit 46c5c2d4 authored by Rémi Bernon's avatar Rémi Bernon Committed by Alexandre Julliard
Browse files
Options

imm32: Complete the composition string when the IME is closed.

parent 0d9e6ada
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 8 deletions
dlls/imm32/ime.c
View file @ 46c5c2d4
...@@ -653,11 +653,7 @@ BOOL WINAPI NotifyIME( HIMC himc, DWORD action, DWORD index, DWORD value ) ...@@ -653,11 +653,7 @@ BOOL WINAPI NotifyIME( HIMC himc, DWORD action, DWORD index, DWORD value )
} }
break; break;
case IMC_SETOPENSTATUS: case IMC_SETOPENSTATUS:
if (!ctx->fOpen) if (!ctx->fOpen) ImmNotifyIME( himc, NI_COMPOSITIONSTR, CPS_COMPLETE, 0 );
{
input_context_set_comp_str( ctx, NULL, 0 );
if ((msg = ime_set_composition_status( himc, FALSE ))) ime_send_message( himc, msg, 0, 0 );
}
NtUserNotifyIMEStatus( ctx->hWnd, ctx->fOpen ); NtUserNotifyIMEStatus( ctx->hWnd, ctx->fOpen );
break; break;
} }
...@@ -691,12 +687,12 @@ BOOL WINAPI NotifyIME( HIMC himc, DWORD action, DWORD index, DWORD value ) ...@@ -691,12 +687,12 @@ BOOL WINAPI NotifyIME( HIMC himc, DWORD action, DWORD index, DWORD value )
if (flags) ime_send_message( himc, WM_IME_COMPOSITION, wchr, flags ); if (flags) ime_send_message( himc, WM_IME_COMPOSITION, wchr, flags );
} }
ImmSetOpenStatus( himc, FALSE ); /* fallthrough */
break;
} }
case CPS_CANCEL: case CPS_CANCEL:
input_context_set_comp_str( ctx, NULL, 0 ); input_context_set_comp_str( ctx, NULL, 0 );
ImmSetOpenStatus( himc, FALSE ); if ((msg = ime_set_composition_status( himc, FALSE )))
ime_send_message( himc, msg, 0, 0 );
break; break;
default: default:
FIXME( "himc %p, action %#lx, index %#lx, value %#lx stub!\n", himc, action, index, value ); FIXME( "himc %p, action %#lx, index %#lx, value %#lx stub!\n", himc, action, index, value );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment