Rémi Bernon : imm32: Fix ImmEscape(A|W) with NULL data.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8f6eda8649b6b214181aa604361b29867372706a
URL:    https://gitlab.winehq.org/wine/wine/-/commit/8f6eda8649b6b214181aa604361b298...

Author: Rémi Bernon 
Date:   Thu Mar 23 12:03:51 2023 +0100

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

---

dlls/imm32/imm.c         | 4 ++--
 dlls/imm32/tests/imm32.c | 6 ------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index c22c1fb9e64..f202c4cf1e7 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -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
     {
diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c
index 93185402441..7088f663535 100644
--- a/dlls/imm32/tests/imm32.c
+++ b/dlls/imm32/tests/imm32.c
@@ -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: