wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against cbca9f847f60773b4e7e5408f6a079f4896c5c1e.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2020-11-28 15:07:12 +11:00
parent 3b0de86bf9
commit 2a073f334b
6 changed files with 99 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/eventfd_synchronization/0002-server-Create-server-objects-for-eventfd-based-synch.patch
View File

@@ -1,4 +1,4 @@
From d10e2324d1295c27e00975526420375a338b5eb1 Mon Sep 17 00:00:00 2001
From e5418972013afdb97f857e49d0beb06833b3b474 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <z.figura12@gmail.com>
Date: Thu, 7 Jun 2018 20:09:59 -0500
Subject: [PATCH] server: Create server objects for eventfd-based
@@ -15,7 +15,7 @@ Subject: [PATCH] server: Create server objects for eventfd-based
create mode 100644 server/esync.h
diff --git a/server/Makefile.in b/server/Makefile.in
index 9a695cefc30..8bd612b4728 100644
index b58ce1e3002..5f225fd0591 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -11,6 +11,7 @@ C_SRCS = \
@@ -381,18 +381,18 @@ index 00000000000..7ca4ca89394
+extern int do_esync(void);
+void esync_init(void);
diff --git a/server/main.c b/server/main.c
index 2b5065e1852..385ae5ee370 100644
index dae08339874..f68888d0fa8 100644
--- a/server/main.c
+++ b/server/main.c
@@ -36,6 +36,7 @@
#include "file.h"
@@ -37,6 +37,7 @@
#include "thread.h"
#include "request.h"
#include "unicode.h"
+#include "esync.h"
/* command-line options */
int debug_level = 0;
@@ -140,6 +141,9 @@ int main( int argc, char *argv[] )
@@ -141,6 +142,9 @@ int main( int argc, char *argv[] )
sock_init();
open_master_socket();
@@ -403,10 +403,10 @@ index 2b5065e1852..385ae5ee370 100644
set_current_time();
init_scheduler();
diff --git a/server/protocol.def b/server/protocol.def
index 5ca762fdabf..552d504cc8d 100644
index eba14534b9d..63fe88f9dda 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -3665,3 +3665,27 @@ struct handle_info
@@ -3657,3 +3657,27 @@ struct handle_info
@REQ(resume_process)
obj_handle_t handle; /* process handle */
@END
@@ -435,5 +435,5 @@ index 5ca762fdabf..552d504cc8d 100644
+ unsigned int shm_idx;
+@END
--
2.28.0
2.29.2

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

