system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 09:24:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ntoskrnl.exe: Use SetupDiOpenDeviceInfo().

Browse source 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2019-06-05 09:22:15 -05:00 committed by Alexandre Julliard
parent 1e05e96c47
commit 510261a4b4
1 changed files with 4 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
dlls/ntoskrnl.exe/pnp.c
View file

@ -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 );