[PATCH v2 6/9] winex11: Compute preedit text buffer sizes in WCHAR units.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/winex11.drv/xim.c | 54 ++++++++++++++++++------------------------
 1 file changed, 23 insertions(+), 31 deletions(-)

diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c
index a7e2a0a2c26..61998c22ad2 100644
--- a/dlls/winex11.drv/xim.c
+++ b/dlls/winex11.drv/xim.c
@@ -44,10 +44,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(xim);

BOOL ximInComposeMode=FALSE;

-/* moved here from imm32 for dll separation */
-static DWORD dwCompStringLength = 0;
-static LPBYTE CompositionString = NULL;
-static DWORD dwCompStringSize = 0;
+static DWORD preedit_len = 0;
+static DWORD preedit_max = 0;
+static WCHAR *preedit_buf = NULL;

static XIMStyle input_style = 0;
 static XIMStyle input_style_req = XIMPreeditCallbacks | XIMStatusCallbacks;
@@ -87,38 +86,32 @@ static LRESULT send_ime_ui_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l
     return send_message( hwnd, msg, wparam, lparam );
 }

-static void X11DRV_ImmSetInternalString(UINT offset, UINT selLength, LPWSTR lpComp, UINT len)
+static void xim_update_preedit_string( UINT offset, UINT old_len, WCHAR *text, UINT new_len )
 {
-    /* Composition strings are edited in chunks */
-    unsigned int byte_length = len * sizeof(WCHAR);
-    unsigned int byte_offset = offset * sizeof(WCHAR);
-    unsigned int byte_selection = selLength * sizeof(WCHAR);
-    int byte_expansion = byte_length - byte_selection;
-    LPBYTE ptr_new;
+    int diff = new_len - old_len;

-    TRACE("( %i, %i, %p, %d):\n", offset, selLength, lpComp, len );
+    TRACE( "offset %u, old_len %u, text %s\n", offset, old_len, debugstr_wn(text, new_len) );

-    if (byte_expansion + dwCompStringLength >= dwCompStringSize)
+    if (preedit_len + diff >= preedit_max)
     {
-        ptr_new = realloc( CompositionString, dwCompStringSize + byte_expansion );
-        if (ptr_new == NULL)
+        WCHAR *tmp;
+
+        if (!(tmp = realloc( preedit_buf, (preedit_max + diff) * sizeof(WCHAR) )))
         {
             ERR("Couldn't expand composition string buffer\n");
             return;
         }

-        CompositionString = ptr_new;
-        dwCompStringSize += byte_expansion;
+        preedit_buf = tmp;
+        preedit_max += diff;
     }

-    ptr_new = CompositionString + byte_offset;
-    memmove(ptr_new + byte_length, ptr_new + byte_selection,
-            dwCompStringLength - byte_offset - byte_selection);
-    if (lpComp) memcpy(ptr_new, lpComp, byte_length);
-    dwCompStringLength += byte_expansion;
+    memmove( preedit_buf + offset + new_len, preedit_buf + offset + old_len,
+             (preedit_len - offset - old_len) * sizeof(WCHAR) );
+    if (text) memcpy( preedit_buf + offset, text, new_len * sizeof(WCHAR) );
+    preedit_len += diff;

-    x11drv_client_func( client_func_ime_set_composition_string,
-                        CompositionString, dwCompStringLength );
+    x11drv_client_func( client_func_ime_set_composition_string, preedit_buf, preedit_len * sizeof(WCHAR) );
 }

void X11DRV_XIMLookupChars( const char *str, UINT count )
@@ -170,11 +163,10 @@ static int xic_preedit_done( XIC xic, XPointer user, XPointer arg )
     TRACE( "xic %p, hwnd %p, arg %p\n", xic, hwnd, arg );

ximInComposeMode = FALSE;
-    if (dwCompStringSize)
-        free( CompositionString );
-    dwCompStringSize = 0;
-    dwCompStringLength = 0;
-    CompositionString = NULL;
+    free( preedit_buf );
+    preedit_max = 0;
+    preedit_len = 0;
+    preedit_buf = NULL;

send_ime_ui_message( hwnd, WM_WINE_IME_SET_COMP_STATUS, FALSE, 0 );
     return 0;
@@ -191,7 +183,7 @@ static int xic_preedit_draw( XIC xic, XPointer user, XPointer arg )
     if (!params) return 0;

if (!(text = params->text))
-        X11DRV_ImmSetInternalString( params->chg_first, params->chg_length, NULL, 0 );
+        xim_update_preedit_string( params->chg_first, params->chg_length, NULL, 0 );
     else
     {
         size_t text_len;
@@ -211,7 +203,7 @@ static int xic_preedit_draw( XIC xic, XPointer user, XPointer arg )
         if ((output = malloc( text_len * sizeof(WCHAR) )))
         {
             text_len = ntdll_umbstowcs( str, text_len, output, text_len );
-            X11DRV_ImmSetInternalString( params->chg_first, params->chg_length, output, text_len );
+            xim_update_preedit_string( params->chg_first, params->chg_length, output, text_len );
             free( output );
         }