system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-06 15:55:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

imm32: Clear vkey before calling ToAsciiEx in ImmTranslateMessage.

Browse source
This commit is contained in:
Rémi Bernon 2023-05-01 11:37:50 +02:00 committed by Alexandre Julliard
parent bfb7799b74
commit 1c96ed9bd9
2 changed files with 15 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
dlls/imm32/imm.c
View file

@ -85,8 +85,8 @@ struct imc
DWORD dwLock;
INPUTCONTEXT IMC;
struct ime *ime;
UINT lastVK;
struct ime *ime;
UINT vkey;
HWND ui_hwnd; /* IME UI window, on the default input context */
};
@ -2111,27 +2111,15 @@ BOOL WINAPI ImmGetStatusWindowPos( HIMC himc, POINT *pos )
/***********************************************************************
* ImmGetVirtualKey (IMM32.@)
*/
UINT WINAPI ImmGetVirtualKey(HWND hWnd)
UINT WINAPI ImmGetVirtualKey( HWND hwnd )
{
OSVERSIONINFOA version;
struct imc *data = get_imc_data( ImmGetContext( hWnd ) );
TRACE("%p\n", hWnd);
HIMC himc = ImmGetContext( hwnd );
struct imc *imc;
if ( data )
return data->lastVK;
TRACE( "%p\n", hwnd );
version.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA);
GetVersionExA( &version );
switch(version.dwPlatformId)
{
case VER_PLATFORM_WIN32_WINDOWS:
return VK_PROCESSKEY;
case VER_PLATFORM_WIN32_NT:
return 0;
default:
FIXME("%ld not supported\n",version.dwPlatformId);
return VK_PROCESSKEY;
}
if ((imc = get_imc_data( himc ))) return imc->vkey;
return VK_PROCESSKEY;
}
/***********************************************************************
@ -3127,17 +3115,17 @@ BOOL WINAPI ImmTranslateMessage( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar
if (msg < WM_KEYDOWN || msg > WM_KEYUP) return FALSE;
if (!(data = get_imc_data( ImmGetContext( hwnd ) ))) return FALSE;
if (!(ime = imc_select_ime( data ))) return FALSE;
if (data->lastVK == VK_PROCESSKEY) return FALSE;
if ((vkey = data->vkey) == VK_PROCESSKEY) return FALSE;
data->vkey = VK_PROCESSKEY;
GetKeyboardState( state );
scan = lparam >> 0x10 & 0xff;
vkey = data->lastVK;
if (ime->info.fdwProperty & IME_PROP_KBD_CHAR_FIRST)
{
if (!ime_is_unicode( ime )) ToAscii( data->lastVK, scan, state, &chr, 0 );
else ToUnicodeEx( data->lastVK, scan, state, &chr, 1, 0, GetKeyboardLayout( 0 ) );
vkey = MAKELONG( data->lastVK, chr );
if (!ime_is_unicode( ime )) ToAscii( vkey, scan, state, &chr, 0 );
else ToUnicodeEx( vkey, scan, state, &chr, 1, 0, GetKeyboardLayout( 0 ) );
vkey = MAKELONG( vkey, chr );
}
count = ime->pImeToAsciiEx( vkey, scan, state, &buffer.list, 0, data->handle );
@ -3146,8 +3134,6 @@ BOOL WINAPI ImmTranslateMessage( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar
if (count > ARRAY_SIZE(buffer.TransMsg)) ImmGenerateMessage( data->handle );
else for (i = 0; i < count; i++) imc_post_message( data, buffer.TransMsg + i );
data->lastVK = VK_PROCESSKEY;
return count > 0;
}
@ -3171,7 +3157,7 @@ BOOL WINAPI ImmProcessKey( HWND hwnd, HKL hkl, UINT vkey, LPARAM lparam, DWORD u
GetKeyboardState( state );
ret = ime->pImeProcessKey( imc->handle, vkey, lparam, state );
imc->lastVK = ret ? vkey : VK_PROCESSKEY;
imc->vkey = ret ? vkey : VK_PROCESSKEY;
return ret;
}

2
dlls/imm32/tests/imm32.c
View file

@ -3457,7 +3457,7 @@ static UINT WINAPI ime_ImeToAsciiEx( UINT vkey, UINT vsc, BYTE *state, TRANSMSGL
todo_wine ok_eq( 256, msgs->uMsgCount, UINT, "%u" );
ctx = ImmLockIMC( himc );
todo_wine ok_ret( VK_PROCESSKEY, ImmGetVirtualKey( ctx->hWnd ) );
ok_ret( VK_PROCESSKEY, ImmGetVirtualKey( ctx->hWnd ) );
if (vsc & 0x200)
{