Zebediah Figura : setupapi: Merge the InterfaceInfo and InterfaceInstances structs.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 86d26dded5560d6d8adb195372f0676d1f7229b0
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=86d26dded5560d6d8adb195372f0676d1f7229b0

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Sun Jul 29 20:26:27 2018 -0500

setupapi: Merge the InterfaceInfo and InterfaceInstances structs.

It seems the original motivation for separating these was to facilitate easy
enumeration of specific classes using SetupDiEnumDeviceInterfaces(), but it
makes other things unnecessarily complex [including an eventual
implementation of SetupDiRemoveDeviceInterface()] and the implementation
provided here seems quite simple enough.

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/setupapi/devinst.c | 541 +++++++++++++++++-------------------------------
 1 file changed, 189 insertions(+), 352 deletions(-)

Diff:   https://source.winehq.org/git/wine.git/?a=commitdiff;h=86d26dded5560d6d8adb195372f0676d1f7229b0