@@ -1,4 +1,4 @@
From 260c2c237a88e187757c51cdd31ecb78da45af34 Mon Sep 17 00:00:00 2001
From af7dc115ada8acf19aebedfc091e048b919c2478 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
@@ -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 a290e0647e4..1c9a705632f 100644
index 295db7767b2..a67f1918a3a 100644
--- a/server/console.c
+++ b/server/console.c
@@ -81,6 +81,7 @@ static const struct object_ops console_input_ops =
@@ -82,6 +82,7 @@ static const struct object_ops console_ops =
add_queue, /* add_queue */
remove_queue, /* remove_queue */
console_input_signaled, /* signaled */
console_signaled, /* signaled */
+ NULL, /* get_esync_fd */
no_satisfied, /* satisfied */
no_signal, /* signal */
console_input_get_fd, /* get_fd */
@@ -152,6 +153,7 @@ static const struct object_ops console_server_ops =
console_get_fd, /* get_fd */
@@ -157,6 +158,7 @@ static const struct object_ops console_server_ops =
add_queue, /* add_queue */
remove_queue, /* remove_queue */
console_server_signaled, /* signaled */
@@ -129,7 +129,7 @@ index a290e0647e4..1c9a705632f 100644
no_satisfied, /* satisfied */
no_signal, /* signal */
console_server_get_fd, /* get_fd */
@@ -220,6 +222,7 @@ static const struct object_ops screen_buffer_ops =
@@ -225,6 +227,7 @@ static const struct object_ops screen_buffer_ops =
screen_buffer_add_queue, /* add_queue */
NULL, /* remove_queue */
NULL, /* signaled */
@@ -137,7 +137,7 @@ index a290e0647e4..1c9a705632f 100644
NULL, /* satisfied */
no_signal, /* signal */
screen_buffer_get_fd, /* get_fd */
@@ -267,6 +270,7 @@ static const struct object_ops console_device_ops =
@@ -274,6 +277,7 @@ static const struct object_ops console_device_ops =
no_add_queue, /* add_queue */
NULL, /* remove_queue */
NULL, /* signaled */
@@ -145,23 +145,23 @@ index a290e0647e4..1c9a705632f 100644
no_satisfied, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
@@ -297,6 +301,7 @@ static const struct object_ops input_device_ops =
input_device_add_queue, /* add_queue */
@@ -311,6 +315,7 @@ static const struct object_ops console_input_ops =
console_input_add_queue, /* add_queue */
NULL, /* remove_queue */
NULL, /* signaled */
+ NULL, /* get_esync_fd */
no_satisfied, /* satisfied */
no_signal, /* signal */
input_device_get_fd, /* get_fd */
@@ -327,6 +332,7 @@ static const struct object_ops output_device_ops =
output_device_add_queue, /* add_queue */
console_input_get_fd, /* get_fd */
@@ -367,6 +372,7 @@ static const struct object_ops console_output_ops =
console_output_add_queue, /* add_queue */
NULL, /* remove_queue */
NULL, /* signaled */
+ NULL, /* get_esync_fd */
no_satisfied, /* satisfied */
no_signal, /* signal */
output_device_get_fd, /* get_fd */
@@ -365,6 +371,7 @@ static const struct object_ops console_connection_ops =
console_output_get_fd, /* get_fd */
@@ -424,6 +430,7 @@ static const struct object_ops console_connection_ops =
no_add_queue, /* add_queue */
NULL, /* remove_queue */
NULL, /* signaled */
@@ -226,7 +226,7 @@ index 652da83e1e2..cc9aa2358a4 100644
no_signal, /* signal */
device_file_get_fd, /* get_fd */
diff --git a/server/directory.c b/server/directory.c
index 6f8fb179808..faf41585ed8 100644
index 81d02d6f64e..1ffa35f0cc8 100644
--- a/server/directory.c
+++ b/server/directory.c
@@ -57,6 +57,7 @@ static const struct object_ops object_type_ops =
@@ -314,10 +314,10 @@ index c3c53489212..d3b1e515b52 100644
no_signal, /* signal */
no_get_fd, /* get_fd */
diff --git a/server/file.c b/server/file.c
index 4690af2424e..2c0d24da21d 100644
index 2cc4a9d978c..5c28b1c176d 100644
--- a/server/file.c
+++ b/server/file.c
@@ -85,6 +85,7 @@ static const struct object_ops file_ops =
@@ -86,6 +86,7 @@ static const struct object_ops file_ops =
add_queue, /* add_queue */
remove_queue, /* remove_queue */
default_fd_signaled, /* signaled */
@@ -350,7 +350,7 @@ index 2a3da247313..61b5014c442 100644
no_signal, /* signal */
no_get_fd, /* get_fd */
diff --git a/server/mailslot.c b/server/mailslot.c
index e0294d946e4..378c0bbb274 100644
index 5d26c606080..2e09bab22fa 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 e0294d946e4..378c0bbb274 100644
no_signal, /* signal */
mailslot_device_file_get_fd, /* get_fd */
diff --git a/server/mapping.c b/server/mapping.c
index 769a986ae21..37da37d6ab3 100644
index 6c2e7a1fd2b..d06ceaa1a66 100644
--- a/server/mapping.c
+++ b/server/mapping.c
@@ -68,6 +68,7 @@ static const struct object_ops ranges_ops =
@@ -426,10 +426,10 @@ index 823ad54ffc3..fc236b3e623 100644
mutex_signal, /* signal */
no_get_fd, /* get_fd */
diff --git a/server/named_pipe.c b/server/named_pipe.c
index 60bd059d93d..9ab99d915b9 100644
index ff1fdbe3f07..cbf7cdf9874 100644
--- a/server/named_pipe.c
+++ b/server/named_pipe.c
@@ -118,6 +118,7 @@ static const struct object_ops named_pipe_ops =
@@ -119,6 +119,7 @@ static const struct object_ops named_pipe_ops =
no_add_queue, /* add_queue */
NULL, /* remove_queue */
NULL, /* signaled */
@@ -437,7 +437,7 @@ index 60bd059d93d..9ab99d915b9 100644
NULL, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
@@ -162,6 +163,7 @@ static const struct object_ops pipe_server_ops =
@@ -167,6 +168,7 @@ static const struct object_ops pipe_server_ops =
add_queue, /* add_queue */
remove_queue, /* remove_queue */
default_fd_signaled, /* signaled */
@@ -445,7 +445,7 @@ index 60bd059d93d..9ab99d915b9 100644
no_satisfied, /* satisfied */
no_signal, /* signal */
pipe_end_get_fd, /* get_fd */
@@ -205,6 +207,7 @@ static const struct object_ops pipe_client_ops =
@@ -210,6 +212,7 @@ static const struct object_ops pipe_client_ops =
add_queue, /* add_queue */
remove_queue, /* remove_queue */
default_fd_signaled, /* signaled */
@@ -453,7 +453,7 @@ index 60bd059d93d..9ab99d915b9 100644
no_satisfied, /* satisfied */
no_signal, /* signal */
pipe_end_get_fd, /* get_fd */
@@ -252,6 +255,7 @@ static const struct object_ops named_pipe_device_ops =
@@ -257,6 +260,7 @@ static const struct object_ops named_pipe_device_ops =
no_add_queue, /* add_queue */
NULL, /* remove_queue */
NULL, /* signaled */
@@ -461,7 +461,7 @@ index 60bd059d93d..9ab99d915b9 100644
no_satisfied, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
@@ -283,6 +287,7 @@ static const struct object_ops named_pipe_device_file_ops =
@@ -288,6 +292,7 @@ static const struct object_ops named_pipe_device_file_ops =
add_queue, /* add_queue */
remove_queue, /* remove_queue */
default_fd_signaled, /* signaled */
@@ -470,7 +470,7 @@ index 60bd059d93d..9ab99d915b9 100644
no_signal, /* signal */
named_pipe_device_file_get_fd, /* get_fd */
diff --git a/server/object.h b/server/object.h
index 394a4aac463..10a049c8fb8 100644
index 73058fd3f99..02878ef0e0e 100644
--- a/server/object.h
+++ b/server/object.h
@@ -68,6 +68,8 @@ struct object_ops
@@ -483,7 +483,7 @@ index 394a4aac463..10a049c8fb8 100644
void (*satisfied)(struct object *,struct wait_queue_entry *);
/* signal an object */
diff --git a/server/process.c b/server/process.c
index 1786493a814..30699fbaeae 100644
index 5b3e29e5dfd..a7db8332702 100644
--- a/server/process.c
+++ b/server/process.c
@@ -78,6 +78,7 @@ static const struct object_ops process_ops =
@@ -543,10 +543,10 @@ index c937e051597..8110bbb340c 100644
no_signal, /* signal */
no_get_fd, /* get_fd */
diff --git a/server/request.c b/server/request.c
index 97bf1a746d2..20b0ec309f3 100644
index 24cfda26110..72166ce2d33 100644
--- a/server/request.c
+++ b/server/request.c
@@ -96,6 +96,7 @@ static const struct object_ops master_socket_ops =
@@ -97,6 +97,7 @@ static const struct object_ops master_socket_ops =
no_add_queue, /* add_queue */
NULL, /* remove_queue */
NULL, /* signaled */
@@ -591,7 +591,7 @@ index 7c2bf2cc154..b6d6dcfc4b6 100644
no_signal, /* signal */
no_get_fd, /* get_fd */
diff --git a/server/sock.c b/server/sock.c
index 8f500adc68b..6b771911f26 100644
index 1ff56f7bbe5..57dd5a7c6d7 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -188,6 +188,7 @@ static const struct object_ops sock_ops =
@@ -610,7 +610,7 @@ index 8f500adc68b..6b771911f26 100644
no_satisfied, /* satisfied */
no_signal, /* signal */
ifchange_get_fd, /* get_fd */
@@ -1747,6 +1749,7 @@ static const struct object_ops socket_device_ops =
@@ -1748,6 +1750,7 @@ static const struct object_ops socket_device_ops =
no_add_queue, /* add_queue */
NULL, /* remove_queue */
NULL, /* signaled */
@@ -619,7 +619,7 @@ index 8f500adc68b..6b771911f26 100644
no_signal, /* signal */
no_get_fd, /* get_fd */
diff --git a/server/symlink.c b/server/symlink.c
index b620f2accb9..1f5ee0bf72b 100644
index 0b85350e1a5..c7212618cac 100644
--- a/server/symlink.c
+++ b/server/symlink.c
@@ -60,6 +60,7 @@ static const struct object_ops symlink_ops =
@@ -683,7 +683,7 @@ index 30320851436..fafa86f292c 100644
no_signal, /* signal */
no_get_fd, /* get_fd */
diff --git a/server/winstation.c b/server/winstation.c
index c9c85e50fff..12060b82c83 100644
index 95e5c0c7d0d..22228d6f987 100644
--- a/server/winstation.c
+++ b/server/winstation.c
@@ -64,6 +64,7 @@ static const struct object_ops winstation_ops =