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 48a74277f5f9e0c87d8c01457236a89d94cb71d3

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2019-06-07 08:38:50 +10:00
parent 1998c0570d
commit a49aa40ac8
5 changed files with 87 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,27 +1,27 @@
From c21d5b2c6ac912a4bc4f4dff281f275b971796bc Mon Sep 17 00:00:00 2001
From 761d7a8f9ce64f1174a1903ab08de2cb5a5c10c3 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 | 50 ++++++++++++++++++++++++++++++++++++++++
programs/winedevice/device.c | 26 +++++++++++++++++++++
dlls/ntoskrnl.exe/tests/driver.c | 50 ++++++++++++++++++++++++++++++++
programs/winedevice/device.c | 26 +++++++++++++++++
2 files changed, 76 insertions(+)
diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c
index 73fc2fb..ed3fece 100644
index f5801a51620..fcea581353b 100644
--- a/dlls/ntoskrnl.exe/tests/driver.c
+++ b/dlls/ntoskrnl.exe/tests/driver.c
@@ -40,6 +40,7 @@ static const WCHAR driver_link[] = {'\\','D','o','s','D','e','v','i','c','e','s'
'\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r',0};
@@ -43,6 +43,7 @@ static const WCHAR driver_link[] = {'\\','D','o','s','D','e','v','i','c','e','s'
static DRIVER_OBJECT *driver_obj;
static DEVICE_OBJECT *lower_device, *upper_device;
+static LDR_MODULE *ldr_module;
static HANDLE okfile;
static LONG successes;
@@ -1411,6 +1412,7 @@ static void test_resource(void)
@@ -1444,6 +1445,7 @@ static void test_resource(void)
ok(status == STATUS_SUCCESS, "got status %#x\n", status);
}
@@ -29,7 +29,7 @@ index 73fc2fb..ed3fece 100644
static void test_lookup_thread(void)
{
NTSTATUS status;
@@ -1509,6 +1511,52 @@ static void WINAPI main_test_task(DEVICE_OBJECT *device, void *context)
@@ -1543,6 +1545,52 @@ static void WINAPI main_test_task(DEVICE_OBJECT *device, void *context)
IoCompleteRequest(irp, IO_NO_INCREMENT);
}
@@ -82,7 +82,7 @@ index 73fc2fb..ed3fece 100644
static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack)
{
ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength;
@@ -1554,6 +1602,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st
@@ -1589,6 +1637,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 73fc2fb..ed3fece 100644
test_resource();
test_lookup_thread();
test_IoAttachDeviceToDeviceStack();
@@ -1704,6 +1753,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
@@ -1747,6 +1796,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
DbgPrint("loading driver\n");
driver_obj = driver;
@@ -99,7 +99,7 @@ index 73fc2fb..ed3fece 100644
/* Allow unloading of the driver */
driver->DriverUnload = driver_Unload;
diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c
index f4ebad2..b8ed745 100644
index f4ebad2f2d0..b8ed745cb64 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_
@@ -137,5 +137,5 @@ index f4ebad2..b8ed745 100644
if (!(stop_event = CreateEventW( NULL, TRUE, FALSE, NULL )))
return;
--
1.9.1
2.17.1