Marc-Aurel Zent : winemac.drv: Resolve symbol vkeys first without modifiers.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c579dcc471f90d43268b9cf55c4b7e65acbb6819
URL:    https://gitlab.winehq.org/wine/wine/-/commit/c579dcc471f90d43268b9cf55c4b7e6...

Author: Marc-Aurel Zent 
Date:   Sat Mar  9 05:24:48 2024 +0100

winemac.drv: Resolve symbol vkeys first without modifiers.

---

dlls/winemac.drv/keyboard.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c
index a86ec910fb1..d1092f0a381 100644
--- a/dlls/winemac.drv/keyboard.c
+++ b/dlls/winemac.drv/keyboard.c
@@ -874,15 +874,15 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data)

/* Now try to match key codes for certain common punctuation characters to
        the most common OEM vkeys (e.g. '.' to VK_OEM_PERIOD). */
-    for (i = 0; i < ARRAY_SIZE(symbol_vkeys); i++)
+    for (combo = 0; combo < ARRAY_SIZE(modifier_combos); combo++)
     {
-        vkey = symbol_vkeys[i].vkey;
+        for (i = 0; i < ARRAY_SIZE(symbol_vkeys); i++)
+        {
+            vkey = symbol_vkeys[i].vkey;

-        if (vkey_used[vkey])
-            continue;
+            if (vkey_used[vkey])
+                continue;

-        for (combo = 0; combo < ARRAY_SIZE(modifier_combos); combo++)
-        {
             for (keyc = 0; keyc < ARRAY_SIZE(map); keyc++)
             {
                 if (!thread_data->keyc2scan[keyc]) continue; /* not a known Mac key code */
@@ -898,9 +898,6 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data)
                     break;
                 }
             }
-
-            if (vkey_used[vkey])
-                break;
         }
     }