win32u: Force US layout in ToUnicode when CTRL is pressed.

The host layout behave very differently in that case and we have tests that check the exact results.

win32u: Force US layout in ToUnicode when CTRL is pressed.
027f73fc · Rémi Bernon · Alexandre Julliard · ca02df5c · 027f73fc
Commit 027f73fc authored Aug 26, 2023 by Rémi Bernon Committed by Alexandre Julliard Nov 30, 2023
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

input.c dlls/win32u/input.c +5 -1

No files found.
--- a/dlls/win32u/input.c
+++ b/dlls/win32u/input.c
@@ -516,6 +516,11 @@ static WCHAR kbd_tables_vkey_to_wchar( const KBDTABLES *tables, UINT vkey, const

    if (ctrl && alt) return WCH_NONE;
    if (!ctrl && vkey == VK_ESCAPE) return VK_ESCAPE;
+    if (ctrl && !alt)
+    {
+        if (vkey >= 'A' && vkey <= 'Z') return vkey - 'A' + 1;
+        tables = &kbdus_tables;
+    }

    mod = caps_mod = kbd_tables_get_mod_num( tables, state, FALSE );
    if (caps) caps_mod = kbd_tables_get_mod_num( tables, state, TRUE );
@@ -531,7 +536,6 @@ static WCHAR kbd_tables_vkey_to_wchar( const KBDTABLES *tables, UINT vkey, const
        }
    }

-    if (ctrl && vkey >= 'A' && vkey <= 'Z') return vkey - 'A' + 1;
    return WCH_NONE;
 }