Jacek Caban : server: Allow reading directly from console handle.
Alexandre Julliard
julliard at winehq.org
Thu Nov 19 16:10:23 CST 2020
Module: wine
Branch: master
Commit: c248999a8f9ca6425235c7120ee5f2d296f26756
URL: https://source.winehq.org/git/wine.git/?a=commit;h=c248999a8f9ca6425235c7120ee5f2d296f26756
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Nov 19 17:59:30 2020 +0100
server: Allow reading directly from console handle.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
server/console.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/server/console.c b/server/console.c
index 40675d931b5..48f92dd66e6 100644
--- a/server/console.c
+++ b/server/console.c
@@ -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 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_ioctl( struct fd *fd, ioctl_code_t code, struct async *async );
@@ -106,7 +107,7 @@ static const struct fd_ops console_input_fd_ops =
default_fd_get_poll_events, /* get_poll_events */
default_poll_event, /* poll_event */
console_get_fd_type, /* get_fd_type */
- no_fd_read, /* read */
+ console_input_read, /* read */
no_fd_write, /* write */
console_input_flush, /* flush */
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 *
}
}
+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 )
{
struct console_input *console = get_fd_user( fd );
More information about the wine-cvs
mailing list