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

Browse Source
This commit is contained in:
Zebediah Figura
2024-03-27 18:08:14 -05:00
parent fdd0f9a334
commit 5d8ef8d881
6 changed files with 11 additions and 322 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 951d65cf18b7950d1aadaaf63c02c6a2a6fce073 Mon Sep 17 00:00:00 2001
From 555187b5ebdae9e7aa8a3edf7a74997c86fe0016 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,10 +10,10 @@ 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 a80bef78fab..18f2920759d 100644
index 751f2acff96..1af19c6f9ba 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 )
@@ -57,6 +57,7 @@ static int kmemcmp( const void *ptr1, const void *ptr2, size_t n )
static DRIVER_OBJECT *driver_obj;
static DEVICE_OBJECT *lower_device, *upper_device;
@@ -21,7 +21,7 @@ index a80bef78fab..18f2920759d 100644
static POBJECT_TYPE *pExEventObjectType, *pIoFileObjectType, *pPsThreadType, *pIoDriverObjectType;
static PEPROCESS *pPsInitialSystemProcess;
@@ -1713,6 +1714,7 @@ static void test_resource(void)
@@ -1716,6 +1717,7 @@ static void test_resource(void)
ok(status == STATUS_SUCCESS, "got status %#lx\n", status);
}
@@ -29,8 +29,8 @@ index a80bef78fab..18f2920759d 100644
static void test_lookup_thread(void)
{
NTSTATUS status;
@@ -2326,6 +2328,52 @@ static void test_driver_object_extension(void)
ok(get_obj_ext == NULL, "got %p\n", get_obj_ext);
@@ -2425,6 +2427,52 @@ static void test_default_security(void)
FltFreeSecurityDescriptor(sd);
}
+static void test_default_modules(void)
@@ -82,7 +82,7 @@ index a80bef78fab..18f2920759d 100644
static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack)
{
void *buffer = irp->AssociatedIrp.SystemBuffer;
@@ -2358,6 +2406,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st
@@ -2457,6 +2505,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st
test_stack_callout();
test_lookaside_list();
test_ob_reference();
@@ -90,7 +90,7 @@ index a80bef78fab..18f2920759d 100644
test_resource();
test_lookup_thread();
test_IoAttachDeviceToDeviceStack();
@@ -2838,6 +2887,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
@@ -2938,6 +2987,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
DbgPrint("loading driver\n");
driver_obj = driver;
@@ -99,7 +99,7 @@ index a80bef78fab..18f2920759d 100644
/* Allow unloading of the driver */
driver->DriverUnload = driver_Unload;
diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c
index 0a96307a017..abcb7b20679 100644
index bb585087230..9b4395ff098 100644
--- a/programs/winedevice/device.c
+++ b/programs/winedevice/device.c
@@ -122,8 +122,16 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_
@@ -145,5 +145,5 @@ index 0a96307a017..abcb7b20679 100644
set_service_status( service_handle, SERVICE_RUNNING,
SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN );
--
2.39.2
2.43.0