Rebase against 7554bd4b41a1429517eb86fd20dbe813cdd0550a.

patches/eventfd_synchronization/0001-configure-Check-for-sys-eventfd.h-ppoll-and-shm_open.patch

@@ -1,4 +1,4 @@
-From 4b23aac811b441d63bc451bb2126d2da04734201 Mon Sep 17 00:00:00 2001
+From d6b29a6153e786ff7a79bdbb7c33977e19c6e267 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Wed, 13 Jun 2018 10:44:49 -0500
 Subject: [PATCH] configure: Check for sys/eventfd.h, ppoll(), and shm_open().
@@ -13,7 +13,7 @@ Although perhaps we shouldn't since the server doesn't do this.
  3 files changed, 89 insertions(+)
 
 diff --git a/configure b/configure
-index c99ee5858e7..e1cc8737eb1 100755
+index ec425d91f63..200b42b7fe7 100755
 --- a/configure
 +++ b/configure
 @@ -7525,6 +7525,7 @@ for ac_header in \
@@ -31,8 +31,8 @@ index c99ee5858e7..e1cc8737eb1 100755
 +	ppoll \
  	prctl \
  	proc_pidinfo \
- 	sched_yield \
-@@ -18257,6 +18259,72 @@ fi
+ 	setproctitle \
+@@ -18255,6 +18257,72 @@ fi
      ;;
  esac
  
@@ -106,10 +106,10 @@ index c99ee5858e7..e1cc8737eb1 100755
  then
          if ${LDAP_CFLAGS:+false} :; then :
 diff --git a/configure.ac b/configure.ac
-index bf9e8103606..adddfacc6fd 100644
+index 718ab1ca50e..d5f82ad2af4 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -498,6 +498,7 @@ AC_CHECK_HEADERS(\
+@@ -496,6 +496,7 @@ AC_CHECK_HEADERS(\
  	sys/cdio.h \
  	sys/epoll.h \
  	sys/event.h \
@@ -117,7 +117,7 @@ index bf9e8103606..adddfacc6fd 100644
  	sys/filio.h \
  	sys/ioctl.h \
  	sys/ipc.h \
-@@ -2173,6 +2174,7 @@ AC_CHECK_FUNCS(\
+@@ -2158,6 +2159,7 @@ AC_CHECK_FUNCS(\
  	port_create \
  	posix_fadvise \
  	posix_fallocate \
@@ -125,7 +125,7 @@ index bf9e8103606..adddfacc6fd 100644
  	prctl \
  	proc_pidinfo \
  	renameat \
-@@ -2215,6 +2217,16 @@ case $host_os in
+@@ -2199,6 +2201,16 @@ case $host_os in
      ;;
  esac
  
@@ -143,10 +143,10 @@ index bf9e8103606..adddfacc6fd 100644
  if test "x$with_ldap" != "xno"
  then
 diff --git a/include/config.h.in b/include/config.h.in
-index fc3749895a3..608a255f1f7 100644
+index e975ca8a55d..a19789dad8c 100644
 --- a/include/config.h.in
 +++ b/include/config.h.in
-@@ -486,6 +486,9 @@
+@@ -474,6 +474,9 @@
  /* Define to 1 if you have the `posix_fallocate' function. */
  #undef HAVE_POSIX_FALLOCATE
  
@@ -156,7 +156,7 @@ index fc3749895a3..608a255f1f7 100644
  /* Define to 1 if you have the `prctl' function. */
  #undef HAVE_PRCTL
  
-@@ -561,6 +564,9 @@
+@@ -546,6 +549,9 @@
  /* Define to 1 if `interface_id' is a member of `sg_io_hdr_t'. */
  #undef HAVE_SG_IO_HDR_T_INTERFACE_ID
  
@@ -166,7 +166,7 @@ index fc3749895a3..608a255f1f7 100644
  /* Define if sigaddset is supported */
  #undef HAVE_SIGADDSET
  
-@@ -716,6 +722,9 @@
+@@ -695,6 +701,9 @@
  /* Define to 1 if you have the <sys/epoll.h> header file. */
  #undef HAVE_SYS_EPOLL_H
  

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

@@ -1,4 +1,4 @@
-From 402e89a3813766ac3ba38525b52e9c5a42a92eee Mon Sep 17 00:00:00 2001
+From b569bf796e685232a6858b1daa2950408c422adf 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 6dfe2eb12f9..d86dafbddf9 100644
+index aac7f8eead7..7ea80f19481 100644
 --- a/dlls/ntdll/Makefile.in
 +++ b/dlls/ntdll/Makefile.in
 @@ -45,6 +45,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 1830c4fb392..8ae1a7548bf 100644
+index dfc0d4c9a09..310556948aa 100644
 --- a/dlls/ntdll/unix/loader.c
 +++ b/dlls/ntdll/unix/loader.c
 @@ -86,6 +86,7 @@
@@ -359,7 +359,7 @@ index 1830c4fb392..8ae1a7548bf 100644
  #include "wine/list.h"
  #include "wine/debug.h"
  
-@@ -1867,6 +1868,7 @@ static void start_main_thread(void)
+@@ -2190,6 +2191,7 @@ static void start_main_thread(void)
      signal_init_thread( teb );
      dbg_init();
      startup_info_size = server_init_process();
@@ -368,7 +368,7 @@ index 1830c4fb392..8ae1a7548bf 100644
      init_cpu_info();
      init_files();
 diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c
-index cec2ef250a3..a5e9eff6f96 100644
+index 53d34e1858a..43b470fc10a 100644
 --- a/dlls/ntdll/unix/server.c
 +++ b/dlls/ntdll/unix/server.c
 @@ -114,7 +114,7 @@ timeout_t server_start_time = 0;  /* time of server startup */
@@ -380,7 +380,7 @@ index cec2ef250a3..a5e9eff6f96 100644
  
  /* atomically exchange a 64-bit value */
  static inline LONG64 interlocked_xchg64( LONG64 *dest, LONG64 val )
-@@ -821,7 +821,7 @@ void wine_server_send_fd( int fd )
+@@ -828,7 +828,7 @@ void wine_server_send_fd( int fd )
   *
   * Receive a file descriptor passed from the server.
   */
@@ -390,18 +390,18 @@ index cec2ef250a3..a5e9eff6f96 100644
      struct iovec vec;
      struct msghdr msghdr;
 diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
-index 16635ee42fa..2c795ea5ee8 100644
+index 86a836a908f..871fe7fb42e 100644
 --- a/dlls/ntdll/unix/sync.c
 +++ b/dlls/ntdll/unix/sync.c
-@@ -72,6 +72,7 @@
- #include "wine/exception.h"
+@@ -71,6 +71,7 @@
+ #include "wine/server.h"
  #include "wine/debug.h"
  #include "unix_private.h"
 +#include "esync.h"
  
  WINE_DEFAULT_DEBUG_CHANNEL(sync);
  
-@@ -322,6 +323,9 @@ NTSTATUS WINAPI NtCreateSemaphore( HANDLE *handle, ACCESS_MASK access, const OBJ
+@@ -324,6 +325,9 @@ NTSTATUS WINAPI NtCreateSemaphore( HANDLE *handle, ACCESS_MASK access, const OBJ
      if (max <= 0 || initial < 0 || initial > max) return STATUS_INVALID_PARAMETER;
      if ((ret = alloc_object_attributes( attr, &objattr, &len ))) return ret;
  
@@ -424,5 +424,5 @@ index a571855c70a..e41bbbf9349 100644
  int do_esync(void)
  {
 -- 
-2.30.2
+2.33.0