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 1bcd38f788bb5165cc65a830ea912ff4eda50b84.

Browse Source
This commit is contained in:
Sebastian Lackner
2016-12-23 04:04:54 +01:00
parent e05b5bf8d5
commit 84b08ebde9
5 changed files with 25 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/setupapi-Display_Device/0002-setupapi-Handle-the-case-that-a-full-driver-path-is-.patch
View File

@ -1,4 +1,4 @@
From cb319b87c1753f771771ced81be00fa0c5de06bd Mon Sep 17 00:00:00 2001
From 29e1247c38bc714ea74e624821381091d4ea4bf0 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:20:33 +0100
Subject: setupapi: Handle the case that a full driver path is passed to
@ -10,10 +10,10 @@ Subject: setupapi: Handle the case that a full driver path is passed to
2 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index 744bcd6..3708de7 100644
index e6a6272..e3cc257 100644
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -2366,8 +2366,30 @@ static void SETUPDI_EnumerateDevices(HDEVINFO DeviceInfoSet, const GUID *class,
@@ -2376,8 +2376,30 @@ static void SETUPDI_EnumerateDevices(HDEVINFO DeviceInfoSet, const GUID *class,
&enumStrKey);
if (!l)
{
@ -47,10 +47,10 @@ index 744bcd6..3708de7 100644
}
}
diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c
index 319bb31..a0aa531 100644
index 6ca0e92..b1f1d04 100644
--- a/dlls/setupapi/tests/devinst.c
+++ b/dlls/setupapi/tests/devinst.c
@@ -1542,6 +1542,28 @@ static void testSetupDiGetINFClassA(void)
@@ -1347,6 +1347,28 @@ static void testSetupDiGetINFClassA(void)
}
}
@ -78,13 +78,13 @@ index 319bb31..a0aa531 100644
+
START_TEST(devinst)
{
init_function_pointers();
@@ -1570,4 +1592,5 @@ START_TEST(devinst)
HKEY hkey;
@@ -1384,4 +1406,5 @@ START_TEST(devinst)
testDeviceRegistryPropertyA();
testDeviceRegistryPropertyW();
testSetupDiGetINFClassA();
+ testSetupDiGetClassDevsA();
}
--
2.7.1
2.9.0