Rebase against c64aa0006e4a33d755a57a693cd81dc1ed95fa9d.

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

@@ -1,4 +1,4 @@
-From d4094baaba721220b0a81170d1f9e6c276dae4ae Mon Sep 17 00:00:00 2001
+From 05ebaac121b440567aa88de7a77d0ef19a8d9242 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,10 +16,10 @@ 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 f8ca3e689ec..82af2152595 100644
+index 74e6da5bb56..a2b498759a9 100644
 --- a/dlls/ntdll/Makefile.in
 +++ b/dlls/ntdll/Makefile.in
-@@ -47,6 +47,7 @@ C_SRCS = \
+@@ -48,6 +48,7 @@ SOURCES = \
  	unix/cdrom.c \
  	unix/debug.c \
  	unix/env.c \
@@ -345,7 +345,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 5b8b6962b4a..92855f7cccc 100644
+index 42b5aa9d84e..974a3624a28 100644
 --- a/dlls/ntdll/unix/loader.c
 +++ b/dlls/ntdll/unix/loader.c
 @@ -87,6 +87,7 @@
@@ -354,9 +354,9 @@ index 5b8b6962b4a..92855f7cccc 100644
  #include "unix_private.h"
 +#include "esync.h"
  #include "wine/list.h"
+ #include "ntsyscalls.h"
  #include "wine/debug.h"
- 
-@@ -2055,6 +2056,7 @@ static void start_main_thread(void)
+@@ -1811,6 +1812,7 @@ static void start_main_thread(void)
      signal_alloc_thread( teb );
      dbg_init();
      startup_info_size = server_init_process();
@@ -365,7 +365,7 @@ index 5b8b6962b4a..92855f7cccc 100644
      init_cpu_info();
      init_files();
 diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c
-index 227784448d3..99563e43cc3 100644
+index 7211457387c..cd8dbbdcc10 100644
 --- a/dlls/ntdll/unix/server.c
 +++ b/dlls/ntdll/unix/server.c
 @@ -103,7 +103,7 @@ sigset_t server_block_set;  /* signals to block during server calls */
@@ -377,7 +377,7 @@ index 227784448d3..99563e43cc3 100644
  
  /* atomically exchange a 64-bit value */
  static inline LONG64 interlocked_xchg64( LONG64 *dest, LONG64 val )
-@@ -907,7 +907,7 @@ void wine_server_send_fd( int fd )
+@@ -918,7 +918,7 @@ void wine_server_send_fd( int fd )
   *
   * Receive a file descriptor passed from the server.
   */
@@ -387,7 +387,7 @@ index 227784448d3..99563e43cc3 100644
      struct iovec vec;
      struct msghdr msghdr;
 diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
-index d1e4e5ee111..b5299c323e3 100644
+index bfbcaf4a851..f21ceb80298 100644
 --- a/dlls/ntdll/unix/sync.c
 +++ b/dlls/ntdll/unix/sync.c
 @@ -63,6 +63,7 @@
@@ -421,5 +421,5 @@ index 35b4833fd4c..75ef586df30 100644
  int do_esync(void)
  {
 -- 
-2.40.1
+2.42.0