Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-31 19:42:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[UMPNPMGR] PNP_GetRelatedDeviceInstance must return the root device as the parent of non-existing devices

Browse source
This commit is contained in:
Eric Kohl 2022-04-18 09:48:03 +02:00
parent 94d144f8a5
commit 11886ebec2
1 changed files with 33 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
base/services/umpnpmgr/rpcserver.c
View file

@ -413,6 +413,17 @@ IsRootDeviceInstanceID(
} }
static
BOOL
IsPresentDeviceInstanceID(
_In_ LPWSTR pszDeviceInstanceID)
{
DWORD ulStatus, ulProblem;
return (GetDeviceStatus(pszDeviceInstanceID, &ulStatus, &ulProblem) == CR_SUCCESS);
}
static static
CONFIGRET CONFIGRET
OpenConfigurationKey( OpenConfigurationKey(
@ -781,10 +792,29 @@ PNP_GetRelatedDeviceInstance(
if (!IsValidDeviceInstanceID(pDeviceID)) if (!IsValidDeviceInstanceID(pDeviceID))
return CR_INVALID_DEVINST; return CR_INVALID_DEVINST;
/* The root device does not have a parent device or sibling devices */ if (ulRelationship == PNP_GET_PARENT_DEVICE_INSTANCE)
if ((ulRelationship == PNP_GET_PARENT_DEVICE_INSTANCE) ||
(ulRelationship == PNP_GET_SIBLING_DEVICE_INSTANCE))
{ {
/* The root device does not have a parent */
if (IsRootDeviceInstanceID(pDeviceID))
return CR_NO_SUCH_DEVINST;
/* Return the root device for non existing devices */
if (!IsPresentDeviceInstanceID(pDeviceID))
{
if ((wcslen(szRootDeviceInstanceID) + 1) > *pulLength)
{
*pulLength = wcslen(szRootDeviceInstanceID) + 1;
return CR_BUFFER_SMALL;
}
wcscpy(pRelatedDeviceId, szRootDeviceInstanceID);
*pulLength = wcslen(szRootDeviceInstanceID) + 1;
return CR_SUCCESS;
}
}
else if (ulRelationship == PNP_GET_SIBLING_DEVICE_INSTANCE)
{
/* The root device does not have siblings */
if (IsRootDeviceInstanceID(pDeviceID)) if (IsRootDeviceInstanceID(pDeviceID))
return CR_NO_SUCH_DEVINST; return CR_NO_SUCH_DEVINST;
} }