Release v7.0-rc2

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

@@ -1,4 +1,4 @@
-From 2cee55344dd3bef2ed548d2dff275612021e8641 Mon Sep 17 00:00:00 2001
+From f2401390227b40c68bb97983fc028d5060a70e8c 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().
@@ -7,23 +7,23 @@ We use ppoll() instead of poll() for the better time granularity.
 
 Although perhaps we shouldn't since the server doesn't do this.
 ---
- configure.ac        | 12 ++++++++++++
- include/config.h.in |  9 +++++++++
- 2 files changed, 21 insertions(+)
+ configure.ac        | 8 ++++++++
+ include/config.h.in | 9 +++++++++
+ 2 files changed, 17 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 4d3c2fab566..2b26e892b08 100644
+index 9683798b57b..b4465a98794 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -481,6 +481,7 @@ AC_CHECK_HEADERS(\
+@@ -478,6 +478,7 @@ AC_CHECK_HEADERS(\
  	sys/cdio.h \
  	sys/epoll.h \
  	sys/event.h \
 +	sys/eventfd.h \
  	sys/filio.h \
- 	sys/ioctl.h \
  	sys/ipc.h \
-@@ -1959,6 +1960,7 @@ AC_CHECK_FUNCS(\
+ 	sys/link.h \
+@@ -1991,6 +1992,7 @@ AC_CHECK_FUNCS(\
  	port_create \
  	posix_fadvise \
  	posix_fallocate \
@@ -31,28 +31,24 @@ index 4d3c2fab566..2b26e892b08 100644
  	prctl \
  	proc_pidinfo \
  	sched_yield \
-@@ -2001,6 +2003,16 @@ case $host_os in
+@@ -2033,6 +2035,12 @@ case $host_os in
      ;;
  esac
  
-+dnl Check for shm_open which may be in -lrt
-+if test "$ac_cv_header_sys_mman_h" = "yes" -a "x$RT_LIBS" = "x"
-+then
-+    ac_save_LIBS=$LIBS
-+    AC_SEARCH_LIBS(shm_open, rt,
-+                   [AC_DEFINE(HAVE_SHM_OPEN, 1, [Define to 1 if you have the `shm_open' function.])
-+                    test "$ac_res" = "none required" || AC_SUBST(RT_LIBS,"$ac_res")])
-+fi
++ac_save_LIBS=$LIBS
++AC_SEARCH_LIBS(shm_open, rt,
++               [AC_DEFINE(HAVE_SHM_OPEN, 1, [Define to 1 if you have the `shm_open' function.])
++                test "$ac_res" = "none required" || AC_SUBST(RT_LIBS,"$ac_res")])
 +LIBS=$ac_save_LIBS
 +
  dnl **** Check for OpenLDAP ***
  if test "x$with_ldap" != "xno"
  then
 diff --git a/include/config.h.in b/include/config.h.in
-index 0fe50e8ce7c..48dae80850d 100644
+index 197c3b97f09..13f822cb36c 100644
 --- a/include/config.h.in
 +++ b/include/config.h.in
-@@ -398,6 +398,9 @@
+@@ -362,6 +362,9 @@
  /* Define to 1 if you have the `posix_fallocate' function. */
  #undef HAVE_POSIX_FALLOCATE
  
@@ -62,7 +58,7 @@ index 0fe50e8ce7c..48dae80850d 100644
  /* Define to 1 if you have the `prctl' function. */
  #undef HAVE_PRCTL
  
-@@ -473,6 +476,9 @@
+@@ -434,6 +437,9 @@
  /* Define to 1 if `interface_id' is a member of `sg_io_hdr_t'. */
  #undef HAVE_SG_IO_HDR_T_INTERFACE_ID
  
@@ -72,7 +68,7 @@ index 0fe50e8ce7c..48dae80850d 100644
  /* Define if sigaddset is supported */
  #undef HAVE_SIGADDSET
  
-@@ -625,6 +631,9 @@
+@@ -574,6 +580,9 @@
  /* Define to 1 if you have the <sys/epoll.h> header file. */
  #undef HAVE_SYS_EPOLL_H
  

patches/eventfd_synchronization/0002-server-Create-server-objects-for-eventfd-based-synch.patch

@@ -1,4 +1,4 @@
-From 2e40c85732d66a427927d26d0d560c835187fcf2 Mon Sep 17 00:00:00 2001
+From 27524b275c81c1c9057e4b4ca3d9cec734a3bd8a Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Thu, 7 Jun 2018 20:09:59 -0500
 Subject: [PATCH] server: Create server objects for eventfd-based
@@ -6,16 +6,16 @@ Subject: [PATCH] server: Create server objects for eventfd-based
 
 ---
  server/Makefile.in  |   1 +
- server/esync.c      | 320 ++++++++++++++++++++++++++++++++++++++++++++
+ server/esync.c      | 318 ++++++++++++++++++++++++++++++++++++++++++++
  server/esync.h      |  22 +++
  server/main.c       |   4 +
  server/protocol.def |  25 +++-
- 5 files changed, 371 insertions(+), 1 deletion(-)
+ 5 files changed, 369 insertions(+), 1 deletion(-)
  create mode 100644 server/esync.c
  create mode 100644 server/esync.h
 
 diff --git a/server/Makefile.in b/server/Makefile.in
-index b58ce1e3002..5f225fd0591 100644
+index c81a2112632..da20dff9f56 100644
 --- a/server/Makefile.in
 +++ b/server/Makefile.in
 @@ -11,6 +11,7 @@ C_SRCS = \
@@ -28,10 +28,10 @@ index b58ce1e3002..5f225fd0591 100644
  	file.c \
 diff --git a/server/esync.c b/server/esync.c
 new file mode 100644
-index 00000000000..a571855c70a
+index 00000000000..b9dbfa322bc
 --- /dev/null
 +++ b/server/esync.c
-@@ -0,0 +1,320 @@
+@@ -0,0 +1,318 @@
 +/*
 + * eventfd-based synchronization objects
 + *
@@ -61,9 +61,7 @@ index 00000000000..a571855c70a
 +#ifdef HAVE_SYS_EVENTFD_H
 +# include <sys/eventfd.h>
 +#endif
-+#ifdef HAVE_SYS_MMAN_H
-+# include <sys/mman.h>
-+#endif
++#include <sys/mman.h>
 +#ifdef HAVE_SYS_STAT_H
 +# include <sys/stat.h>
 +#endif
@@ -381,10 +379,10 @@ index 00000000000..7ca4ca89394
 +extern int do_esync(void);
 +void esync_init(void);
 diff --git a/server/main.c b/server/main.c
-index dae08339874..f68888d0fa8 100644
+index a134d811d82..3436b0871b4 100644
 --- a/server/main.c
 +++ b/server/main.c
-@@ -37,6 +37,7 @@
+@@ -34,6 +34,7 @@
  #include "thread.h"
  #include "request.h"
  #include "unicode.h"
@@ -392,7 +390,7 @@ index dae08339874..f68888d0fa8 100644
  
  /* command-line options */
  int debug_level = 0;
-@@ -141,6 +142,9 @@ int main( int argc, char *argv[] )
+@@ -229,6 +230,9 @@ int main( int argc, char *argv[] )
      sock_init();
      open_master_socket();
  
@@ -403,10 +401,10 @@ index dae08339874..f68888d0fa8 100644
      set_current_time();
      init_scheduler();
 diff --git a/server/protocol.def b/server/protocol.def
-index 10da65be735..22050c65f06 100644
+index c413cc7d7bb..607d56a666c 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -3690,7 +3690,6 @@ struct handle_info
+@@ -3733,7 +3733,6 @@ struct handle_info
      obj_handle_t handle;       /* process handle */
  @END
  
@@ -414,7 +412,7 @@ index 10da65be735..22050c65f06 100644
  /* Iterate thread list for process */
  @REQ(get_next_thread)
      obj_handle_t process;      /* process handle */
-@@ -3701,3 +3700,27 @@ struct handle_info
+@@ -3744,3 +3743,27 @@ struct handle_info
  @REPLY
      obj_handle_t handle;       /* next thread handle */
  @END
@@ -443,5 +441,5 @@ index 10da65be735..22050c65f06 100644
 +    unsigned int shm_idx;
 +@END
 -- 
-2.30.2
+2.33.0
 

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

@@ -1,25 +1,25 @@
-From b569bf796e685232a6858b1daa2950408c422adf Mon Sep 17 00:00:00 2001
+From 291fd879b030b16238329ff4f530ab3577ea6fc0 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.
 
 ---
  dlls/ntdll/Makefile.in   |   1 +
- dlls/ntdll/unix/esync.c  | 273 +++++++++++++++++++++++++++++++++++++++
+ dlls/ntdll/unix/esync.c  | 271 +++++++++++++++++++++++++++++++++++++++
  dlls/ntdll/unix/esync.h  |  35 +++++
  dlls/ntdll/unix/loader.c |   2 +
  dlls/ntdll/unix/server.c |   4 +-
  dlls/ntdll/unix/sync.c   |   4 +
  server/esync.c           |   1 +
- 7 files changed, 318 insertions(+), 2 deletions(-)
+ 7 files changed, 316 insertions(+), 2 deletions(-)
  create mode 100644 dlls/ntdll/unix/esync.c
  create mode 100644 dlls/ntdll/unix/esync.h
 
 diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
-index aac7f8eead7..7ea80f19481 100644
+index 185bc563e68..d7c757cab32 100644
 --- a/dlls/ntdll/Makefile.in
 +++ b/dlls/ntdll/Makefile.in
-@@ -45,6 +45,7 @@ C_SRCS = \
+@@ -46,6 +46,7 @@ C_SRCS = \
  	unix/cdrom.c \
  	unix/debug.c \
  	unix/env.c \
@@ -29,10 +29,10 @@ index aac7f8eead7..7ea80f19481 100644
  	unix/loadorder.c \
 diff --git a/dlls/ntdll/unix/esync.c b/dlls/ntdll/unix/esync.c
 new file mode 100644
-index 00000000000..7c409c7a9ca
+index 00000000000..9e1ef7d8afd
 --- /dev/null
 +++ b/dlls/ntdll/unix/esync.c
-@@ -0,0 +1,273 @@
+@@ -0,0 +1,271 @@
 +/*
 + * eventfd-based synchronization objects
 + *
@@ -64,9 +64,7 @@ index 00000000000..7c409c7a9ca
 +#include <fcntl.h>
 +#include <stdarg.h>
 +#include <stdlib.h>
-+#ifdef HAVE_SYS_MMAN_H
-+# include <sys/mman.h>
-+#endif
++#include <sys/mman.h>
 +#ifdef HAVE_SYS_STAT_H
 +# include <sys/stat.h>
 +#endif
@@ -348,10 +346,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 dfc0d4c9a09..310556948aa 100644
+index 8f20da7eece..befa355a4fc 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,7 +357,7 @@ index dfc0d4c9a09..310556948aa 100644
  #include "wine/list.h"
  #include "wine/debug.h"
  
-@@ -2190,6 +2191,7 @@ static void start_main_thread(void)
+@@ -2081,6 +2082,7 @@ static void start_main_thread(void)
      signal_init_thread( teb );
      dbg_init();
      startup_info_size = server_init_process();
@@ -368,10 +366,10 @@ index dfc0d4c9a09..310556948aa 100644
      init_cpu_info();
      init_files();
 diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c
-index 53d34e1858a..43b470fc10a 100644
+index a388247beb2..79b83589d81 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 */
+@@ -104,7 +104,7 @@ timeout_t server_start_time = 0;  /* time of server startup */
  sigset_t server_block_set;  /* signals to block during server calls */
  static int fd_socket = -1;  /* socket to exchange file descriptors with the server */
  static pid_t server_pid;
@@ -380,7 +378,7 @@ index 53d34e1858a..43b470fc10a 100644
  
  /* atomically exchange a 64-bit value */
  static inline LONG64 interlocked_xchg64( LONG64 *dest, LONG64 val )
-@@ -828,7 +828,7 @@ void wine_server_send_fd( int fd )
+@@ -801,7 +801,7 @@ void wine_server_send_fd( int fd )
   *
   * Receive a file descriptor passed from the server.
   */
@@ -390,10 +388,10 @@ index 53d34e1858a..43b470fc10a 100644
      struct iovec vec;
      struct msghdr msghdr;
 diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
-index 86a836a908f..871fe7fb42e 100644
+index 442243d8bcf..72cbf92f93c 100644
 --- a/dlls/ntdll/unix/sync.c
 +++ b/dlls/ntdll/unix/sync.c
-@@ -71,6 +71,7 @@
+@@ -64,6 +64,7 @@
  #include "wine/server.h"
  #include "wine/debug.h"
  #include "unix_private.h"
@@ -401,7 +399,7 @@ index 86a836a908f..871fe7fb42e 100644
  
  WINE_DEFAULT_DEBUG_CHANNEL(sync);
  
-@@ -324,6 +325,9 @@ NTSTATUS WINAPI NtCreateSemaphore( HANDLE *handle, ACCESS_MASK access, const OBJ
+@@ -262,6 +263,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;
  
@@ -412,10 +410,10 @@ index 86a836a908f..871fe7fb42e 100644
      {
          req->access  = access;
 diff --git a/server/esync.c b/server/esync.c
-index a571855c70a..e41bbbf9349 100644
+index b9dbfa322bc..99e57eca44c 100644
 --- a/server/esync.c
 +++ b/server/esync.c
-@@ -43,6 +43,7 @@
+@@ -41,6 +41,7 @@
  #include "handle.h"
  #include "request.h"
  #include "file.h"

patches/eventfd_synchronization/0004-ntdll-Implement-NtReleaseSemaphore.patch

@@ -1,4 +1,4 @@
-From e5a3456cde339352e78b10fed8a2fc65ca560041 Mon Sep 17 00:00:00 2001
+From 4c255f91363e09892de43bf5f3b991ef5ccce3b2 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 12:16:34 -0500
 Subject: [PATCH] ntdll: Implement NtReleaseSemaphore().
@@ -10,7 +10,7 @@ Subject: [PATCH] ntdll: Implement NtReleaseSemaphore().
  3 files changed, 47 insertions(+)
 
 diff --git a/dlls/ntdll/unix/esync.c b/dlls/ntdll/unix/esync.c
-index 7c409c7a9ca..8f28a36d93f 100644
+index 9e1ef7d8afd..c7320d78bd3 100644
 --- a/dlls/ntdll/unix/esync.c
 +++ b/dlls/ntdll/unix/esync.c
 @@ -28,6 +28,7 @@
@@ -19,9 +19,9 @@ index 7c409c7a9ca..8f28a36d93f 100644
  #include <stdarg.h>
 +#include <stdint.h>
  #include <stdlib.h>
- #ifdef HAVE_SYS_MMAN_H
- # include <sys/mman.h>
-@@ -173,6 +174,16 @@ static struct esync *add_to_list( HANDLE handle, enum esync_type type, int fd, v
+ #include <sys/mman.h>
+ #ifdef HAVE_SYS_STAT_H
+@@ -171,6 +172,16 @@ static struct esync *add_to_list( HANDLE handle, enum esync_type type, int fd, v
      return &esync_list[entry][idx];
  }
  
@@ -38,7 +38,7 @@ index 7c409c7a9ca..8f28a36d93f 100644
  static NTSTATUS create_esync( enum esync_type type, HANDLE *handle, ACCESS_MASK access,
                                const OBJECT_ATTRIBUTES *attr, int initval, int max )
  {
-@@ -228,6 +239,38 @@ extern NTSTATUS esync_create_semaphore(HANDLE *handle, ACCESS_MASK access,
+@@ -226,6 +237,38 @@ extern NTSTATUS esync_create_semaphore(HANDLE *handle, ACCESS_MASK access,
      return create_esync( ESYNC_SEMAPHORE, handle, access, attr, initial, max );
  }
  
@@ -90,10 +90,10 @@ index a50a755149a..09838e95535 100644
  
  /* We have to synchronize on the fd cache mutex so that our calls to receive_fd
 diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
-index 663a170fc61..f4bcda4b473 100644
+index 72cbf92f93c..db992f3a9ad 100644
 --- a/dlls/ntdll/unix/sync.c
 +++ b/dlls/ntdll/unix/sync.c
-@@ -407,6 +407,9 @@ NTSTATUS WINAPI NtReleaseSemaphore( HANDLE handle, ULONG count, ULONG *previous
+@@ -348,6 +348,9 @@ NTSTATUS WINAPI NtReleaseSemaphore( HANDLE handle, ULONG count, ULONG *previous
  {
      NTSTATUS ret;
  
@@ -104,5 +104,5 @@ index 663a170fc61..f4bcda4b473 100644
      {
          req->handle = wine_server_obj_handle( handle );
 -- 
-2.28.0
+2.33.0
 

patches/eventfd_synchronization/0006-ntdll-Implement-NtWaitForMultipleObjects.patch

@@ -1,4 +1,4 @@
-From 908363daafc3b5220967d31e2e878f617d465026 Mon Sep 17 00:00:00 2001
+From e6666b78dbd54b0017de39c85f06900503780110 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 12:34:42 -0500
 Subject: [PATCH] ntdll: Implement NtWaitForMultipleObjects().
@@ -10,10 +10,10 @@ Subject: [PATCH] ntdll: Implement NtWaitForMultipleObjects().
  3 files changed, 180 insertions(+)
 
 diff --git a/dlls/ntdll/unix/esync.c b/dlls/ntdll/unix/esync.c
-index 02b07bf36be..1b71105491c 100644
+index f111342688e..dac49af3083 100644
 --- a/dlls/ntdll/unix/esync.c
 +++ b/dlls/ntdll/unix/esync.c
-@@ -22,17 +22,25 @@
+@@ -22,6 +22,8 @@
  #pragma makedep unix
  #endif
  
@@ -22,24 +22,20 @@ index 02b07bf36be..1b71105491c 100644
  #include "config.h"
  
  #include <assert.h>
- #include <errno.h>
- #include <fcntl.h>
-+#ifdef HAVE_POLL_H
-+#include <poll.h>
-+#endif
- #include <stdarg.h>
- #include <stdint.h>
- #include <stdlib.h>
- #ifdef HAVE_SYS_MMAN_H
- # include <sys/mman.h>
- #endif
-+#ifdef HAVE_SYS_POLL_H
-+# include <sys/poll.h>
-+#endif
+@@ -34,6 +36,12 @@
  #ifdef HAVE_SYS_STAT_H
  # include <sys/stat.h>
  #endif
-@@ -289,6 +297,168 @@ NTSTATUS esync_release_semaphore( HANDLE handle, ULONG count, ULONG *prev )
++#ifdef HAVE_POLL_H
++#include <poll.h>
++#endif
++#ifdef HAVE_SYS_POLL_H
++# include <sys/poll.h>
++#endif
+ #include <sys/types.h>
+ #include <unistd.h>
+ 
+@@ -287,6 +295,168 @@ NTSTATUS esync_release_semaphore( HANDLE handle, ULONG count, ULONG *prev )
      return STATUS_SUCCESS;
  }
  
@@ -223,10 +219,10 @@ index 14e52416764..87516e7597a 100644
  /* We have to synchronize on the fd cache mutex so that our calls to receive_fd
   * don't race with theirs. It looks weird, I know.
 diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
-index f4bcda4b473..445c2a4324d 100644
+index db992f3a9ad..bc643558a28 100644
 --- a/dlls/ntdll/unix/sync.c
 +++ b/dlls/ntdll/unix/sync.c
-@@ -1273,6 +1273,13 @@ NTSTATUS WINAPI NtWaitForMultipleObjects( DWORD count, const HANDLE *handles, BO
+@@ -1410,6 +1410,13 @@ NTSTATUS WINAPI NtWaitForMultipleObjects( DWORD count, const HANDLE *handles, BO
  
      if (!count || count > MAXIMUM_WAIT_OBJECTS) return STATUS_INVALID_PARAMETER_1;
  
@@ -241,5 +237,5 @@ index f4bcda4b473..445c2a4324d 100644
      select_op.wait.op = wait_any ? SELECT_WAIT : SELECT_WAIT_ALL;
      for (i = 0; i < count; i++) select_op.wait.handles[i] = wine_server_obj_handle( handles[i] );
 -- 
-2.28.0
+2.33.0
 

patches/eventfd_synchronization/0010-ntdll-Implement-waiting-on-manual-reset-events.patch

@@ -1,28 +1,30 @@
-From 153efcdc01d57fc29c6d1e80eda52f43666b34a6 Mon Sep 17 00:00:00 2001
+From 4a9eff3f22bfe2c6463e3064ec862617d5dd07d7 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 14:57:42 -0500
 Subject: [PATCH] ntdll: Implement waiting on manual-reset events.
 
 ---
- dlls/ntdll/unix/esync.c | 26 ++++++++++++++++++--------
- 1 file changed, 18 insertions(+), 8 deletions(-)
+ dlls/ntdll/unix/esync.c | 27 +++++++++++++++++----------
+ 1 file changed, 17 insertions(+), 10 deletions(-)
 
 diff --git a/dlls/ntdll/unix/esync.c b/dlls/ntdll/unix/esync.c
-index 97d468b2449..d58cb6c1ee2 100644
+index 80eb3773ee4..f4c27796189 100644
 --- a/dlls/ntdll/unix/esync.c
 +++ b/dlls/ntdll/unix/esync.c
-@@ -38,9 +38,7 @@
- #ifdef HAVE_SYS_MMAN_H
- # include <sys/mman.h>
- #endif
--#ifdef HAVE_SYS_POLL_H
--# include <sys/poll.h>
--#endif
-+#include <poll.h>
+@@ -36,12 +36,7 @@
  #ifdef HAVE_SYS_STAT_H
  # include <sys/stat.h>
  #endif
-@@ -483,12 +481,24 @@ NTSTATUS esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_an
+-#ifdef HAVE_POLL_H
+ #include <poll.h>
+-#endif
+-#ifdef HAVE_SYS_POLL_H
+-# include <sys/poll.h>
+-#endif
+ #include <sys/types.h>
+ #include <unistd.h>
+ 
+@@ -481,12 +476,24 @@ NTSTATUS esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_an
                          int64_t value;
                          ssize_t size;
  

patches/eventfd_synchronization/0056-server-Create-esync-file-descriptors-for-console-ser.patch

@@ -1,17 +1,17 @@
-From fb450637e3b533b3dbef8792aa389ca3614bedf3 Mon Sep 17 00:00:00 2001
+From fa9bbbaa8630c4b259e287437a627e226c1c34da Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Sat, 17 Oct 2020 19:13:16 -0500
 Subject: [PATCH] server: Create esync file descriptors for console servers.
 
 ---
- server/console.c | 22 +++++++++++++++++++++-
- 1 file changed, 21 insertions(+), 1 deletion(-)
+ server/console.c | 36 ++++++++++++++++++++++++++++--------
+ 1 file changed, 28 insertions(+), 8 deletions(-)
 
 diff --git a/server/console.c b/server/console.c
-index dd1bf8f4119..887bba4e63c 100644
+index e7c97e99579..98ac09efc3f 100644
 --- a/server/console.c
 +++ b/server/console.c
-@@ -42,6 +42,7 @@
+@@ -41,6 +41,7 @@
  #include "wincon.h"
  #include "winternl.h"
  #include "wine/condrv.h"
@@ -19,10 +19,26 @@ index dd1bf8f4119..887bba4e63c 100644
  
  struct screen_buffer;
  
-@@ -139,11 +140,13 @@ struct console_server
-     int                   busy;        /* flag if server processing an ioctl */
-     int                   term_fd;     /* UNIX terminal fd */
-     struct termios        termios;     /* original termios */
+@@ -131,20 +132,22 @@ struct console_host_ioctl
+ 
+ struct console_server
+ {
+-    struct object         obj;            /* object header */
+-    struct fd            *fd;             /* pseudo-fd for ioctls */
+-    struct console       *console;        /* attached console */
+-    struct list           queue;          /* ioctl queue */
+-    struct list           read_queue;     /* blocking read queue */
++    struct object         obj;         /* object header */
++    struct fd            *fd;          /* pseudo-fd for ioctls */
++    struct console       *console;     /* attached console */
++    struct list           queue;       /* ioctl queue */
++    struct list           read_queue;  /* blocking read queue */
+     unsigned int          busy : 1;       /* flag if server processing an ioctl */
+     unsigned int          once_input : 1; /* flag if input thread has already been requested */
+-    int                   term_fd;        /* UNIX terminal fd */
+-    struct termios        termios;        /* original termios */
++    int                   term_fd;     /* UNIX terminal fd */
++    struct termios        termios;     /* original termios */
 +    int                   esync_fd;
  };
  
@@ -33,7 +49,7 @@ index dd1bf8f4119..887bba4e63c 100644
  static struct fd *console_server_get_fd( struct object *obj );
  static struct object *console_server_lookup_name( struct object *obj, struct unicode_str *name,
                                                  unsigned int attr, struct object *root );
-@@ -158,7 +161,7 @@ static const struct object_ops console_server_ops =
+@@ -159,7 +162,7 @@ static const struct object_ops console_server_ops =
      add_queue,                        /* add_queue */
      remove_queue,                     /* remove_queue */
      console_server_signaled,          /* signaled */
@@ -42,7 +58,7 @@ index dd1bf8f4119..887bba4e63c 100644
      no_satisfied,                     /* satisfied */
      no_signal,                        /* signal */
      console_server_get_fd,            /* get_fd */
-@@ -526,6 +529,8 @@ static void disconnect_console_server( struct console_server *server )
+@@ -597,6 +600,8 @@ static void disconnect_console_server( struct console_server *server )
          list_remove( &call->entry );
          console_host_ioctl_terminate( call, STATUS_CANCELLED );
      }
@@ -51,7 +67,7 @@ index dd1bf8f4119..887bba4e63c 100644
      while (!list_empty( &server->read_queue ))
      {
          struct console_host_ioctl *call = LIST_ENTRY( list_head( &server->read_queue ), struct console_host_ioctl, entry );
-@@ -844,6 +849,13 @@ static int console_server_signaled( struct object *obj, struct wait_queue_entry
+@@ -897,6 +902,13 @@ static int console_server_signaled( struct object *obj, struct wait_queue_entry
      return !server->console || !list_empty( &server->queue );
  }
  
@@ -65,7 +81,7 @@ index dd1bf8f4119..887bba4e63c 100644
  static struct fd *console_server_get_fd( struct object* obj )
  {
      struct console_server *server = (struct console_server*)obj;
-@@ -874,6 +886,10 @@ static struct object *create_console_server( void )
+@@ -928,6 +940,10 @@ static struct object *create_console_server( void )
          return NULL;
      }
      allow_fd_caching(server->fd);
@@ -76,7 +92,7 @@ index dd1bf8f4119..887bba4e63c 100644
  
      return &server->obj;
  }
-@@ -1388,6 +1404,8 @@ DECL_HANDLER(get_next_console_request)
+@@ -1513,6 +1529,8 @@ DECL_HANDLER(get_next_console_request)
          /* set result of previous ioctl */
          ioctl = LIST_ENTRY( list_head( &server->queue ), struct console_host_ioctl, entry );
          list_remove( &ioctl->entry );
@@ -85,7 +101,7 @@ index dd1bf8f4119..887bba4e63c 100644
      }
  
      if (ioctl)
-@@ -1486,6 +1504,8 @@ DECL_HANDLER(get_next_console_request)
+@@ -1598,6 +1616,8 @@ DECL_HANDLER(get_next_console_request)
      {
          set_error( STATUS_PENDING );
      }
@@ -95,5 +111,5 @@ index dd1bf8f4119..887bba4e63c 100644
      release_object( server );
  }
 -- 
-2.29.2
+2.34.1
 

patches/ntdll-DOS_Attributes/0001-ntdll-Implement-retrieving-DOS-attributes-in-fd_-get.patch

@@ -1,4 +1,4 @@
-From 88941e9247f9311f978c60c98f93a149aa9bf0e2 Mon Sep 17 00:00:00 2001
+From 11107a30f5ddc2065d2b254fad2d10bc158a1ebb Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Tue, 19 Aug 2014 22:10:49 -0600
 Subject: [PATCH] ntdll: Implement retrieving DOS attributes in
@@ -10,10 +10,10 @@ Subject: [PATCH] ntdll: Implement retrieving DOS attributes in
  2 files changed, 50 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index f0762e107f3..714af889bc6 100644
+index d621ae6e712..3ddff238d74 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -90,6 +90,7 @@ AC_ARG_WITH(usb,       AS_HELP_STRING([--without-usb],[do not use the libusb lib
+@@ -65,6 +65,7 @@ AC_ARG_WITH(usb,       AS_HELP_STRING([--without-usb],[do not use the libusb lib
  AC_ARG_WITH(v4l2,      AS_HELP_STRING([--without-v4l2],[do not use v4l2 (video capture)]))
  AC_ARG_WITH(vkd3d,     AS_HELP_STRING([--without-vkd3d],[do not use vkd3d (Direct3D 12 support)]))
  AC_ARG_WITH(vulkan,    AS_HELP_STRING([--without-vulkan],[do not use Vulkan]))
@@ -21,8 +21,8 @@ index f0762e107f3..714af889bc6 100644
  AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]),
              [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi])
  AC_ARG_WITH(xcursor,   AS_HELP_STRING([--without-xcursor],[do not use the Xcursor extension]),
-@@ -697,6 +698,17 @@ AC_CHECK_HEADERS([libprocstat.h],,,
- #include <sys/socket.h>
+@@ -642,6 +643,17 @@ AC_CHECK_HEADERS([libprocstat.h],,,
+ #include <sys/queue.h>
  #endif])
  
 +if test "x$with_xattr" != "xno"
@@ -40,10 +40,10 @@ index f0762e107f3..714af889bc6 100644
  
  AC_SUBST(DLLFLAGS,"")
 diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
-index e6f813966a5..9addefe92f4 100644
+index e459087af76..0b6e5d3b6a7 100644
 --- a/dlls/ntdll/unix/file.c
 +++ b/dlls/ntdll/unix/file.c
-@@ -108,6 +108,9 @@
+@@ -98,6 +98,9 @@
  #ifdef HAVE_SYS_STATFS_H
  #include <sys/statfs.h>
  #endif
@@ -51,9 +51,9 @@ index e6f813966a5..9addefe92f4 100644
 +#include <attr/xattr.h>
 +#endif
  #include <time.h>
- #ifdef HAVE_UNISTD_H
- # include <unistd.h>
-@@ -367,6 +370,20 @@ NTSTATUS errno_to_status( int err )
+ #include <unistd.h>
+ 
+@@ -355,6 +358,20 @@ NTSTATUS errno_to_status( int err )
      }
  }
  
@@ -74,7 +74,7 @@ index e6f813966a5..9addefe92f4 100644
  /* get space from the current directory data buffer, allocating a new one if necessary */
  static void *get_dir_data_space( struct dir_data *data, unsigned int size )
  {
-@@ -1448,6 +1465,22 @@ static BOOL append_entry( struct dir_data *data, const char *long_name,
+@@ -1436,6 +1453,22 @@ static BOOL append_entry( struct dir_data *data, const char *long_name,
  }
  
  
@@ -97,7 +97,7 @@ index e6f813966a5..9addefe92f4 100644
  /* fetch the attributes of a file */
  static inline ULONG get_file_attributes( const struct stat *st )
  {
-@@ -1491,7 +1524,8 @@ static int fd_get_file_info( int fd, unsigned int options, struct stat *st, ULON
+@@ -1479,7 +1512,8 @@ static int fd_get_file_info( int fd, unsigned int options, struct stat *st, ULON
  static int get_file_info( const char *path, struct stat *st, ULONG *attr )
  {
      char *parent_path;
@@ -107,7 +107,7 @@ index e6f813966a5..9addefe92f4 100644
  
      *attr = 0;
      ret = lstat( path, st );
-@@ -1517,6 +1551,9 @@ static int get_file_info( const char *path, struct stat *st, ULONG *attr )
+@@ -1505,6 +1539,9 @@ static int get_file_info( const char *path, struct stat *st, ULONG *attr )
          free( parent_path );
      }
      *attr |= get_file_attributes( st );

patches/ntdll-DOS_Attributes/0005-libport-Add-support-for-Mac-OS-X-style-extended-attr.patch

@@ -1,4 +1,4 @@
-From 65442c83060ee1980900cc5fe38978ef8c29eba4 Mon Sep 17 00:00:00 2001
+From c93462e9ca4529f413b82abaa76b593df9947cc6 Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Mon, 6 Oct 2014 14:21:11 -0600
 Subject: [PATCH] libport: Add support for Mac OS X style extended attributes.
@@ -9,10 +9,10 @@ Subject: [PATCH] libport: Add support for Mac OS X style extended attributes.
  2 files changed, 21 insertions(+), 5 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index cca97ee403b..5e33bfacf91 100644
+index 3ddff238d74..57f76f09b96 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -702,6 +702,9 @@ AC_CHECK_HEADERS([libprocstat.h],,,
+@@ -646,6 +646,9 @@ AC_CHECK_HEADERS([libprocstat.h],,,
  if test "x$with_xattr" != "xno"
  then
      AC_CHECK_HEADERS(attr/xattr.h, [HAVE_XATTR=1])
@@ -23,10 +23,10 @@ index cca97ee403b..5e33bfacf91 100644
  if test "x$with_xattr" = "xyes"
  then
 diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
-index a72d95f8378..5e0ac914e1c 100644
+index 6f33d2c748f..d4cb708336c 100644
 --- a/dlls/ntdll/unix/file.c
 +++ b/dlls/ntdll/unix/file.c
-@@ -106,7 +106,10 @@
+@@ -99,7 +99,10 @@
  #include <sys/statfs.h>
  #endif
  #ifdef HAVE_ATTR_XATTR_H
@@ -36,8 +36,8 @@ index a72d95f8378..5e0ac914e1c 100644
 +#include <sys/xattr.h>
  #endif
  #include <time.h>
- #ifdef HAVE_UNISTD_H
-@@ -378,7 +381,9 @@ NTSTATUS errno_to_status( int err )
+ #include <unistd.h>
+@@ -364,7 +367,9 @@ NTSTATUS errno_to_status( int err )
  
  static int xattr_fremove( int filedes, const char *name )
  {
@@ -48,7 +48,7 @@ index a72d95f8378..5e0ac914e1c 100644
      return fremovexattr( filedes, name );
  #else
      errno = ENOSYS;
-@@ -388,7 +393,9 @@ static int xattr_fremove( int filedes, const char *name )
+@@ -374,7 +379,9 @@ static int xattr_fremove( int filedes, const char *name )
  
  static int xattr_fset( int filedes, const char *name, void *value, size_t size )
  {
@@ -59,7 +59,7 @@ index a72d95f8378..5e0ac914e1c 100644
      return fsetxattr( filedes, name, value, size, 0 );
  #else
      errno = ENOSYS;
-@@ -398,7 +405,9 @@ static int xattr_fset( int filedes, const char *name, void *value, size_t size )
+@@ -384,7 +391,9 @@ static int xattr_fset( int filedes, const char *name, void *value, size_t size )
  
  static int xattr_get( const char *path, const char *name, void *value, size_t size )
  {
@@ -70,7 +70,7 @@ index a72d95f8378..5e0ac914e1c 100644
      return getxattr( path, name, value, size );
  #else
      errno = ENOSYS;
-@@ -408,7 +417,9 @@ static int xattr_get( const char *path, const char *name, void *value, size_t si
+@@ -394,7 +403,9 @@ static int xattr_get( const char *path, const char *name, void *value, size_t si
  
  static int xattr_remove( const char *path, const char *name )
  {
@@ -81,7 +81,7 @@ index a72d95f8378..5e0ac914e1c 100644
      return removexattr( path, name );
  #else
      errno = ENOSYS;
-@@ -418,7 +429,9 @@ static int xattr_remove( const char *path, const char *name )
+@@ -404,7 +415,9 @@ static int xattr_remove( const char *path, const char *name )
  
  static int xattr_set( const char *path, const char *name, void *value, size_t size )
  {
@@ -93,5 +93,5 @@ index a72d95f8378..5e0ac914e1c 100644
  #else
      errno = ENOSYS;
 -- 
-2.28.0
+2.33.0
 

patches/ntdll-DOS_Attributes/0006-libport-Add-support-for-FreeBSD-style-extended-attri.patch

@@ -1,4 +1,4 @@
-From e7dacaafcbdef04a9cabfdb645497f89d19ca781 Mon Sep 17 00:00:00 2001
+From 691c8c2dfe1c14d968cf91f2356d4fca0611d579 Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Mon, 6 Oct 2014 14:26:24 -0600
 Subject: [PATCH] ntdll: Add support for FreeBSD style extended attributes.
@@ -9,10 +9,10 @@ Subject: [PATCH] ntdll: Add support for FreeBSD style extended attributes.
  2 files changed, 38 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index f964230858e..a37b314a063 100644
+index 57f76f09b96..b99be0623b9 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -689,7 +689,7 @@ AC_CHECK_HEADERS([libprocstat.h],,,
+@@ -645,7 +645,7 @@ AC_CHECK_HEADERS([libprocstat.h],,,
  
  if test "x$with_xattr" != "xno"
  then
@@ -22,10 +22,10 @@ index f964230858e..a37b314a063 100644
          [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/xattr.h>]], [[getxattr("", "", "", 0, 0, 0);]])],
              [AC_DEFINE(XATTR_ADDITIONAL_OPTIONS, 1, [Define if xattr functions take additional arguments (Mac OS X)])])])
 diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
-index 301241e2edd..4ccc74c300a 100644
+index d4cb708336c..63fff5f7697 100644
 --- a/dlls/ntdll/unix/file.c
 +++ b/dlls/ntdll/unix/file.c
-@@ -114,6 +114,10 @@
+@@ -104,6 +104,10 @@
  #elif defined(HAVE_SYS_XATTR_H)
  #include <sys/xattr.h>
  #endif
@@ -34,9 +34,9 @@ index 301241e2edd..4ccc74c300a 100644
 +#include <sys/extattr.h>
 +#endif
  #include <time.h>
- #ifdef HAVE_UNISTD_H
- # include <unistd.h>
-@@ -381,6 +385,21 @@ NTSTATUS errno_to_status( int err )
+ #include <unistd.h>
+ 
+@@ -364,6 +368,21 @@ NTSTATUS errno_to_status( int err )
  #ifndef XATTR_USER_PREFIX
  #define XATTR_USER_PREFIX "user."
  #endif
@@ -58,7 +58,7 @@ index 301241e2edd..4ccc74c300a 100644
  
  static int xattr_fremove( int filedes, const char *name )
  {
-@@ -388,6 +407,9 @@ static int xattr_fremove( int filedes, const char *name )
+@@ -371,6 +390,9 @@ static int xattr_fremove( int filedes, const char *name )
      return fremovexattr( filedes, name, 0 );
  #elif defined(HAVE_SYS_XATTR_H) || defined(HAVE_ATTR_XATTR_H)
      return fremovexattr( filedes, name );
@@ -68,7 +68,7 @@ index 301241e2edd..4ccc74c300a 100644
  #else
      errno = ENOSYS;
      return -1;
-@@ -400,6 +422,10 @@ static int xattr_fset( int filedes, const char *name, void *value, size_t size )
+@@ -383,6 +405,10 @@ static int xattr_fset( int filedes, const char *name, void *value, size_t size )
      return fsetxattr( filedes, name, value, size, 0, 0 );
  #elif defined(HAVE_SYS_XATTR_H) || defined(HAVE_ATTR_XATTR_H)
      return fsetxattr( filedes, name, value, size, 0 );
@@ -79,7 +79,7 @@ index 301241e2edd..4ccc74c300a 100644
  #else
      errno = ENOSYS;
      return -1;
-@@ -412,6 +438,10 @@ static int xattr_get( const char *path, const char *name, void *value, size_t si
+@@ -395,6 +421,10 @@ static int xattr_get( const char *path, const char *name, void *value, size_t si
      return getxattr( path, name, value, size, 0, 0 );
  #elif defined(HAVE_SYS_XATTR_H) || defined(HAVE_ATTR_XATTR_H)
      return getxattr( path, name, value, size );
@@ -90,7 +90,7 @@ index 301241e2edd..4ccc74c300a 100644
  #else
      errno = ENOSYS;
      return -1;
-@@ -424,6 +454,9 @@ static int xattr_remove( const char *path, const char *name )
+@@ -407,6 +437,9 @@ static int xattr_remove( const char *path, const char *name )
      return removexattr( path, name, 0 );
  #elif defined(HAVE_SYS_XATTR_H) || defined(HAVE_ATTR_XATTR_H)
      return removexattr( path, name );
@@ -100,7 +100,7 @@ index 301241e2edd..4ccc74c300a 100644
  #else
      errno = ENOSYS;
      return -1;
-@@ -436,6 +469,10 @@ static int xattr_set( const char *path, const char *name, void *value, size_t si
+@@ -419,6 +452,10 @@ static int xattr_set( const char *path, const char *name, void *value, size_t si
      return setxattr( path, name, value, size, 0, 0 );
  #elif defined(HAVE_SYS_XATTR_H) || defined(HAVE_ATTR_XATTR_H)
      return setxattr( path, name, value, size, 0 );
@@ -112,5 +112,5 @@ index 301241e2edd..4ccc74c300a 100644
      errno = ENOSYS;
      return -1;
 -- 
-2.29.2
+2.33.0
 

patches/ntdll-Serial_Port_Detection/0001-ntdll-Do-a-device-check-before-returning-a-default-s.patch

@@ -1,4 +1,4 @@
-From 6417963f31677985e181baaa61297671cdf26543 Mon Sep 17 00:00:00 2001
+From 6684c0f0f73c1664c923ba150e1cb663704d8991 Mon Sep 17 00:00:00 2001
 From: Alex Henrie <alexhenrie24@gmail.com>
 Date: Tue, 29 Dec 2015 00:48:02 -0700
 Subject: [PATCH] mountmgr.sys: Do a device check before returning a default
@@ -7,9 +7,9 @@ Subject: [PATCH] mountmgr.sys: Do a device check before returning a default
 Fixes https://bugs.winehq.org/show_bug.cgi?id=39793
 ---
  dlls/mountmgr.sys/device.c  |  2 +-
- dlls/mountmgr.sys/unixlib.c | 24 ++++++++++++++++++++++++
+ dlls/mountmgr.sys/unixlib.c | 22 ++++++++++++++++++++++
  dlls/mountmgr.sys/unixlib.h |  1 +
- 3 files changed, 26 insertions(+), 1 deletion(-)
+ 3 files changed, 24 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c
 index 8c2808bb643..57ae874b247 100644
@@ -25,20 +25,18 @@ index 8c2808bb643..57ae874b247 100644
      /* create DOS device */
      if (MOUNTMGR_CALL( set_dosdev_symlink, &params )) return FALSE;
 diff --git a/dlls/mountmgr.sys/unixlib.c b/dlls/mountmgr.sys/unixlib.c
-index 73735c22d13..5f720c29bd5 100644
+index 73735c22d13..f83f7104d82 100644
 --- a/dlls/mountmgr.sys/unixlib.c
 +++ b/dlls/mountmgr.sys/unixlib.c
-@@ -46,6 +46,9 @@
+@@ -46,6 +46,7 @@
  #ifdef HAVE_SYS_MOUNT_H
  #include <sys/mount.h>
  #endif
-+#ifdef HAVE_TERMIOS_H
-+# include <termios.h>
-+#endif
++#include <termios.h>
  
  #include "unixlib.h"
  
-@@ -268,6 +271,27 @@ static NTSTATUS set_dosdev_symlink( void *args )
+@@ -268,6 +269,27 @@ static NTSTATUS set_dosdev_symlink( void *args )
      char *path;
      NTSTATUS status = STATUS_SUCCESS;
  

patches/ntdll-Syscall_Emulation/0001-ntdll-Support-x86_64-syscall-emulation.patch

@@ -1,4 +1,4 @@
-From 54b37227849cb6e4d214b4a6740d37624e4bb037 Mon Sep 17 00:00:00 2001
+From d7be25a11e01c6f223b39df2fb45cc9f531f6c83 Mon Sep 17 00:00:00 2001
 From: Paul Gofman <pgofman@codeweavers.com>
 Date: Tue, 14 Jul 2020 15:00:34 +0300
 Subject: [PATCH] ntdll: Support x86_64 syscall emulation.
@@ -10,11 +10,11 @@ Subject: [PATCH] ntdll: Support x86_64 syscall emulation.
  3 files changed, 125 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 9af23da03e6..058fea5941d 100644
+index 5a5d88f10b0..7ae43b0c593 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -455,6 +455,7 @@ AC_CHECK_HEADERS(\
- 	linux/joystick.h \
+@@ -448,6 +448,7 @@ AC_CHECK_HEADERS(\
+ 	linux/ioctl.h \
  	linux/major.h \
  	linux/param.h \
 +	linux/seccomp.h \
@@ -22,7 +22,7 @@ index 9af23da03e6..058fea5941d 100644
  	linux/types.h \
  	linux/ucdrom.h \
 diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
-index 4600d079536..f028a855147 100644
+index 06d99545913..9a46b4a50b0 100644
 --- a/dlls/ntdll/unix/signal_x86_64.c
 +++ b/dlls/ntdll/unix/signal_x86_64.c
 @@ -27,11 +27,13 @@
@@ -53,7 +53,7 @@ index 4600d079536..f028a855147 100644
  #define NONAMELESSUNION
  #define NONAMELESSSTRUCT
  #include "ntstatus.h"
-@@ -2422,6 +2431,118 @@ static inline DWORD is_privileged_instr( CONTEXT *context )
+@@ -2432,6 +2441,118 @@ static inline DWORD is_privileged_instr( CONTEXT *context )
      return 0;
  }
  
@@ -172,7 +172,7 @@ index 4600d079536..f028a855147 100644
  
  /***********************************************************************
   *           handle_interrupt
-@@ -3000,6 +3121,7 @@ void signal_init_process(void)
+@@ -3010,6 +3131,7 @@ void signal_init_process(void)
      if (sigaction( SIGSEGV, &sig_act, NULL ) == -1) goto error;
      if (sigaction( SIGILL, &sig_act, NULL ) == -1) goto error;
      if (sigaction( SIGBUS, &sig_act, NULL ) == -1) goto error;
@@ -180,7 +180,7 @@ index 4600d079536..f028a855147 100644
      return;
  
   error:
-@@ -3218,6 +3340,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher,
+@@ -3228,6 +3350,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher,
                     "leaq 0x28(%rsp),%rsi\n\t"      /* first argument */
                     "movq %rcx,%rsp\n\t"
                     "movq 0x00(%rcx),%rax\n\t"
@@ -189,10 +189,10 @@ index 4600d079536..f028a855147 100644
                     "movl %eax,%ebx\n\t"
                     "shrl $8,%ebx\n\t"
 diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c
-index 104397716f1..5f62210f486 100644
+index c876d51f8e6..37f1465a139 100644
 --- a/tools/winebuild/import.c
 +++ b/tools/winebuild/import.c
-@@ -1410,7 +1410,6 @@ static int cmp_link_name( const void *e1, const void *e2 )
+@@ -1366,7 +1366,6 @@ static int cmp_link_name( const void *e1, const void *e2 )
      return strcmp( odp1->link_name, odp2->link_name );
  }
  
@@ -200,7 +200,7 @@ index 104397716f1..5f62210f486 100644
  /* output the functions for system calls */
  void output_syscalls( DLLSPEC *spec )
  {
-@@ -1468,7 +1467,7 @@ void output_syscalls( DLLSPEC *spec )
+@@ -1424,7 +1423,7 @@ void output_syscalls( DLLSPEC *spec )
               * validate that instruction, we can just put a jmp there instead. */
              output( "\t.byte 0x4c,0x8b,0xd1\n" ); /* movq %rcx,%r10 */
              output( "\t.byte 0xb8\n" );           /* movl $i,%eax */

patches/ntdll-ext4-case-folder/0002-ntdll-server-Mark-drive_c-as-case-insensitive-when-c.patch

@@ -1,4 +1,4 @@
-From 627618459891aa36fc9a9ac0c04b7035d2272fb1 Mon Sep 17 00:00:00 2001
+From 31cfae4fcd5b142a4d1b70ad33159c3bddd42181 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Gabriel=20Iv=C4=83ncescu?= <gabrielopcode@gmail.com>
 Date: Fri, 24 May 2019 15:09:35 +0300
 Subject: [PATCH] ntdll/server: Mark drive_c as case-insensitive when created
@@ -13,12 +13,12 @@ Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
  1 file changed, 45 insertions(+)
 
 diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c
-index 8dc3f33bc80..0e6c9d90281 100644
+index 0952b54f4ef..f998ce35dd0 100644
 --- a/dlls/ntdll/unix/server.c
 +++ b/dlls/ntdll/unix/server.c
-@@ -55,6 +55,12 @@
- #ifdef HAVE_SYS_MMAN_H
- #include <sys/mman.h>
+@@ -49,6 +49,12 @@
+ #ifdef HAVE_SYS_UN_H
+ #include <sys/un.h>
  #endif
 +#ifdef HAVE_SYS_IOCTL_H
 +#include <sys/ioctl.h>
@@ -29,7 +29,7 @@ index 8dc3f33bc80..0e6c9d90281 100644
  #ifdef HAVE_SYS_PRCTL_H
  # include <sys/prctl.h>
  #endif
-@@ -93,6 +99,22 @@
+@@ -83,6 +89,22 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(server);
  
@@ -52,7 +52,7 @@ index 8dc3f33bc80..0e6c9d90281 100644
  #ifndef MSG_CMSG_CLOEXEC
  #define MSG_CMSG_CLOEXEC 0
  #endif
-@@ -729,6 +751,28 @@ static const char *init_server_dir( dev_t dev, ino_t ino )
+@@ -1140,6 +1162,28 @@ static const char *init_server_dir( dev_t dev, ino_t ino )
  }
  
  
@@ -81,7 +81,7 @@ index 8dc3f33bc80..0e6c9d90281 100644
  /***********************************************************************
   *           setup_config_dir
   *
-@@ -765,6 +809,7 @@ static int setup_config_dir(void)
+@@ -1176,6 +1220,7 @@ static int setup_config_dir(void)
      if (!mkdir( "dosdevices", 0777 ))
      {
          mkdir( "drive_c", 0777 );
@@ -90,5 +90,5 @@ index 8dc3f33bc80..0e6c9d90281 100644
          symlink( "/", "dosdevices/z:" );
      }
 -- 
-2.26.2
+2.33.0
 

patches/patchinstall.sh

@@ -51,13 +51,13 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "3f6102080e632b9f4d8a97c0f0b1231fbd8e759b"
+	echo "2f5f8b4bd4cb5771223d1ee96a55002d18ad01eb"
 }
 
 # Show version information
 version()
 {
-	echo "Wine Staging 6.23"
+	echo "Wine Staging 7.0-rc2"
 	echo "Copyright (C) 2014-2019 the Wine Staging project authors."
 	echo "Copyright (C) 2018-2020 Alistair Leslie-Hughes"
 	echo ""
@@ -205,7 +205,6 @@ patch_enable_all ()
 	enable_user32_Dialog_Paint_Event="$1"
 	enable_user32_DrawTextExW="$1"
 	enable_user32_FlashWindowEx="$1"
-	enable_user32_GetSystemMetrics="$1"
 	enable_user32_Implement_CascadeWindows="$1"
 	enable_user32_LR_LOADFROMFILE="$1"
 	enable_user32_ListBox_Size="$1"
@@ -644,9 +643,6 @@ patch_enable ()
 		user32-FlashWindowEx)
 			enable_user32_FlashWindowEx="$2"
 			;;
-		user32-GetSystemMetrics)
-			enable_user32_GetSystemMetrics="$2"
-			;;
 		user32-Implement-CascadeWindows)
 			enable_user32_Implement_CascadeWindows="$2"
 			;;
@@ -3209,18 +3205,6 @@ if test "$enable_user32_FlashWindowEx" -eq 1; then
 	patch_apply user32-FlashWindowEx/0001-user32-Improve-FlashWindowEx-message-and-return-valu.patch
 fi
 
-# Patchset user32-GetSystemMetrics
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#18732] Make it possible to change media center / tablet pc status
-# |
-# | Modified files:
-# |   *	dlls/user32/sysparams.c
-# |
-if test "$enable_user32_GetSystemMetrics" -eq 1; then
-	patch_apply user32-GetSystemMetrics/0001-user32-Allow-changing-the-tablet-media-center-status.patch
-fi
-
 # Patchset user32-Implement-CascadeWindows
 # |
 # | This patchset fixes the following Wine bugs:

patches/secur32-InitializeSecurityContextW/0001-secur32-Input-Parameter-should-be-NULL-on-first-call.patch

@@ -1,4 +1,4 @@
-From e229a4497bcfd9649ddfdb2d77f06b03f6e7b97f Mon Sep 17 00:00:00 2001
+From 3b7ee6a45c7b33aeccc9ccf7460d1e4d69cc7023 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Wed, 21 Apr 2021 21:06:55 +1000
 Subject: [PATCH] secur32: Input Parameter should be NULL on first call to
@@ -13,10 +13,10 @@ Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c
-index 895364a3fc7..58d40cfb3eb 100644
+index 32181b3b35f..bca15750bc9 100644
 --- a/dlls/secur32/schannel.c
 +++ b/dlls/secur32/schannel.c
-@@ -915,7 +915,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW(
+@@ -724,7 +724,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW(
          ptsExpiry->HighPart = 0;
      }
  
@@ -24,7 +24,7 @@ index 895364a3fc7..58d40cfb3eb 100644
 +    if (!phContext || (phNewContext && !pInput))
      {
          ULONG_PTR handle;
- 
+         struct create_session_params create_params;
 diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c
 index 7cb3871193c..27381d60b38 100644
 --- a/dlls/secur32/tests/schannel.c

patches/user32-GetSystemMetrics/definition

@@ -1 +1,2 @@
 Fixes: [18732] Make it possible to change media center / tablet pc status
+Disabled: True

patches/winex11-CandidateWindowPos/0001-winex11.drv-Update-a-candidate-window-s-position-wit.patch

@@ -1,4 +1,4 @@
-From c4ea95ba65062d383c7635ce79bea2e21ca1ef8a Mon Sep 17 00:00:00 2001
+From 496ea7a4273c2f33bce0035063c21a28027b1523 Mon Sep 17 00:00:00 2001
 From: Felix Yan <felixonmars@gmail.com>
 Date: Tue, 23 Sep 2014 23:22:17 +0800
 Subject: [PATCH] winex11.drv: Update a candidate window's position with
@@ -19,12 +19,12 @@ received a lot of help from Sebastian Lackner.
 ---
  dlls/user32/caret.c       |  4 +++
  dlls/user32/driver.c      |  7 ++++
- dlls/win32u/driver.c      |  5 +++
+ dlls/win32u/driver.c      |  7 ++++
  dlls/winex11.drv/init.c   |  1 +
  dlls/winex11.drv/x11drv.h |  1 +
  dlls/winex11.drv/xim.c    | 72 ++++++++++++++++++++++++++++++++++++++-
- include/wine/gdi_driver.h |  2 ++
- 7 files changed, 91 insertions(+), 1 deletion(-)
+ include/wine/gdi_driver.h |  5 +++
+ 7 files changed, 96 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/user32/caret.c b/dlls/user32/caret.c
 index 2da7e02ca1a..1dd3ff29de4 100644
@@ -56,10 +56,10 @@ index 2da7e02ca1a..1dd3ff29de4 100644
      }
      return ret;
 diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c
-index 9ff676aca22..747e1d55533 100644
+index 73f4ee67257..ffcf8d264a1 100644
 --- a/dlls/user32/driver.c
 +++ b/dlls/user32/driver.c
-@@ -321,6 +321,11 @@ static BOOL CDECL loaderdrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDW
+@@ -364,6 +364,11 @@ static BOOL CDECL loaderdrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDW
      return load_driver()->pUpdateLayeredWindow( hwnd, info, window_rect );
  }
  
@@ -71,46 +71,53 @@ index 9ff676aca22..747e1d55533 100644
  static struct user_driver_funcs lazy_load_driver =
  {
      { NULL },
-@@ -373,6 +378,8 @@ static struct user_driver_funcs lazy_load_driver =
-     nulldrv_WindowPosChanged,
-     /* system parameters */
-     nulldrv_SystemParametersInfo,
+@@ -416,6 +421,8 @@ static struct user_driver_funcs lazy_load_driver =
+     NULL,
+     /* vulkan support */
+     NULL,
 +    /* candidate pos functions */
 +    loaderdrv_UpdateCandidatePos,
      /* thread management */
      nulldrv_ThreadDetach
  };
 diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c
-index 93c2ff1da4c..f63da32561a 100644
+index 405dbf38e11..f52a2240e59 100644
 --- a/dlls/win32u/driver.c
 +++ b/dlls/win32u/driver.c
-@@ -991,6 +991,10 @@ static BOOL CDECL nulldrv_SystemParametersInfo( UINT action, UINT int_param, voi
+@@ -930,11 +930,17 @@ static BOOL CDECL nulldrv_SystemParametersInfo( UINT action, UINT int_param, voi
      return FALSE;
  }
  
++
+ static const struct vulkan_funcs * CDECL nulldrv_wine_get_vulkan_driver( UINT version )
+ {
+     return NULL;
+ }
+ 
 +static void CDECL nulldrv_UpdateCandidatePos( HWND hwnd, const RECT *caret_rect )
 +{
++
 +}
 +
  static void CDECL nulldrv_ThreadDetach( void )
  {
  }
-@@ -1129,6 +1133,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver
-     SET_USER_FUNC(WindowPosChanging);
+@@ -1098,6 +1104,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver
      SET_USER_FUNC(WindowPosChanged);
      SET_USER_FUNC(SystemParametersInfo);
+     SET_USER_FUNC(wine_get_vulkan_driver);
 +    SET_USER_FUNC(UpdateCandidatePos);
      SET_USER_FUNC(ThreadDetach);
  #undef SET_USER_FUNC
  
 diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c
-index 1a86836b9c1..d9bdd2b6e3f 100644
+index 1f0549e4d39..7ed3ef7183c 100644
 --- a/dlls/winex11.drv/init.c
 +++ b/dlls/winex11.drv/init.c
-@@ -429,6 +429,7 @@ static const struct user_driver_funcs x11drv_funcs =
-     .pWindowPosChanging = X11DRV_WindowPosChanging,
+@@ -422,6 +422,7 @@ static const struct user_driver_funcs x11drv_funcs =
      .pWindowPosChanged = X11DRV_WindowPosChanged,
      .pSystemParametersInfo = X11DRV_SystemParametersInfo,
+     .pwine_get_vulkan_driver = X11DRV_wine_get_vulkan_driver,
 +    .pUpdateCandidatePos = X11DRV_UpdateCandidatePos,
      .pThreadDetach = X11DRV_ThreadDetach,
  };
@@ -231,15 +238,20 @@ index 3994c2106cc..ec943dcd623 100644
      return xic;
  }
 diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h
-index b8e088282e5..dcf11f240d4 100644
+index 567a6c21608..ff92d097f7d 100644
 --- a/include/wine/gdi_driver.h
 +++ b/include/wine/gdi_driver.h
-@@ -322,6 +322,8 @@ struct user_driver_funcs
+@@ -319,8 +319,13 @@ struct user_driver_funcs
                                         const RECT *,struct window_surface*);
      /* system parameters */
      BOOL    (CDECL *pSystemParametersInfo)(UINT,UINT,void*,UINT);
++
+     /* vulkan support */
+     const struct vulkan_funcs * (CDECL *pwine_get_vulkan_driver)(UINT);
++
 +    /* IME functions */
 +    void    (CDECL *pUpdateCandidatePos)(HWND, const RECT *);
++
      /* thread management */
      void    (CDECL *pThreadDetach)(void);
  };

patches/winex11-_NET_ACTIVE_WINDOW/0001-winex11.drv-Add-support-for-_NET_ACTIVE_WINDOW.patch

@@ -1,4 +1,4 @@
-From 69c2c3be2a4789a8065866f63dd65997e1d6c4cb Mon Sep 17 00:00:00 2001
+From 0ec817b88c5aadb3afe4dcaec32359a80296dbf5 Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Wed, 10 Feb 2016 15:09:29 +0800
 Subject: [PATCH] winex11.drv: Add support for _NET_ACTIVE_WINDOW. (v2)
@@ -15,14 +15,14 @@ For bug #2155.
  dlls/winex11.drv/window.c      | 48 ++++++++++++++++++++++++++++++++++
  dlls/winex11.drv/x11drv.h      |  3 +++
  dlls/winex11.drv/x11drv_main.c |  1 +
- include/wine/gdi_driver.h      |  3 ++-
- 9 files changed, 72 insertions(+), 1 deletion(-)
+ include/wine/gdi_driver.h      |  1 +
+ 9 files changed, 71 insertions(+)
 
 diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c
-index cb30ca942e5..28d77e99256 100644
+index ffcf8d264a1..86444d8a831 100644
 --- a/dlls/user32/driver.c
 +++ b/dlls/user32/driver.c
-@@ -153,6 +153,10 @@ static void CDECL nulldrv_ReleaseDC( HWND hwnd, HDC hdc )
+@@ -208,6 +208,10 @@ static void CDECL nulldrv_ReleaseDC( HWND hwnd, HDC hdc )
  {
  }
  
@@ -33,7 +33,7 @@ index cb30ca942e5..28d77e99256 100644
  static void CDECL nulldrv_SetCapture( HWND hwnd, UINT flags )
  {
  }
-@@ -339,6 +343,7 @@ static struct user_driver_funcs lazy_load_driver =
+@@ -403,6 +407,7 @@ static struct user_driver_funcs lazy_load_driver =
      nulldrv_MsgWaitForMultipleObjectsEx,
      nulldrv_ReleaseDC,
      NULL,
@@ -55,10 +55,10 @@ index 775a8f428c1..bd6d12cd355 100644
      if (focus)
      {
 diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c
-index e9b3781f461..10a3fce2585 100644
+index f52a2240e59..bac29683ca4 100644
 --- a/dlls/win32u/driver.c
 +++ b/dlls/win32u/driver.c
-@@ -896,6 +896,10 @@ static BOOL CDECL nulldrv_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update )
+@@ -858,6 +858,10 @@ static BOOL CDECL nulldrv_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update )
                          hdc, rect.left - dx, rect.top - dy, SRCCOPY, 0, 0 );
  }
  
@@ -69,7 +69,7 @@ index e9b3781f461..10a3fce2585 100644
  static void CDECL nulldrv_SetCapture( HWND hwnd, UINT flags )
  {
  }
-@@ -1106,6 +1110,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver
+@@ -1088,6 +1092,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver
      SET_USER_FUNC(MsgWaitForMultipleObjectsEx);
      SET_USER_FUNC(ReleaseDC);
      SET_USER_FUNC(ScrollDC);
@@ -101,10 +101,10 @@ index 6a4f3b5db08..50cb77037c1 100644
             Foreground window, because in most cases the messages sent
             above must have already changed the foreground window, in which
 diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c
-index d9bdd2b6e3f..9b4ec242ec8 100644
+index 7ed3ef7183c..75884022107 100644
 --- a/dlls/winex11.drv/init.c
 +++ b/dlls/winex11.drv/init.c
-@@ -413,6 +413,7 @@ static const struct user_driver_funcs x11drv_funcs =
+@@ -405,6 +405,7 @@ static const struct user_driver_funcs x11drv_funcs =
      .pMsgWaitForMultipleObjectsEx = X11DRV_MsgWaitForMultipleObjectsEx,
      .pReleaseDC = X11DRV_ReleaseDC,
      .pScrollDC = X11DRV_ScrollDC,
@@ -212,19 +212,10 @@ index bdd458182af..f775c2aa89b 100644
      "_NET_STARTUP_INFO",
      "_NET_SUPPORTED",
 diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h
-index dd58e625801..97c3b0a4320 100644
+index ff92d097f7d..17ba60e0307 100644
 --- a/include/wine/gdi_driver.h
 +++ b/include/wine/gdi_driver.h
-@@ -167,7 +167,7 @@ struct gdi_dc_funcs
- };
- 
- /* increment this when you change the DC function table */
--#define WINE_GDI_DRIVER_VERSION 73
-+#define WINE_GDI_DRIVER_VERSION 74
- 
- #define GDI_PRIORITY_NULL_DRV        0  /* null driver */
- #define GDI_PRIORITY_FONT_DRV      100  /* any font driver */
-@@ -302,6 +302,7 @@ struct user_driver_funcs
+@@ -301,6 +301,7 @@ struct user_driver_funcs
      DWORD   (CDECL *pMsgWaitForMultipleObjectsEx)(DWORD,const HANDLE*,DWORD,DWORD,DWORD);
      void    (CDECL *pReleaseDC)(HWND,HDC);
      BOOL    (CDECL *pScrollDC)(HDC,INT,INT,HRGN);

staging/VERSION

@@ -1 +1 @@
-Wine Staging 6.23
+Wine Staging 7.0-rc2