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 433b9081ba7c862feb947400f507228e793d7d4c.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2021-02-03 10:11:33 +11:00
parent 32b29ad4d8
commit cae1b3eba0
10 changed files with 86 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From fd3e782fbebdfbac412ab3ee9ba01c2a562b61ee Mon Sep 17 00:00:00 2001
From b528c37ea124f6c84bf2383a75ae50dc6f12b571 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 f39ffb42c6f..f742d084906 100644
index 258274ac529..1c3fb065ecf 100644
--- a/dlls/ntdll/Makefile.in
+++ b/dlls/ntdll/Makefile.in
@@ -46,6 +46,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 c2b6ea603e3..ab2d9e347c3 100644
index bcd1635e75c..52e61feb43a 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -86,6 +86,7 @@
@@ -89,6 +89,7 @@
#include "winioctl.h"
#include "winternl.h"
#include "unix_private.h"
@@ -359,16 +359,16 @@ index c2b6ea603e3..ab2d9e347c3 100644
#include "wine/list.h"
#include "wine/debug.h"
@@ -1564,6 +1565,7 @@ static void start_main_thread(void)
@@ -1626,6 +1627,7 @@ static void start_main_thread(void)
signal_init_thread( teb );
dbg_init();
server_init_process();
startup_info_size = server_init_thread( teb->Peb, &suspend );
startup_info_size = server_init_process();
+ esync_init();
virtual_map_user_shared_data();
init_cpu_info();
init_files();
diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c
index 7236f0acb83..971341bf6e0 100644
index 7b469959f66..3063a13efb5 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 */
@@ -380,7 +380,7 @@ index 7236f0acb83..971341bf6e0 100644
/* atomically exchange a 64-bit value */
static inline LONG64 interlocked_xchg64( LONG64 *dest, LONG64 val )
@@ -813,7 +813,7 @@ void CDECL wine_server_send_fd( int fd )
@@ -832,7 +832,7 @@ void CDECL wine_server_send_fd( int fd )
*
* Receive a file descriptor passed from the server.
*/
@@ -390,7 +390,7 @@ index 7236f0acb83..971341bf6e0 100644
struct iovec vec;
struct msghdr msghdr;
diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
index bba7af7e34f..663a170fc61 100644
index 383e9c93273..19e1494a9b8 100644
--- a/dlls/ntdll/unix/sync.c
+++ b/dlls/ntdll/unix/sync.c
@@ -72,6 +72,7 @@
@@ -424,5 +424,5 @@ index b8b257281bf..226e70cd1ad 100644
int do_esync(void)
{
--
2.28.0
2.29.2