system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-30 04:08:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

win32u: Move default window proc to IME window forwarding implementation from user32.

Browse source
This commit is contained in:
Jacek Caban 2022-07-15 13:00:51 +02:00 committed by Alexandre Julliard
parent 51f414bdc2
commit 70ad65d8d1
2 changed files with 15 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
dlls/user32/defwnd.c
View file

@ -147,23 +147,6 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam
}
}
/* fall through */
case WM_IME_STARTCOMPOSITION:
case WM_IME_ENDCOMPOSITION:
case WM_IME_SELECT:
case WM_IME_NOTIFY:
case WM_IME_CONTROL:
{
HWND hwndIME = ImmGetDefaultIMEWnd( hwnd );
if (hwndIME)
result = SendMessageA( hwndIME, msg, wParam, lParam );
}
break;
case WM_IME_SETCONTEXT:
{
HWND hwndIME = ImmGetDefaultIMEWnd( hwnd );
if (hwndIME) result = ImmIsUIMessageA( hwndIME, msg, wParam, lParam );
}
break;
default:
result = NtUserMessageCall( hwnd, msg, wParam, lParam, 0, NtUserDefWindowProc, TRUE );
@ -220,13 +203,6 @@ LRESULT WINAPI DefWindowProcW(
result = PostMessageW( hwnd, WM_KEYUP, wParam, lParam );
break;
case WM_IME_SETCONTEXT:
{
HWND hwndIME = ImmGetDefaultIMEWnd( hwnd );
if (hwndIME) result = ImmIsUIMessageW( hwndIME, msg, wParam, lParam );
}
break;
case WM_IME_COMPOSITION:
if (lParam & GCS_RESULTSTR)
{
@ -249,17 +225,6 @@ LRESULT WINAPI DefWindowProcW(
}
}
/* fall through */
case WM_IME_STARTCOMPOSITION:
case WM_IME_ENDCOMPOSITION:
case WM_IME_SELECT:
case WM_IME_NOTIFY:
case WM_IME_CONTROL:
{
HWND hwndIME = ImmGetDefaultIMEWnd( hwnd );
if (hwndIME)
result = SendMessageW( hwndIME, msg, wParam, lParam );
}
break;
default:
result = NtUserMessageCall( hwnd, msg, wParam, lParam, 0, NtUserDefWindowProc, FALSE );

15
dlls/win32u/defwnd.c
View file

@ -2901,6 +2901,21 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam,
free( win_array );
break;
}
case WM_IME_SETCONTEXT:
case WM_IME_COMPOSITION:
case WM_IME_STARTCOMPOSITION:
case WM_IME_ENDCOMPOSITION:
case WM_IME_SELECT:
case WM_IME_NOTIFY:
case WM_IME_CONTROL:
{
HWND ime_hwnd = get_default_ime_window( hwnd );
if (ime_hwnd)
result = NtUserMessageCall( ime_hwnd, msg, wparam, lparam,
0, NtUserSendMessage, ansi );
}
break;
}
return result;