Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
01c17ca2
Commit
01c17ca2
authored
Oct 15, 2020
by
Jacek Caban
Committed by
Alexandre Julliard
Oct 15, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
conhost: Remove no longer needed non-blocking IOCTL_CONDRV_READ_INPUT.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
7fe55d2f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
6 deletions
+3
-6
console.c
dlls/kernelbase/console.c
+1
-2
conhost.c
programs/conhost/conhost.c
+2
-4
No files found.
dlls/kernelbase/console.c
View file @
01c17ca2
...
...
@@ -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
);
...
...
programs/conhost/conhost.c
View file @
01c17ca2
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment