Rebase against 9415667cdfbb4c94cdfe03a1e80a87482bee98c1.

This commit is contained in:
Alistair Leslie-Hughes
2020-07-17 11:26:22 +10:00
parent c3c5d48b18
commit 914f67c020
7 changed files with 63 additions and 63 deletions

View File

@@ -1,4 +1,4 @@
From d67ca0757315f863020402e44c50b89f08be3ae6 Mon Sep 17 00:00:00 2001
From b230ad8676c16e2c02b6c317b0c050494225c696 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 fa8d7b20e3e..176b60d66ad 100644
index 0671a56efc7..85327c6f4b3 100644
--- a/dlls/ntoskrnl.exe/tests/driver.c
+++ b/dlls/ntoskrnl.exe/tests/driver.c
@@ -46,6 +46,7 @@ static const WCHAR driver_link[] = {'\\','D','o','s','D','e','v','i','c','e','s'
@@ -29,8 +29,8 @@ index fa8d7b20e3e..176b60d66ad 100644
static void test_lookup_thread(void)
{
NTSTATUS status;
@@ -1996,6 +1998,52 @@ static void test_process_memory(const struct test_input *test_input)
ObDereferenceObject(process);
@@ -2072,6 +2074,52 @@ static void test_permanence(void)
ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", status);
}
+static void test_default_modules(void)
@@ -82,7 +82,7 @@ index fa8d7b20e3e..176b60d66ad 100644
static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack)
{
ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength;
@@ -2042,6 +2090,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st
@@ -2118,6 +2166,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st
test_stack_callout();
test_lookaside_list();
test_ob_reference(test_input->path);
@@ -90,7 +90,7 @@ index fa8d7b20e3e..176b60d66ad 100644
test_resource();
test_lookup_thread();
test_IoAttachDeviceToDeviceStack();
@@ -2296,6 +2345,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
@@ -2392,6 +2441,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
DbgPrint("loading driver\n");
driver_obj = driver;
@@ -137,5 +137,5 @@ index 0755caaafb0..6595788053e 100644
if (!(stop_event = CreateEventW( NULL, TRUE, FALSE, NULL )))
return;
--
2.26.2
2.27.0