Rebase against 6b76648a8b773838ecde00719ca54a433edf5ce6

This commit is contained in:
Alistair Leslie-Hughes
2019-02-06 14:27:30 +11:00
parent 1edb7d5bc5
commit 3dab9e5e6b
7 changed files with 11 additions and 893 deletions

View File

@ -1,4 +1,4 @@
From b396392de5b090fb78a358dec7a8790ecedf2240 Mon Sep 17 00:00:00 2001
From dd19f26a49f288dec1d287ebaaeb7a2dd2e7f0cd Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Mon, 15 Oct 2018 12:05:41 +1100
Subject: [PATCH] setupapi: Add SetupDiInstallDeviceInterfaces
@ -11,12 +11,12 @@ Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
2 files changed, 13 insertions(+)
diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index 771fc70..b15e580 100644
index 632d704c9bd..129b7384162 100644
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -4020,3 +4020,15 @@ BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO info_set, PSP_DEVINFO_DATA info_d
SetLastError(ERROR_NOT_FOUND);
return FALSE;
@@ -4002,3 +4002,15 @@ BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_
SetLastError(ls);
return !ls;
}
+
+/***********************************************************************
@ -31,7 +31,7 @@ index 771fc70..b15e580 100644
+}
+
diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec
index 99509e1..3f906ed 100644
index 3cd5663a01e..984f2218f02 100644
--- a/dlls/setupapi/setupapi.spec
+++ b/dlls/setupapi/setupapi.spec
@@ -367,6 +367,7 @@
@ -43,5 +43,5 @@ index 99509e1..3f906ed 100644
@ stdcall SetupDiLoadClassIcon(ptr ptr ptr)
@ stub SetupDiMoveDuplicateDevice
--
1.9.1
2.20.1