Skip to content

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

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

As in 6fd3bd9b.
parent 45b096ab
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 0 deletions
dlls/user32/defwnd.c
View file @ 6fb47669
...@@ -119,8 +119,13 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ...@@ -119,8 +119,13 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam
break; break;
case WM_IME_COMPOSITION: case WM_IME_COMPOSITION:
{
HWND ime_hwnd = NtUserGetDefaultImeWindow( hwnd );
if (!ime_hwnd || ime_hwnd == NtUserGetParent( hwnd )) break;
default_ime_compositionA( hwnd, wParam, lParam ); default_ime_compositionA( hwnd, wParam, lParam );
/* fall through */ /* fall through */
}
default: default:
result = NtUserMessageCall( hwnd, msg, wParam, lParam, 0, NtUserDefWindowProc, TRUE ); result = NtUserMessageCall( hwnd, msg, wParam, lParam, 0, NtUserDefWindowProc, TRUE );
...@@ -178,8 +183,13 @@ LRESULT WINAPI DefWindowProcW( ...@@ -178,8 +183,13 @@ LRESULT WINAPI DefWindowProcW(
break; break;
case WM_IME_COMPOSITION: case WM_IME_COMPOSITION:
{
HWND ime_hwnd = NtUserGetDefaultImeWindow( hwnd );
if (!ime_hwnd || ime_hwnd == NtUserGetParent( hwnd )) break;
default_ime_compositionW( hwnd, wParam, lParam ); default_ime_compositionW( hwnd, wParam, lParam );
/* fall through */ /* fall through */
}
default: default:
result = NtUserMessageCall( hwnd, msg, wParam, lParam, 0, NtUserDefWindowProc, FALSE ); result = NtUserMessageCall( hwnd, msg, wParam, lParam, 0, NtUserDefWindowProc, FALSE );
......
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