From d6ac81a83b47987a8513adacdf6778038e82d203 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Fri, 27 Jan 2023 10:39:34 +1100
Subject: [PATCH] Rebase against aabdb15458aaee80b157175bc31cbaf3d57bf5e4.

---
 ...ts-Add-basic-tests-for-RtlQueryPackageIdent.patch | 12 ++++++------
 patches/patchinstall.sh                              |  2 +-
 staging/upstream-commit                              |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/patches/ntdll-RtlQueryPackageIdentity/0003-ntdll-tests-Add-basic-tests-for-RtlQueryPackageIdent.patch b/patches/ntdll-RtlQueryPackageIdentity/0003-ntdll-tests-Add-basic-tests-for-RtlQueryPackageIdent.patch
index 62887e1f..34873602 100644
--- a/patches/ntdll-RtlQueryPackageIdentity/0003-ntdll-tests-Add-basic-tests-for-RtlQueryPackageIdent.patch
+++ b/patches/ntdll-RtlQueryPackageIdentity/0003-ntdll-tests-Add-basic-tests-for-RtlQueryPackageIdent.patch
@@ -1,4 +1,4 @@
-From 7e1c63548513ec95978c5cbc428555ac5ed7c1d2 Mon Sep 17 00:00:00 2001
+From 3c8ddcd9f29524479004800c91a39ec04456bd08 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 17 Jan 2016 00:50:50 +0100
 Subject: [PATCH] ntdll/tests: Add basic tests for RtlQueryPackageIdentity.
@@ -20,7 +20,7 @@ index 90deb5865f8..428ebde23b3 100644
  C_SRCS = \
  	atom.c \
 diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c
-index 1e5e8c2580c..3690402c268 100644
+index a7c43a46e07..9088d222b47 100644
 --- a/dlls/ntdll/tests/rtl.c
 +++ b/dlls/ntdll/tests/rtl.c
 @@ -28,6 +28,9 @@
@@ -53,7 +53,7 @@ index 1e5e8c2580c..3690402c268 100644
          pLdrRegisterDllNotification = (void *)GetProcAddress(hntdll, "LdrRegisterDllNotification");
          pLdrUnregisterDllNotification = (void *)GetProcAddress(hntdll, "LdrUnregisterDllNotification");
      }
-@@ -3775,6 +3784,76 @@ static void test_RtlFirstFreeAce(void)
+@@ -3788,6 +3797,76 @@ static void test_RtlFirstFreeAce(void)
      HeapFree(GetProcessHeap(), 0, acl);
  }
  
@@ -127,10 +127,10 @@ index 1e5e8c2580c..3690402c268 100644
 +    CoUninitialize();
 +}
 +
- START_TEST(rtl)
+ static void test_TlsIndex(void)
  {
-     InitFunctionPtrs();
-@@ -3814,6 +3893,7 @@ START_TEST(rtl)
+     LIST_ENTRY *root = &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList;
+@@ -3852,6 +3931,7 @@ START_TEST(rtl)
      test_RtlInitializeCriticalSectionEx();
      test_RtlLeaveCriticalSection();
      test_LdrEnumerateLoadedModules();
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 2e254e51..66f8ff78 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "876742bf2bf23765cd8a845a20b297cdf7803c67"
+	echo "aabdb15458aaee80b157175bc31cbaf3d57bf5e4"
 }
 
 # Show version information
diff --git a/staging/upstream-commit b/staging/upstream-commit
index 27098df7..ec972438 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-876742bf2bf23765cd8a845a20b297cdf7803c67
+aabdb15458aaee80b157175bc31cbaf3d57bf5e4