wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-12-15 08:03:15 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 0807b09cfa7f2446f7a69f99ff1006e88c9de60b.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2021-06-03 08:57:21 +10:00
parent 0e6e23e1f9
commit 06523ed0a0
5 changed files with 52 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/eventfd_synchronization/0003-ntdll-Create-eventfd-based-objects-for-semaphores.patch
View File

@@ -1,4 +1,4 @@
From bdc4be1fa3a5fca212eb8d146d114214399b9bd7 Mon Sep 17 00:00:00 2001
From 402e89a3813766ac3ba38525b52e9c5a42a92eee Mon Sep 17 00:00:00 2001
From: Zebediah Figura <zfigura@codeweavers.com>
Date: Mon, 6 Jul 2020 12:09:22 -0500
Subject: [PATCH] ntdll: Create eventfd-based objects for semaphores.
@@ -16,7 +16,7 @@ Subject: [PATCH] ntdll: Create eventfd-based objects for semaphores.
create mode 100644 dlls/ntdll/unix/esync.h
diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
index 179d00b29ef..1de3490d4f0 100644
index 6dfe2eb12f9..d86dafbddf9 100644
--- a/dlls/ntdll/Makefile.in
+++ b/dlls/ntdll/Makefile.in
@@ -45,6 +45,7 @@ C_SRCS = \
@@ -348,10 +348,10 @@ index 00000000000..a50a755149a
+
+extern int receive_fd( obj_handle_t *handle ) DECLSPEC_HIDDEN;
diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index 20f614f59f1..afbb0e391f3 100644
index 1830c4fb392..8ae1a7548bf 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -89,6 +89,7 @@
@@ -86,6 +86,7 @@
#include "winioctl.h"
#include "winternl.h"
#include "unix_private.h"
@@ -359,19 +359,19 @@ index 20f614f59f1..afbb0e391f3 100644
#include "wine/list.h"
#include "wine/debug.h"
@@ -1602,6 +1603,7 @@ static void start_main_thread(void)
@@ -1867,6 +1868,7 @@ static void start_main_thread(void)
signal_init_thread( teb );
dbg_init();
startup_info_size = server_init_process();
+ esync_init();
virtual_map_user_shared_data();
init_cpu_info();
syscall_dispatcher = signal_init_syscalls();
init_files();
diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c
index 4f149c0f644..59f409ead8c 100644
index cec2ef250a3..a5e9eff6f96 100644
--- a/dlls/ntdll/unix/server.c
+++ b/dlls/ntdll/unix/server.c
@@ -112,7 +112,7 @@ timeout_t server_start_time = 0; /* time of server startup */
@@ -114,7 +114,7 @@ timeout_t server_start_time = 0; /* time of server startup */
sigset_t server_block_set; /* signals to block during server calls */
static int fd_socket = -1; /* socket to exchange file descriptors with the server */
static pid_t server_pid;
@@ -380,7 +380,7 @@ index 4f149c0f644..59f409ead8c 100644
/* atomically exchange a 64-bit value */
static inline LONG64 interlocked_xchg64( LONG64 *dest, LONG64 val )
@@ -835,7 +835,7 @@ void CDECL wine_server_send_fd( int fd )
@@ -821,7 +821,7 @@ void wine_server_send_fd( int fd )
*
* Receive a file descriptor passed from the server.
*/
@@ -424,5 +424,5 @@ index a571855c70a..e41bbbf9349 100644
int do_esync(void)
{
--
2.30.1
2.30.2