Rebase against 0f8a0fd4002f9d5d1cb6dadcb81ef430d8be21b7.

[kernel32-CompareString_Length]
Removed patch to ensure CompareStringW aborts on the first nonmatching
character (accepted upstream).

[ntdll-SystemRecommendedSharedDataAlignment]
Removed patch to implement SystemRecommendedSharedDataAlignment class (accepted
upstream).

[vmm.vxd-PageReserve]
Removed patch to fix protection flags passed to VirtualAlloc call (accepted
upstream).

patches/ntdll-SystemRecommendedSharedDataAlignment/0001-include-Add-more-constants-to-SYSTEM_INFORMATION_CLA.patch

@@ -1,14 +1,14 @@
-From 8ffb502a5289e9bd56ae02d292f19c67b94e2b19 Mon Sep 17 00:00:00 2001
+From 26f2ec230b2f6e35c39968d79a533cdb21d3f424 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Thu, 21 Jan 2016 00:28:15 +0100
 Subject: include: Add more constants to SYSTEM_INFORMATION_CLASS.
 
 ---
- include/winternl.h | 46 +++++++++++++++++++++++++++-------------------
- 1 file changed, 27 insertions(+), 19 deletions(-)
+ include/winternl.h | 44 ++++++++++++++++++++++++++------------------
+ 1 file changed, 26 insertions(+), 18 deletions(-)
 
 diff --git a/include/winternl.h b/include/winternl.h
-index 3494c00..e665a47 100644
+index 9b40fd4..1a799ab 100644
 --- a/include/winternl.h
 +++ b/include/winternl.h
 @@ -822,26 +822,34 @@ typedef enum _SYSTEM_INFORMATION_CLASS {
@@ -19,7 +19,11 @@ index 3494c00..e665a47 100644
 -    Unknown55,
 -    Unknown56,
 -    Unknown57,
--    Unknown58,
++    SystemLoadGdiDriverInSystemSpace = 54,
++    SystemNumaProcessorMap = 55,
++    SystemPrefetcherInformation = 56,
++    SystemExtendedProcessInformation = 57,
+     SystemRecommendedSharedDataAlignment = 58,
 -    Unknown59,
 -    Unknown60,
 -    Unknown61,
@@ -34,11 +38,6 @@ index 3494c00..e665a47 100644
 -    Unknown70,
 -    Unknown71,
 -    Unknown72,
-+    SystemLoadGdiDriverInSystemSpace = 54,
-+    SystemNumaProcessorMap = 55,
-+    SystemPrefetcherInformation = 56,
-+    SystemExtendedProcessInformation = 57,
-+    SystemRecommendedSharedDataAlignment = 58,
 +    SystemComPlusPackage = 59,
 +    SystemNumaAvailableMemory = 60,
 +    SystemProcessorPowerInformation = 61,
@@ -66,5 +65,5 @@ index 3494c00..e665a47 100644
      SystemInformationClassMax
  } SYSTEM_INFORMATION_CLASS, *PSYSTEM_INFORMATION_CLASS;
 -- 
-2.6.4
+2.7.1
 

patches/ntdll-SystemRecommendedSharedDataAlignment/0002-ntdll-Implement-SystemRecommendedSharedDataAlignment.patch

@@ -1,70 +0,0 @@
-From f5437d47185217d5c82ae09301ad92a6d22e55c9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Thu, 21 Jan 2016 00:30:31 +0100
-Subject: ntdll: Implement SystemRecommendedSharedDataAlignment class in
- NtQuerySystemInformation.
-
----
- dlls/ntdll/nt.c         | 11 +++++++++++
- dlls/ntdll/tests/info.c | 16 ++++++++++++++++
- 2 files changed, 27 insertions(+)
-
-diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
-index 9ee1923..e28b21f 100644
---- a/dlls/ntdll/nt.c
-+++ b/dlls/ntdll/nt.c
-@@ -2155,6 +2155,17 @@ NTSTATUS WINAPI NtQuerySystemInformation(
-             RtlFreeHeap(GetProcessHeap(), 0, buf);
-         }
-         break;
-+    case SystemRecommendedSharedDataAlignment:
-+        {
-+            len = sizeof(DWORD);
-+            if (Length >= len)
-+            {
-+                if (!SystemInformation) ret = STATUS_ACCESS_VIOLATION;
-+                else *((DWORD *)SystemInformation) = 64;
-+            }
-+            else ret = STATUS_INFO_LENGTH_MISMATCH;
-+        }
-+        break;
-     default:
- 	FIXME("(0x%08x,%p,0x%08x,%p) stub\n",
- 	      SystemInformationClass,SystemInformation,Length,ResultLength);
-diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c
-index 252736e..e8ad0bf 100644
---- a/dlls/ntdll/tests/info.c
-+++ b/dlls/ntdll/tests/info.c
-@@ -1929,6 +1929,19 @@ static void test_thread_start_address(void)
-     CloseHandle(thread);
- }
- 
-+static void test_query_data_alignment(void)
-+{
-+    ULONG ReturnLength;
-+    NTSTATUS status;
-+    DWORD value;
-+
-+    value = 0xdeadbeef;
-+    status = pNtQuerySystemInformation(SystemRecommendedSharedDataAlignment, &value, sizeof(value), &ReturnLength);
-+    ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
-+    ok(sizeof(value) == ReturnLength, "Inconsistent length %u\n", ReturnLength);
-+    ok(value == 64, "Expected 64, got %u\n", value);
-+}
-+
- START_TEST(info)
- {
-     char **argv;
-@@ -1995,6 +2008,9 @@ START_TEST(info)
-     test_query_logicalproc();
-     test_query_logicalprocex();
- 
-+    trace("Starting test_query_data_alignment()\n");
-+    test_query_data_alignment();
-+
-     /* NtPowerInformation */
- 
-     /* 0xb ProcessorInformation */
--- 
-2.6.4
-

patches/ntdll-SystemRecommendedSharedDataAlignment/definition

@@ -1 +0,0 @@
-Fixes: Implement SystemRecommendedSharedDataAlignment class in NtQuerySystemInformation