Rebase against 29d9659095fd76e303f204050ab4c85d0a0486e4.

This commit is contained in:
Zebediah Figura
2021-03-31 16:49:32 -05:00
parent 2929606a6a
commit 4e2dc89043
11 changed files with 107 additions and 225 deletions

View File

@@ -1,4 +1,4 @@
From e4dea5ee77c25ec502104dca8c503d5016e1a1d4 Mon Sep 17 00:00:00 2001
From be83f47da548774293bf47411d6e128a1aa5d817 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
@@ -99,17 +99,17 @@ 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..f16f6204efe 100644
index 3acc5e8a799..adaabedf68f 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_
static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv )
{
+ static const WCHAR ntoskrnlW[] = {'n','t','o','s','k','r','n','l','.','e','x','e',0};
+ static const WCHAR win32kW[] = {'w','i','n','3','2','k','.','s','y','s',0};
+ static const WCHAR dxgkrnlW[] = {'d','x','g','k','r','n','l','.','s','y','s',0};
+ static const WCHAR dxgmms1W[] = {'d','x','g','m','m','s','1','.','s','y','s',0};
+ static const WCHAR ntoskrnlW[] = L"C:\\windows\\system32\\ntoskrnl.exe";
+ static const WCHAR win32kW[] = L"C:\\windows\\system32\\win32k.sys";
+ static const WCHAR dxgkrnlW[] = L"C:\\windows\\system32\\drivers\\dxgkrnl.sys";
+ static const WCHAR dxgmms1W[] = L"C:\\windows\\system32\\drivers\\dxgmms1.sys";
+ static const WCHAR *stubs[] = { win32kW, dxgkrnlW, dxgmms1W };
WCHAR driver_dir[MAX_PATH];
const WCHAR *service_group = (argc >= 2) ? argv[1] : argv[0];