Rebase against 4de079bb7247c8b849558c0f27a280a9546c5570.

This commit is contained in:
Zebediah Figura
2021-02-19 19:32:08 -06:00
parent aa8a3d90cb
commit 9aeea5d12e
9 changed files with 59 additions and 254 deletions

View File

@@ -1,4 +1,4 @@
From b528c37ea124f6c84bf2383a75ae50dc6f12b571 Mon Sep 17 00:00:00 2001
From 19ec5223ae49b6862ca6fc420a2c41f94befc0df 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 258274ac529..1c3fb065ecf 100644
index b2f63d9f63a..5dc4ebb07fc 100644
--- a/dlls/ntdll/Makefile.in
+++ b/dlls/ntdll/Makefile.in
@@ -46,6 +46,7 @@ C_SRCS = \
@@ -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 bcd1635e75c..52e61feb43a 100644
index c4f897f3d0d..0012d8d08af 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -89,6 +89,7 @@
@@ -359,16 +359,16 @@ index bcd1635e75c..52e61feb43a 100644
#include "wine/list.h"
#include "wine/debug.h"
@@ -1626,6 +1627,7 @@ static void start_main_thread(void)
@@ -1649,6 +1650,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();
init_files();
syscall_dispatcher = signal_init_syscalls();
diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c
index 7b469959f66..3063a13efb5 100644
index 6af8effe9e1..401d439b363 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 */
@@ -390,7 +390,7 @@ index 7b469959f66..3063a13efb5 100644
struct iovec vec;
struct msghdr msghdr;
diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
index 383e9c93273..19e1494a9b8 100644
index 16635ee42fa..2c795ea5ee8 100644
--- a/dlls/ntdll/unix/sync.c
+++ b/dlls/ntdll/unix/sync.c
@@ -72,6 +72,7 @@
@@ -412,7 +412,7 @@ index 383e9c93273..19e1494a9b8 100644
{
req->access = access;
diff --git a/server/esync.c b/server/esync.c
index b8b257281bf..226e70cd1ad 100644
index a571855c70a..e41bbbf9349 100644
--- a/server/esync.c
+++ b/server/esync.c
@@ -43,6 +43,7 @@
@@ -424,5 +424,5 @@ index b8b257281bf..226e70cd1ad 100644
int do_esync(void)
{
--
2.29.2
2.20.1