wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

setupapi-Display_Device: Correct rebase.

Browse Source
This commit is contained in:
Zebediah Figura 2019-02-27 21:01:33 -06:00
parent b02bd9c446
commit b50c875c39
1 changed files with 6 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,16 +1,16 @@
From 7e98f3407f4dfda7ef82ae236af3073029c60191 Mon Sep 17 00:00:00 2001
From e9814d73df6ba4589a7da3138c2c0db521e0fc4a 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
display drivers.
---
dlls/setupapi/devinst.c | 122 ++++++++++++++++++++++++++++++++++++++++++++----
dlls/setupapi/devinst.c | 102 +++++++++++++++++++++++++++++++++++++---
loader/wine.inf.in | 2 +
2 files changed, 116 insertions(+), 8 deletions(-)
2 files changed, 98 insertions(+), 6 deletions(-)
diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index 537b335..1693684 100644
index 537b3351..19e56f83 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};
@ -150,35 +150,8 @@ index 537b335..1693684 100644
if (enumKey != INVALID_HANDLE_VALUE)
{
if (enumstr)
@@ -3555,8 +3645,24 @@ HKEY WINAPI SetupDiOpenDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data,
FIXME("Unhandled type %#x.\n", KeyType);
l = ERROR_CALL_NOT_IMPLEMENTED;
}
- SetLastError(l == ERROR_FILE_NOT_FOUND ? ERROR_KEY_DOES_NOT_EXIST : l);
- return l ? INVALID_HANDLE_VALUE : key;
+ return key;
+}
+
+static BOOL SETUPDI_DeleteDevKey(struct device *device)
+{
+ HKEY enumKey;
+ BOOL ret = FALSE;
+ LONG l;
+
+ l = open_enum_key(&enumKey);
+ if (!l)
+ {
+ ret = RegDeleteTreeW(enumKey, device->instanceId);
+ RegCloseKey(enumKey);
+ }
+ else
+ SetLastError(l);
+ return ret;
}
/***********************************************************************
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index 1fe8b11..93c3afb 100644
index 1fe8b115..93c3afb3 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -465,6 +465,8 @@ HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"Locale",0x1
@ -191,5 +164,5 @@ index 1fe8b11..93c3afb 100644
HKLM,System\CurrentControlSet\Control\Class\{4d36e978-e325-11ce-bfc1-08002be10318},"Class",,"Ports"
HKLM,System\CurrentControlSet\Control\Class\{6bdd1fc6-810f-11d0-bec7-08002be2092f},,,"Imaging devices"
--
1.9.1
2.20.1