You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against d9f3ea328785d4146a095ce2efbdbb7c1f69f1cf.
This commit is contained in:
Alistair Leslie-Hughes
@@ -1,4 +1,4 @@
|
||||
From 5f823452dba72254c36a68c974528b83cb5c50b6 Mon Sep 17 00:00:00 2001
|
||||
From 9ab2897d8c05a9950ce14200d1d7f374a31ee886 Mon Sep 17 00:00:00 2001
|
||||
From: Zebediah Figura <z.figura12@gmail.com>
|
||||
Date: Fri, 8 Jun 2018 18:51:40 -0500
|
||||
Subject: [PATCH] server: Add an object operation to grab the esync file
|
||||
@@ -38,11 +38,12 @@ Split off to decrease patch size.
|
||||
server/thread.c | 3 +++
|
||||
server/timer.c | 1 +
|
||||
server/token.c | 1 +
|
||||
server/window.c | 1 +
|
||||
server/winstation.c | 2 ++
|
||||
33 files changed, 67 insertions(+)
|
||||
34 files changed, 68 insertions(+)
|
||||
|
||||
diff --git a/server/async.c b/server/async.c
|
||||
index 1a564ff1a69..0b8e1ba1fd9 100644
|
||||
index 7aef28355f0..7ac675f75c4 100644
|
||||
--- a/server/async.c
|
||||
+++ b/server/async.c
|
||||
@@ -77,6 +77,7 @@ static const struct object_ops async_ops =
|
||||
@@ -53,7 +54,7 @@ index 1a564ff1a69..0b8e1ba1fd9 100644
|
||||
async_satisfied, /* satisfied */
|
||||
no_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
@@ -587,6 +588,7 @@ static const struct object_ops iosb_ops =
|
||||
@@ -586,6 +587,7 @@ static const struct object_ops iosb_ops =
|
||||
no_add_queue, /* add_queue */
|
||||
NULL, /* remove_queue */
|
||||
NULL, /* signaled */
|
||||
@@ -74,7 +75,7 @@ index ff0799f5880..d9824de8eac 100644
|
||||
no_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
diff --git a/server/change.c b/server/change.c
|
||||
index a01d6894151..782801e8e1d 100644
|
||||
index 325782d8197..90d5bfa3019 100644
|
||||
--- a/server/change.c
|
||||
+++ b/server/change.c
|
||||
@@ -112,6 +112,7 @@ static const struct object_ops dir_ops =
|
||||
@@ -110,7 +111,7 @@ index 6933195e72d..3d4be86a212 100644
|
||||
no_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
diff --git a/server/console.c b/server/console.c
|
||||
index 136c14862e3..e7c97e99579 100644
|
||||
index 5407fba1411..ef6bcb12f5a 100644
|
||||
--- a/server/console.c
|
||||
+++ b/server/console.c
|
||||
@@ -81,6 +81,7 @@ static const struct object_ops console_ops =
|
||||
@@ -278,7 +279,7 @@ index f1b79b1b35e..c727bfdd1ba 100644
|
||||
no_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
diff --git a/server/fd.c b/server/fd.c
|
||||
index 45a1b226f33..b0e98909fa6 100644
|
||||
index cd8f7171e6e..a61c09559fe 100644
|
||||
--- a/server/fd.c
|
||||
+++ b/server/fd.c
|
||||
@@ -212,6 +212,7 @@ static const struct object_ops fd_ops =
|
||||
@@ -314,10 +315,10 @@ index 45a1b226f33..b0e98909fa6 100644
|
||||
no_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
diff --git a/server/file.c b/server/file.c
|
||||
index 3079afdbdfd..30db0450a3f 100644
|
||||
index 090d6c244f7..7edf612de73 100644
|
||||
--- a/server/file.c
|
||||
+++ b/server/file.c
|
||||
@@ -94,6 +94,7 @@ static const struct object_ops file_ops =
|
||||
@@ -123,6 +123,7 @@ static const struct object_ops file_ops =
|
||||
add_queue, /* add_queue */
|
||||
remove_queue, /* remove_queue */
|
||||
default_fd_signaled, /* signaled */
|
||||
@@ -326,7 +327,7 @@ index 3079afdbdfd..30db0450a3f 100644
|
||||
no_signal, /* signal */
|
||||
file_get_fd, /* get_fd */
|
||||
diff --git a/server/handle.c b/server/handle.c
|
||||
index bc692b8ebeb..c280335611c 100644
|
||||
index 38ad80da267..53cc1e4eb43 100644
|
||||
--- a/server/handle.c
|
||||
+++ b/server/handle.c
|
||||
@@ -126,6 +126,7 @@ static const struct object_ops handle_table_ops =
|
||||
@@ -386,7 +387,7 @@ index 2d8697ec9bd..4cf9b73f784 100644
|
||||
no_signal, /* signal */
|
||||
mailslot_device_file_get_fd, /* get_fd */
|
||||
diff --git a/server/mapping.c b/server/mapping.c
|
||||
index bc9ed5bdcb9..6cd123f6aa9 100644
|
||||
index 8d4332d240f..1a8d480cfa9 100644
|
||||
--- a/server/mapping.c
|
||||
+++ b/server/mapping.c
|
||||
@@ -67,6 +67,7 @@ static const struct object_ops ranges_ops =
|
||||
@@ -470,7 +471,7 @@ index 3e6cf09d4f2..b8ec17a787a 100644
|
||||
no_signal, /* signal */
|
||||
named_pipe_device_file_get_fd, /* get_fd */
|
||||
diff --git a/server/object.h b/server/object.h
|
||||
index f156f1d2f13..c98e45125a0 100644
|
||||
index f6ad9e8ccdd..f4261d0d585 100644
|
||||
--- a/server/object.h
|
||||
+++ b/server/object.h
|
||||
@@ -78,6 +78,8 @@ struct object_ops
|
||||
@@ -483,7 +484,7 @@ index f156f1d2f13..c98e45125a0 100644
|
||||
void (*satisfied)(struct object *,struct wait_queue_entry *);
|
||||
/* signal an object */
|
||||
diff --git a/server/process.c b/server/process.c
|
||||
index 0cc7f6b60ee..c502a58f9a2 100644
|
||||
index 60cc03032b2..c79a574d137 100644
|
||||
--- a/server/process.c
|
||||
+++ b/server/process.c
|
||||
@@ -105,6 +105,7 @@ static const struct object_ops process_ops =
|
||||
@@ -511,7 +512,7 @@ index 0cc7f6b60ee..c502a58f9a2 100644
|
||||
no_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
diff --git a/server/queue.c b/server/queue.c
|
||||
index bcb2f237074..6daa12958ca 100644
|
||||
index 051aafc6c3d..375b3e33a6e 100644
|
||||
--- a/server/queue.c
|
||||
+++ b/server/queue.c
|
||||
@@ -173,6 +173,7 @@ static const struct object_ops msg_queue_ops =
|
||||
@@ -531,7 +532,7 @@ index bcb2f237074..6daa12958ca 100644
|
||||
no_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
diff --git a/server/registry.c b/server/registry.c
|
||||
index b00abdbc004..8652576ec3f 100644
|
||||
index 93e8a309593..32a424cd842 100644
|
||||
--- a/server/registry.c
|
||||
+++ b/server/registry.c
|
||||
@@ -178,6 +178,7 @@ static const struct object_ops key_ops =
|
||||
@@ -591,7 +592,7 @@ index 19b76d44c16..55cd6aa037e 100644
|
||||
no_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
diff --git a/server/sock.c b/server/sock.c
|
||||
index 2df4f3d3056..3cc06db8225 100644
|
||||
index 512b7c0f78e..7a8be919494 100644
|
||||
--- a/server/sock.c
|
||||
+++ b/server/sock.c
|
||||
@@ -249,6 +249,7 @@ static const struct object_ops sock_ops =
|
||||
@@ -602,7 +603,7 @@ index 2df4f3d3056..3cc06db8225 100644
|
||||
no_satisfied, /* satisfied */
|
||||
no_signal, /* signal */
|
||||
sock_get_fd, /* get_fd */
|
||||
@@ -3114,6 +3115,7 @@ static const struct object_ops ifchange_ops =
|
||||
@@ -3124,6 +3125,7 @@ static const struct object_ops ifchange_ops =
|
||||
no_add_queue, /* add_queue */
|
||||
NULL, /* remove_queue */
|
||||
NULL, /* signaled */
|
||||
@@ -610,7 +611,7 @@ index 2df4f3d3056..3cc06db8225 100644
|
||||
no_satisfied, /* satisfied */
|
||||
no_signal, /* signal */
|
||||
ifchange_get_fd, /* get_fd */
|
||||
@@ -3335,6 +3337,7 @@ static const struct object_ops socket_device_ops =
|
||||
@@ -3345,6 +3347,7 @@ static const struct object_ops socket_device_ops =
|
||||
no_add_queue, /* add_queue */
|
||||
NULL, /* remove_queue */
|
||||
NULL, /* signaled */
|
||||
@@ -671,10 +672,10 @@ index 96dc9d00ca1..f59902d5607 100644
|
||||
no_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
diff --git a/server/token.c b/server/token.c
|
||||
index 820a7a0e07d..e42c1a159e3 100644
|
||||
index dcb2a879ba6..76a6bc279a5 100644
|
||||
--- a/server/token.c
|
||||
+++ b/server/token.c
|
||||
@@ -163,6 +163,7 @@ static const struct object_ops token_ops =
|
||||
@@ -150,6 +150,7 @@ static const struct object_ops token_ops =
|
||||
no_add_queue, /* add_queue */
|
||||
NULL, /* remove_queue */
|
||||
NULL, /* signaled */
|
||||
@@ -682,8 +683,20 @@ index 820a7a0e07d..e42c1a159e3 100644
|
||||
NULL, /* satisfied */
|
||||
no_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
diff --git a/server/window.c b/server/window.c
|
||||
index 24059aac0fe..a79fda5ad80 100644
|
||||
--- a/server/window.c
|
||||
+++ b/server/window.c
|
||||
@@ -108,6 +108,7 @@ static const struct object_ops window_ops =
|
||||
no_add_queue, /* add_queue */
|
||||
NULL, /* remove_queue */
|
||||
NULL, /* signaled */
|
||||
+ NULL, /* get_esync_fd */
|
||||
NULL, /* satisfied */
|
||||
no_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
diff --git a/server/winstation.c b/server/winstation.c
|
||||
index 854affead77..1535321da2d 100644
|
||||
index 1408e1a9e65..a99c60a28ff 100644
|
||||
--- a/server/winstation.c
|
||||
+++ b/server/winstation.c
|
||||
@@ -75,6 +75,7 @@ static const struct object_ops winstation_ops =
|
||||
|
||||
Reference in New Issue
Block a user