Rémi Bernon : winemac: Use UINT(32) for HIMC in the unixlib interface.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d69f799ced32d8a1e5a33a2f90bcb4cf8d4ee043
URL:    https://gitlab.winehq.org/wine/wine/-/commit/d69f799ced32d8a1e5a33a2f90bcb4c...

Author: Rémi Bernon 
Date:   Sun Apr  2 21:00:09 2023 +0200

winemac: Use UINT(32) for HIMC in the unixlib interface.

---

dlls/winemac.drv/ime.c         | 2 +-
 dlls/winemac.drv/keyboard.c    | 5 +++--
 dlls/winemac.drv/macdrv_main.c | 4 ++--
 dlls/winemac.drv/unixlib.h     | 6 +++---
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c
index 363bd8f9a1f..a9d73da3291 100644
--- a/dlls/winemac.drv/ime.c
+++ b/dlls/winemac.drv/ime.c
@@ -649,11 +649,11 @@ UINT WINAPI ImeToAsciiEx(UINT uVKey, UINT uScanCode, const LPBYTE lpbKeyState,
     UnlockRealIMC(hIMC);

TRACE("Processing Mac 0x%04x\n", vkey);
+    params.himc = HandleToULong(hIMC);
     params.vkey = uVKey;
     params.scan = uScanCode;
     params.repeat = repeat;
     params.key_state = lpbKeyState;
-    params.himc = hIMC;
     params.done = &done;
     MACDRV_CALL(ime_process_text_input, &params);

diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c
index 76c038caf02..14731f2d235 100644
--- a/dlls/winemac.drv/keyboard.c
+++ b/dlls/winemac.drv/keyboard.c
@@ -1194,12 +1194,13 @@ NTSTATUS macdrv_ime_process_text_input(void *arg)
 {
     struct process_text_input_params *params = arg;
     struct macdrv_thread_data *thread_data = macdrv_thread_data();
+    void *himc = UlongToHandle(params->himc);
     const BYTE *key_state = params->key_state;
     unsigned int flags;
     int keyc;

TRACE("vkey 0x%04x scan 0x%04x repeat %u himc %p\n", params->vkey, params->scan,
-          params->repeat, params->himc);
+          params->repeat, himc);

flags = thread_data->last_modifiers;
     if (key_state[VK_SHIFT] & 0x80)
@@ -1232,7 +1233,7 @@ NTSTATUS macdrv_ime_process_text_input(void *arg)
     TRACE("flags 0x%08x keyc 0x%04x\n", flags, keyc);

macdrv_send_text_input_event(((params->scan & 0x8000) == 0), flags, params->repeat, keyc,
-                                 params->himc, params->done);
+                                 himc, params->done);
     return 0;
 }

diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c
index eeed9a4bcbe..a4b280283ee 100644
--- a/dlls/winemac.drv/macdrv_main.c
+++ b/dlls/winemac.drv/macdrv_main.c
@@ -667,20 +667,20 @@ static NTSTATUS wow64_ime_process_text_input(void *arg)
 {
     struct
     {
+        UINT himc;
         UINT vkey;
         UINT scan;
         UINT repeat;
         ULONG key_state;
-        ULONG himc;
         ULONG done;
     } *params32 = arg;
     struct process_text_input_params params;

+    params.himc = params32->himc;
     params.vkey = params32->vkey;
     params.scan = params32->scan;
     params.repeat = params32->repeat;
     params.key_state = UlongToPtr(params32->key_state);
-    params.himc = UlongToPtr(params32->himc);
     params.done = UlongToPtr(params32->done);
     return macdrv_ime_process_text_input(&params);
 }
diff --git a/dlls/winemac.drv/unixlib.h b/dlls/winemac.drv/unixlib.h
index 108ace8914c..ca5115f4982 100644
--- a/dlls/winemac.drv/unixlib.h
+++ b/dlls/winemac.drv/unixlib.h
@@ -63,11 +63,11 @@ struct dnd_have_format_params
 /* macdrv_ime_process_text_input params */
 struct process_text_input_params
 {
+    UINT himc;
     UINT vkey;
     UINT scan;
     UINT repeat;
     const BYTE *key_state;
-    void *himc;
     int *done;
 };

@@ -177,7 +177,7 @@ struct ime_query_char_rect_params
 {
     UINT32 hwnd;
     UINT32 location;
-    UINT64 himc;
+    UINT32 himc;
     UINT64 result; /* FIXME: Use NtCallbackReturn instead */
     UINT32 length;
 };
@@ -187,7 +187,7 @@ struct ime_set_text_params
 {
     UINT32 hwnd;
     UINT32 cursor_pos;
-    UINT64 himc;
+    UINT32 himc;
     UINT32 complete;
     WCHAR text[1];
 };