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 75aa4ab16b03a11464ab0d3e4c4cfbff0180c269

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2019-04-24 09:36:21 +10:00
parent 4e7071e4f1
commit 38c1f5e4d5
9 changed files with 83 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,16 +1,16 @@
From e0c12afb9d1c7d0fb82cde48d5a92ed7e2ad77f5 Mon Sep 17 00:00:00 2001
From bf9b5ec8a095b59e64452a321f7396bfc6434a0e 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
order.
---
dlls/ntoskrnl.exe/tests/driver.c | 52 ++++++++++++++++++++++++++++++++
programs/winedevice/device.c | 26 ++++++++++++++++
dlls/ntoskrnl.exe/tests/driver.c | 52 ++++++++++++++++++++++++++++++++++++++++
programs/winedevice/device.c | 26 ++++++++++++++++++++
2 files changed, 78 insertions(+)
diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c
index d7083f7fa5a..ede3054deda 100644
index 030c955..d528347 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 d7083f7fa5a..ede3054deda 100644
static HANDLE okfile;
static LONG successes;
static LONG failures;
@@ -1168,6 +1170,7 @@ static void test_resource(void)
@@ -1172,6 +1174,7 @@ static void test_resource(void)
ok(status == STATUS_SUCCESS, "got status %#x\n", status);
}
@@ -30,8 +30,8 @@ index d7083f7fa5a..ede3054deda 100644
static void test_lookup_thread(void)
{
NTSTATUS status;
@@ -1182,6 +1185,52 @@ static void test_lookup_thread(void)
ok(status == STATUS_INVALID_PARAMETER, "PsLookupThreadByThreadId returned %#x\n", status);
@@ -1187,6 +1190,52 @@ static void test_lookup_thread(void)
"PsLookupThreadByThreadId returned %#x\n", status);
}
+static void test_default_modules(void)
@@ -83,7 +83,7 @@ index d7083f7fa5a..ede3054deda 100644
static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info)
{
ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength;
@@ -1224,6 +1273,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st
@@ -1229,6 +1278,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 d7083f7fa5a..ede3054deda 100644
test_resource();
test_lookup_thread();
@@ -1338,6 +1388,8 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
@@ -1343,6 +1393,8 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
DbgPrint("loading driver\n");
@@ -101,7 +101,7 @@ index d7083f7fa5a..ede3054deda 100644
driver->DriverUnload = driver_Unload;
diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c
index 201a0411d60..33b332da933 100644
index 201a041..33b332d 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_
@@ -139,5 +139,5 @@ index 201a0411d60..33b332da933 100644
if (!(stop_event = CreateEventW( NULL, TRUE, FALSE, NULL )))
return;
--
2.20.1
1.9.1