[PATCH 4/6] setupapi: Call DIF_DESTROYPRIVATEDATA when deleting a device.

[Zebediah Figura]

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
 dlls/setupapi/devinst.c       | 5 +++++
 dlls/setupapi/tests/devinst.c | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index 8e3e5615c4..281d7d3178 100644
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -724,6 +724,11 @@ static void remove_device(struct device *device)
 static void delete_device(struct device *device)
 {
     struct device_iface *iface, *next;
+    SP_DEVINFO_DATA device_data;
+
+    device_data.cbSize = sizeof(device_data);
+    copy_device_data(&device_data, device);
+    SetupDiCallClassInstaller(DIF_DESTROYPRIVATEDATA, device->set, &device_data);
 
     if (device->phantom)
         remove_device(device);
diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c
index 5d9c03fa36..2cd5637aed 100644
--- a/dlls/setupapi/tests/devinst.c
+++ b/dlls/setupapi/tests/devinst.c
@@ -2428,8 +2428,8 @@ static void test_class_installer(void)
 
     SetupDiDestroyDeviceInfoList(set);
 
-    todo_wine ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count);
-    todo_wine ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message);
+    ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count);
+    ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message);
     *coinst_callback_count = 0;
 
     /* Test returning an error. */
@@ -2506,8 +2506,8 @@ static void test_class_installer(void)
 
     SetupDiDestroyDeviceInfoList(set);
 
-    todo_wine ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count);
-    todo_wine ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message);
+    ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count);
+    ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message);
     *coinst_callback_count = 0;
 
     res = RegDeleteKeyA(class_key, "");
-- 
2.21.0