Rebase against 4d5824112e13160e538013a25f1c13a124565180.

This commit is contained in:
Alistair Leslie-Hughes
2021-03-17 09:44:07 +11:00
parent 1f89c15143
commit c747e46d75
8 changed files with 73 additions and 73 deletions

View File

@@ -1,4 +1,4 @@
From 19ec5223ae49b6862ca6fc420a2c41f94befc0df Mon Sep 17 00:00:00 2001
From bdc4be1fa3a5fca212eb8d146d114214399b9bd7 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,17 +16,17 @@ 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 b2f63d9f63a..5dc4ebb07fc 100644
index 179d00b29ef..1de3490d4f0 100644
--- a/dlls/ntdll/Makefile.in
+++ b/dlls/ntdll/Makefile.in
@@ -46,6 +46,7 @@ C_SRCS = \
@@ -45,6 +45,7 @@ C_SRCS = \
unix/cdrom.c \
unix/debug.c \
unix/env.c \
+ unix/esync.c \
unix/file.c \
unix/loader.c \
unix/process.c \
unix/loadorder.c \
diff --git a/dlls/ntdll/unix/esync.c b/dlls/ntdll/unix/esync.c
new file mode 100644
index 00000000000..7c409c7a9ca
@@ -348,7 +348,7 @@ 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 c4f897f3d0d..0012d8d08af 100644
index 20f614f59f1..afbb0e391f3 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -89,6 +89,7 @@
@@ -359,7 +359,7 @@ index c4f897f3d0d..0012d8d08af 100644
#include "wine/list.h"
#include "wine/debug.h"
@@ -1649,6 +1650,7 @@ static void start_main_thread(void)
@@ -1602,6 +1603,7 @@ static void start_main_thread(void)
signal_init_thread( teb );
dbg_init();
startup_info_size = server_init_process();
@@ -368,7 +368,7 @@ index c4f897f3d0d..0012d8d08af 100644
init_cpu_info();
syscall_dispatcher = signal_init_syscalls();
diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c
index 6af8effe9e1..401d439b363 100644
index 4f149c0f644..59f409ead8c 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 6af8effe9e1..401d439b363 100644
/* atomically exchange a 64-bit value */
static inline LONG64 interlocked_xchg64( LONG64 *dest, LONG64 val )
@@ -832,7 +832,7 @@ void CDECL wine_server_send_fd( int fd )
@@ -835,7 +835,7 @@ void CDECL 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.20.1
2.30.1