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 3c86adab766e3bc7c91da088c2dd6bc41a917055.

Browse Source
This commit is contained in:
Zebediah Figura
2020-06-01 22:31:00 -05:00
parent f132e60b9d
commit c81093882b
17 changed files with 224 additions and 257 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 06fef705b2735f358f64443c2c3f5c1904eae273 Mon Sep 17 00:00:00 2001
From 86c0ddea979a6124a4e60a970501102b83664a21 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 356c60a2e78d..bdc69c16f448 100644
index f51064986b5..d34db7c5828 100644
--- a/dlls/ntoskrnl.exe/tests/driver.c
+++ b/dlls/ntoskrnl.exe/tests/driver.c
@@ -44,6 +44,7 @@ static const WCHAR driver_link[] = {'\\','D','o','s','D','e','v','i','c','e','s'
@@ -21,7 +21,7 @@ index 356c60a2e78d..bdc69c16f448 100644
static HANDLE okfile;
static LONG successes;
@@ -1504,6 +1505,7 @@ static void test_resource(void)
@@ -1681,6 +1682,7 @@ static void test_resource(void)
ok(status == STATUS_SUCCESS, "got status %#x\n", status);
}
@@ -29,8 +29,8 @@ index 356c60a2e78d..bdc69c16f448 100644
static void test_lookup_thread(void)
{
NTSTATUS status;
@@ -1779,6 +1781,52 @@ static void test_affinity(void)
KeRevertToUserAffinityThread();
@@ -2132,6 +2134,52 @@ static void test_process_memory(const struct test_input *test_input)
ObDereferenceObject(process);
}
+static void test_default_modules(void)
@@ -82,7 +82,7 @@ index 356c60a2e78d..bdc69c16f448 100644
static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack)
{
ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength;
@@ -1825,6 +1873,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st
@@ -2178,6 +2226,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 356c60a2e78d..bdc69c16f448 100644
test_resource();
test_lookup_thread();
test_IoAttachDeviceToDeviceStack();
@@ -2076,6 +2125,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
@@ -2431,6 +2480,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
DbgPrint("loading driver\n");
driver_obj = driver;
@@ -99,7 +99,7 @@ index 356c60a2e78d..bdc69c16f448 100644
/* Allow unloading of the driver */
driver->DriverUnload = driver_Unload;
diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c
index 0755caaafb01..6595788053e8 100644
index 0755caaafb0..6595788053e 100644
--- a/programs/winedevice/device.c
+++ b/programs/winedevice/device.c
@@ -120,7 +120,33 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_