[PATCH v10 4/5] winemac: Move macdrv_ImeProcessKey logic to ImeProcessKey and macdrv_ImeToAsciiEx.

[Marc-Aurel Zent]

From: Marc-Aurel Zent <[e-mail]>

---
 dlls/imm32/ime.c            |  8 ++++++
 dlls/winemac.drv/keyboard.c | 50 +++++++++++++++----------------------
 2 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/dlls/imm32/ime.c b/dlls/imm32/ime.c
index fcf2454f857..94eaaa0dcbd 100644
--- a/dlls/imm32/ime.c
+++ b/dlls/imm32/ime.c
@@ -551,6 +551,14 @@ BOOL WINAPI ImeProcessKey( HIMC himc, UINT vkey, LPARAM lparam, BYTE *state )
     if (!(ctx = ImmLockIMC( himc ))) return FALSE;
     ret = NtUserMessageCall( ctx->hWnd, WINE_IME_PROCESS_KEY, vkey, lparam, ¶ms,
                              NtUserImeDriverCall, FALSE );
+    switch (LOWORD(vkey))
+    {
+        case VK_SHIFT:
+        case VK_CONTROL:
+        case VK_CAPITAL:
+        case VK_MENU:
+            ret = FALSE;
+    }
     ImmUnlockIMC( himc );
 
     return ret;
diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c
index 962a8c50896..578dbfcea8b 100644
--- a/dlls/winemac.drv/keyboard.c
+++ b/dlls/winemac.drv/keyboard.c
@@ -1110,34 +1110,6 @@ void macdrv_hotkey_press(const macdrv_event *event)
  */
 UINT macdrv_ImeProcessKey(HIMC himc, UINT wparam, UINT lparam, const BYTE *key_state)
 {
-    WORD vkey = LOWORD(wparam);
-    BOOL pressed = !(lparam >> 31);
-
-    TRACE("himc %p, vkey %#x, pressed %u\n",
-          himc, vkey, pressed);
-
-    if (!macdrv_using_input_method()) return 0;
-
-    if (!pressed)
-    {
-        /* Only key down events should be sent to the Cocoa input context. We do
-           not handle key ups, and instead let those go through as a normal
-           WM_KEYUP. */
-        return 0;
-    }
-
-    switch (vkey)
-    {
-        case VK_SHIFT:
-        case VK_CONTROL:
-        case VK_CAPITAL:
-        case VK_MENU:
-        case VK_KANA:
-        case VK_KANJI:
-        TRACE("Skipping metakey\n");
-        return 0;
-    }
-
     return 1;
 }
 
@@ -1150,12 +1122,30 @@ UINT macdrv_ImeToAsciiEx(UINT vkey, UINT vsc, const BYTE *state, HIMC himc)
     unsigned int flags;
     int keyc;
     bool ret;
-    BOOL repeat = !!(vsc & 0x4000);
+    BOOL repeat = !!(vsc & KF_REPEAT);
 
     TRACE("himc %p, vkey %#x state %p repeat %u\n",
           himc, vkey, state, repeat);
 
-    if (!state) return 0;
+    if (!state) return STATUS_SUCCESS;
+
+    if (!macdrv_using_input_method()) return STATUS_NOT_IMPLEMENTED;
+
+    if (vsc & KF_UP)
+    {
+        /* Only key down events should be sent to the Cocoa input context. We do
+           not handle key ups, and instead let those go through as a normal
+           WM_KEYUP. */
+        return STATUS_NOT_IMPLEMENTED;
+    }
+
+    switch (vkey)
+    {
+        case VK_KANA:
+        case VK_KANJI:
+            TRACE("Skipping metakey\n");
+            return STATUS_NOT_IMPLEMENTED;
+    }
 
     flags = thread_data->last_modifiers;
     if (state[VK_SHIFT] & 0x80)
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/9992