Zebediah Figura : setupapi: Merge the DeviceInstance and DeviceInfo structs.

[Alexandre Julliard]

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

Author: Zebediah Figura <z.figura12(a)gmail.com>
Date:   Sun Jul 29 20:26:24 2018 -0500

setupapi: Merge the DeviceInstance and DeviceInfo structs.

These are two different representations of the same underlying object;
there's no reason to keep them separate.

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

---

 dlls/setupapi/devinst.c | 374 ++++++++++++++++++++----------------------------
 1 file changed, 155 insertions(+), 219 deletions(-)

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