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 61aea5a9879f41224022d4775cce28d28618ea89.

Browse Source
This commit is contained in:
Zebediah Figura
2019-05-17 16:51:57 -05:00
parent 831b1f895e
commit 77ef8ff7ef
5 changed files with 82 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From e6228bde99103e0fbb08c98e0b76f6a518274c7f Mon Sep 17 00:00:00 2001
From 9732937171cfb05055b0ef8cb2d4fcf7efddf679 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
@ -10,10 +10,10 @@ Subject: [PATCH] setupapi: Handle the case that a full driver path is passed
2 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index d0fe0b3..cf2d304 100644
index 38d994e3a..846531343 100644
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -2438,8 +2438,30 @@ static void SETUPDI_EnumerateDevices(HDEVINFO DeviceInfoSet, const GUID *class,
@@ -2455,8 +2455,30 @@ static void SETUPDI_EnumerateDevices(HDEVINFO DeviceInfoSet, const GUID *class,
&enumStrKey);
if (!l)
{
@ -47,10 +47,10 @@ index d0fe0b3..cf2d304 100644
}
}
diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c
index 9107d82..a887bdd 100644
index afb431f8d..332755190 100644
--- a/dlls/setupapi/tests/devinst.c
+++ b/dlls/setupapi/tests/devinst.c
@@ -1881,6 +1881,28 @@ static void test_device_interface_key(void)
@@ -1884,6 +1884,28 @@ static void test_device_interface_key(void)
SetupDiDestroyDeviceInfoList(set);
}
@ -79,7 +79,7 @@ index 9107d82..a887bdd 100644
static void test_device_install_params(void)
{
SP_DEVINFO_DATA device = {sizeof(device)};
@@ -1948,8 +1970,6 @@ static void test_device_install_params(void)
@@ -1951,8 +1973,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);
@ -87,8 +87,8 @@ index 9107d82..a887bdd 100644
- SetupDiDestroyDeviceInfoList(set);
}
START_TEST(devinst)
@@ -1978,6 +1998,7 @@ START_TEST(devinst)
#ifdef __i386__
@@ -2135,6 +2155,7 @@ START_TEST(devinst)
test_registry_property_a();
test_registry_property_w();
test_get_inf_class();
@ -97,5 +97,5 @@ index 9107d82..a887bdd 100644
test_device_interface_key();
test_device_install_params();
--
1.9.1
2.21.0