From 32c64aa429d0c45786b907132daa3723fcfba21f Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Sat, 17 Dec 2022 17:40:41 +1100
Subject: [PATCH] Rebase against 17e5ff74308f41ab662d46f684db2c6023a4a16b.

---
 ...-basic-tests-for-RtlQueryPackageIdent.patch | 18 +++++++++---------
 patches/patchinstall.sh                        |  2 +-
 staging/upstream-commit                        |  2 +-
 3 files changed, 11 insertions(+), 11 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 9acaad80..62887e1f 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 0e455713af03b7f91fea4332c893390a8de8ca44 Mon Sep 17 00:00:00 2001
+From 7e1c63548513ec95978c5cbc428555ac5ed7c1d2 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,20 +20,20 @@ index 90deb5865f8..428ebde23b3 100644
  C_SRCS = \
  	atom.c \
 diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c
-index 2e0bfb650e4..cdb159479f2 100644
+index 1e5e8c2580c..3690402c268 100644
 --- a/dlls/ntdll/tests/rtl.c
 +++ b/dlls/ntdll/tests/rtl.c
-@@ -27,6 +27,9 @@
- #include "in6addr.h"
+@@ -28,6 +28,9 @@
  #include "inaddr.h"
  #include "ip2string.h"
+ #include "wine/asm.h"
 +#include "initguid.h"
 +#define COBJMACROS
 +#include "shobjidl.h"
  
  #ifndef __WINE_WINTERNL_H
  
-@@ -80,6 +83,9 @@ static BOOL      (WINAPI *pRtlIsCriticalSectionLocked)(CRITICAL_SECTION *);
+@@ -95,6 +98,9 @@ static BOOL      (WINAPI *pRtlIsCriticalSectionLocked)(CRITICAL_SECTION *);
  static BOOL      (WINAPI *pRtlIsCriticalSectionLockedByThread)(CRITICAL_SECTION *);
  static NTSTATUS  (WINAPI *pRtlInitializeCriticalSectionEx)(CRITICAL_SECTION *, ULONG, ULONG);
  static NTSTATUS  (WINAPI *pLdrEnumerateLoadedModules)(void *, void *, void *);
@@ -43,7 +43,7 @@ index 2e0bfb650e4..cdb159479f2 100644
  static NTSTATUS  (WINAPI *pLdrRegisterDllNotification)(ULONG, PLDR_DLL_NOTIFICATION_FUNCTION, void *, void **);
  static NTSTATUS  (WINAPI *pLdrUnregisterDllNotification)(void *);
  
-@@ -120,6 +126,9 @@ static void InitFunctionPtrs(void)
+@@ -137,6 +143,9 @@ static void InitFunctionPtrs(void)
          pRtlIsCriticalSectionLockedByThread = (void *)GetProcAddress(hntdll, "RtlIsCriticalSectionLockedByThread");
          pRtlInitializeCriticalSectionEx = (void *)GetProcAddress(hntdll, "RtlInitializeCriticalSectionEx");
          pLdrEnumerateLoadedModules = (void *)GetProcAddress(hntdll, "LdrEnumerateLoadedModules");
@@ -53,7 +53,7 @@ index 2e0bfb650e4..cdb159479f2 100644
          pLdrRegisterDllNotification = (void *)GetProcAddress(hntdll, "LdrRegisterDllNotification");
          pLdrUnregisterDllNotification = (void *)GetProcAddress(hntdll, "LdrUnregisterDllNotification");
      }
-@@ -3730,6 +3739,76 @@ static void test_RtlFirstFreeAce(void)
+@@ -3775,6 +3784,76 @@ static void test_RtlFirstFreeAce(void)
      HeapFree(GetProcessHeap(), 0, acl);
  }
  
@@ -130,7 +130,7 @@ index 2e0bfb650e4..cdb159479f2 100644
  START_TEST(rtl)
  {
      InitFunctionPtrs();
-@@ -3769,6 +3848,7 @@ START_TEST(rtl)
+@@ -3814,6 +3893,7 @@ START_TEST(rtl)
      test_RtlInitializeCriticalSectionEx();
      test_RtlLeaveCriticalSection();
      test_LdrEnumerateLoadedModules();
@@ -139,5 +139,5 @@ index 2e0bfb650e4..cdb159479f2 100644
      test_LdrRegisterDllNotification();
      test_DbgPrint();
 -- 
-2.35.1
+2.39.0
 
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 9af85b7a..9ca5aa69 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "ccdef80543ff5c1f08a8aaff39c3f623522152df"
+	echo "17e5ff74308f41ab662d46f684db2c6023a4a16b"
 }
 
 # Show version information
diff --git a/staging/upstream-commit b/staging/upstream-commit
index 100a5485..6e8a65d8 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-ec62575e9d99fc35752760cc37ded207febdfd11
+17e5ff74308f41ab662d46f684db2c6023a4a16b