[PATCH 2/5] imm32: Fix ImmEnumRegisterWord(A|W) callback conversion.

[Rémi Bernon]

From: Rémi Bernon

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

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index f202c4cf1e7..e47e8aa4c44 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -928,6 +928,23 @@ BOOL WINAPI ImmDestroyContext(HIMC hIMC)
     return IMM_DestroyContext(hIMC);
 }

+struct enum_register_word_params_WtoA
+{
+    REGISTERWORDENUMPROCA proc;
+    void *user;
+};
+
+static int CALLBACK enum_register_word_WtoA( const WCHAR *readingW, DWORD style,
+                                             const WCHAR *stringW, void *user )
+{
+    char *readingA = strdupWtoA( readingW ), *stringA = strdupWtoA( stringW );
+    struct enum_register_word_params_WtoA *params = user;
+    int ret = params->proc( readingA, style, stringA, params->user );
+    free( readingA );
+    free( stringA );
+    return ret;
+}
+
 /***********************************************************************
  *		ImmEnumRegisterWordA (IMM32.@)
  */
@@ -946,8 +963,9 @@ UINT WINAPI ImmEnumRegisterWordA( HKL hkl, REGISTERWORDENUMPROCA procA, const ch
         ret = ime->pImeEnumRegisterWord( procA, readingA, style, stringA, user );
     else
     {
+        struct enum_register_word_params_WtoA params = {.proc = procA, .user = user};
         WCHAR *readingW = strdupAtoW( readingA ), *stringW = strdupAtoW( stringA );
-        ret = ime->pImeEnumRegisterWord( procA, readingW, style, stringW, user );
+        ret = ime->pImeEnumRegisterWord( enum_register_word_WtoA, readingW, style, stringW, &params );
         free( readingW );
         free( stringW );
     }
@@ -956,6 +974,23 @@ UINT WINAPI ImmEnumRegisterWordA( HKL hkl, REGISTERWORDENUMPROCA procA, const ch
     return ret;
 }

+struct enum_register_word_params_AtoW
+{
+    REGISTERWORDENUMPROCW proc;
+    void *user;
+};
+
+static int CALLBACK enum_register_word_AtoW( const char *readingA, DWORD style,
+                                             const char *stringA, void *user )
+{
+    WCHAR *readingW = strdupAtoW( readingA ), *stringW = strdupAtoW( stringA );
+    struct enum_register_word_params_AtoW *params = user;
+    int ret = params->proc( readingW, style, stringW, params->user );
+    free( readingW );
+    free( stringW );
+    return ret;
+}
+
 /***********************************************************************
  *		ImmEnumRegisterWordW (IMM32.@)
  */
@@ -974,8 +1009,9 @@ UINT WINAPI ImmEnumRegisterWordW( HKL hkl, REGISTERWORDENUMPROCW procW, const WC
         ret = ime->pImeEnumRegisterWord( procW, readingW, style, stringW, user );
     else
     {
+        struct enum_register_word_params_AtoW params = {.proc = procW, .user = user};
         char *readingA = strdupWtoA( readingW ), *stringA = strdupWtoA( stringW );
-        ret = ime->pImeEnumRegisterWord( procW, readingA, style, stringA, user );
+        ret = ime->pImeEnumRegisterWord( enum_register_word_AtoW, readingA, style, stringA, &params );
         free( readingA );
         free( stringA );
     }
diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c
index 7088f663535..5f6cefe3bd9 100644
--- a/dlls/imm32/tests/imm32.c
+++ b/dlls/imm32/tests/imm32.c
@@ -3408,9 +3408,7 @@ static int CALLBACK enum_register_wordA( const char *reading, DWORD style, const
     ime_trace( "reading %s, style %#lx, string %s, user %p\n", debugstr_a(reading), style, debugstr_a(string), user );

ok_eq( 0xdeadbeef, style, UINT, "%#x" );
-    todo_wine_if( reading[1] == 0 )
     ok_str( "Reading", reading );
-    todo_wine_if( string[1] == 0 )
     ok_str( "String", string );

return 0xdeadbeef;
@@ -3421,9 +3419,7 @@ static int CALLBACK enum_register_wordW( const WCHAR *reading, DWORD style, cons
     ime_trace( "reading %s, style %#lx, string %s, user %p\n", debugstr_w(reading), style, debugstr_w(string), user );

ok_eq( 0xdeadbeef, style, UINT, "%#x" );
-    todo_wine_if( reading[0] != 'R' )
     ok_wcs( L"Reading", reading );
-    todo_wine_if( string[0] != 'S' )
     ok_wcs( L"String", string );

return 0xdeadbeef;