patch 8.0.0917: MS-Windows:CTRL-C handling in terminal window is wrong
Problem: MS-Windows:CTRL-C handling in terminal window is wrong
Solution: Pass CTRL-C as a key. Turn CTRL-BREAK into a key stroke. (Yasuhiro
Matsumoto, closes #1965)
diff --git a/src/os_win32.c b/src/os_win32.c
index 496f95f..c6d9ad1 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -3741,6 +3741,9 @@
handler_routine(
DWORD dwCtrlType)
{
+ INPUT_RECORD ir;
+ DWORD out;
+
switch (dwCtrlType)
{
case CTRL_C_EVENT:
@@ -3750,6 +3753,16 @@
case CTRL_BREAK_EVENT:
g_fCBrkPressed = TRUE;
+ ctrl_break_was_pressed = TRUE;
+ /* ReadConsoleInput is blocking, send a key event to continue. */
+ ir.EventType = KEY_EVENT;
+ ir.Event.KeyEvent.bKeyDown = TRUE;
+ ir.Event.KeyEvent.wRepeatCount = 1;
+ ir.Event.KeyEvent.wVirtualKeyCode = VK_CANCEL;
+ ir.Event.KeyEvent.wVirtualScanCode = 0;
+ ir.Event.KeyEvent.dwControlKeyState = 0;
+ ir.Event.KeyEvent.uChar.UnicodeChar = 0;
+ WriteConsoleInput(g_hConIn, &ir, 1, &out);
return TRUE;
/* fatal events: shut down gracefully */