system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 05:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

conhost: Remove no longer needed non-blocking IOCTL_CONDRV_READ_INPUT.

Browse source 
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2020-10-15 18:19:59 +02:00 committed by Alexandre Julliard
parent 7fe55d2f7a
commit 01c17ca260
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dlls/kernelbase/console.c
View file

@ -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 )
{
int blocking = 1;
if (!console_ioctl( handle, IOCTL_CONDRV_READ_INPUT, &blocking, sizeof(blocking),
if (!console_ioctl( handle, IOCTL_CONDRV_READ_INPUT, NULL, 0,
buffer, length * sizeof(*buffer), count ))
return FALSE;
*count /= sizeof(*buffer);

6
programs/conhost/conhost.c
View file

@ -2358,11 +2358,9 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code,
case IOCTL_CONDRV_READ_INPUT:
{
unsigned int blocking;
if (in_size && in_size != sizeof(blocking)) return STATUS_INVALID_PARAMETER;
if (in_size) return STATUS_INVALID_PARAMETER;
ensure_tty_input_thread( console );
blocking = in_size && *(unsigned int *)in_data;
if (blocking && !console->record_count && *out_size)
if (!console->record_count && *out_size)
{
TRACE( "pending read\n" );
console->read_ioctl = IOCTL_CONDRV_READ_INPUT;