wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08: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
Show Stats 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 =

2
patches/patchinstall.sh
View File

@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "9faa5eeddd24a057d9ff522259c9dbdc6203c098"
echo "cbca9f847f60773b4e7e5408f6a079f4896c5c1e"
}
# Show version information

92
patches/server-Object_Types/0003-server-Register-types-during-startup.patch
View File

@ -1,4 +1,4 @@
From 3f37e21dc1ff1cbd971b5bf7307b6898c2339b29 Mon Sep 17 00:00:00 2001
From b79e8d5b9ecadb8e14276b0abcf6497ff3b5608d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Wed, 8 Mar 2017 03:32:43 +0100
Subject: [PATCH] server: Register types during startup.
@ -26,10 +26,10 @@ Subject: [PATCH] server: Register types during startup.
19 files changed, 81 insertions(+), 40 deletions(-)
diff --git a/server/completion.c b/server/completion.c
index db04727b93b..f8561172b70 100644
index 176cf1b817e..ef66260c991 100644
--- a/server/completion.c
+++ b/server/completion.c
@@ -109,8 +109,7 @@ static void completion_dump( struct object *obj, int verbose )
@@ -111,8 +111,7 @@ static void completion_dump( struct object *obj, int verbose )
static struct object_type *completion_get_type( struct object *obj )
{
@ -40,10 +40,10 @@ index db04727b93b..f8561172b70 100644
}
diff --git a/server/directory.c b/server/directory.c
index 75f1e8f117d..b39a4606277 100644
index 04d27946ad9..6e09168b783 100644
--- a/server/directory.c
+++ b/server/directory.c
@@ -121,8 +121,7 @@ static void object_type_dump( struct object *obj, int verbose )
@@ -125,8 +125,7 @@ static void object_type_dump( struct object *obj, int verbose )
static struct object_type *object_type_get_type( struct object *obj )
{
@ -53,7 +53,7 @@ index 75f1e8f117d..b39a4606277 100644
return get_object_type( &str );
}
@@ -133,8 +132,7 @@ static void directory_dump( struct object *obj, int verbose )
@@ -137,8 +136,7 @@ static void directory_dump( struct object *obj, int verbose )
static struct object_type *directory_get_type( struct object *obj )
{
@ -64,10 +64,10 @@ index 75f1e8f117d..b39a4606277 100644
}
diff --git a/server/event.c b/server/event.c
index d339d85aa45..511a705648d 100644
index b6f989d4d6a..8607b494b6d 100644
--- a/server/event.c
+++ b/server/event.c
@@ -164,8 +164,7 @@ static void event_dump( struct object *obj, int verbose )
@@ -193,8 +193,7 @@ static void event_dump( struct object *obj, int verbose )
static struct object_type *event_get_type( struct object *obj )
{
@ -77,7 +77,7 @@ index d339d85aa45..511a705648d 100644
return get_object_type( &str );
}
@@ -240,8 +239,7 @@ static void keyed_event_dump( struct object *obj, int verbose )
@@ -284,8 +283,7 @@ static void keyed_event_dump( struct object *obj, int verbose )
static struct object_type *keyed_event_get_type( struct object *obj )
{
@ -88,10 +88,10 @@ index d339d85aa45..511a705648d 100644
}
diff --git a/server/file.c b/server/file.c
index bce202138e0..d419da0db8a 100644
index b64c3bf0bcf..2edc2d1be8f 100644
--- a/server/file.c
+++ b/server/file.c
@@ -281,8 +281,7 @@ static void file_dump( struct object *obj, int verbose )
@@ -522,8 +522,7 @@ static void file_dump( struct object *obj, int verbose )
struct object_type *file_get_type( struct object *obj )
{
@ -102,10 +102,10 @@ index bce202138e0..d419da0db8a 100644
}
diff --git a/server/mailslot.c b/server/mailslot.c
index 781e6f3141a..42350048877 100644
index 2e09bab22fa..3b8f8086dd1 100644
--- a/server/mailslot.c
+++ b/server/mailslot.c
@@ -352,8 +352,7 @@ static void mailslot_device_dump( struct object *obj, int verbose )
@@ -393,8 +393,7 @@ static void mailslot_device_dump( struct object *obj, int verbose )
static struct object_type *mailslot_device_get_type( struct object *obj )
{
@ -116,22 +116,22 @@ index 781e6f3141a..42350048877 100644
}
diff --git a/server/main.c b/server/main.c
index efb205f5292..fee10ea3d37 100644
index f68888d0fa8..89a326ed8ce 100644
--- a/server/main.c
+++ b/server/main.c
@@ -145,6 +145,7 @@ int main( int argc, char *argv[] )
@@ -151,6 +151,7 @@ int main( int argc, char *argv[] )
init_signals();
init_directories();
init_directories( load_intl_file() );
init_registry();
+ init_types();
main_loop();
return 0;
}
diff --git a/server/mapping.c b/server/mapping.c
index 0941dd87c05..88894661025 100644
index d06ceaa1a66..7729d958247 100644
--- a/server/mapping.c
+++ b/server/mapping.c
@@ -915,8 +915,7 @@ static void mapping_dump( struct object *obj, int verbose )
@@ -956,8 +956,7 @@ static void mapping_dump( struct object *obj, int verbose )
static struct object_type *mapping_get_type( struct object *obj )
{
@ -142,10 +142,10 @@ index 0941dd87c05..88894661025 100644
}
diff --git a/server/mutex.c b/server/mutex.c
index 8a8f7248eae..a7ac1759c52 100644
index fc236b3e623..1235ab4731f 100644
--- a/server/mutex.c
+++ b/server/mutex.c
@@ -142,8 +142,7 @@ static void mutex_dump( struct object *obj, int verbose )
@@ -144,8 +144,7 @@ static void mutex_dump( struct object *obj, int verbose )
static struct object_type *mutex_get_type( struct object *obj )
{
@ -156,10 +156,10 @@ index 8a8f7248eae..a7ac1759c52 100644
}
diff --git a/server/named_pipe.c b/server/named_pipe.c
index f97b1416415..46e68e9f037 100644
index 1638b83ee67..12fd301d49d 100644
--- a/server/named_pipe.c
+++ b/server/named_pipe.c
@@ -455,8 +455,7 @@ static void named_pipe_device_dump( struct object *obj, int verbose )
@@ -498,8 +498,7 @@ static void named_pipe_device_dump( struct object *obj, int verbose )
static struct object_type *named_pipe_device_get_type( struct object *obj )
{
@ -170,10 +170,10 @@ index f97b1416415..46e68e9f037 100644
}
diff --git a/server/object.c b/server/object.c
index dacfe1d71a0..150ab3734f7 100644
index fb7a335c167..b9ccfdf1f2e 100644
--- a/server/object.c
+++ b/server/object.c
@@ -702,3 +702,39 @@ int no_close_handle( struct object *obj, struct process *process, obj_handle_t h
@@ -717,3 +717,39 @@ int no_close_handle( struct object *obj, struct process *process, obj_handle_t h
void no_destroy( struct object *obj )
{
}
@ -214,12 +214,12 @@ index dacfe1d71a0..150ab3734f7 100644
+ }
+}
diff --git a/server/object.h b/server/object.h
index 3144eb56678..5cc593f5c52 100644
index 8134439859d..31740cbe713 100644
--- a/server/object.h
+++ b/server/object.h
@@ -239,6 +239,30 @@ extern struct object_type *get_object_type( const struct unicode_str *name );
@@ -251,6 +251,30 @@ extern struct object_type *get_object_type( const struct unicode_str *name );
extern int directory_link_name( struct object *obj, struct object_name *name, struct object *parent );
extern void init_directories(void);
extern void init_directories( struct fd *intl_fd );
+/* type functions */
+
@ -249,10 +249,10 @@ index 3144eb56678..5cc593f5c52 100644
extern struct object *create_obj_symlink( struct object *root, const struct unicode_str *name,
diff --git a/server/process.c b/server/process.c
index 76bb6faa91a..be5caaecd7e 100644
index dfa5bd728f7..9fcb609d5ab 100644
--- a/server/process.c
+++ b/server/process.c
@@ -215,8 +215,7 @@ static struct job *get_job_obj( struct process *process, obj_handle_t handle, un
@@ -226,8 +226,7 @@ static struct job *get_job_obj( struct process *process, obj_handle_t handle, un
static struct object_type *job_get_type( struct object *obj )
{
@ -262,7 +262,7 @@ index 76bb6faa91a..be5caaecd7e 100644
return get_object_type( &str );
};
@@ -645,8 +644,7 @@ static void process_dump( struct object *obj, int verbose )
@@ -669,8 +668,7 @@ static void process_dump( struct object *obj, int verbose )
static struct object_type *process_get_type( struct object *obj )
{
@ -273,10 +273,10 @@ index 76bb6faa91a..be5caaecd7e 100644
}
diff --git a/server/registry.c b/server/registry.c
index dcbb3f791e1..08cb6faa31b 100644
index 8110bbb340c..95b8b4abf0e 100644
--- a/server/registry.c
+++ b/server/registry.c
@@ -304,8 +304,7 @@ static void key_dump( struct object *obj, int verbose )
@@ -307,8 +307,7 @@ static void key_dump( struct object *obj, int verbose )
static struct object_type *key_get_type( struct object *obj )
{
@ -287,10 +287,10 @@ index dcbb3f791e1..08cb6faa31b 100644
}
diff --git a/server/semaphore.c b/server/semaphore.c
index 6e2415fd79a..33615047ec5 100644
index ff94e42576b..d7d3a24e48f 100644
--- a/server/semaphore.c
+++ b/server/semaphore.c
@@ -128,8 +128,7 @@ static void semaphore_dump( struct object *obj, int verbose )
@@ -130,8 +130,7 @@ static void semaphore_dump( struct object *obj, int verbose )
static struct object_type *semaphore_get_type( struct object *obj )
{
@ -301,10 +301,10 @@ index 6e2415fd79a..33615047ec5 100644
}
diff --git a/server/symlink.c b/server/symlink.c
index e5ee09f015a..287432f692e 100644
index c7212618cac..67eaa4594ba 100644
--- a/server/symlink.c
+++ b/server/symlink.c
@@ -87,8 +87,7 @@ static void symlink_dump( struct object *obj, int verbose )
@@ -89,8 +89,7 @@ static void symlink_dump( struct object *obj, int verbose )
static struct object_type *symlink_get_type( struct object *obj )
{
@ -315,10 +315,10 @@ index e5ee09f015a..287432f692e 100644
}
diff --git a/server/thread.c b/server/thread.c
index e2bfa50c7ba..4d518a93403 100644
index f320f2b26e9..1a245c58396 100644
--- a/server/thread.c
+++ b/server/thread.c
@@ -445,8 +445,7 @@ static void dump_thread( struct object *obj, int verbose )
@@ -467,8 +467,7 @@ static void dump_thread( struct object *obj, int verbose )
static struct object_type *thread_get_type( struct object *obj )
{
@ -329,10 +329,10 @@ index e2bfa50c7ba..4d518a93403 100644
}
diff --git a/server/timer.c b/server/timer.c
index 6460acbf519..89b8d9bba33 100644
index 11fcdf3bae7..dcbc9e2ece5 100644
--- a/server/timer.c
+++ b/server/timer.c
@@ -192,8 +192,7 @@ static void timer_dump( struct object *obj, int verbose )
@@ -205,8 +205,7 @@ static void timer_dump( struct object *obj, int verbose )
static struct object_type *timer_get_type( struct object *obj )
{
@ -343,10 +343,10 @@ index 6460acbf519..89b8d9bba33 100644
}
diff --git a/server/token.c b/server/token.c
index 2fa95e17aaf..aff6b31ef58 100644
index fafa86f292c..0f128728b0f 100644
--- a/server/token.c
+++ b/server/token.c
@@ -171,8 +171,7 @@ static void token_dump( struct object *obj, int verbose )
@@ -174,8 +174,7 @@ static void token_dump( struct object *obj, int verbose )
static struct object_type *token_get_type( struct object *obj )
{
@ -357,10 +357,10 @@ index 2fa95e17aaf..aff6b31ef58 100644
}
diff --git a/server/winstation.c b/server/winstation.c
index 43d112334d4..a26b33d8327 100644
index 22228d6f987..ac570b81903 100644
--- a/server/winstation.c
+++ b/server/winstation.c
@@ -142,8 +142,7 @@ static void winstation_dump( struct object *obj, int verbose )
@@ -146,8 +146,7 @@ static void winstation_dump( struct object *obj, int verbose )
static struct object_type *winstation_get_type( struct object *obj )
{
@ -370,7 +370,7 @@ index 43d112334d4..a26b33d8327 100644
return get_object_type( &str );
}
@@ -247,8 +246,7 @@ static void desktop_dump( struct object *obj, int verbose )
@@ -251,8 +250,7 @@ static void desktop_dump( struct object *obj, int verbose )
static struct object_type *desktop_get_type( struct object *obj )
{
@ -381,5 +381,5 @@ index 43d112334d4..a26b33d8327 100644
}
--
2.26.2
2.29.2

16
patches/server-Realtime_Priority/0001-wineserver-Draft-to-implement-priority-levels-throug.patch
View File

@ -1,4 +1,4 @@
From 13a0529750a14a032bb9ef5af97a48bc4f1aff14 Mon Sep 17 00:00:00 2001
From fd64d5f62d71dbae71f696af972b2d2b1fde804e Mon Sep 17 00:00:00 2001
From: Joakim Hernberg <jhernberg@alchemy.lu>
Date: Tue, 31 Mar 2015 20:58:20 +0200
Subject: [PATCH] wineserver: Draft to implement priority levels through POSIX
@ -19,7 +19,7 @@ Changes by Sebastian Lackner <sebastian@fds-team.de>:
create mode 100644 server/scheduler.c
diff --git a/server/Makefile.in b/server/Makefile.in
index e90c5d1336c..9a695cefc30 100644
index 4264e3db108..b58ce1e3002 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -30,6 +30,7 @@ C_SRCS = \
@ -31,16 +31,16 @@ index e90c5d1336c..9a695cefc30 100644
serial.c \
signal.c \
diff --git a/server/main.c b/server/main.c
index efb205f5292..2b5065e1852 100644
index d7aed0da199..dae08339874 100644
--- a/server/main.c
+++ b/server/main.c
@@ -142,6 +142,7 @@ int main( int argc, char *argv[] )
@@ -143,6 +143,7 @@ int main( int argc, char *argv[] )
if (debug_level) fprintf( stderr, "wineserver: starting (pid=%ld)\n", (long) getpid() );
set_current_time();
+ init_scheduler();
init_signals();
init_directories();
init_directories( load_intl_file() );
init_registry();
diff --git a/server/scheduler.c b/server/scheduler.c
new file mode 100644
@ -215,10 +215,10 @@ index 00000000000..4a5d82b208d
+
+#endif
diff --git a/server/thread.c b/server/thread.c
index 9b14174578e..7280f87012d 100644
index 942a8ff8389..6da77ad17a3 100644
--- a/server/thread.c
+++ b/server/thread.c
@@ -608,7 +608,10 @@ static void set_thread_info( struct thread *thread,
@@ -611,7 +611,10 @@ static void set_thread_info( struct thread *thread,
if ((req->priority >= min && req->priority <= max) ||
req->priority == THREAD_PRIORITY_IDLE ||
req->priority == THREAD_PRIORITY_TIME_CRITICAL)
@ -244,5 +244,5 @@ index 650bc44628d..2599f7629c3 100644
+
#endif /* __WINE_SERVER_THREAD_H */
--
2.27.0
2.29.2

2
staging/upstream-commit
View File

@ -1 +1 @@
9faa5eeddd24a057d9ff522259c9dbdc6203c098
cbca9f847f60773b4e7e5408f6a079f4896c5c1e