Rebase against bd89ab3040e30c11b34a95072d88f635ade03bdc.

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

@@ -1,4 +1,4 @@
-From b7ce843ce7c536b452aee408ab127a8300412909 Mon Sep 17 00:00:00 2001
+From 60fc38b76fb1fa1f70f37eacc50127fe8de30840 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 3a5564fc6b8..5408fc4b7da 100644
+index b1ef492627a..e13b24a0219 100644
 --- a/dlls/ntdll/tests/rtl.c
 +++ b/dlls/ntdll/tests/rtl.c
 @@ -28,6 +28,9 @@
@@ -127,10 +127,10 @@ index 3a5564fc6b8..5408fc4b7da 100644
 +    CoUninitialize();
 +}
 +
- START_TEST(rtl)
+ static void test_RtlInitializeSid(void)
  {
-     InitFunctionPtrs();
-@@ -3647,6 +3726,7 @@ START_TEST(rtl)
+     SID_IDENTIFIER_AUTHORITY sid_ident = { SECURITY_NT_AUTHORITY };
+@@ -3687,6 +3766,7 @@ START_TEST(rtl)
      test_RtlInitializeCriticalSectionEx();
      test_RtlLeaveCriticalSection();
      test_LdrEnumerateLoadedModules();
@@ -139,5 +139,5 @@ index 3a5564fc6b8..5408fc4b7da 100644
      test_LdrRegisterDllNotification();
      test_DbgPrint();
 -- 
-2.39.2
+2.40.1
 

staging/upstream-commit

@@ -1 +1 @@
-0b9620266f08d57c2db41b934a77b6ce4a94aeda
+bd89ab3040e30c11b34a95072d88f635ade03bdc