[PATCH 0/1] MR1018: conhost: Fix tests on ReadConsole with CONSOLE_READCONSOLE_CONTROL.

[eric pouech (＠epo)]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52648

The patch should fix the errors around line 1370 in conhost/tests/tty.c,
but it doesn't fix other errors around line 1530 and 1550 which are
completly unrelated to this change.
So failures to be expected on the later.

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

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

[PATCH 1/1] conhost: Fix tests on ReadConsole with CONSOLE_READCONSOLE_CONTROL.

[Eric Pouech]

From: Eric Pouech <eric.pouech(a)gmail.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52648

The patch should fix the errors around line 1370 in conhost/tests/tty.c,
but it doesn't fix other errors around line 1530 and 1550 which are
completly unrelated to this change.
So failures to be expected on the later.

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
 programs/conhost/tests/tty.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c
index 849986a1c29..cab7cd5574f 100644
--- a/programs/conhost/tests/tty.c
+++ b/programs/conhost/tests/tty.c
@@ -1337,6 +1337,9 @@ static void test_read_console_control(void)
     /* test simple behavior */
     for (ctrl = 0; ctrl < ' '; ctrl++)
     {
+        DWORD state;
+        SHORT cc;
+
         /* don't play with fire */
         if (ctrl == 0 || ctrl == 3 || ctrl == '\n' || ctrl == 27) continue;
 
@@ -1359,10 +1362,13 @@ static void test_read_console_control(void)
         strcpy(buf, "def."); buf[3] = ctrl;
         write_console_pipe(buf);
         wcscpy(bufw, L"abcdef."); bufw[6] = (WCHAR)ctrl;
-        child_expect_read_control_result(child_pipe, bufw,
-                                         (ctrl == '\t' || ctrl == '\r') ? 0
-                                         : ((ctrl == 30 || ctrl == 31) ? (LEFT_CTRL_PRESSED | SHIFT_PRESSED)
-                                            : LEFT_CTRL_PRESSED));
+        /* ^H requires special handling */
+        cc = (ctrl == 8) ? 0x0200 : VkKeyScanA(ctrl);
+        if (cc == -1) cc = 0;
+        state = 0;
+        if (cc & 0x0100) state |= SHIFT_PRESSED;
+        if (cc & 0x0200) state |= LEFT_CTRL_PRESSED;
+        child_expect_read_control_result(child_pipe, bufw, state);
         skip_sequence("\x1b[?25l"); /* hide cursor */
         expect_output_sequence("def");
         skip_sequence("\x1b[?25h"); /* show cursor */
-- 
GitLab

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

[Jacek Caban (＠jacek)]

It looks like your repo is somehow hidden. I noticed that with your other MRs previously, where it's not possible to fetch branches, but it also prevents pipelines from running, which is increasingly important.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1018#note_10103

[eric pouech (＠epo)]

Hi Jacek,

Repo should be public by now. Thanks for noticing.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1018#note_10110