Rebase against a8fa80cfb4a1819be12ece459753bc07d4ea8be6.

patches/ntdll-RtlQueryPackageIdentity/0003-ntdll-tests-Add-basic-tests-for-RtlQueryPackageIdent.patch

@@ -1,4 +1,4 @@
-From 3c8ddcd9f29524479004800c91a39ec04456bd08 Mon Sep 17 00:00:00 2001
+From b7ce843ce7c536b452aee408ab127a8300412909 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 a7c43a46e07..9088d222b47 100644
+index 3a5564fc6b8..5408fc4b7da 100644
 --- a/dlls/ntdll/tests/rtl.c
 +++ b/dlls/ntdll/tests/rtl.c
 @@ -28,6 +28,9 @@
@@ -53,7 +53,7 @@ index a7c43a46e07..9088d222b47 100644
          pLdrRegisterDllNotification = (void *)GetProcAddress(hntdll, "LdrRegisterDllNotification");
          pLdrUnregisterDllNotification = (void *)GetProcAddress(hntdll, "LdrUnregisterDllNotification");
      }
-@@ -3788,6 +3797,76 @@ static void test_RtlFirstFreeAce(void)
+@@ -3608,6 +3617,76 @@ static void test_RtlFirstFreeAce(void)
      HeapFree(GetProcessHeap(), 0, acl);
  }
  
@@ -127,10 +127,10 @@ index a7c43a46e07..9088d222b47 100644
 +    CoUninitialize();
 +}
 +
- static void test_TlsIndex(void)
+ START_TEST(rtl)
  {
-     LIST_ENTRY *root = &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList;
-@@ -3852,6 +3931,7 @@ START_TEST(rtl)
+     InitFunctionPtrs();
+@@ -3647,6 +3726,7 @@ START_TEST(rtl)
      test_RtlInitializeCriticalSectionEx();
      test_RtlLeaveCriticalSection();
      test_LdrEnumerateLoadedModules();
@@ -139,5 +139,5 @@ index a7c43a46e07..9088d222b47 100644
      test_LdrRegisterDllNotification();
      test_DbgPrint();
 -- 
-2.39.0
+2.39.2
 

staging/upstream-commit

@@ -1 +1 @@
-50f5f9af1c27c4380a7489596d20d8048f003365
+a8fa80cfb4a1819be12ece459753bc07d4ea8be6