Eric Pouech : conhost/tests: Fix tests for some keyboard layouts.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: bdad6f2c853045602ab3995ec3490bee3d0a60fb
URL:    https://gitlab.winehq.org/wine/wine/-/commit/bdad6f2c853045602ab3995ec3490be...

Author: Eric Pouech <eric.pouech(a)gmail.com>
Date:   Mon Oct 24 15:24:33 2022 +0200

conhost/tests: Fix tests for some keyboard layouts.

Some keyboards (French, German and some others) report the right alt key
(which is some cases the right-shift one) as ctrl+alt.
Add proper handling for ctrl+alt return from VkKeyScan().

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52980
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---

 programs/conhost/tests/tty.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c
index cab7cd5574f..78e24cdb42d 100644
--- a/programs/conhost/tests/tty.c
+++ b/programs/conhost/tests/tty.c
@@ -543,7 +543,7 @@ static void expect_key_input_(unsigned int line, unsigned int ctx, WCHAR ch, uns
                        "%x: wVirtualScanCode = %x expected %x\n", ctx,
                        record.Event.KeyEvent.wVirtualScanCode, vs);
     ok_(__FILE__,line)(record.Event.KeyEvent.dwControlKeyState == ctrl_state,
-                       "%x: dwControlKeyState = %lx\n", ctx, record.Event.KeyEvent.dwControlKeyState);
+                       "%x: dwControlKeyState = %lx expected %x\n", ctx, record.Event.KeyEvent.dwControlKeyState, ctrl_state);
 }
 
 #define get_input_key_vt() get_input_key_vt_(__LINE__)
@@ -567,12 +567,17 @@ static void expect_key_pressed_(unsigned int line, unsigned int ctx, WCHAR ch, u
     if (ctrl_state & LEFT_ALT_PRESSED)
         expect_key_input_(line, ctx, 0, VK_MENU, TRUE,
                           LEFT_ALT_PRESSED | (ctrl_state & SHIFT_PRESSED));
-    if (ctrl_state & LEFT_CTRL_PRESSED)
+    if (ctrl_state & RIGHT_ALT_PRESSED)
+        expect_key_input_(line, ctx, 0, VK_MENU, TRUE,
+                          RIGHT_ALT_PRESSED | LEFT_CTRL_PRESSED | ENHANCED_KEY | (ctrl_state & SHIFT_PRESSED));
+    else if (ctrl_state & LEFT_CTRL_PRESSED)
         expect_key_input_(line, ctx, 0, VK_CONTROL, TRUE,
                           LEFT_CTRL_PRESSED | (ctrl_state & (SHIFT_PRESSED | LEFT_ALT_PRESSED)));
     expect_key_input_(line, ctx, ch, vk, TRUE, ctrl_state);
     expect_key_input_(line, ctx, ch, vk, FALSE, ctrl_state);
-    if (ctrl_state & LEFT_CTRL_PRESSED)
+    if (ctrl_state & RIGHT_ALT_PRESSED)
+        expect_key_input_(line, ctx, 0, VK_MENU, FALSE, ENHANCED_KEY | (ctrl_state & SHIFT_PRESSED));
+    else if (ctrl_state & LEFT_CTRL_PRESSED)
         expect_key_input_(line, ctx, 0, VK_CONTROL, FALSE,
                           ctrl_state & (SHIFT_PRESSED | LEFT_ALT_PRESSED));
     if (ctrl_state & LEFT_ALT_PRESSED)
@@ -585,9 +590,12 @@ static void expect_key_pressed_(unsigned int line, unsigned int ctx, WCHAR ch, u
 static void expect_char_key_(unsigned int line, WCHAR ch)
 {
     unsigned int ctrl = 0, vk;
+
     vk = VkKeyScanW(ch);
     if (vk == ~0) vk = 0;
     if (vk & 0x0100) ctrl |= SHIFT_PRESSED;
+    /* Some keyboard (like German or French one) report right alt as ctrl+alt */
+    if ((vk & 0x0600) == 0x0600) ctrl |= RIGHT_ALT_PRESSED;
     if (vk & 0x0200) ctrl |= LEFT_CTRL_PRESSED;
     vk &= 0xff;
     expect_key_pressed_(line, ch, ch, vk, ctrl);