Skip to content

setupapi: Fix uninitialized len in is_device_instance_linked, use RegGetValueW, and check for refstr #309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xzn wants to merge 1 commit into
base: bleeding-edge
Choose a base branch
from
+27 −18
Open

setupapi: Fix uninitialized len in is_device_instance_linked, use RegGetValueW, and check for refstr #309

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 27 additions & 18 deletions dlls/setupapi/devinst.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2455,14 +2455,15 @@ static void SETUPDI_EnumerateInterfaces(HDEVINFO DeviceInfoSet,
static BOOL is_device_instance_linked(HKEY subKey, HKEY interfacesKey, const WCHAR *deviceInstance)
{
LONG l;
DWORD class_idx = 0, device_idx, len, type;
HKEY class_key, device_key, link_key;
WCHAR class_keyname[40], device_keyname[MAX_DEVICE_ID_LEN];
DWORD class_idx = 0, device_idx, refstr_idx, len, type;
HKEY class_key, device_key, refstr_key;
WCHAR class_keyname[40], device_keyname[MAX_DEVICE_ID_LEN], refstr_keyname[MAX_DEVICE_ID_LEN];
WCHAR interface_devinstance[MAX_DEVICE_ID_LEN];
WCHAR alt_devinstance[MAX_DEVICE_ID_LEN];
WCHAR service[40];

l = RegQueryValueExW(subKey, L"Service", NULL, &type, (BYTE *)service, &len);
len = sizeof(service);
l = RegGetValueW(subKey, NULL, L"Service", RRF_RT_REG_SZ, &type, (BYTE *)service, &len);
if (!l && type == REG_SZ && !wcsicmp(service, L"winehid") && !wcsstr(deviceInstance, L"HID\\"))
{
const WCHAR *tmp = wcschr(deviceInstance, L'\\');
Expand Down Expand Up @@ -2497,8 +2498,8 @@ static BOOL is_device_instance_linked(HKEY subKey, HKEY interfacesKey, const WCH
if (l)
continue;

len = ARRAY_SIZE(interface_devinstance);
l = RegQueryValueExW(device_key, L"DeviceInstance", NULL, &type, (BYTE *)interface_devinstance, &len);
len = sizeof(interface_devinstance);
l = RegGetValueW(device_key, NULL, L"DeviceInstance", RRF_RT_REG_SZ, &type, (BYTE *)interface_devinstance, &len);
if (l || type != REG_SZ)
{
RegCloseKey(device_key);
Expand All @@ -2512,22 +2513,30 @@ static BOOL is_device_instance_linked(HKEY subKey, HKEY interfacesKey, const WCH
continue;
}

l = RegOpenKeyExW(device_key, L"#", 0, KEY_READ, &link_key);
if (l)
/* return TRUE if any interface of the instance is linked */
refstr_idx = 0;
while (1)
{
RegCloseKey(device_key);
continue;
}
len = ARRAY_SIZE(refstr_keyname);
l = RegEnumKeyExW(device_key, refstr_idx++, refstr_keyname, &len, NULL, NULL, NULL, NULL);
if (l)
break;

if (is_linked(link_key))
{
RegCloseKey(link_key);
RegCloseKey(device_key);
RegCloseKey(class_key);
return TRUE;
l = RegOpenKeyExW(device_key, refstr_keyname, 0, KEY_READ, &refstr_key);
if (l)
continue;

if (is_linked(refstr_key))
{
RegCloseKey(refstr_key);
RegCloseKey(device_key);
RegCloseKey(class_key);
return TRUE;
}

RegCloseKey(refstr_key);
}

RegCloseKey(link_key);
RegCloseKey(device_key);
}

Expand Down