Rebase against a8583acae9548e6340d8400ec7710136cd061ab2.

patches/ntdll-NtAlertThreadByThreadId/0010-ntdll-Get-rid-of-the-direct-futex-path-for-condition.patch

@@ -1,4 +1,4 @@
-From e1e438f9089561a1fd7e80db9274c720be46b43b Mon Sep 17 00:00:00 2001
+From 16e1eb20e23a8bd8129cf59efef1db06848752ed Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Mon, 31 Aug 2020 23:55:29 -0500
 Subject: [PATCH] ntdll: Get rid of the direct futex path for condition
@@ -10,8 +10,8 @@ Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
  dlls/ntdll/unix/loader.c       |  2 -
  dlls/ntdll/unix/sync.c         | 71 ----------------------------------
  dlls/ntdll/unix/unix_private.h |  3 --
- dlls/ntdll/unixlib.h           |  5 +--
- 5 files changed, 9 insertions(+), 96 deletions(-)
+ dlls/ntdll/unixlib.h           |  3 --
+ 5 files changed, 8 insertions(+), 95 deletions(-)
 
 diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c
 index 6edf104c5e9..4b92379a0ff 100644
@@ -80,10 +80,10 @@ index 6edf104c5e9..4b92379a0ff 100644
      if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED)
          RtlAcquireSRWLockShared( lock );
 diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
-index 3cf19b16c4e..f1767f2b568 100644
+index 9633aaf3966..c2b713597d7 100644
 --- a/dlls/ntdll/unix/loader.c
 +++ b/dlls/ntdll/unix/loader.c
-@@ -1876,8 +1876,6 @@ static struct unix_funcs unix_funcs =
+@@ -2156,8 +2156,6 @@ static struct unix_funcs unix_funcs =
      fast_RtlAcquireSRWLockShared,
      fast_RtlReleaseSRWLockExclusive,
      fast_RtlReleaseSRWLockShared,
@@ -187,10 +187,10 @@ index 42ac52c9704..99be558da12 100644
 -
  #endif
 diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h
-index a5d63e918cc..452eb2790ab 100644
+index b5a0b4121bc..dd13a976a7f 100644
 --- a/dlls/ntdll/unix/unix_private.h
 +++ b/dlls/ntdll/unix/unix_private.h
-@@ -102,10 +102,7 @@ extern NTSTATUS CDECL fast_RtlTryAcquireSRWLockShared( RTL_SRWLOCK *lock ) DECLS
+@@ -108,10 +108,7 @@ extern NTSTATUS CDECL fast_RtlTryAcquireSRWLockShared( RTL_SRWLOCK *lock ) DECLS
  extern NTSTATUS CDECL fast_RtlAcquireSRWLockShared( RTL_SRWLOCK *lock ) DECLSPEC_HIDDEN;
  extern NTSTATUS CDECL fast_RtlReleaseSRWLockExclusive( RTL_SRWLOCK *lock ) DECLSPEC_HIDDEN;
  extern NTSTATUS CDECL fast_RtlReleaseSRWLockShared( RTL_SRWLOCK *lock ) DECLSPEC_HIDDEN;
@@ -202,18 +202,9 @@ index a5d63e918cc..452eb2790ab 100644
  extern NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispatch,
                                            CONTEXT *context ) DECLSPEC_HIDDEN;
 diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h
-index 94e0096089b..9d9842b4072 100644
+index 3834dc78728..f7e9dc0a214 100644
 --- a/dlls/ntdll/unixlib.h
 +++ b/dlls/ntdll/unixlib.h
-@@ -26,7 +26,7 @@
- struct _DISPATCHER_CONTEXT;
- 
- /* increment this when you change the function table */
--#define NTDLL_UNIXLIB_VERSION 125
-+#define NTDLL_UNIXLIB_VERSION 126
- 
- struct unix_funcs
- {
 @@ -46,9 +46,6 @@ struct unix_funcs
      NTSTATUS      (CDECL *fast_RtlAcquireSRWLockShared)( RTL_SRWLOCK *lock );
      NTSTATUS      (CDECL *fast_RtlReleaseSRWLockExclusive)( RTL_SRWLOCK *lock );
@@ -225,5 +216,5 @@ index 94e0096089b..9d9842b4072 100644
      /* math functions */
      double        (CDECL *atan)( double d );
 -- 
-2.30.2
+2.33.0
 

patches/ntdll-Zero_mod_name/0001-ntdll-Initialize-mod_name-to-zero.patch

@@ -1,4 +1,4 @@
-From f15d4797f17e6b45056fd1d211f54d4810c31e67 Mon Sep 17 00:00:00 2001
+From a3c5b5c3650ff03c7be30364af37c4bc146f77d2 Mon Sep 17 00:00:00 2001
 From: Qian Hong <qhong@codeweavers.com>
 Date: Wed, 9 Sep 2015 05:31:18 +0800
 Subject: [PATCH] ntdll: Initialize mod_name to zero.
@@ -8,11 +8,11 @@ Subject: [PATCH] ntdll: Initialize mod_name to zero.
  1 file changed, 2 insertions(+)
 
 diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index f9dd2e8c61a..ba43de24576 100644
+index 60a02fd093c..bf16562be55 100644
 --- a/dlls/ntdll/loader.c
 +++ b/dlls/ntdll/loader.c
-@@ -1424,6 +1424,8 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved
-         init_builtin_dll( wm->ldr.DllBase );
+@@ -1399,6 +1399,8 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved
+         unix_funcs->init_builtin_dll( wm->ldr.DllBase );
      if (!entry) return STATUS_SUCCESS;
  
 +    memset( mod_name, 0, sizeof(mod_name) );
@@ -21,5 +21,5 @@ index f9dd2e8c61a..ba43de24576 100644
      {
          size_t len = min( wm->ldr.BaseDllName.Length, sizeof(mod_name)-sizeof(WCHAR) );
 -- 
-2.30.2
+2.33.0
 

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "0b7f8373e3593ca8e5261d4486f1d04092a15653"
+	echo "a8583acae9548e6340d8400ec7710136cd061ab2"
 }
 
 # Show version information

staging/upstream-commit

@@ -1 +1 @@
-0b7f8373e3593ca8e5261d4486f1d04092a15653
+a8583acae9548e6340d8400ec7710136cd061ab2