wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against f33bf35d9a395a17e83b4bf512c5434368a8218e.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2021-08-24 08:01:24 +10:00
parent dc0aa10ad7
commit 270f893aea
3 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 1ecb2712f80d52480a8204824df6b56a88c062b8 Mon Sep 17 00:00:00 2001
From 57742beb169682bcc0d4de196242ee0528e223df 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, 67 insertions(+)
diff --git a/server/async.c b/server/async.c
index 1ac5117edb9..e52707a4929 100644
index 442d98d8c7a..0645cc5f7bb 100644
--- a/server/async.c
+++ b/server/async.c
@@ -72,6 +72,7 @@ static const struct object_ops async_ops =
@ -53,7 +53,7 @@ index 1ac5117edb9..e52707a4929 100644
async_satisfied, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
@@ -499,6 +500,7 @@ static const struct object_ops iosb_ops =
@@ -489,6 +490,7 @@ static const struct object_ops iosb_ops =
no_add_queue, /* add_queue */
NULL, /* remove_queue */
NULL, /* signaled */
@ -74,7 +74,7 @@ index 8d0ffbb05f3..ff0d8b5d87b 100644
no_signal, /* signal */
no_get_fd, /* get_fd */
diff --git a/server/change.c b/server/change.c
index ff8c3ad1037..30b4c9776e1 100644
index b02a9cd65bf..9ccdec75ed4 100644
--- a/server/change.c
+++ b/server/change.c
@@ -114,6 +114,7 @@ static const struct object_ops dir_ops =
@ -86,7 +86,7 @@ index ff8c3ad1037..30b4c9776e1 100644
no_signal, /* signal */
dir_get_fd, /* get_fd */
diff --git a/server/clipboard.c b/server/clipboard.c
index 1c4875ff726..e21663b5a94 100644
index eb9bd4f7020..cb4ca0362df 100644
--- a/server/clipboard.c
+++ b/server/clipboard.c
@@ -77,6 +77,7 @@ static const struct object_ops clipboard_ops =
@ -110,7 +110,7 @@ index eb0d256ad09..5a8bb8fb47f 100644
no_signal, /* signal */
no_get_fd, /* get_fd */
diff --git a/server/console.c b/server/console.c
index 848ee6e8d98..a7f122adacd 100644
index 1e6f6c0f8a3..4443c322548 100644
--- a/server/console.c
+++ b/server/console.c
@@ -81,6 +81,7 @@ static const struct object_ops console_ops =
@ -170,7 +170,7 @@ index 848ee6e8d98..a7f122adacd 100644
no_signal, /* signal */
console_connection_get_fd, /* get_fd */
diff --git a/server/debugger.c b/server/debugger.c
index 2a2839f42ee..aee4bebb147 100644
index ca84a88258f..08d78eabe9b 100644
--- a/server/debugger.c
+++ b/server/debugger.c
@@ -87,6 +87,7 @@ static const struct object_ops debug_event_ops =
@ -190,18 +190,18 @@ index 2a2839f42ee..aee4bebb147 100644
no_signal, /* signal */
no_get_fd, /* get_fd */
diff --git a/server/device.c b/server/device.c
index 6400751e339..6f8a65c6c41 100644
index b669921a003..6086f134df7 100644
--- a/server/device.c
+++ b/server/device.c
@@ -68,6 +68,7 @@ static const struct object_ops irp_call_ops =
add_queue, /* add_queue */
remove_queue, /* remove_queue */
irp_call_signaled, /* signaled */
@@ -67,6 +67,7 @@ static const struct object_ops irp_call_ops =
no_add_queue, /* add_queue */
NULL, /* remove_queue */
NULL, /* signaled */
+ NULL, /* get_esync_fd */
no_satisfied, /* satisfied */
NULL, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
@@ -108,6 +109,7 @@ static const struct object_ops device_manager_ops =
@@ -107,6 +108,7 @@ static const struct object_ops device_manager_ops =
add_queue, /* add_queue */
remove_queue, /* remove_queue */
device_manager_signaled, /* signaled */
@ -209,7 +209,7 @@ index 6400751e339..6f8a65c6c41 100644
no_satisfied, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
@@ -165,6 +167,7 @@ static const struct object_ops device_ops =
@@ -164,6 +166,7 @@ static const struct object_ops device_ops =
no_add_queue, /* add_queue */
NULL, /* remove_queue */
NULL, /* signaled */
@ -217,7 +217,7 @@ index 6400751e339..6f8a65c6c41 100644
no_satisfied, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
@@ -217,6 +220,7 @@ static const struct object_ops device_file_ops =
@@ -216,6 +219,7 @@ static const struct object_ops device_file_ops =
add_queue, /* add_queue */
remove_queue, /* remove_queue */
default_fd_signaled, /* signaled */
@ -226,7 +226,7 @@ index 6400751e339..6f8a65c6c41 100644
no_signal, /* signal */
device_file_get_fd, /* get_fd */
diff --git a/server/directory.c b/server/directory.c
index 30d69459984..1f2e7d28302 100644
index ec8187b425a..1264551f4e4 100644
--- a/server/directory.c
+++ b/server/directory.c
@@ -70,6 +70,7 @@ static const struct object_ops object_type_ops =
@ -278,7 +278,7 @@ index ccdd465dd5b..3d869037bf5 100644
no_signal, /* signal */
no_get_fd, /* get_fd */
diff --git a/server/fd.c b/server/fd.c
index 43c0d36dff9..819cd059547 100644
index 01d6c181f1b..f7187ca2b34 100644
--- a/server/fd.c
+++ b/server/fd.c
@@ -218,6 +218,7 @@ static const struct object_ops fd_ops =
@ -314,7 +314,7 @@ index 43c0d36dff9..819cd059547 100644
no_signal, /* signal */
no_get_fd, /* get_fd */
diff --git a/server/file.c b/server/file.c
index ccac535e50f..70aa784fa21 100644
index 53c694177df..e3f52f4ef76 100644
--- a/server/file.c
+++ b/server/file.c
@@ -97,6 +97,7 @@ static const struct object_ops file_ops =
@ -326,7 +326,7 @@ index ccac535e50f..70aa784fa21 100644
no_signal, /* signal */
file_get_fd, /* get_fd */
diff --git a/server/handle.c b/server/handle.c
index 6e0848eedf0..65176c0be30 100644
index 15da701ee99..c07199109fd 100644
--- a/server/handle.c
+++ b/server/handle.c
@@ -126,6 +126,7 @@ static const struct object_ops handle_table_ops =
@ -350,7 +350,7 @@ index c048908c295..f5450b5a870 100644
no_signal, /* signal */
no_get_fd, /* get_fd */
diff --git a/server/mailslot.c b/server/mailslot.c
index 5597a21dd29..eec27a89dfc 100644
index d4b2fd1b562..8cd4e9a741a 100644
--- a/server/mailslot.c
+++ b/server/mailslot.c
@@ -78,6 +78,7 @@ static const struct object_ops mailslot_ops =
@ -386,7 +386,7 @@ index 5597a21dd29..eec27a89dfc 100644
no_signal, /* signal */
mailslot_device_file_get_fd, /* get_fd */
diff --git a/server/mapping.c b/server/mapping.c
index 3a162eae76b..f182ac10b47 100644
index a814fe8090f..c7541f353f4 100644
--- a/server/mapping.c
+++ b/server/mapping.c
@@ -68,6 +68,7 @@ static const struct object_ops ranges_ops =
@ -426,7 +426,7 @@ index 75ff5117d3f..681cbc3e759 100644
mutex_signal, /* signal */
no_get_fd, /* get_fd */
diff --git a/server/named_pipe.c b/server/named_pipe.c
index a3ce9d463f1..74348b45dc9 100644
index df8c7e3170c..d756de18db0 100644
--- a/server/named_pipe.c
+++ b/server/named_pipe.c
@@ -119,6 +119,7 @@ static const struct object_ops named_pipe_ops =
@ -470,7 +470,7 @@ index a3ce9d463f1..74348b45dc9 100644
no_signal, /* signal */
named_pipe_device_file_get_fd, /* get_fd */
diff --git a/server/object.h b/server/object.h
index 1aef43018b2..a4b5523866c 100644
index 039bf4e7d4e..0a09663cfa7 100644
--- a/server/object.h
+++ b/server/object.h
@@ -81,6 +81,8 @@ struct object_ops
@ -483,7 +483,7 @@ index 1aef43018b2..a4b5523866c 100644
void (*satisfied)(struct object *,struct wait_queue_entry *);
/* signal an object */
diff --git a/server/process.c b/server/process.c
index f65d7abe2af..af7aef0cdac 100644
index 0870de5bb26..0b14f4e6193 100644
--- a/server/process.c
+++ b/server/process.c
@@ -91,6 +91,7 @@ static const struct object_ops process_ops =
@ -502,7 +502,7 @@ index f65d7abe2af..af7aef0cdac 100644
no_satisfied, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
@@ -200,6 +202,7 @@ static const struct object_ops job_ops =
@@ -203,6 +205,7 @@ static const struct object_ops job_ops =
add_queue, /* add_queue */
remove_queue, /* remove_queue */
job_signaled, /* signaled */
@ -511,10 +511,10 @@ index f65d7abe2af..af7aef0cdac 100644
no_signal, /* signal */
no_get_fd, /* get_fd */
diff --git a/server/queue.c b/server/queue.c
index 2c7ad2de9eb..0bd84fb7223 100644
index 54dcd246d89..2d6d262f09d 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -172,6 +172,7 @@ static const struct object_ops msg_queue_ops =
@@ -175,6 +175,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 */
@ -522,7 +522,7 @@ index 2c7ad2de9eb..0bd84fb7223 100644
msg_queue_satisfied, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
@@ -209,6 +210,7 @@ static const struct object_ops thread_input_ops =
@@ -212,6 +213,7 @@ static const struct object_ops thread_input_ops =
no_add_queue, /* add_queue */
NULL, /* remove_queue */
NULL, /* signaled */
@ -531,10 +531,10 @@ index 2c7ad2de9eb..0bd84fb7223 100644
no_signal, /* signal */
no_get_fd, /* get_fd */
diff --git a/server/registry.c b/server/registry.c
index 74da4d1d9a4..e9f7bf761e8 100644
index 427da8a5883..1dd201d5b69 100644
--- a/server/registry.c
+++ b/server/registry.c
@@ -174,6 +174,7 @@ static const struct object_ops key_ops =
@@ -178,6 +178,7 @@ static const struct object_ops key_ops =
no_add_queue, /* add_queue */
NULL, /* remove_queue */
NULL, /* signaled */
@ -567,7 +567,7 @@ index 543d5883ec8..9f37e2d8aa6 100644
semaphore_signal, /* signal */
no_get_fd, /* get_fd */
diff --git a/server/serial.c b/server/serial.c
index ba8402c5935..ba5d470704e 100644
index d3ea4cbe420..af1fb49e52b 100644
--- a/server/serial.c
+++ b/server/serial.c
@@ -92,6 +92,7 @@ static const struct object_ops serial_ops =
@ -591,10 +591,10 @@ index 0c22c157f2b..45d176de46c 100644
no_signal, /* signal */
no_get_fd, /* get_fd */
diff --git a/server/sock.c b/server/sock.c
index 775ec6edf32..651736a2280 100644
index 50bfc08e145..a7ae0e1c7dc 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -189,6 +189,7 @@ static const struct object_ops sock_ops =
@@ -247,6 +247,7 @@ static const struct object_ops sock_ops =
add_queue, /* add_queue */
remove_queue, /* remove_queue */
default_fd_signaled, /* signaled */
@ -602,7 +602,7 @@ index 775ec6edf32..651736a2280 100644
no_satisfied, /* satisfied */
no_signal, /* signal */
sock_get_fd, /* get_fd */
@@ -1526,6 +1527,7 @@ static const struct object_ops ifchange_ops =
@@ -2966,6 +2967,7 @@ static const struct object_ops ifchange_ops =
no_add_queue, /* add_queue */
NULL, /* remove_queue */
NULL, /* signaled */
@ -610,7 +610,7 @@ index 775ec6edf32..651736a2280 100644
no_satisfied, /* satisfied */
no_signal, /* signal */
ifchange_get_fd, /* get_fd */
@@ -1746,6 +1748,7 @@ static const struct object_ops socket_device_ops =
@@ -3186,6 +3188,7 @@ static const struct object_ops socket_device_ops =
no_add_queue, /* add_queue */
NULL, /* remove_queue */
NULL, /* signaled */
@ -631,10 +631,10 @@ index 3879bb685f7..5ebe35636e1 100644
no_signal, /* signal */
no_get_fd, /* get_fd */
diff --git a/server/thread.c b/server/thread.c
index b78ffe558de..62f9a3f877a 100644
index 3bd932bad9f..7192faa544a 100644
--- a/server/thread.c
+++ b/server/thread.c
@@ -110,6 +110,7 @@ static const struct object_ops thread_apc_ops =
@@ -97,6 +97,7 @@ static const struct object_ops thread_apc_ops =
add_queue, /* add_queue */
remove_queue, /* remove_queue */
thread_apc_signaled, /* signaled */
@ -642,7 +642,7 @@ index b78ffe558de..62f9a3f877a 100644
no_satisfied, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
@@ -147,6 +148,7 @@ static const struct object_ops context_ops =
@@ -142,6 +143,7 @@ static const struct object_ops context_ops =
add_queue, /* add_queue */
remove_queue, /* remove_queue */
context_signaled, /* signaled */
@ -650,7 +650,7 @@ index b78ffe558de..62f9a3f877a 100644
no_satisfied, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
@@ -196,6 +198,7 @@ static const struct object_ops thread_ops =
@@ -191,6 +193,7 @@ static const struct object_ops thread_ops =
add_queue, /* add_queue */
remove_queue, /* remove_queue */
thread_signaled, /* signaled */
@ -659,7 +659,7 @@ index b78ffe558de..62f9a3f877a 100644
no_signal, /* signal */
no_get_fd, /* get_fd */
diff --git a/server/timer.c b/server/timer.c
index 49483d9ae13..23d03aa3582 100644
index 5e265d2ddf6..86ecf3cb7a3 100644
--- a/server/timer.c
+++ b/server/timer.c
@@ -77,6 +77,7 @@ static const struct object_ops timer_ops =
@ -671,10 +671,10 @@ index 49483d9ae13..23d03aa3582 100644
no_signal, /* signal */
no_get_fd, /* get_fd */
diff --git a/server/token.c b/server/token.c
index 089f1c5c61e..d08539084bd 100644
index 5d2fc9555a2..79beea16ab2 100644
--- a/server/token.c
+++ b/server/token.c
@@ -161,6 +161,7 @@ static const struct object_ops token_ops =
@@ -162,6 +162,7 @@ static const struct object_ops token_ops =
no_add_queue, /* add_queue */
NULL, /* remove_queue */
NULL, /* signaled */
@ -683,7 +683,7 @@ index 089f1c5c61e..d08539084bd 100644
no_signal, /* signal */
no_get_fd, /* get_fd */
diff --git a/server/winstation.c b/server/winstation.c
index 1c7552f0687..86d82619433 100644
index 61f9f77c73f..a38b2e831c4 100644
--- a/server/winstation.c
+++ b/server/winstation.c
@@ -75,6 +75,7 @@ static const struct object_ops winstation_ops =
@ -703,5 +703,5 @@ index 1c7552f0687..86d82619433 100644
no_signal, /* signal */
no_get_fd, /* get_fd */
--
2.30.1
2.32.0

2
patches/patchinstall.sh
View File

@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "17ba916c564236c9940ad736ff15a87fc5d1b12f"
echo "f33bf35d9a395a17e83b4bf512c5434368a8218e"
}
# Show version information

2
staging/upstream-commit
View File

@ -1 +1 @@
17ba916c564236c9940ad736ff15a87fc5d1b12f
f33bf35d9a395a17e83b4bf512c5434368a8218e