From 6d650bfc8ff134e9b17c1268dc7790c66fa668b7 Mon Sep 17 00:00:00 2001
From: Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
Date: Mon, 27 Mar 2023 19:42:47 +0900
Subject: [PATCH] [COMCTL32][USER32] WM_IME_CHAR: Rely on DefWindowProc...
 (#5191)

Use DefWindowProc... for WM_IME_CHAR handling. CORE-15289, CORE-11700
---
 dll/win32/comctl32/edit.c           | 4 ++++
 win32ss/user/user32/controls/edit.c | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/dll/win32/comctl32/edit.c b/dll/win32/comctl32/edit.c
index 354fe0fccb8..2ac526e2473 100644
--- a/dll/win32/comctl32/edit.c
+++ b/dll/win32/comctl32/edit.c
@@ -4781,6 +4781,10 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR
         break;
 
     case WM_IME_CHAR:
+#ifdef __REACTOS__
+        result = DefWindowProcW(hwnd, msg, wParam, lParam);
+        break;
+#endif
     case WM_CHAR:
     {
         WCHAR charW = wParam;
diff --git a/win32ss/user/user32/controls/edit.c b/win32ss/user/user32/controls/edit.c
index c079687e077..89ab481f7da 100644
--- a/win32ss/user/user32/controls/edit.c
+++ b/win32ss/user/user32/controls/edit.c
@@ -5063,6 +5063,11 @@ LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 		break;
 
         case WM_IME_CHAR:
+#ifdef __REACTOS__
+	        /* Rely on DefWindowProc */
+            result = DefWindowProcT(hwnd, msg, wParam, lParam, unicode);
+            break;
+#else
             if (!unicode)
             {
                 WCHAR charW;
@@ -5076,6 +5081,7 @@ LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 		break;
             }
             /* fall through */
+#endif
 	case WM_CHAR:
 	{
 		WCHAR charW;