Rémi Bernon : winex11: Fix XIM wchar encoding in xic_preedit_draw.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 994d79903a096dccb905795a96492d87268ef6d3
URL:    https://gitlab.winehq.org/wine/wine/-/commit/994d79903a096dccb905795a96492d8...

Author: Rémi Bernon 
Date:   Sun Apr  2 10:18:07 2023 +0200

winex11: Fix XIM wchar encoding in xic_preedit_draw.

---

dlls/winex11.drv/xim.c | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c
index a60ee4b2042..219e5b18974 100644
--- a/dlls/winex11.drv/xim.c
+++ b/dlls/winex11.drv/xim.c
@@ -182,24 +182,30 @@ static int xic_preedit_draw( XIC xic, XPointer user, XPointer arg )

if (!(text = params->text))
         X11DRV_ImmSetInternalString( params->chg_first, params->chg_length, NULL, 0 );
-    else if (!text->encoding_is_wchar)
+    else
     {
         size_t text_len;
         WCHAR *output;
+        char *str;
+        int len;
+
+        if (!text->encoding_is_wchar) str = text->string.multi_byte;
+        else if ((len = wcstombs( NULL, text->string.wide_char, text->length )) < 0) str = NULL;
+        else if ((str = malloc( len + 1 )))
+        {
+            wcstombs( str, text->string.wide_char, len );
+            str[len] = 0;
+        }

-        text_len = strlen( text->string.multi_byte );
+        text_len = str ? strlen( str ) : 0;
         if ((output = malloc( text_len * sizeof(WCHAR) )))
         {
-            text_len = ntdll_umbstowcs( text->string.multi_byte, text_len, output, text_len );
+            text_len = ntdll_umbstowcs( str, text_len, output, text_len );
             X11DRV_ImmSetInternalString( params->chg_first, params->chg_length, output, text_len );
             free( output );
         }
-    }
-    else
-    {
-        FIXME( "wchar PROBIBILY WRONG\n" );
-        X11DRV_ImmSetInternalString( params->chg_first, params->chg_length,
-                                     (WCHAR *)text->string.wide_char, text->length );
+
+        if (str != text->string.multi_byte) free( str );
     }

x11drv_client_call( client_ime_set_cursor_pos, params->caret );