zontreck/wine
1
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine.git synced 2024-11-19 17:06:04 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

conhost.exe: Handle ctrl-pause/break key strokes.

Browse source 
Note: this patch should be extended by adding insertion
of the CTRL_BREAK_EVENT into processes' crtl handler
(as it's done for CTRL_C_EVENT).

Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
This commit is contained in:
Eric Pouech 2022-12-21 10:48:28 +01:00 committed by Alexandre Julliard
parent ae84e423c5
commit fda954dfd4
Notes: Alexandre Julliard 2023-01-25 22:21:29 +01:00 
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/wine/-/merge_requests/1867
2 changed files with 32 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
programs/conhost/conhost.c
View file

@ -1463,6 +1463,29 @@ static NTSTATUS read_console( struct console *console, unsigned int ioctl, size_
return process_console_input( console );
}
static BOOL map_to_ctrlevent( struct console *console, const INPUT_RECORD *record,
unsigned int* event)
{
if (record->EventType == KEY_EVENT)
{
if (record->Event.KeyEvent.uChar.UnicodeChar == 'C' - 64 &&
!(record->Event.KeyEvent.dwControlKeyState & ENHANCED_KEY))
{
*event = CTRL_C_EVENT;
return TRUE;
}
/* we want to get ctrl-pause/break, but it's already translated by user32 into VK_CANCEL */
if (record->Event.KeyEvent.uChar.UnicodeChar == 0 &&
record->Event.KeyEvent.wVirtualKeyCode == VK_CANCEL &&
record->Event.KeyEvent.dwControlKeyState == LEFT_CTRL_PRESSED)
{
*event = CTRL_BREAK_EVENT;
return TRUE;
}
}
return FALSE;
}
/* add input events to a console input queue */
NTSTATUS write_console_input( struct console *console, const INPUT_RECORD *records,
unsigned int count, BOOL flush )
@ -1485,9 +1508,9 @@ NTSTATUS write_console_input( struct console *console, const INPUT_RECORD *recor
unsigned int i = 0;
while (i < count)
{
if (records[i].EventType == KEY_EVENT &&
records[i].Event.KeyEvent.uChar.UnicodeChar == 'C' - 64 &&
!(records[i].Event.KeyEvent.dwControlKeyState & ENHANCED_KEY))
unsigned int event;
if (map_to_ctrlevent(console, &records[i], &event))
{
if (i != count - 1)
memcpy( &console->records[console->record_count + i],
@ -1499,7 +1522,7 @@ NTSTATUS write_console_input( struct console *console, const INPUT_RECORD *recor
struct condrv_ctrl_event ctrl_event;
IO_STATUS_BLOCK io;
ctrl_event.event = CTRL_C_EVENT;
ctrl_event.event = event;
ctrl_event.group_id = 0;
NtDeviceIoControlFile( console->server, NULL, NULL, NULL, &io, IOCTL_CONDRV_CTRL_EVENT,
&ctrl_event, sizeof(ctrl_event), NULL, 0 );

8
server/console.c
View file

@ -694,14 +694,16 @@ static void propagate_console_signal( struct console *console,
set_error( STATUS_INVALID_PARAMETER );
return;
}
/* FIXME: should support the other events (like CTRL_BREAK) */
if (sig != CTRL_C_EVENT)
switch (sig)
{
case CTRL_C_EVENT: csi.signal = SIGINT; break;
case CTRL_BREAK_EVENT: csi.signal = SIGQUIT; break;
default:
/* FIXME: should support the other events */
set_error( STATUS_NOT_IMPLEMENTED );
return;
}
csi.console = console;
csi.signal = SIGINT;
csi.group = group_id;
enum_processes(propagate_console_signal_cb, &csi);