Rebase against e73bb07ff59d0d0b7925df3d642299689275b0a8.

patches/ntdll-NtAlertThreadByThreadId/0007-ntdll-Reimplement-Win32-futexes-on-top-of-thread-ID-.patch

@@ -1,4 +1,4 @@
-From 683cdfce393f1a4fca23d1520866d3e663a8c60f Mon Sep 17 00:00:00 2001
+From 41d56b3e16cbe1dd59b19eee9faf0d6b3ec9bf8f Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Mon, 7 Jun 2021 16:26:18 -0500
 Subject: [PATCH] ntdll: Reimplement Win32 futexes on top of thread-ID alerts.
@@ -266,10 +266,10 @@ index f1263ae33fd..c0a6e3a729e 100644
 +    if (tid) NtAlertThreadByThreadId( (HANDLE)(DWORD_PTR)tid );
  }
 diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
-index 8720660eb6b..269788bcf91 100644
+index a9645d45653..2504311053b 100644
 --- a/dlls/ntdll/unix/loader.c
 +++ b/dlls/ntdll/unix/loader.c
-@@ -2151,9 +2151,6 @@ static struct unix_funcs unix_funcs =
+@@ -2148,9 +2148,6 @@ static struct unix_funcs unix_funcs =
  #endif
      DbgUiIssueRemoteBreakin,
      RtlGetSystemTimePrecise,
@@ -472,15 +472,15 @@ index 7f5d9a49ef5..43838e593dc 100644
 -    mutex_unlock( &addr_mutex );
 -}
 diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h
-index 4b7c8b45be7..921ceedbdb2 100644
+index d56259deff2..c602e6c9af0 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 126
-+#define NTDLL_UNIXLIB_VERSION 127
+-#define NTDLL_UNIXLIB_VERSION 127
++#define NTDLL_UNIXLIB_VERSION 128
  
  struct unix_funcs
  {

patches/ntdll-NtAlertThreadByThreadId/0009-ntdll-Reimplement-the-critical-section-fast-path-on-.patch

@@ -1,4 +1,4 @@
-From d43977918339fdda79e06331502254eaf456adab Mon Sep 17 00:00:00 2001
+From ce1c07228439555e3cdf5e68298fc7cf542a0ff5 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Mon, 31 Aug 2020 23:38:09 -0500
 Subject: [PATCH] ntdll: Reimplement the critical section fast path on top of
@@ -84,10 +84,10 @@ index db68a466d8a..3a47679bb60 100644
      return ret;
  }
 diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
-index 269788bcf91..5302b7f1638 100644
+index 2504311053b..173e611b018 100644
 --- a/dlls/ntdll/unix/loader.c
 +++ b/dlls/ntdll/unix/loader.c
-@@ -2151,9 +2151,6 @@ static struct unix_funcs unix_funcs =
+@@ -2148,9 +2148,6 @@ static struct unix_funcs unix_funcs =
  #endif
      DbgUiIssueRemoteBreakin,
      RtlGetSystemTimePrecise,
@@ -233,15 +233,15 @@ index 6b8835bcba0..d142fa894b1 100644
  extern NTSTATUS CDECL fast_RtlAcquireSRWLockExclusive( RTL_SRWLOCK *lock ) DECLSPEC_HIDDEN;
  extern NTSTATUS CDECL fast_RtlTryAcquireSRWLockShared( RTL_SRWLOCK *lock ) DECLSPEC_HIDDEN;
 diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h
