From b25daf4b564a7f911c3ac034f39e59caebb316b3 Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Thu, 23 Mar 2023 12:24:00 +0900 Subject: [PATCH] [COMCTL32][USER32] EDIT: Half-implement WM_IME_STARTCOMPOSITION (#5183) Improve WM_IME_STARTCOMPOSITION handling in the window procedure of the EDIT control. CORE-15289, CORE-11700 --- dll/win32/comctl32/edit.c | 5 +++++ win32ss/user/user32/controls/edit.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/dll/win32/comctl32/edit.c b/dll/win32/comctl32/edit.c index 0a0023908a6..5ba8371dfd5 100644 --- a/dll/win32/comctl32/edit.c +++ b/dll/win32/comctl32/edit.c @@ -4978,6 +4978,11 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case WM_IME_STARTCOMPOSITION: es->composition_start = es->selection_end; es->composition_len = 0; +#ifdef __REACTOS__ + if (FALSE) /* FIXME: Condition */ + return TRUE; + result = DefWindowProcW(hwnd, WM_IME_STARTCOMPOSITION, wParam, lParam); +#endif break; case WM_IME_COMPOSITION: diff --git a/win32ss/user/user32/controls/edit.c b/win32ss/user/user32/controls/edit.c index 419f13ff16e..ae9814b74bc 100644 --- a/win32ss/user/user32/controls/edit.c +++ b/win32ss/user/user32/controls/edit.c @@ -5291,6 +5291,11 @@ LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP case WM_IME_STARTCOMPOSITION: es->composition_start = es->selection_end; es->composition_len = 0; +#ifdef __REACTOS__ + if (FALSE) /* FIXME: Condition */ + return TRUE; + result = DefWindowProcT(hwnd, msg, wParam, lParam, unicode); +#endif break; case WM_IME_COMPOSITION: