wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against b940c5e7c91bff963336dd7d2c4defc3a82c75a1.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2020-11-11 10:26:07 +11:00
parent 41c7c741d7
commit c7ea1850c7
5 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
patches/eventfd_synchronization/0011-server-Add-an-object-operation-to-grab-the-esync-fil.patch
View File

@@ -1,4 +1,4 @@
From c5e2bf28d7a1ce4008a8b6173fd66b035a2010d3 Mon Sep 17 00:00:00 2001
From b1d3f568603db79bb2ceb1ed7c19faf01832a1f6 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
@@ -42,7 +42,7 @@ Split off to decrease patch size.
33 files changed, 65 insertions(+)
diff --git a/server/async.c b/server/async.c
index 24fed811da2..1b4f86a1b8b 100644
index 81d575b52bd..bdd68663ab9 100644
--- a/server/async.c
+++ b/server/async.c
@@ -70,6 +70,7 @@ static const struct object_ops async_ops =
@@ -110,18 +110,18 @@ index 0bad4d7a260..176cf1b817e 100644
no_signal, /* signal */
no_get_fd, /* get_fd */
diff --git a/server/console.c b/server/console.c
index d1e3cae8919..c0892b251c4 100644
index ebcc8beb97c..038a9c13663 100644
--- a/server/console.c
+++ b/server/console.c
@@ -80,6 +80,7 @@ static const struct object_ops console_input_ops =
no_add_queue, /* add_queue */
NULL, /* remove_queue */
NULL, /* signaled */
@@ -81,6 +81,7 @@ static const struct object_ops console_input_ops =
add_queue, /* add_queue */
remove_queue, /* remove_queue */
console_input_signaled, /* signaled */
+ NULL, /* get_esync_fd */
no_satisfied, /* satisfied */
no_signal, /* signal */
console_input_get_fd, /* get_fd */
@@ -151,6 +152,7 @@ static const struct object_ops console_server_ops =
@@ -152,6 +153,7 @@ static const struct object_ops console_server_ops =
add_queue, /* add_queue */
remove_queue, /* remove_queue */
console_server_signaled, /* signaled */
@@ -129,15 +129,15 @@ index d1e3cae8919..c0892b251c4 100644
no_satisfied, /* satisfied */
no_signal, /* signal */
console_server_get_fd, /* get_fd */
@@ -218,6 +220,7 @@ static const struct object_ops screen_buffer_ops =
no_add_queue, /* add_queue */
@@ -220,6 +222,7 @@ static const struct object_ops screen_buffer_ops =
screen_buffer_add_queue, /* add_queue */
NULL, /* remove_queue */
NULL, /* signaled */
+ NULL, /* get_esync_fd */
NULL, /* satisfied */
no_signal, /* signal */
screen_buffer_get_fd, /* get_fd */
@@ -265,6 +268,7 @@ static const struct object_ops console_device_ops =
@@ -267,6 +270,7 @@ static const struct object_ops console_device_ops =
no_add_queue, /* add_queue */
NULL, /* remove_queue */
NULL, /* signaled */
@@ -145,7 +145,7 @@ index d1e3cae8919..c0892b251c4 100644
no_satisfied, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
@@ -303,6 +307,7 @@ static const struct object_ops console_connection_ops =
@@ -305,6 +309,7 @@ static const struct object_ops console_connection_ops =
no_add_queue, /* add_queue */
NULL, /* remove_queue */
NULL, /* signaled */
@@ -310,7 +310,7 @@ index 4690af2424e..2c0d24da21d 100644
no_signal, /* signal */
file_get_fd, /* get_fd */
diff --git a/server/handle.c b/server/handle.c
index 15382256f10..2f123515c7c 100644
index 2556a03901e..4d7e4231a07 100644
--- a/server/handle.c
+++ b/server/handle.c
@@ -123,6 +123,7 @@ static const struct object_ops handle_table_ops =
@@ -495,10 +495,10 @@ index 1786493a814..30699fbaeae 100644
no_signal, /* signal */
no_get_fd, /* get_fd */
diff --git a/server/queue.c b/server/queue.c
index 7e7e6fbdf29..0ee2da59bcd 100644
index a552fed57bb..263bb46ea00 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -171,6 +171,7 @@ static const struct object_ops msg_queue_ops =
@@ -172,6 +172,7 @@ static const struct object_ops msg_queue_ops =
msg_queue_add_queue, /* add_queue */
msg_queue_remove_queue, /* remove_queue */
msg_queue_signaled, /* signaled */
@@ -506,7 +506,7 @@ index 7e7e6fbdf29..0ee2da59bcd 100644
msg_queue_satisfied, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
@@ -208,6 +209,7 @@ static const struct object_ops thread_input_ops =
@@ -209,6 +210,7 @@ static const struct object_ops thread_input_ops =
no_add_queue, /* add_queue */
NULL, /* remove_queue */
NULL, /* signaled */
@@ -575,10 +575,10 @@ index 7c2bf2cc154..b6d6dcfc4b6 100644
no_signal, /* signal */
no_get_fd, /* get_fd */
diff --git a/server/sock.c b/server/sock.c
index 4f97fe72080..8898b66f7a5 100644
index 8f500adc68b..6b771911f26 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -172,6 +172,7 @@ static const struct object_ops sock_ops =
@@ -188,6 +188,7 @@ static const struct object_ops sock_ops =
add_queue, /* add_queue */
remove_queue, /* remove_queue */
sock_signaled, /* signaled */
@@ -586,7 +586,7 @@ index 4f97fe72080..8898b66f7a5 100644
no_satisfied, /* satisfied */
no_signal, /* signal */
sock_get_fd, /* get_fd */
@@ -1173,6 +1174,7 @@ static const struct object_ops ifchange_ops =
@@ -1527,6 +1528,7 @@ static const struct object_ops ifchange_ops =
add_queue, /* add_queue */
NULL, /* remove_queue */
NULL, /* signaled */
@@ -594,7 +594,7 @@ index 4f97fe72080..8898b66f7a5 100644
no_satisfied, /* satisfied */
no_signal, /* signal */
ifchange_get_fd, /* get_fd */
@@ -1393,6 +1395,7 @@ static const struct object_ops socket_device_ops =
@@ -1747,6 +1749,7 @@ static const struct object_ops socket_device_ops =
no_add_queue, /* add_queue */
NULL, /* remove_queue */
NULL, /* signaled */
@@ -615,7 +615,7 @@ index b620f2accb9..1f5ee0bf72b 100644
no_signal, /* signal */
no_get_fd, /* get_fd */
diff --git a/server/thread.c b/server/thread.c
index 6da77ad17a3..1bde63120ed 100644
index 0a0d957384b..c10f1710542 100644
--- a/server/thread.c
+++ b/server/thread.c
@@ -110,6 +110,7 @@ static const struct object_ops thread_apc_ops =