Rebase against 8ef224fa43869a8c977921d6bec08863382d6e11

This commit is contained in:
Alistair Leslie-Hughes
2018-07-10 08:39:20 +10:00
parent 738fd3fd35
commit f61b8570b8
13 changed files with 56 additions and 724 deletions

View File

@@ -1,7 +1,8 @@
From 0b0d7c4983de54b3ca98a52a4afdd55c92a53031 Mon Sep 17 00:00:00 2001
From 5eaebe8bd280d4a331911bfdc088b4f0e9b655b5 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: programs/winedevice: Load some common drivers and fix ldr order.
Subject: [PATCH] programs/winedevice: Load some common drivers and fix ldr
order.
---
dlls/ntoskrnl.exe/tests/driver.c | 52 ++++++++++++++++++++++++++++++++++++++++
@@ -10,7 +11,7 @@ Subject: programs/winedevice: Load some common drivers and fix ldr order.
3 files changed, 79 insertions(+)
diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c
index 1ef27fb..6bf2e76 100644
index f56e2dd..c09099f 100644
--- a/dlls/ntoskrnl.exe/tests/driver.c
+++ b/dlls/ntoskrnl.exe/tests/driver.c
@@ -31,6 +31,7 @@
@@ -30,7 +31,7 @@ index 1ef27fb..6bf2e76 100644
static HANDLE okfile;
static LONG successes;
static LONG failures;
@@ -231,6 +234,52 @@ static void test_lookaside_list(void)
@@ -246,6 +249,52 @@ static void test_lookaside_list(void)
ExDeleteNPagedLookasideList(&list);
}
@@ -83,15 +84,15 @@ index 1ef27fb..6bf2e76 100644
static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info)
{
ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength;
@@ -258,6 +307,7 @@ static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info)
test_mdl_map();
@@ -274,6 +323,7 @@ static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info)
test_init_funcs();
test_version();
test_lookaside_list();
+ test_default_modules();
/* print process report */
if (test_input->winetest_debug)
@@ -346,6 +396,8 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
@@ -362,6 +412,8 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
DbgPrint("loading driver\n");
@@ -151,5 +152,5 @@ index fa8b268..aad5981 100644
if (!(stop_event = CreateEventW( NULL, TRUE, FALSE, NULL )))
return;
--
2.7.4
1.9.1