Commit 01c17ca2 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

conhost: Remove no longer needed non-blocking IOCTL_CONDRV_READ_INPUT.

parent 7fe55d2f
...@@ -1373,8 +1373,7 @@ BOOL WINAPI ReadConsoleInputA( HANDLE handle, INPUT_RECORD *buffer, DWORD length ...@@ -1373,8 +1373,7 @@ BOOL WINAPI ReadConsoleInputA( HANDLE handle, INPUT_RECORD *buffer, DWORD length
*/ */
BOOL WINAPI ReadConsoleInputW( HANDLE handle, INPUT_RECORD *buffer, DWORD length, DWORD *count ) BOOL WINAPI ReadConsoleInputW( HANDLE handle, INPUT_RECORD *buffer, DWORD length, DWORD *count )
{ {
int blocking = 1; if (!console_ioctl( handle, IOCTL_CONDRV_READ_INPUT, NULL, 0,
if (!console_ioctl( handle, IOCTL_CONDRV_READ_INPUT, &blocking, sizeof(blocking),
buffer, length * sizeof(*buffer), count )) buffer, length * sizeof(*buffer), count ))
return FALSE; return FALSE;
*count /= sizeof(*buffer); *count /= sizeof(*buffer);
......
...@@ -2358,11 +2358,9 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, ...@@ -2358,11 +2358,9 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code,
case IOCTL_CONDRV_READ_INPUT: case IOCTL_CONDRV_READ_INPUT:
{ {
unsigned int blocking; if (in_size) return STATUS_INVALID_PARAMETER;
if (in_size && in_size != sizeof(blocking)) return STATUS_INVALID_PARAMETER;
ensure_tty_input_thread( console ); ensure_tty_input_thread( console );
blocking = in_size && *(unsigned int *)in_data; if (!console->record_count && *out_size)
if (blocking && !console->record_count && *out_size)
{ {
TRACE( "pending read\n" ); TRACE( "pending read\n" );
console->read_ioctl = IOCTL_CONDRV_READ_INPUT; console->read_ioctl = IOCTL_CONDRV_READ_INPUT;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment