Skip to content

W
wine-winehq
Commit 836bd1fd authored by Aric Stewart's avatar Aric Stewart Committed by Alexandre Julliard
Browse files
Options

imm32: Handle keyboard changes when processing input.

parent 6df5ce7c
Show whitespace changes
Inline Side-by-side
Showing with 16 additions and 0 deletions
dlls/imm32/imm.c
View file @ 836bd1fd
...@@ -2882,6 +2882,22 @@ BOOL WINAPI ImmProcessKey(HWND hwnd, HKL hKL, UINT vKey, LPARAM lKeyData, DWORD ...@@ -2882,6 +2882,22 @@ BOOL WINAPI ImmProcessKey(HWND hwnd, HKL hKL, UINT vKey, LPARAM lKeyData, DWORD
else else
return FALSE; return FALSE;
/* Make sure we are inputting to the correct keyboard */
if (data->immKbd->hkl != hKL)
{
ImmHkl *new_hkl = IMM_GetImmHkl(hKL);
if (new_hkl)
{
data->immKbd->pImeSelect(imc, FALSE);
data->immKbd->uSelected--;
data->immKbd = new_hkl;
data->immKbd->pImeSelect(imc, TRUE);
data->immKbd->uSelected++;
}
else
return FALSE;
}
if (!data->immKbd->hIME || !data->immKbd->pImeProcessKey) if (!data->immKbd->hIME || !data->immKbd->pImeProcessKey)
return FALSE; return 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