From eb479ea60ccbb4d49d297e222109c9d2192b80ad Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Thu, 14 Jul 2022 09:12:35 +1000
Subject: [PATCH] Rebase against 7ff508838ec6631b9def78ae391ff266fcc0d80e.

---
 ...kernel32-tests-Add-tests-for-NtQuerySection.patch | 12 ++++++------
 patches/patchinstall.sh                              |  2 +-
 staging/upstream-commit                              |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/patches/ntdll-NtQuerySection/0002-kernel32-tests-Add-tests-for-NtQuerySection.patch b/patches/ntdll-NtQuerySection/0002-kernel32-tests-Add-tests-for-NtQuerySection.patch
index 0181e31d..72cf457a 100644
--- a/patches/ntdll-NtQuerySection/0002-kernel32-tests-Add-tests-for-NtQuerySection.patch
+++ b/patches/ntdll-NtQuerySection/0002-kernel32-tests-Add-tests-for-NtQuerySection.patch
@@ -1,4 +1,4 @@
-From 75ee9968e8532dcadd39163ff93db9a5c81fb799 Mon Sep 17 00:00:00 2001
+From c4c562ca31cfd3ce391abae2cc4e94a6bf4da049 Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Thu, 16 Oct 2014 23:26:35 +0200
 Subject: [PATCH] kernel32/tests: Add tests for NtQuerySection. (try 2)
@@ -8,10 +8,10 @@ Subject: [PATCH] kernel32/tests: Add tests for NtQuerySection. (try 2)
  1 file changed, 245 insertions(+)
 
 diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c
-index 365194b9065..167df789abf 100644
+index f492b2cf9b1..f6ac324c3a7 100644
 --- a/dlls/kernel32/tests/virtual.c
 +++ b/dlls/kernel32/tests/virtual.c
-@@ -54,6 +54,23 @@ static PVOID (WINAPI *pVirtualAllocFromApp)(PVOID, SIZE_T, DWORD, DWORD);
+@@ -55,6 +55,23 @@ static BOOL  (WINAPI *pPrefetchVirtualMemory)(HANDLE, ULONG_PTR, PWIN32_MEMORY_R
  
  /* ############################### */
  
@@ -35,8 +35,8 @@ index 365194b9065..167df789abf 100644
  static HANDLE create_target_process(const char *arg)
  {
      char **argv;
-@@ -4240,6 +4257,233 @@ static void test_shared_memory_ro(BOOL is_child, DWORD child_access)
-     CloseHandle(mapping);
+@@ -4246,6 +4263,233 @@ static void test_PrefetchVirtualMemory(void)
+         "PrefetchVirtualMemory unexpected status on 2 page-aligned entries: %ld\n", GetLastError() );
  }
  
 +static void test_NtQuerySection(void)
@@ -269,7 +269,7 @@ index 365194b9065..167df789abf 100644
  START_TEST(virtual)
  {
      int argc;
-@@ -4304,6 +4548,7 @@ START_TEST(virtual)
+@@ -4312,6 +4556,7 @@ START_TEST(virtual)
      test_shared_memory_ro(FALSE, FILE_MAP_COPY);
      test_shared_memory_ro(FALSE, FILE_MAP_COPY|FILE_MAP_WRITE);
      test_mappings();
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index d2788d99..67b11a1e 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "b9a61cde89e5dc6264b4c152f4dc24ecf064f8f6"
+	echo "7ff508838ec6631b9def78ae391ff266fcc0d80e"
 }
 
 # Show version information
diff --git a/staging/upstream-commit b/staging/upstream-commit
index 1bcb6902..adaad929 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-b9a61cde89e5dc6264b4c152f4dc24ecf064f8f6
+7ff508838ec6631b9def78ae391ff266fcc0d80e