Jacek Caban : server: Support waiting on screen buffer handles.
Alexandre Julliard
julliard at winehq.org
Tue Nov 10 15:30:24 CST 2020
Module: wine
Branch: master
Commit: 2eb8644426d327d2c75fd02dd4d038c68c901fad
URL: https://source.winehq.org/git/wine.git/?a=commit;h=2eb8644426d327d2c75fd02dd4d038c68c901fad
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue Nov 10 16:31:53 2020 +0100
server: Support waiting on screen buffer handles.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/kernel32/tests/console.c | 4 ----
server/console.c | 14 +++++++++++++-
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c
index 6d15abd8c5f..4a06a2b396e 100644
--- a/dlls/kernel32/tests/console.c
+++ b/dlls/kernel32/tests/console.c
@@ -1019,7 +1019,6 @@ static void test_wait(HANDLE input, HANDLE orig_output)
res = WaitForSingleObject(input, 0);
ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res);
res = WaitForSingleObject(output, 0);
- todo_wine
ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res);
res = WaitForSingleObject(orig_output, 0);
ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res);
@@ -1027,7 +1026,6 @@ static void test_wait(HANDLE input, HANDLE orig_output)
ok(status == STATUS_TIMEOUT || broken(status == STATUS_ACCESS_DENIED /* win2k8 */),
"NtWaitForSingleObject returned %x\n", status);
status = NtWaitForSingleObject(output, FALSE, &zero);
- todo_wine
ok(status == STATUS_TIMEOUT || broken(status == STATUS_ACCESS_DENIED /* win2k8 */),
"NtWaitForSingleObject returned %x\n", status);
@@ -1037,7 +1035,6 @@ static void test_wait(HANDLE input, HANDLE orig_output)
res = WaitForSingleObject(input, 0);
ok(!res, "WaitForSingleObject returned %x\n", res);
res = WaitForSingleObject(output, 0);
- todo_wine
ok(!res, "WaitForSingleObject returned %x\n", res);
res = WaitForSingleObject(orig_output, 0);
ok(!res, "WaitForSingleObject returned %x\n", res);
@@ -1045,7 +1042,6 @@ static void test_wait(HANDLE input, HANDLE orig_output)
ok(!status || broken(status == STATUS_ACCESS_DENIED /* win2k8 */),
"NtWaitForSingleObject returned %x\n", status);
status = NtWaitForSingleObject(output, FALSE, &zero);
- todo_wine
ok(!status || broken(status == STATUS_ACCESS_DENIED /* win2k8 */),
"NtWaitForSingleObject returned %x\n", status);
diff --git a/server/console.c b/server/console.c
index 4e51ed48a31..8bb7d8ecfa8 100644
--- a/server/console.c
+++ b/server/console.c
@@ -208,6 +208,7 @@ struct screen_buffer
static void screen_buffer_dump( struct object *obj, int verbose );
static void screen_buffer_destroy( struct object *obj );
+static int screen_buffer_add_queue( struct object *obj, struct wait_queue_entry *entry );
static struct fd *screen_buffer_get_fd( struct object *obj );
static struct object *screen_buffer_open_file( struct object *obj, unsigned int access,
unsigned int sharing, unsigned int options );
@@ -217,7 +218,7 @@ static const struct object_ops screen_buffer_ops =
sizeof(struct screen_buffer), /* size */
screen_buffer_dump, /* dump */
no_get_type, /* get_type */
- no_add_queue, /* add_queue */
+ screen_buffer_add_queue, /* add_queue */
NULL, /* remove_queue */
NULL, /* signaled */
NULL, /* satisfied */
@@ -706,6 +707,17 @@ static struct object *screen_buffer_open_file( struct object *obj, unsigned int
return grab_object( obj );
}
+static int screen_buffer_add_queue( struct object *obj, struct wait_queue_entry *entry )
+{
+ struct screen_buffer *screen_buffer = (struct screen_buffer*)obj;
+ if (!screen_buffer->input)
+ {
+ set_error( STATUS_ACCESS_DENIED );
+ return 0;
+ }
+ return add_queue( &screen_buffer->input->obj, entry );
+}
+
static struct fd *screen_buffer_get_fd( struct object *obj )
{
struct screen_buffer *screen_buffer = (struct screen_buffer*)obj;
More information about the wine-cvs
mailing list