Rebase against fb5b0c64639c056d55e14011a3b4e6f2d83e7cda

This commit is contained in:
Alistair Leslie-Hughes 2019-08-23 08:14:11 +10:00
parent 938dddf7df
commit 7447216104

View File

@ -1,4 +1,4 @@
From 761d7a8f9ce64f1174a1903ab08de2cb5a5c10c3 Mon Sep 17 00:00:00 2001
From 024ec37f4c46f08e09b38d05ff9d4ebd5e9346e5 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,10 +10,10 @@ 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 f5801a51620..fcea581353b 100644
index 0506011ce56..9b42605a2a9 100644
--- a/dlls/ntoskrnl.exe/tests/driver.c
+++ b/dlls/ntoskrnl.exe/tests/driver.c
@@ -43,6 +43,7 @@ static const WCHAR driver_link[] = {'\\','D','o','s','D','e','v','i','c','e','s'
@@ -44,6 +44,7 @@ static const WCHAR driver_link[] = {'\\','D','o','s','D','e','v','i','c','e','s'
static DRIVER_OBJECT *driver_obj;
static DEVICE_OBJECT *lower_device, *upper_device;
@ -21,7 +21,7 @@ index f5801a51620..fcea581353b 100644
static HANDLE okfile;
static LONG successes;
@@ -1444,6 +1445,7 @@ static void test_resource(void)
@@ -1506,6 +1507,7 @@ static void test_resource(void)
ok(status == STATUS_SUCCESS, "got status %#x\n", status);
}
@ -29,9 +29,9 @@ index f5801a51620..fcea581353b 100644
static void test_lookup_thread(void)
{
NTSTATUS status;
@@ -1543,6 +1545,52 @@ static void WINAPI main_test_task(DEVICE_OBJECT *device, void *context)
IoCompleteRequest(irp, IO_NO_INCREMENT);
@@ -1712,6 +1714,52 @@ static void test_executable_pool(void)
}
#endif
+static void test_default_modules(void)
+{
@ -82,7 +82,7 @@ index f5801a51620..fcea581353b 100644
static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack)
{
ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength;
@@ -1589,6 +1637,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st
@@ -1758,6 +1806,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 f5801a51620..fcea581353b 100644
test_resource();
test_lookup_thread();
test_IoAttachDeviceToDeviceStack();
@@ -1747,6 +1796,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
@@ -1981,6 +2030,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
DbgPrint("loading driver\n");
driver_obj = driver;