wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 474a6771ba03e2c475cd088ff40c97e8285a455f

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2019-02-27 11:09:27 +11:00
parent 733fa5c485
commit 7c1618b197
8 changed files with 46 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/winedevice-Default_Drivers/0004-programs-winedevice-Load-some-common-drivers-and-fix.patch
View File

@@ -1,4 +1,4 @@
From 63ae0e1dd59a078db172a96b3c1d63db4e9d8245 Mon Sep 17 00:00:00 2001
From 6f57fd23096d854ac448817cbe69747e7265f9fb 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, 77 insertions(+)
diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c
index 6d64cc8e..f3465b77 100644
index b2ac5fc8a0e..c2675eadca7 100644
--- a/dlls/ntoskrnl.exe/tests/driver.c
+++ b/dlls/ntoskrnl.exe/tests/driver.c
@@ -38,6 +38,8 @@ static const WCHAR driver_device[] = {'\\','D','e','v','i','c','e',
@@ -22,7 +22,7 @@ index 6d64cc8e..f3465b77 100644
static HANDLE okfile;
static LONG successes;
static LONG failures;
@@ -944,6 +946,52 @@ static void test_resource(void)
@@ -1071,6 +1073,52 @@ static void test_resource(void)
ok(status == STATUS_SUCCESS, "got status %#x\n", status);
}
@@ -75,15 +75,15 @@ index 6d64cc8e..f3465b77 100644
static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info)
{
ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength;
@@ -978,6 +1026,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st
@@ -1113,6 +1161,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st
test_stack_callout();
test_lookaside_list();
test_resource();
test_ob_reference(test_input->path);
+ test_default_modules();
test_resource();
/* print process report */
if (test_input->winetest_debug)
@@ -1090,6 +1139,8 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
@@ -1226,6 +1275,8 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
DbgPrint("loading driver\n");
@@ -93,7 +93,7 @@ index 6d64cc8e..f3465b77 100644
driver->DriverUnload = driver_Unload;
diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c
index 201a0411..33b332da 100644
index 201a0411d60..33b332da933 100644
--- a/programs/winedevice/device.c
+++ b/programs/winedevice/device.c
@@ -124,7 +124,33 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_