Rebase against feb088b2247e1722b848ac0d67483596d33758ba.

patches/ntdll-NtAlertThreadByThreadId/0003-ntdll-Implement-NtAlertThreadByThreadId-and-NtWaitFo.patch

@@ -1,4 +1,4 @@
-From b14229169f51d73f36bd5821388a3ba455ee5c99 Mon Sep 17 00:00:00 2001
+From 4d20defb0e12891e3d85a2f162f152f89cf0447d Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Fri, 30 Apr 2021 15:07:04 -0500
 Subject: [PATCH] ntdll: Implement NtAlertThreadByThreadId and
@@ -12,10 +12,10 @@ Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
  3 files changed, 97 insertions(+)
 
 diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
-index a9cf662a29a..c9cd6fb59fd 100644
+index aad7bd89d14..8544d759587 100644
 --- a/dlls/ntdll/ntdll.spec
 +++ b/dlls/ntdll/ntdll.spec
-@@ -137,6 +137,7 @@
+@@ -138,6 +138,7 @@
  @ stdcall -syscall NtAdjustPrivilegesToken(long long ptr long ptr ptr)
  @ stdcall -syscall NtAlertResumeThread(long ptr)
  @ stdcall -syscall NtAlertThread(long)
@@ -23,16 +23,16 @@ index a9cf662a29a..c9cd6fb59fd 100644
  @ stdcall -syscall NtAllocateLocallyUniqueId(ptr)
  # @ stub NtAllocateUserPhysicalPages
  @ stdcall -syscall NtAllocateUuids(ptr ptr ptr ptr)
-@@ -423,6 +424,7 @@
+@@ -424,6 +425,7 @@
  @ stdcall -syscall NtUnmapViewOfSection(long ptr)
- @ stub NtVdmControl
- @ stub NtW32Call
+ # @ stub NtVdmControl
+ # @ stub NtW32Call
 +@ stdcall -syscall NtWaitForAlertByThreadId(ptr ptr)
  @ stdcall -syscall NtWaitForDebugEvent(long long ptr ptr)
  @ stdcall -syscall NtWaitForKeyedEvent(long ptr long ptr)
  @ stdcall -syscall NtWaitForMultipleObjects(long ptr long long ptr)
 diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
-index 16635ee42fa..014e5e5d0a7 100644
+index d31c5b69015..2dad70be456 100644
 --- a/dlls/ntdll/unix/sync.c
 +++ b/dlls/ntdll/unix/sync.c
 @@ -32,6 +32,9 @@
@@ -45,7 +45,7 @@ index 16635ee42fa..014e5e5d0a7 100644
  #ifdef HAVE_SYS_SYSCALL_H
  #include <sys/syscall.h>
  #endif
-@@ -81,6 +84,12 @@ static const LARGE_INTEGER zero_timeout;
+@@ -82,6 +85,12 @@ static const LARGE_INTEGER zero_timeout;
  
  static pthread_mutex_t addr_mutex = PTHREAD_MUTEX_INITIALIZER;
  
@@ -58,7 +58,7 @@ index 16635ee42fa..014e5e5d0a7 100644
  /* return a monotonic time counter, in Win32 ticks */
  static inline ULONGLONG monotonic_counter(void)
  {
-@@ -2277,6 +2286,90 @@ NTSTATUS WINAPI NtQueryInformationAtom( RTL_ATOM atom, ATOM_INFORMATION_CLASS cl
+@@ -2333,6 +2342,90 @@ NTSTATUS WINAPI NtQueryInformationAtom( RTL_ATOM atom, ATOM_INFORMATION_CLASS cl
  }
  
  
@@ -150,10 +150,10 @@ index 16635ee42fa..014e5e5d0a7 100644
  
  NTSTATUS CDECL fast_RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit, int timeout )
 diff --git a/include/winternl.h b/include/winternl.h
-index 69d0e32f1d4..a6c22a5711d 100644
+index 7a8a977b512..6bb6ad58277 100644
 --- a/include/winternl.h
 +++ b/include/winternl.h
-@@ -3639,6 +3639,7 @@ NTSYSAPI NTSTATUS  WINAPI NtAdjustGroupsToken(HANDLE,BOOLEAN,PTOKEN_GROUPS,ULONG
+@@ -3799,6 +3799,7 @@ NTSYSAPI NTSTATUS  WINAPI NtAdjustGroupsToken(HANDLE,BOOLEAN,PTOKEN_GROUPS,ULONG
  NTSYSAPI NTSTATUS  WINAPI NtAdjustPrivilegesToken(HANDLE,BOOLEAN,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD);
  NTSYSAPI NTSTATUS  WINAPI NtAlertResumeThread(HANDLE,PULONG);
  NTSYSAPI NTSTATUS  WINAPI NtAlertThread(HANDLE ThreadHandle);
@@ -161,7 +161,7 @@ index 69d0e32f1d4..a6c22a5711d 100644
  NTSYSAPI NTSTATUS  WINAPI NtAllocateLocallyUniqueId(PLUID lpLuid);
  NTSYSAPI NTSTATUS  WINAPI NtAllocateUuids(PULARGE_INTEGER,PULONG,PULONG,PUCHAR);
  NTSYSAPI NTSTATUS  WINAPI NtAllocateVirtualMemory(HANDLE,PVOID*,ULONG_PTR,SIZE_T*,ULONG,ULONG);
-@@ -3876,6 +3877,7 @@ NTSYSAPI NTSTATUS  WINAPI NtUnlockFile(HANDLE,PIO_STATUS_BLOCK,PLARGE_INTEGER,PL
+@@ -4036,6 +4037,7 @@ NTSYSAPI NTSTATUS  WINAPI NtUnlockFile(HANDLE,PIO_STATUS_BLOCK,PLARGE_INTEGER,PL
  NTSYSAPI NTSTATUS  WINAPI NtUnlockVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG);
  NTSYSAPI NTSTATUS  WINAPI NtUnmapViewOfSection(HANDLE,PVOID);
  NTSYSAPI NTSTATUS  WINAPI NtVdmControl(ULONG,PVOID);

patches/patchinstall.sh

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

staging/upstream-commit

@@ -1 +1 @@
-d60c450c7be196c2072f74e34f7760d39e3bad32
+feb088b2247e1722b848ac0d67483596d33758ba