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 8d076bc5e46cc11ec94db631e7c608f62d75cee2.

Browse Source
This commit is contained in:
Zebediah Figura
2021-04-06 17:41:23 -05:00
parent 733a420dd7
commit 0c295023f1
9 changed files with 85 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From be83f47da548774293bf47411d6e128a1aa5d817 Mon Sep 17 00:00:00 2001
From 39314cbad0b085a913d829ce4f264edf76af4ff3 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 d9d712418ee..808f304b258 100644
index 179d2d5e02d..505641d9f87 100644
--- a/dlls/ntoskrnl.exe/tests/driver.c
+++ b/dlls/ntoskrnl.exe/tests/driver.c
@@ -52,6 +52,7 @@ static int kmemcmp( const void *ptr1, const void *ptr2, size_t n )
@@ -21,7 +21,7 @@ index d9d712418ee..808f304b258 100644
static POBJECT_TYPE *pExEventObjectType, *pIoFileObjectType, *pPsThreadType, *pIoDriverObjectType;
static PEPROCESS *pPsInitialSystemProcess;
@@ -1592,6 +1593,7 @@ static void test_resource(void)
@@ -1584,6 +1585,7 @@ static void test_resource(void)
ok(status == STATUS_SUCCESS, "got status %#x\n", status);
}
@@ -29,7 +29,7 @@ index d9d712418ee..808f304b258 100644
static void test_lookup_thread(void)
{
NTSTATUS status;
@@ -2119,6 +2121,52 @@ static void test_permanence(void)
@@ -2111,6 +2113,52 @@ static void test_permanence(void)
ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", status);
}
@@ -82,15 +82,15 @@ index d9d712418ee..808f304b258 100644
static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack)
{
ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength;
@@ -2165,6 +2213,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st
@@ -2158,6 +2206,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);
test_ob_reference();
+ test_default_modules();
test_resource();
test_lookup_thread();
test_IoAttachDeviceToDeviceStack();
@@ -2560,6 +2609,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
@@ -2553,6 +2602,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
DbgPrint("loading driver\n");
driver_obj = driver;
@@ -99,10 +99,10 @@ index d9d712418ee..808f304b258 100644
/* Allow unloading of the driver */
driver->DriverUnload = driver_Unload;
diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c
index 3acc5e8a799..adaabedf68f 100644
index 509cab96308..14f8c9e4704 100644
--- a/programs/winedevice/device.c
+++ b/programs/winedevice/device.c
@@ -115,8 +115,16 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_
@@ -121,8 +121,16 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_
static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv )
{
@@ -119,7 +119,7 @@ index 3acc5e8a799..adaabedf68f 100644
if (!(stop_event = CreateEventW( NULL, TRUE, FALSE, NULL )))
return;
@@ -129,6 +137,24 @@ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv )
@@ -135,6 +143,24 @@ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv )
wcscat( driver_dir, L"\\drivers" );
AddDllDirectory( driver_dir );