conhost: Input should be restored and input_thread handle should be closed before return.

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

conhost: Input should be restored and input_thread handle should be closed before return.
d22e8219 · Haidong Yu · Alexandre Julliard · d4b16250 · d22e8219
Commit d22e8219 authored Sep 23, 2020 by Haidong Yu Committed by Alexandre Julliard Sep 23, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

conhost.c programs/conhost/conhost.c +2 -1

No files found.
--- a/programs/conhost/conhost.c
+++ b/programs/conhost/conhost.c
@@ -1652,7 +1652,7 @@ static DWORD WINAPI tty_input( void *param )
            {
            case 3: /* end of text */
                LeaveCriticalSection( &console_section );
-                return 0;
+                goto done;
            case '\n':
                key_press( console, '\n', VK_RETURN, LEFT_CTRL_PRESSED );
                break;
@@ -1681,6 +1681,7 @@ static DWORD WINAPI tty_input( void *param )

    TRACE( "NtReadFile failed: %#x\n", status );

+done:
    EnterCriticalSection( &console_section );
    if (console->read_ioctl) read_complete( console, status, NULL, 0, FALSE );
    if (console->is_unix)