From 97a1486fb942251afeaed1f6d1161d606cd85415 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Wed, 29 Nov 2023 14:48:04 +1100
Subject: [PATCH] Rebase against bc13bda5ee4edaafa7ba9472d41acbad50c42112.

---
 ...-basic-tests-for-RtlQueryPackageIdent.patch | 18 +++++++++---------
 staging/upstream-commit                        |  2 +-
 2 files changed, 10 insertions(+), 10 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 9c7f71f0..6588194d 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 fa493586583e4dd534b01b72812c7ab79c0aecca Mon Sep 17 00:00:00 2001
+From cff2c9da12bb4fa89def37d69a6a0cd84af03139 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 3ca77a03053..7508e1ad796 100644
  SOURCES = \
  	atom.c \
 diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c
-index 88f62b0b588..8ca339dde0f 100644
+index 442ad729540..dcdac2a936a 100644
 --- a/dlls/ntdll/tests/rtl.c
 +++ b/dlls/ntdll/tests/rtl.c
 @@ -29,6 +29,9 @@
@@ -33,9 +33,9 @@ index 88f62b0b588..8ca339dde0f 100644
  
  #ifndef __WINE_WINTERNL_H
  
-@@ -96,6 +99,9 @@ static BOOL      (WINAPI *pRtlIsCriticalSectionLocked)(CRITICAL_SECTION *);
- static BOOL      (WINAPI *pRtlIsCriticalSectionLockedByThread)(CRITICAL_SECTION *);
+@@ -97,6 +100,9 @@ static BOOL      (WINAPI *pRtlIsCriticalSectionLockedByThread)(CRITICAL_SECTION
  static NTSTATUS  (WINAPI *pRtlInitializeCriticalSectionEx)(CRITICAL_SECTION *, ULONG, ULONG);
+ static void *    (WINAPI *pRtlFindExportedRoutineByName)(HMODULE,const char *);
  static NTSTATUS  (WINAPI *pLdrEnumerateLoadedModules)(void *, void *, void *);
 +static NTSTATUS  (WINAPI *pRtlQueryPackageIdentity)(HANDLE, WCHAR*, SIZE_T*, WCHAR*, SIZE_T*, BOOLEAN*);
 +static NTSTATUS  (WINAPI *pRtlMakeSelfRelativeSD)(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,LPDWORD);
@@ -43,9 +43,9 @@ index 88f62b0b588..8ca339dde0f 100644
  static NTSTATUS  (WINAPI *pLdrRegisterDllNotification)(ULONG, PLDR_DLL_NOTIFICATION_FUNCTION, void *, void **);
  static NTSTATUS  (WINAPI *pLdrUnregisterDllNotification)(void *);
  
-@@ -138,6 +144,9 @@ static void InitFunctionPtrs(void)
-         pRtlIsCriticalSectionLockedByThread = (void *)GetProcAddress(hntdll, "RtlIsCriticalSectionLockedByThread");
+@@ -140,6 +146,9 @@ static void InitFunctionPtrs(void)
          pRtlInitializeCriticalSectionEx = (void *)GetProcAddress(hntdll, "RtlInitializeCriticalSectionEx");
+         pRtlFindExportedRoutineByName = (void *)GetProcAddress(hntdll, "RtlFindExportedRoutineByName");
          pLdrEnumerateLoadedModules = (void *)GetProcAddress(hntdll, "LdrEnumerateLoadedModules");
 +        pRtlQueryPackageIdentity = (void *)GetProcAddress(hntdll, "RtlQueryPackageIdentity");
 +        pRtlMakeSelfRelativeSD = (void *)GetProcAddress(hntdll, "RtlMakeSelfRelativeSD");
@@ -53,7 +53,7 @@ index 88f62b0b588..8ca339dde0f 100644
          pLdrRegisterDllNotification = (void *)GetProcAddress(hntdll, "LdrRegisterDllNotification");
          pLdrUnregisterDllNotification = (void *)GetProcAddress(hntdll, "LdrUnregisterDllNotification");
      }
-@@ -3611,6 +3620,76 @@ static void test_RtlFirstFreeAce(void)
+@@ -3613,6 +3622,76 @@ static void test_RtlFirstFreeAce(void)
      HeapFree(GetProcessHeap(), 0, acl);
  }
  
@@ -130,7 +130,7 @@ index 88f62b0b588..8ca339dde0f 100644
  static void test_RtlInitializeSid(void)
  {
      SID_IDENTIFIER_AUTHORITY sid_ident = { SECURITY_NT_AUTHORITY };
-@@ -3690,6 +3769,7 @@ START_TEST(rtl)
+@@ -3707,6 +3786,7 @@ START_TEST(rtl)
      test_RtlInitializeCriticalSectionEx();
      test_RtlLeaveCriticalSection();
      test_LdrEnumerateLoadedModules();
@@ -139,5 +139,5 @@ index 88f62b0b588..8ca339dde0f 100644
      test_LdrRegisterDllNotification();
      test_DbgPrint();
 -- 
-2.42.0
+2.43.0
 
diff --git a/staging/upstream-commit b/staging/upstream-commit
index c7b77350..f5350670 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-6343dc6c9571fce20cd00102c5b0bd5c96861cfd
+bc13bda5ee4edaafa7ba9472d41acbad50c42112