kernel32: Use PEB console handle in CONSOLE_HandleCtrlC to check console connection.

Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

kernel32: Use PEB console handle in CONSOLE_HandleCtrlC to check console connection.
0451e44d · Jacek Caban · Alexandre Julliard · ac94d889 · 0451e44d
Commit 0451e44d authored Aug 13, 2020 by Jacek Caban Committed by Alexandre Julliard Aug 13, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

console.c dlls/kernel32/console.c +1 -3

No files found.
--- a/dlls/kernel32/console.c
+++ b/dlls/kernel32/console.c
@@ -659,9 +659,7 @@ LONG CALLBACK CONSOLE_HandleCtrlC( EXCEPTION_POINTERS *eptr )
    HANDLE thread;

    if (eptr->ExceptionRecord->ExceptionCode != CONTROL_C_EXIT) return EXCEPTION_CONTINUE_SEARCH;
-
-    /* FIXME: better test whether a console is attached to this process ??? */
-    if (CONSOLE_GetNumHistoryEntries() == (unsigned)-1) return EXCEPTION_CONTINUE_SEARCH;
+    if (!RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle)  return EXCEPTION_CONTINUE_SEARCH;

    /* check if we have to ignore ctrl-C events */
    if (!(NtCurrentTeb()->Peb->ProcessParameters->ConsoleFlags & 1))