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 07e249e431c5009fa6ab8d274b4a8fe62a286358

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2019-05-17 08:58:11 +10:00
parent 1b7ebd3bb8
commit 071fe01910
6 changed files with 155 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 8dd3d1b76f5b90d0adaf7905f91fdc11e7389f86 Mon Sep 17 00:00:00 2001
From e6228bde99103e0fbb08c98e0b76f6a518274c7f 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: [PATCH] setupapi: Handle the case that a full driver path is passed
@@ -6,14 +6,14 @@ Subject: [PATCH] setupapi: Handle the case that a full driver path is passed
---
dlls/setupapi/devinst.c | 26 ++++++++++++++++++++++++--
dlls/setupapi/tests/devinst.c | 23 +++++++++++++++++++++++
2 files changed, 47 insertions(+), 2 deletions(-)
dlls/setupapi/tests/devinst.c | 25 +++++++++++++++++++++++--
2 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index 0452d7a5..8b9aae85 100644
index d0fe0b3..cf2d304 100644
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -2332,8 +2332,30 @@ static void SETUPDI_EnumerateDevices(HDEVINFO DeviceInfoSet, const GUID *class,
@@ -2438,8 +2438,30 @@ static void SETUPDI_EnumerateDevices(HDEVINFO DeviceInfoSet, const GUID *class,
&enumStrKey);
if (!l)
{
@@ -47,10 +47,10 @@ index 0452d7a5..8b9aae85 100644
}
}
diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c
index 0e6a1c0a..fce81ea0 100644
index 9107d82..a887bdd 100644
--- a/dlls/setupapi/tests/devinst.c
+++ b/dlls/setupapi/tests/devinst.c
@@ -1331,6 +1331,28 @@ static void test_device_interface_key(void)
@@ -1881,6 +1881,28 @@ static void test_device_interface_key(void)
SetupDiDestroyDeviceInfoList(set);
}
@@ -76,17 +76,26 @@ index 0e6a1c0a..fce81ea0 100644
+ SetupDiDestroyDeviceInfoList(set);
+}
+
START_TEST(devinst)
static void test_device_install_params(void)
{
HKEY hkey;
@@ -1355,6 +1377,7 @@ START_TEST(devinst)
SP_DEVINFO_DATA device = {sizeof(device)};
@@ -1948,8 +1970,6 @@ static void test_device_install_params(void)
ok(!params.FileQueue, "Got queue %p.\n", params.FileQueue);
ok(!params.ClassInstallReserved, "Got class installer data %#lx.\n", params.ClassInstallReserved);
ok(!strcasecmp(params.DriverPath, "C:\\windows"), "Got driver path %s.\n", params.DriverPath);
-
- SetupDiDestroyDeviceInfoList(set);
}
START_TEST(devinst)
@@ -1978,6 +1998,7 @@ START_TEST(devinst)
test_registry_property_a();
test_registry_property_w();
test_get_inf_class();
+ testSetupDiGetClassDevsA();
test_devnode();
test_device_interface_key();
}
test_device_install_params();
--
2.19.1
1.9.1