wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 6a610a325809d47f48bc72f3a757e1a62b193ea8

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2019-05-22 08:24:22 +10:00
parent 0bb3121273
commit 6f185a694c
3 changed files with 41 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/setupapi-Display_Device/0001-setupapi-Create-registry-keys-for-display-devices-an.patch
View File

@ -1,4 +1,4 @@
From e9814d73df6ba4589a7da3138c2c0db521e0fc4a Mon Sep 17 00:00:00 2001
From c9b3268ab753c5d00ba39968eba4311fdc6e6100 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 11 Feb 2016 03:17:09 +0100
Subject: [PATCH] setupapi: Create registry keys for display devices and
@ -10,12 +10,12 @@ Subject: [PATCH] setupapi: Create registry keys for display devices and
2 files changed, 98 insertions(+), 6 deletions(-)
diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index 537b3351..19e56f83 100644
index 9b83c3519be..e666d3bb008 100644
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -95,6 +95,15 @@ static const WCHAR Control[] = {'C','o','n','t','r','o','l',0};
static const WCHAR Linked[] = {'L','i','n','k','e','d',0};
static const WCHAR emptyW[] = {0};
@@ -111,6 +111,15 @@ struct driver
WCHAR description[LINE_LEN];
};
+/* GUIDs */
+static const WCHAR displayGUIDW[] = {'{','4','d','3','6','e','9','6','8','-','e','3','2','5','-',
@ -29,7 +29,7 @@ index 537b3351..19e56f83 100644
/* is used to identify if a DeviceInfoSet pointer is
valid or not */
#define SETUP_DEVICE_INFO_SET_MAGIC 0xd00ff056
@@ -190,6 +199,90 @@ static struct device_iface *get_device_iface(HDEVINFO devinfo, const SP_DEVICE_I
@@ -210,6 +219,90 @@ static struct device_iface *get_device_iface(HDEVINFO devinfo, const SP_DEVICE_I
return (struct device_iface *)data->Reserved;
}
@ -120,7 +120,7 @@ index 537b3351..19e56f83 100644
static inline void copy_device_data(SP_DEVINFO_DATA *data, const struct device *device)
{
data->ClassGuid = device->class;
@@ -503,8 +596,7 @@ static HKEY SETUPDI_CreateDevKey(struct device *device)
@@ -523,8 +616,7 @@ static HKEY SETUPDI_CreateDevKey(struct device *device)
HKEY enumKey, key = INVALID_HANDLE_VALUE;
LONG l;
@ -130,7 +130,7 @@ index 537b3351..19e56f83 100644
if (!l)
{
RegCreateKeyExW(enumKey, device->instanceId, 0, NULL, 0,
@@ -2099,8 +2191,7 @@ static void SETUPDI_EnumerateMatchingInterfaces(HDEVINFO DeviceInfoSet,
@@ -2143,8 +2235,7 @@ static void SETUPDI_EnumerateMatchingInterfaces(HDEVINFO DeviceInfoSet,
TRACE("%s\n", debugstr_w(enumstr));
@ -140,7 +140,7 @@ index 537b3351..19e56f83 100644
for (i = 0; !l; i++)
{
len = ARRAY_SIZE(subKeyName);
@@ -2320,8 +2411,7 @@ static void SETUPDI_EnumerateDevices(HDEVINFO DeviceInfoSet, const GUID *class,
@@ -2364,8 +2455,7 @@ static void SETUPDI_EnumerateDevices(HDEVINFO DeviceInfoSet, const GUID *class,
TRACE("%p, %s, %s, %08x\n", DeviceInfoSet, debugstr_guid(class),
debugstr_w(enumstr), flags);
@ -151,7 +151,7 @@ index 537b3351..19e56f83 100644
{
if (enumstr)
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index 1fe8b115..93c3afb3 100644
index 4d28a93c359..7a44e0fe713 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -465,6 +465,8 @@ HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"Locale",0x1