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 c3ac646a8ded3ef3ebc743a7fdda01b0691a427a.

Browse Source
This commit is contained in:
Zebediah Figura
2019-02-06 19:44:16 -06:00
parent 3dab9e5e6b
commit ca3bfa28f9
11 changed files with 72 additions and 389 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,19 +1,19 @@
From 19d87f547060563a82988d2c17c6a923fc27c6ca Mon Sep 17 00:00:00 2001
From 09df46b62a34ccfdc214bc3b5e20731d7170f93f 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 | 51 ++++++++++++++++++++++++++++++++++++++++
programs/winedevice/device.c | 26 ++++++++++++++++++++
dlls/ntoskrnl.exe/tests/driver.c | 51 ++++++++++++++++++++++++++++++++
programs/winedevice/device.c | 26 ++++++++++++++++
2 files changed, 77 insertions(+)
diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c
index 13fce71..8da13cd 100644
index 2e622c8d..d37e0b93 100644
--- a/dlls/ntoskrnl.exe/tests/driver.c
+++ b/dlls/ntoskrnl.exe/tests/driver.c
@@ -41,6 +41,8 @@ static const WCHAR driver_device[] = {'\\','D','e','v','i','c','e',
@@ -38,6 +38,8 @@ static const WCHAR driver_device[] = {'\\','D','e','v','i','c','e',
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};
@@ -22,8 +22,8 @@ index 13fce71..8da13cd 100644
static HANDLE okfile;
static LONG successes;
static LONG failures;
@@ -633,6 +635,52 @@ static void test_lookaside_list(void)
ExDeleteNPagedLookasideList(&list);
@@ -632,6 +634,52 @@ static void test_version(void)
ok(*pNtBuildNumber == build, "Expected build number %u, got %u\n", build, *pNtBuildNumber);
}
+static void test_default_modules(void)
@@ -76,14 +76,14 @@ index 13fce71..8da13cd 100644
{
ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength;
@@ -664,6 +712,7 @@ static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info)
test_sync();
test_version();
test_stack_callout();
test_lookaside_list();
+ test_default_modules();
test_stack_callout();
/* print process report */
@@ -773,6 +822,8 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
if (test_input->winetest_debug)
@@ -772,6 +821,8 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
DbgPrint("loading driver\n");
@@ -93,7 +93,7 @@ index 13fce71..8da13cd 100644
driver->DriverUnload = driver_Unload;
diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c
index 201a041..33b332d 100644
index 201a0411..33b332da 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_
@@ -131,5 +131,5 @@ index 201a041..33b332d 100644
if (!(stop_event = CreateEventW( NULL, TRUE, FALSE, NULL )))
return;
--
1.9.1
2.20.1