-index 921ceedbdb2..d86501dfb5e 100644
+index c602e6c9af0..25a624c3e21 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 127
-+#define NTDLL_UNIXLIB_VERSION 128
+-#define NTDLL_UNIXLIB_VERSION 128
++#define NTDLL_UNIXLIB_VERSION 129
  
  struct unix_funcs
  {

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

@@ -1,4 +1,4 @@
-From a90c16005d368581ea802f9fb2780fcb10d23566 Mon Sep 17 00:00:00 2001
+From cde4ea0e9ec950f3f2dd95b3f96cee83b948da3d 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
@@ -81,18 +81,18 @@ index 3a47679bb60..6e68d07b81b 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 5302b7f1638..bb25f50581c 100644
+index 173e611b018..86cd373b21d 100644
 --- a/dlls/ntdll/unix/loader.c
 +++ b/dlls/ntdll/unix/loader.c
-@@ -2157,8 +2157,6 @@ static struct unix_funcs unix_funcs =
+@@ -2154,8 +2154,6 @@ static struct unix_funcs unix_funcs =
      fast_RtlAcquireSRWLockShared,
      fast_RtlReleaseSRWLockExclusive,
      fast_RtlReleaseSRWLockShared,
 -    fast_RtlWakeConditionVariable,
 -    fast_wait_cv,
-     ntdll_atan,
-     ntdll_ceil,
-     ntdll_cos,
+     load_so_dll,
+     init_builtin_dll,
+     init_unix_lib,
 diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
 index 6a636d30f21..f0267c2df1c 100644
 --- a/dlls/ntdll/unix/sync.c
@@ -203,15 +203,15 @@ index d142fa894b1..f192215f32a 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 d86501dfb5e..5b56f1f2cf1 100644
+index 25a624c3e21..51771b1b5d6 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 128
-+#define NTDLL_UNIXLIB_VERSION 129
+-#define NTDLL_UNIXLIB_VERSION 129
++#define NTDLL_UNIXLIB_VERSION 130
  
  struct unix_funcs
  {
@@ -223,8 +223,8 @@ index d86501dfb5e..5b56f1f2cf1 100644
 -    NTSTATUS      (CDECL *fast_wait_cv)( RTL_CONDITION_VARIABLE *variable, const void *value,
 -                                         const LARGE_INTEGER *timeout );
  
-     /* math functions */
-     double        (CDECL *atan)( double d );
+     /* loader functions */
+     NTSTATUS      (CDECL *load_so_dll)( UNICODE_STRING *nt_name, void **module );
 -- 
 2.33.0
 

patches/ntdll-NtAlertThreadByThreadId/0011-ntdll-Reimplement-SRW-locks-on-top-of-Win32-futexes.patch

@@ -1,4 +1,4 @@
-From f032b2f1811e4a13a817b69b1f81fa9171e70502 Mon Sep 17 00:00:00 2001
+From 0c3f702c6a607cec5d8553b27ed9fd35f1864211 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Sun, 22 Nov 2020 20:51:10 -0600
 Subject: [PATCH] ntdll: Reimplement SRW locks on top of Win32 futexes.
@@ -393,10 +393,10 @@ index 6e68d07b81b..e380f3e4e93 100644
  
  /***********************************************************************
 diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
-index bb25f50581c..a8dc128adcf 100644
+index 86cd373b21d..4d3b5593b96 100644
 --- a/dlls/ntdll/unix/loader.c
 +++ b/dlls/ntdll/unix/loader.c
-@@ -2151,12 +2151,6 @@ static struct unix_funcs unix_funcs =
+@@ -2148,12 +2148,6 @@ static struct unix_funcs unix_funcs =
  #endif
      DbgUiIssueRemoteBreakin,
      RtlGetSystemTimePrecise,
@@ -406,9 +406,9 @@ index bb25f50581c..a8dc128adcf 100644
 -    fast_RtlAcquireSRWLockShared,
 -    fast_RtlReleaseSRWLockExclusive,
 -    fast_RtlReleaseSRWLockShared,
-     ntdll_atan,
-     ntdll_ceil,
-     ntdll_cos,
+     load_so_dll,
+     init_builtin_dll,
+     init_unix_lib,
 diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
 index f0267c2df1c..19a499ff2c9 100644
 --- a/dlls/ntdll/unix/sync.c
@@ -764,15 +764,15 @@ index f192215f32a..fc52b7d210e 100644
  
  extern NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispatch,
 diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h
-index 5b56f1f2cf1..a3eaf9a59d0 100644
+index 51771b1b5d6..7a63f6f1ec6 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 129
-+#define NTDLL_UNIXLIB_VERSION 130
+-#define NTDLL_UNIXLIB_VERSION 130
++#define NTDLL_UNIXLIB_VERSION 131
  
  struct unix_funcs
  {
@@ -788,9 +788,9 @@ index 5b56f1f2cf1..a3eaf9a59d0 100644
 -    NTSTATUS      (CDECL *fast_RtlReleaseSRWLockExclusive)( RTL_SRWLOCK *lock );
 -    NTSTATUS      (CDECL *fast_RtlReleaseSRWLockShared)( RTL_SRWLOCK *lock );
 -
-     /* math functions */
-     double        (CDECL *atan)( double d );
-     double        (CDECL *ceil)( double d );
+     /* loader functions */
+     NTSTATUS      (CDECL *load_so_dll)( UNICODE_STRING *nt_name, void **module );
+     void          (CDECL *init_builtin_dll)( void *module );
 -- 
 2.33.0
 

patches/patchinstall.sh

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

staging/upstream-commit

@@ -1 +1 @@
-ababea0fd7036ab13ec17d31afbd584c39f62696
+e73bb07ff59d0d0b7925df3d642299689275b0a8