ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel32: Always uninitialize the terminal for the console shell process. 

The terminal raw IO check and the console shell process check are used
separately to initialize the terminal in different ways. However, if
either check fails during uninitialization, then no uninitialization
will occur at all and modified terminfo settings will remain instead of
being restored. We should check each condition individually and
uninitialize each part as required.

Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Andrew Eikum 2015-11-17 09:41:43 -06:00 committed by Alexandre Julliard
parent 19eaed6a38
commit df718b8ab8
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/kernel32/console.c
View File

@ -211,15 +211,18 @@ static BOOL put_console_into_raw_mode(int fd)
static BOOL restore_console_mode(HANDLE hin)
{
int fd;
BOOL ret;
BOOL ret = TRUE;
if (S_termios_raw)
{
if ((fd = get_console_bare_fd(hin)) == -1) return FALSE;
ret = tcsetattr(fd, TCSANOW, &S_termios) >= 0;
close(fd);
}
if (RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle == KERNEL32_CONSOLE_SHELL)
TERM_Exit();
if (!S_termios_raw ||
RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle != KERNEL32_CONSOLE_SHELL)
return TRUE;
if ((fd = get_console_bare_fd(hin)) == -1) return FALSE;
ret = tcsetattr(fd, TCSANOW, &S_termios) >= 0;
close(fd);
TERM_Exit();
return ret;
}