Rémi Bernon : win32u: Allow KBDTABLES conversion from CTRL + ALT to WCHAR.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ed9f1d071549296f218a8a38817051a13813ad8e
URL:    https://gitlab.winehq.org/wine/wine/-/commit/ed9f1d071549296f218a8a38817051a...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Sun Oct 15 09:58:18 2023 +0200

win32u: Allow KBDTABLES conversion from CTRL + ALT to WCHAR.

---

 dlls/win32u/input.c | 2 +-
 include/kbd.h       | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c
index ae03f99adc9..fa64de881cf 100644
--- a/dlls/win32u/input.c
+++ b/dlls/win32u/input.c
@@ -514,7 +514,7 @@ static WCHAR kbd_tables_vkey_to_wchar( const KBDTABLES *tables, UINT vkey, const
     ctrl = state[VK_CONTROL] & 0x80;
     caps = state[VK_CAPITAL] & 1;
 
-    if (ctrl && alt) return WCH_NONE;
+    if (ctrl && alt && !(tables->fLocaleFlags & KLLF_ALTGR)) return WCH_NONE;
     if (!ctrl && vkey == VK_ESCAPE) return VK_ESCAPE;
     if (ctrl && !alt)
     {
diff --git a/include/kbd.h b/include/kbd.h
index 9bbcd886b1c..da805b7cefc 100644
--- a/include/kbd.h
+++ b/include/kbd.h
@@ -40,6 +40,10 @@
 #define KANALOK          0x08
 #define GRPSELTAP        0x80
 
+#define KLLF_ALTGR       0x0001
+#define KLLF_SHIFTLOCK   0x0002
+#define KLLF_LRM_RLM     0x0004
+
 typedef struct
 {
     BYTE Vk;