Rebase against 10765f2956d6f9fc2d16bb2bec476b12a31786f6.

This commit is contained in:
Alistair Leslie-Hughes
2023-03-03 11:22:41 +11:00
parent f7b671178c
commit cd22a0fb15
6 changed files with 63 additions and 63 deletions

View File

@@ -1,4 +1,4 @@
From f7664a23897b809862a80e287122464cb31e4986 Mon Sep 17 00:00:00 2001
From 951d65cf18b7950d1aadaaf63c02c6a2a6fce073 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 dc4f4ad993d..4a57cf56f75 100644
index a80bef78fab..18f2920759d 100644
--- a/dlls/ntoskrnl.exe/tests/driver.c
+++ b/dlls/ntoskrnl.exe/tests/driver.c
@@ -52,6 +52,7 @@ static int kmemcmp( const void *ptr1, const void *ptr2, size_t n )
@@ -21,7 +21,7 @@ index dc4f4ad993d..4a57cf56f75 100644
static POBJECT_TYPE *pExEventObjectType, *pIoFileObjectType, *pPsThreadType, *pIoDriverObjectType;
static PEPROCESS *pPsInitialSystemProcess;
@@ -1712,6 +1713,7 @@ static void test_resource(void)
@@ -1713,6 +1714,7 @@ static void test_resource(void)
ok(status == STATUS_SUCCESS, "got status %#lx\n", status);
}
@@ -29,8 +29,8 @@ index dc4f4ad993d..4a57cf56f75 100644
static void test_lookup_thread(void)
{
NTSTATUS status;
@@ -2290,6 +2292,52 @@ static void test_permanence(void)
ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "got %#lx\n", status);
@@ -2326,6 +2328,52 @@ static void test_driver_object_extension(void)
ok(get_obj_ext == NULL, "got %p\n", get_obj_ext);
}
+static void test_default_modules(void)
@@ -82,7 +82,7 @@ index dc4f4ad993d..4a57cf56f75 100644
static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack)
{
void *buffer = irp->AssociatedIrp.SystemBuffer;
@@ -2322,6 +2370,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st
@@ -2358,6 +2406,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st
test_stack_callout();
test_lookaside_list();
test_ob_reference();
@@ -90,7 +90,7 @@ index dc4f4ad993d..4a57cf56f75 100644
test_resource();
test_lookup_thread();
test_IoAttachDeviceToDeviceStack();
@@ -2801,6 +2850,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
@@ -2838,6 +2887,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
DbgPrint("loading driver\n");
driver_obj = driver;
@@ -145,5 +145,5 @@ index 0a96307a017..abcb7b20679 100644
set_service_status( service_handle, SERVICE_RUNNING,
SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN );
--
2.34.1
2.39.2