Rebase against da5112c74313b5236183135204cab38a8b0169ed.

patches/ntoskrnl-Stubs/0013-ntoskrnl.exe-Implement-NtBuildNumber.patch

@@ -1,4 +1,4 @@
-From 7c5d975bef7261f253bf80f4ae5a0e424073d480 Mon Sep 17 00:00:00 2001
+From 6b77a809cc81c22fced7c970c1c43a5f5426184b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Tue, 6 Jun 2017 21:08:51 +0200
 Subject: ntoskrnl.exe: Implement NtBuildNumber.
@@ -7,8 +7,7 @@ Subject: ntoskrnl.exe: Implement NtBuildNumber.
  dlls/ntoskrnl.exe/ntoskrnl.c        | 11 +++++++++--
  dlls/ntoskrnl.exe/ntoskrnl.exe.spec |  2 +-
  dlls/ntoskrnl.exe/tests/driver.c    | 30 ++++++++++++++++++++++++++++++
- include/ddk/wdm.h                   |  1 +
- 4 files changed, 41 insertions(+), 3 deletions(-)
+ 3 files changed, 40 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
 index ae699dc..21507dc 100644
@@ -54,7 +53,7 @@ index ae699dc..21507dc 100644
      case DLL_PROCESS_DETACH:
          if (reserved) break;
 diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
-index fc2fd94..7c40d5c 100644
+index a572399..0fc9256 100644
 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
 +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
 @@ -743,7 +743,7 @@
@@ -67,7 +66,7 @@ index fc2fd94..7c40d5c 100644
  @ stdcall NtConnectPort(ptr ptr ptr ptr ptr ptr ptr ptr)
  @ stdcall NtCreateEvent(ptr long ptr long long)
 diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c
-index 84cfff7..5fe997a 100644
+index 06b365f..71d2491 100644
 --- a/dlls/ntoskrnl.exe/tests/driver.c
 +++ b/dlls/ntoskrnl.exe/tests/driver.c
 @@ -143,6 +143,22 @@ static void winetest_end_todo(void)
@@ -121,18 +120,6 @@ index 84cfff7..5fe997a 100644
  
      /* print process report */
      if (test_input->winetest_debug)
-diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
-index cab9828..d6b808f 100644
---- a/include/ddk/wdm.h
-+++ b/include/ddk/wdm.h
-@@ -1421,6 +1421,7 @@ PVOID     WINAPI MmAllocateContiguousMemory(SIZE_T,PHYSICAL_ADDRESS);
- PVOID     WINAPI MmAllocateNonCachedMemory(SIZE_T);
- PMDL      WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,SIZE_T);
- void      WINAPI MmFreeNonCachedMemory(PVOID,SIZE_T);
-+void *    WINAPI MmGetSystemRoutineAddress(UNICODE_STRING*);
- PVOID     WINAPI MmMapLockedPagesSpecifyCache(PMDL,KPROCESSOR_MODE,MEMORY_CACHING_TYPE,PVOID,ULONG,ULONG);
- MM_SYSTEMSIZE WINAPI MmQuerySystemSize(void);
- void      WINAPI MmProbeAndLockPages(PMDLX, KPROCESSOR_MODE, LOCK_OPERATION);
 -- 
 2.7.4
 

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "8b9ba16e9ad9ca85b93b05c13d6c5044a1a5ecf3"
+	echo "da5112c74313b5236183135204cab38a8b0169ed"
 }
 
 # Show version information