Rémi Bernon : winemac: Wait for IME input result on the unix side.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3b42967442924fb154ddf8d0c598ae890cfb6133
URL:    https://gitlab.winehq.org/wine/wine/-/commit/3b42967442924fb154ddf8d0c598ae8...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Sun Apr  2 21:11:20 2023 +0200

winemac: Wait for IME input result on the unix side.

---

 dlls/winemac.drv/ime.c         | 10 +++-------
 dlls/winemac.drv/keyboard.c    | 14 ++++++--------
 dlls/winemac.drv/macdrv_main.c |  2 --
 dlls/winemac.drv/unixlib.h     |  1 -
 4 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c
index 351eb28ff98..23e6d1c78cc 100644
--- a/dlls/winemac.drv/ime.c
+++ b/dlls/winemac.drv/ime.c
@@ -628,7 +628,7 @@ UINT WINAPI ImeToAsciiEx(UINT uVKey, UINT uScanCode, const LPBYTE lpbKeyState,
     LPIMEPRIVATE myPrivate;
     HWND hwnd;
     UINT repeat;
-    int done = 0;
+    UINT ret;
 
     TRACE("uVKey 0x%04x uScanCode 0x%04x fuState %u hIMC %p\n", uVKey, uScanCode, fuState, hIMC);
 
@@ -660,13 +660,9 @@ UINT WINAPI ImeToAsciiEx(UINT uVKey, UINT uScanCode, const LPBYTE lpbKeyState,
     params.scan = uScanCode;
     params.repeat = repeat;
     params.key_state = lpbKeyState;
-    params.done = &done;
-    MACDRV_CALL(ime_process_text_input, ¶ms);
+    ret = MACDRV_CALL(ime_process_text_input, ¶ms);
 
-    while (!done)
-        MsgWaitForMultipleObjectsEx(0, NULL, INFINITE, QS_POSTMESSAGE | QS_SENDMESSAGE, 0);
-
-    if (done < 0)
+    if (!ret)
     {
         UINT msgs = 0;
         UINT msg = (uScanCode & 0x8000) ? WM_KEYUP : WM_KEYDOWN;
diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c
index 14731f2d235..17abbedb230 100644
--- a/dlls/winemac.drv/keyboard.c
+++ b/dlls/winemac.drv/keyboard.c
@@ -1197,7 +1197,7 @@ NTSTATUS macdrv_ime_process_text_input(void *arg)
     void *himc = UlongToHandle(params->himc);
     const BYTE *key_state = params->key_state;
     unsigned int flags;
-    int keyc;
+    int keyc, done = 0;
 
     TRACE("vkey 0x%04x scan 0x%04x repeat %u himc %p\n", params->vkey, params->scan,
           params->repeat, himc);
@@ -1224,17 +1224,15 @@ NTSTATUS macdrv_ime_process_text_input(void *arg)
     for (keyc = 0; keyc < ARRAY_SIZE(thread_data->keyc2vkey); keyc++)
         if (thread_data->keyc2vkey[keyc] == params->vkey) break;
 
-    if (keyc >= ARRAY_SIZE(thread_data->keyc2vkey))
-    {
-        *params->done = -1;
-        return 0;
-    }
+    if (keyc >= ARRAY_SIZE(thread_data->keyc2vkey)) return 0;
 
     TRACE("flags 0x%08x keyc 0x%04x\n", flags, keyc);
 
     macdrv_send_text_input_event(((params->scan & 0x8000) == 0), flags, params->repeat, keyc,
-                                 himc, params->done);
-    return 0;
+                                 himc, &done);
+    while (!done) NtUserMsgWaitForMultipleObjectsEx(0, NULL, INFINITE, QS_POSTMESSAGE | QS_SENDMESSAGE, 0);
+
+    return done > 0;
 }
 
 
diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c
index bf03ab6f5fe..7e91e0ca3e1 100644
--- a/dlls/winemac.drv/macdrv_main.c
+++ b/dlls/winemac.drv/macdrv_main.c
@@ -673,7 +673,6 @@ static NTSTATUS wow64_ime_process_text_input(void *arg)
         UINT scan;
         UINT repeat;
         ULONG key_state;
-        ULONG done;
     } *params32 = arg;
     struct process_text_input_params params;
 
@@ -682,7 +681,6 @@ static NTSTATUS wow64_ime_process_text_input(void *arg)
     params.scan = params32->scan;
     params.repeat = params32->repeat;
     params.key_state = UlongToPtr(params32->key_state);
-    params.done = UlongToPtr(params32->done);
     return macdrv_ime_process_text_input(¶ms);
 }
 
diff --git a/dlls/winemac.drv/unixlib.h b/dlls/winemac.drv/unixlib.h
index b3f45291904..493e4f6c139 100644
--- a/dlls/winemac.drv/unixlib.h
+++ b/dlls/winemac.drv/unixlib.h
@@ -69,7 +69,6 @@ struct process_text_input_params
     UINT scan;
     UINT repeat;
     const BYTE *key_state;
-    int *done;
 };
 
 /* macdrv_init params */