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
c248999a
Commit
c248999a
authored
Nov 19, 2020
by
Jacek Caban
Committed by
Alexandre Julliard
Nov 19, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
server: Allow reading directly from console handle.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
a66eab0d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
1 deletion
+14
-1
console.c
server/console.c
+14
-1
No files found.
server/console.c
View file @
c248999a
...
@@ -98,6 +98,7 @@ static const struct object_ops console_input_ops =
...
@@ -98,6 +98,7 @@ static const struct object_ops console_input_ops =
};
};
static
enum
server_fd_type
console_get_fd_type
(
struct
fd
*
fd
);
static
enum
server_fd_type
console_get_fd_type
(
struct
fd
*
fd
);
static
int
console_input_read
(
struct
fd
*
fd
,
struct
async
*
async
,
file_pos_t
pos
);
static
int
console_input_flush
(
struct
fd
*
fd
,
struct
async
*
async
);
static
int
console_input_flush
(
struct
fd
*
fd
,
struct
async
*
async
);
static
int
console_input_ioctl
(
struct
fd
*
fd
,
ioctl_code_t
code
,
struct
async
*
async
);
static
int
console_input_ioctl
(
struct
fd
*
fd
,
ioctl_code_t
code
,
struct
async
*
async
);
...
@@ -106,7 +107,7 @@ static const struct fd_ops console_input_fd_ops =
...
@@ -106,7 +107,7 @@ static const struct fd_ops console_input_fd_ops =
default_fd_get_poll_events
,
/* get_poll_events */
default_fd_get_poll_events
,
/* get_poll_events */
default_poll_event
,
/* poll_event */
default_poll_event
,
/* poll_event */
console_get_fd_type
,
/* get_fd_type */
console_get_fd_type
,
/* get_fd_type */
no_fd_read
,
/* read */
console_input_read
,
/* read */
no_fd_write
,
/* write */
no_fd_write
,
/* write */
console_input_flush
,
/* flush */
console_input_flush
,
/* flush */
no_fd_get_file_info
,
/* get_file_info */
no_fd_get_file_info
,
/* get_file_info */
...
@@ -913,6 +914,18 @@ static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async *
...
@@ -913,6 +914,18 @@ static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async *
}
}
}
}
static
int
console_input_read
(
struct
fd
*
fd
,
struct
async
*
async
,
file_pos_t
pos
)
{
struct
console_input
*
console
=
get_fd_user
(
fd
);
if
(
!
console
->
server
)
{
set_error
(
STATUS_INVALID_HANDLE
);
return
0
;
}
return
queue_host_ioctl
(
console
->
server
,
IOCTL_CONDRV_READ_FILE
,
0
,
async
,
&
console
->
ioctl_q
);
}
static
int
console_input_flush
(
struct
fd
*
fd
,
struct
async
*
async
)
static
int
console_input_flush
(
struct
fd
*
fd
,
struct
async
*
async
)
{
{
struct
console_input
*
console
=
get_fd_user
(
fd
);
struct
console_input
*
console
=
get_fd_user
(
fd
);
...
...
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