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

As in 6fd3bd9b.

user32: Ignore WM_IME_COMPOSITION from the IME UI window in DefWindowProc.
6fb47669 · Rémi Bernon · Alexandre Julliard · 45b096ab · 6fb47669
Commit 6fb47669 authored Apr 17, 2023 by Rémi Bernon Committed by Alexandre Julliard Apr 17, 2023
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

defwnd.c dlls/user32/defwnd.c +10 -0

No files found.
--- 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 );