Rebase against 87733a69f7448d25539cbc4fc37d2e93466f38de.

This commit is contained in:
Alistair Leslie-Hughes
2020-05-27 10:10:56 +10:00
parent 8be56c21f9
commit f3298432f0
11 changed files with 109 additions and 227 deletions

View File

@@ -1,4 +1,4 @@
From 98e637cc4bdb5f5ac793e5bfb567b299cb9a7dcc Mon Sep 17 00:00:00 2001
From 06fef705b2735f358f64443c2c3f5c1904eae273 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 65be4a8d35a8..3920a3710799 100644
index 356c60a2e78d..bdc69c16f448 100644
--- a/dlls/ntoskrnl.exe/tests/driver.c
+++ b/dlls/ntoskrnl.exe/tests/driver.c
@@ -44,6 +44,7 @@ static const WCHAR driver_link[] = {'\\','D','o','s','D','e','v','i','c','e','s'
@@ -29,8 +29,8 @@ index 65be4a8d35a8..3920a3710799 100644
static void test_lookup_thread(void)
{
NTSTATUS status;
@@ -1740,6 +1742,52 @@ static void test_affinity(void)
ok(mask == ~((~0u) << cpu_count), "Got unexpected mask %#lx.\n", mask);
@@ -1779,6 +1781,52 @@ static void test_affinity(void)
KeRevertToUserAffinityThread();
}
+static void test_default_modules(void)
@@ -82,7 +82,7 @@ index 65be4a8d35a8..3920a3710799 100644
static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack)
{
ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength;
@@ -1786,6 +1834,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st
@@ -1825,6 +1873,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 65be4a8d35a8..3920a3710799 100644
test_resource();
test_lookup_thread();
test_IoAttachDeviceToDeviceStack();
@@ -2037,6 +2086,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
@@ -2076,6 +2125,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
DbgPrint("loading driver\n");
driver_obj = driver;