Rémi Bernon : imm32: Resize the composition string if the driver requested so.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4870a9dfad3527c9eca7ed0ac9481281cbdfc254
URL:    https://gitlab.winehq.org/wine/wine/-/commit/4870a9dfad3527c9eca7ed0ac948128...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Thu May 11 08:22:08 2023 +0200

imm32: Resize the composition string if the driver requested so.

---

 dlls/imm32/ime.c         | 22 +++++++++++++++++-----
 dlls/imm32/imm_private.h |  2 ++
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/dlls/imm32/ime.c b/dlls/imm32/ime.c
index db9cdfa9a3b..b544035dbd7 100644
--- a/dlls/imm32/ime.c
+++ b/dlls/imm32/ime.c
@@ -457,9 +457,8 @@ BOOL WINAPI ImeProcessKey( HIMC himc, UINT vkey, LPARAM lparam, BYTE *state )
 
 UINT WINAPI ImeToAsciiEx( UINT vkey, UINT vsc, BYTE *state, TRANSMSGLIST *msgs, UINT flags, HIMC himc )
 {
-    struct ime_driver_call_params params = {.himc = himc, .state = state};
     COMPOSITIONSTRING *compstr;
-    UINT count = 0;
+    UINT size, count = 0;
     INPUTCONTEXT *ctx;
     NTSTATUS status;
 
@@ -468,10 +467,23 @@ UINT WINAPI ImeToAsciiEx( UINT vkey, UINT vsc, BYTE *state, TRANSMSGLIST *msgs,
 
     if (!(ctx = ImmLockIMC( himc ))) return 0;
     if (!(compstr = ImmLockIMCC( ctx->hCompStr ))) goto done;
+    size = compstr->dwSize;
+
+    do
+    {
+        struct ime_driver_call_params params = {.himc = himc, .state = state};
+        HIMCC himcc;
+
+        ImmUnlockIMCC( ctx->hCompStr );
+        if (!(himcc = ImmReSizeIMCC( ctx->hCompStr, size ))) goto done;
+        if (!(compstr = ImmLockIMCC( (ctx->hCompStr = himcc) ))) goto done;
+
+        params.compstr = compstr;
+        status = NtUserMessageCall( ctx->hWnd, WINE_IME_TO_ASCII_EX, vkey, vsc, ¶ms,
+                                    NtUserImeDriverCall, FALSE );
+        size = compstr->dwSize;
+    } while (status == STATUS_BUFFER_TOO_SMALL);
 
-    params.compstr = compstr;
-    status = NtUserMessageCall( ctx->hWnd, WINE_IME_TO_ASCII_EX, vkey, vsc, ¶ms,
-                                NtUserImeDriverCall, FALSE );
     if (status) WARN( "WINE_IME_TO_ASCII_EX returned status %#lx\n", status );
 
     ImmUnlockIMCC( ctx->hCompStr );
diff --git a/dlls/imm32/imm_private.h b/dlls/imm32/imm_private.h
index 8a957494ce9..4cc4acda6c1 100644
--- a/dlls/imm32/imm_private.h
+++ b/dlls/imm32/imm_private.h
@@ -19,6 +19,8 @@
 #include <stdarg.h>
 #include <stddef.h>
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"