Zebediah Figura : ntoskrnl.exe: Use SetupDiOpenDeviceInfo().

[Alexandre Julliard]

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

Author: Zebediah Figura 
Date:   Wed Jun  5 09:22:15 2019 -0500

ntoskrnl.exe: Use SetupDiOpenDeviceInfo().

Signed-off-by: Zebediah Figura 
Signed-off-by: Alexandre Julliard

---

dlls/ntoskrnl.exe/pnp.c | 37 ++++---------------------------------
 1 file changed, 4 insertions(+), 33 deletions(-)

diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c
index d8f74e0..b88b9f1 100644
--- a/dlls/ntoskrnl.exe/pnp.c
+++ b/dlls/ntoskrnl.exe/pnp.c
@@ -623,7 +623,6 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla
     WCHAR *instance_id;
     DWORD required;
     HDEVINFO set;
-    BOOL rc;

TRACE("device %p, class_guid %s, refstr %s, symbolic_link %p.\n",
             device, debugstr_guid(class_guid), debugstr_us(refstr), symbolic_link);
@@ -634,39 +633,11 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla
     status = get_instance_id( device, &instance_id );
     if (status != STATUS_SUCCESS) return status;

-    rc = SetupDiCreateDeviceInfoW( set, instance_id, class_guid, NULL, NULL, 0, &sp_device );
-    if (rc == 0)
+    if (!SetupDiCreateDeviceInfoW( set, instance_id, class_guid, NULL, NULL, 0, &sp_device )
+            && !SetupDiOpenDeviceInfoW( set, instance_id, NULL, 0, &sp_device ))
     {
-        if (GetLastError() == ERROR_DEVINST_ALREADY_EXISTS)
-        {
-            DWORD index = 0;
-            DWORD size = strlenW(instance_id) + 2;
-            WCHAR *id = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) );
-            do
-            {
-                rc = SetupDiEnumDeviceInfo( set, index, &sp_device );
-                if (rc && IsEqualGUID( &sp_device.ClassGuid, class_guid ))
-                {
-                    BOOL check;
-                    check = SetupDiGetDeviceInstanceIdW( set, &sp_device, id, size, &required );
-                    if (check && strcmpW( id, instance_id ) == 0)
-                        break;
-                }
-                index++;
-            } while (rc);
-
-            HeapFree( GetProcessHeap(), 0, id );
-            if (!rc)
-            {
-                ExFreePool( instance_id );
-                return STATUS_UNSUCCESSFUL;
-            }
-        }
-        else
-        {
-            ExFreePool( instance_id );
-            return STATUS_UNSUCCESSFUL;
-        }
+        ERR("Failed to create device %s, error %#x.\n", debugstr_w(instance_id), GetLastError());
+        return GetLastError();
     }
     ExFreePool( instance_id );