Rebase against d48ffbdc014954907d3280a3b53eb9b478b10195

This commit is contained in:
Alistair Leslie-Hughes
2019-05-02 08:42:59 +10:00
parent 7d9b7bbdf5
commit 57370fd9ae
13 changed files with 14 additions and 894 deletions

View File

@@ -1,4 +1,4 @@
From bf9b5ec8a095b59e64452a321f7396bfc6434a0e Mon Sep 17 00:00:00 2001
From 913dada333cd12aae0080bfe3919467fcf709621 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, 78 insertions(+)
diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c
index 030c955..d528347 100644
index ac31a4d..a4456ae 100644
--- a/dlls/ntoskrnl.exe/tests/driver.c
+++ b/dlls/ntoskrnl.exe/tests/driver.c
@@ -39,6 +39,8 @@ static const WCHAR driver_device[] = {'\\','D','e','v','i','c','e',
@@ -22,7 +22,7 @@ index 030c955..d528347 100644
static HANDLE okfile;
static LONG successes;
static LONG failures;
@@ -1172,6 +1174,7 @@ static void test_resource(void)
@@ -1203,6 +1205,7 @@ static void test_resource(void)
ok(status == STATUS_SUCCESS, "got status %#x\n", status);
}
@@ -30,8 +30,8 @@ index 030c955..d528347 100644
static void test_lookup_thread(void)
{
NTSTATUS status;
@@ -1187,6 +1190,52 @@ static void test_lookup_thread(void)
"PsLookupThreadByThreadId returned %#x\n", status);
@@ -1246,6 +1249,52 @@ static void WINAPI main_test_task(DEVICE_OBJECT *device, void *context)
IoCompleteRequest(irp, IO_NO_INCREMENT);
}
+static void test_default_modules(void)
@@ -80,10 +80,10 @@ index 030c955..d528347 100644
+ ok(dxgmms1, "Failed to find dxgmms1.sys\n");
+}
+
static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info)
static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack)
{
ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength;
@@ -1229,6 +1278,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st
@@ -1291,6 +1340,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);
@@ -91,7 +91,7 @@ index 030c955..d528347 100644
test_resource();
test_lookup_thread();
@@ -1343,6 +1393,8 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
@@ -1404,6 +1454,8 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
DbgPrint("loading driver\n");