system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 17:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

imm32: Fix ImmEscape(A|W) with NULL data.

Browse source
This commit is contained in:
Rémi Bernon 2023-03-23 12:03:51 +01:00 committed by Alexandre Julliard
parent caf5ae1981
commit 8f6eda8649
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dlls/imm32/imm.c
View file

@ -1006,7 +1006,7 @@ LRESULT WINAPI ImmEscapeA( HKL hkl, HIMC himc, UINT code, void *data )
if (!(ime = ime_acquire( hkl ))) return 0;
if (!EscapeRequiresWA( code ) || !ime_is_unicode( ime ))
if (!EscapeRequiresWA( code ) || !ime_is_unicode( ime ) || !data)
ret = ime->pImeEscape( himc, code, data );
else
{
@ -1039,7 +1039,7 @@ LRESULT WINAPI ImmEscapeW( HKL hkl, HIMC himc, UINT code, void *data )
if (!(ime = ime_acquire( hkl ))) return 0;
if (!EscapeRequiresWA( code ) || ime_is_unicode( ime ))
if (!EscapeRequiresWA( code ) || ime_is_unicode( ime ) || !data)
ret = ime->pImeEscape( himc, code, data );
else
{

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

@ -2574,15 +2574,9 @@ static LRESULT WINAPI ime_ImeEscape( HIMC himc, UINT escape, void *data )
case IME_ESC_SET_EUDC_DICTIONARY:
if (!data) return 4;
if (ime_info.fdwProperty & IME_PROP_UNICODE)
{
todo_wine_if(*(WCHAR *)data != 'E')
ok_wcs( L"EscapeIme", data );
}
else
{
todo_wine_if(*(char *)data != 'E')
ok_str( "EscapeIme", data );
}
/* fallthrough */
case IME_ESC_QUERY_SUPPORT:
case IME_ESC_SEQUENCE_TO_INTERNAL: