From bd28d7c328da03f08fb4562e184962182e516b2f Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Thu, 1 Feb 2024 12:18:53 +1100
Subject: [PATCH] Rebase against e607da943aa6869ba334611ccfd044f2ffe212c4.

---
 ...-Add-basic-tests-for-RtlQueryPackageIdent.patch | 14 +++++++-------
 staging/upstream-commit                            |  2 +-
 2 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 70d7c7ea..b818fd26 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 cff2c9da12bb4fa89def37d69a6a0cd84af03139 Mon Sep 17 00:00:00 2001
+From 265b5cb7e6f676562e077181f681c40387c4d0c5 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 442ad729540..dcdac2a936a 100644
+index 4a4370d5903..e5b74c6bfc7 100644
 --- a/dlls/ntdll/tests/rtl.c
 +++ b/dlls/ntdll/tests/rtl.c
 @@ -29,6 +29,9 @@
@@ -42,8 +42,8 @@ index 442ad729540..dcdac2a936a 100644
 +static NTSTATUS  (WINAPI *pRtlAbsoluteToSelfRelativeSD)(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PULONG);
  static NTSTATUS  (WINAPI *pLdrRegisterDllNotification)(ULONG, PLDR_DLL_NOTIFICATION_FUNCTION, void *, void **);
  static NTSTATUS  (WINAPI *pLdrUnregisterDllNotification)(void *);
- 
-@@ -140,6 +146,9 @@ static void InitFunctionPtrs(void)
+ static VOID      (WINAPI *pRtlGetDeviceFamilyInfoEnum)(ULONGLONG *,DWORD *,DWORD *);
+@@ -141,6 +147,9 @@ static void InitFunctionPtrs(void)
          pRtlInitializeCriticalSectionEx = (void *)GetProcAddress(hntdll, "RtlInitializeCriticalSectionEx");
          pRtlFindExportedRoutineByName = (void *)GetProcAddress(hntdll, "RtlFindExportedRoutineByName");
          pLdrEnumerateLoadedModules = (void *)GetProcAddress(hntdll, "LdrEnumerateLoadedModules");
@@ -52,8 +52,8 @@ index 442ad729540..dcdac2a936a 100644
 +        pRtlAbsoluteToSelfRelativeSD = (void *)GetProcAddress(hntdll, "RtlAbsoluteToSelfRelativeSD");
          pLdrRegisterDllNotification = (void *)GetProcAddress(hntdll, "LdrRegisterDllNotification");
          pLdrUnregisterDllNotification = (void *)GetProcAddress(hntdll, "LdrUnregisterDllNotification");
-     }
-@@ -3613,6 +3622,76 @@ static void test_RtlFirstFreeAce(void)
+         pRtlGetDeviceFamilyInfoEnum = (void *)GetProcAddress(hntdll, "RtlGetDeviceFamilyInfoEnum");
+@@ -3701,6 +3710,76 @@ static void test_RtlFirstFreeAce(void)
      HeapFree(GetProcessHeap(), 0, acl);
  }
  
@@ -130,7 +130,7 @@ index 442ad729540..dcdac2a936a 100644
  static void test_RtlInitializeSid(void)
  {
      SID_IDENTIFIER_AUTHORITY sid_ident = { SECURITY_NT_AUTHORITY };
-@@ -3707,6 +3786,7 @@ START_TEST(rtl)
+@@ -3816,6 +3895,7 @@ START_TEST(rtl)
      test_RtlInitializeCriticalSectionEx();
      test_RtlLeaveCriticalSection();
      test_LdrEnumerateLoadedModules();
diff --git a/staging/upstream-commit b/staging/upstream-commit
index 617745fc..dd506caa 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-fdd9e257e2913ecb53fa3c31bfa9ed1ec65fce3c
+e607da943aa6869ba334611ccfd044f2ffe212c4