Jacek Caban : server: Use separated fd ops for unbound console input.
Alexandre Julliard
julliard at winehq.org
Fri Nov 27 16:04:39 CST 2020
Module: wine
Branch: master
Commit: a61188bfa5bf20443b11f397d8ef6e7e5fd4bdf1
URL: https://source.winehq.org/git/wine.git/?a=commit;h=a61188bfa5bf20443b11f397d8ef6e7e5fd4bdf1
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Nov 27 18:13:59 2020 +0100
server: Use separated fd ops for unbound console input.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/kernel32/tests/console.c | 18 ++++++++-
server/console.c | 94 ++++++++++++++++++++++++++++++++++++++-----
2 files changed, 101 insertions(+), 11 deletions(-)
diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c
index 0376d00892e..5e604e949f6 100644
--- a/dlls/kernel32/tests/console.c
+++ b/dlls/kernel32/tests/console.c
@@ -3776,15 +3776,20 @@ static void test_GetConsoleScreenBufferInfoEx(HANDLE std_output)
static void test_FreeConsole(void)
{
- HANDLE handle, unbound_output = NULL;
+ HANDLE handle, unbound_output = NULL, unbound_input = NULL;
DWORD size, mode;
WCHAR title[16];
+ char buf[32];
HWND hwnd;
UINT cp;
BOOL ret;
ok(RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle != NULL, "ConsoleHandle is NULL\n");
- if (!skip_nt) unbound_output = create_unbound_handle(TRUE, TRUE);
+ if (!skip_nt)
+ {
+ unbound_input = create_unbound_handle(FALSE, TRUE);
+ unbound_output = create_unbound_handle(TRUE, TRUE);
+ }
ret = FreeConsole();
ok(ret, "FreeConsole failed: %u\n", GetLastError());
@@ -3865,10 +3870,19 @@ static void test_FreeConsole(void)
handle = GetConsoleInputWaitHandle();
ok(!handle, "GetConsoleInputWaitHandle returned %p\n", handle);
+ ret = ReadFile(unbound_input, buf, sizeof(buf), &size, NULL);
+ ok(!ret && GetLastError() == ERROR_INVALID_HANDLE,
+ "ReadFile returned %x %u\n", ret, GetLastError());
+
+ ret = FlushFileBuffers(unbound_input);
+ ok(!ret && GetLastError() == ERROR_INVALID_HANDLE,
+ "ReadFile returned %x %u\n", ret, GetLastError());
+
ret = GetConsoleMode(unbound_output, &mode);
ok(!ret && GetLastError() == ERROR_INVALID_HANDLE,
"GetConsoleMode returned %x %u\n", ret, GetLastError());
+ CloseHandle(unbound_input);
CloseHandle(unbound_output);
}
diff --git a/server/console.c b/server/console.c
index 91a00df0998..7cffa512f0e 100644
--- a/server/console.c
+++ b/server/console.c
@@ -290,15 +290,22 @@ static const struct object_ops console_device_ops =
no_destroy /* destroy */
};
+struct console_input
+{
+ struct object obj; /* object header */
+ struct fd *fd; /* pseudo-fd */
+};
+
static void console_input_dump( struct object *obj, int verbose );
static struct object *console_input_open_file( struct object *obj, unsigned int access,
unsigned int sharing, unsigned int options );
static int console_input_add_queue( struct object *obj, struct wait_queue_entry *entry );
static struct fd *console_input_get_fd( struct object *obj );
+static void console_input_destroy( struct object *obj );
static const struct object_ops console_input_ops =
{
- sizeof(struct object), /* size */
+ sizeof(struct console_input), /* size */
console_input_dump, /* dump */
console_device_get_type, /* get_type */
console_input_add_queue, /* add_queue */
@@ -317,7 +324,26 @@ static const struct object_ops console_input_ops =
console_input_open_file, /* open_file */
no_kernel_obj_list, /* get_kernel_obj_list */
no_close_handle, /* close_handle */
- no_destroy /* destroy */
+ console_input_destroy /* destroy */
+};
+
+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 );
+
+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 */
+ console_input_read, /* read */
+ no_fd_write, /* write */
+ console_input_flush, /* flush */
+ console_get_file_info, /* get_file_info */
+ console_get_volume_info, /* get_volume_info */
+ console_input_ioctl, /* ioctl */
+ default_fd_queue_async, /* queue_async */
+ default_fd_reselect_async /* reselect_async */
};
static void console_output_dump( struct object *obj, int verbose );
@@ -1213,8 +1239,17 @@ static struct object *console_device_lookup_name( struct object *obj, struct uni
if (name->len == sizeof(inputW) && !memcmp( name->str, inputW, name->len ))
{
+ struct console_input *console_input;
name->len = 0;
- return alloc_object( &console_input_ops );
+ if (!(console_input = alloc_object( &console_input_ops ))) return NULL;
+ console_input->fd = alloc_pseudo_fd( &console_input_fd_ops, &console_input->obj,
+ FILE_SYNCHRONOUS_IO_NONALERT );
+ if (!console_input->fd)
+ {
+ release_object( console_input );
+ return NULL;
+ }
+ return &console_input->obj;
}
if (name->len == sizeof(outputW) && !memcmp( name->str, outputW, name->len ))
@@ -1285,12 +1320,9 @@ static int console_input_add_queue( struct object *obj, struct wait_queue_entry
static struct fd *console_input_get_fd( struct object *obj )
{
- if (!current->process->console)
- {
- set_error( STATUS_ACCESS_DENIED );
- return 0;
- }
- return get_obj_fd( ¤t->process->console->obj );
+ struct console_input *console_input = (struct console_input *)obj;
+ assert( obj->ops == &console_input_ops );
+ return (struct fd *)grab_object( console_input->fd );
}
static struct object *console_input_open_file( struct object *obj, unsigned int access,
@@ -1299,6 +1331,50 @@ static struct object *console_input_open_file( struct object *obj, unsigned int
return grab_object( obj );
}
+static void console_input_destroy( struct object *obj )
+{
+ struct console_input *console_input = (struct console_input *)obj;
+
+ assert( obj->ops == &console_input_ops );
+ if (console_input->fd) release_object( console_input->fd );
+}
+
+static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async *async )
+{
+ struct console *console = current->process->console;
+
+ if (!console)
+ {
+ set_error( STATUS_INVALID_HANDLE );
+ return 0;
+ }
+ return console_ioctl( console->fd, code, async );
+}
+
+static int console_input_read( struct fd *fd, struct async *async, file_pos_t pos )
+{
+ struct console *console = current->process->console;
+
+ if (!console)
+ {
+ set_error( STATUS_INVALID_HANDLE );
+ return 0;
+ }
+ return console_read( console->fd, async, pos );
+}
+
+static int console_input_flush( struct fd *fd, struct async *async )
+{
+ struct console *console = current->process->console;
+
+ if (!console)
+ {
+ set_error( STATUS_INVALID_HANDLE );
+ return 0;
+ }
+ return console_flush( console->fd, async );
+}
+
static void console_output_dump( struct object *obj, int verbose )
{
fputs( "console Output device\n", stderr );
More information about the wine-cvs
mailing list