Rebase against ac65e1540960e64ce29e40ec19e4eade8369d520.

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "5a8bc554ef06c4a21d8b49ea8d936299f2cb2f34"
+	echo "ac65e1540960e64ce29e40ec19e4eade8369d520"
 }
 
 # Show version information

patches/winedevice-Default_Drivers/0004-programs-winedevice-Load-some-common-drivers-and-fix.patch

@@ -1,4 +1,4 @@
-From 39314cbad0b085a913d829ce4f264edf76af4ff3 Mon Sep 17 00:00:00 2001
+From f95c63015492ff46479930c17bb0736715ceadcf Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Thu, 8 Jun 2017 23:50:03 +0200
 Subject: [PATCH] programs/winedevice: Load some common drivers and fix ldr
@@ -10,7 +10,7 @@ Subject: [PATCH] programs/winedevice: Load some common drivers and fix ldr
  2 files changed, 76 insertions(+)
 
 diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c
-index 179d2d5e02d..505641d9f87 100644
+index 0d991cd98d6..4d13829229b 100644
 --- a/dlls/ntoskrnl.exe/tests/driver.c
 +++ b/dlls/ntoskrnl.exe/tests/driver.c
 @@ -52,6 +52,7 @@ static int kmemcmp( const void *ptr1, const void *ptr2, size_t n )
@@ -29,7 +29,7 @@ index 179d2d5e02d..505641d9f87 100644
  static void test_lookup_thread(void)
  {
      NTSTATUS status;
-@@ -2111,6 +2113,52 @@ static void test_permanence(void)
+@@ -2099,6 +2101,52 @@ static void test_permanence(void)
      ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", status);
  }
  
@@ -81,8 +81,8 @@ index 179d2d5e02d..505641d9f87 100644
 +
  static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack)
  {
-     ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength;
-@@ -2158,6 +2206,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st
+     void *buffer = irp->AssociatedIrp.SystemBuffer;
+@@ -2130,6 +2178,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st
      test_stack_callout();
      test_lookaside_list();
      test_ob_reference();
@@ -90,7 +90,7 @@ index 179d2d5e02d..505641d9f87 100644
      test_resource();
      test_lookup_thread();
      test_IoAttachDeviceToDeviceStack();
-@@ -2553,6 +2602,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
+@@ -2530,6 +2579,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
      DbgPrint("loading driver\n");
  
      driver_obj = driver;

staging/upstream-commit

@@ -1 +1 @@
-5a8bc554ef06c4a21d8b49ea8d936299f2cb2f34
+ac65e1540960e64ce29e40ec19e4eade8369d520