Rémi Bernon : user32: Ignore WM_IME_COMPOSITION from the IME UI window in DefWindowProc.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6fb47669476a2cdd982b5e3a461d0d97ebf74dec
URL:    https://gitlab.winehq.org/wine/wine/-/commit/6fb47669476a2cdd982b5e3a461d0d9...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Mon Apr 17 09:37:58 2023 +0200

user32: Ignore WM_IME_COMPOSITION from the IME UI window in DefWindowProc.

As in 6fd3bd9b62f405a54db29dc5a72805063a6099ca.

---

 dlls/user32/defwnd.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c
index 6c45f89e392..60afec4e7c6 100644
--- a/dlls/user32/defwnd.c
+++ b/dlls/user32/defwnd.c
@@ -119,8 +119,13 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam
         break;
 
     case WM_IME_COMPOSITION:
+    {
+        HWND ime_hwnd = NtUserGetDefaultImeWindow( hwnd );
+        if (!ime_hwnd || ime_hwnd == NtUserGetParent( hwnd )) break;
+
         default_ime_compositionA( hwnd, wParam, lParam );
         /* fall through */
+    }
 
     default:
         result = NtUserMessageCall( hwnd, msg, wParam, lParam, 0, NtUserDefWindowProc, TRUE );
@@ -178,8 +183,13 @@ LRESULT WINAPI DefWindowProcW(
         break;
 
     case WM_IME_COMPOSITION:
+    {
+        HWND ime_hwnd = NtUserGetDefaultImeWindow( hwnd );
+        if (!ime_hwnd || ime_hwnd == NtUserGetParent( hwnd )) break;
+
         default_ime_compositionW( hwnd, wParam, lParam );
         /* fall through */
+    }
 
     default:
         result = NtUserMessageCall( hwnd, msg, wParam, lParam, 0, NtUserDefWindowProc, FALSE );