Skip to content

W
wine-cw
Commit 8f6eda86 authored by Rémi Bernon's avatar Rémi Bernon Committed by Alexandre Julliard
Browse files
Options

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

parent caf5ae19
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 8 deletions
dlls/imm32/imm.c
View file @ 8f6eda86
......@@ -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
{
......
dlls/imm32/tests/imm32.c
View file @ 8f6eda86
......@@ -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:
......
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