Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-27 00:11:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

[UMPNPMGR] PNP_Get(First/Next)LogConf: return proper tags for the resource list case

Browse source
This commit is contained in:
Eric Kohl 2023-06-29 18:06:02 +02:00
parent 209439a5ae
commit e1eb9e3620
1 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4237,7 +4237,7 @@ PNP_GetFirstLogConf(
goto done;
}
DPRINT("Data size %lu\n", ulDataSize);
DPRINT1("Data size %lu\n", ulDataSize);
if (ulDataSize == 0 || lpData == NULL)
{
DPRINT1("No config data available!\n");
@ -4248,21 +4248,15 @@ PNP_GetFirstLogConf(
/* Get the first tag */
if (RegDataType == REG_RESOURCE_LIST)
{
DPRINT("REG_RESOURCE_LIST\n");
DPRINT("REG_RESOURCE_LIST->Count %lu\n", ((PCM_RESOURCE_LIST)lpData)->Count);
DPRINT("ResourceList->Count %lu\n", ((PCM_RESOURCE_LIST)lpData)->Count);
/* Indicate that we reached the end of the list */
if (((PCM_RESOURCE_LIST)lpData)->Count == 0)
{
DPRINT1("No resource descriptors!\n");
ret = CR_NO_MORE_LOG_CONF;
goto done;
}
DPRINT("lpData %p\n", lpData);
DPRINT("&List[0] %p\n", &(((PCM_RESOURCE_LIST)lpData)->List[0]));
*pulLogConfTag = (DWORD)((DWORD_PTR)&(((PCM_RESOURCE_LIST)lpData)->List[0]) - (DWORD_PTR)lpData);
DPRINT("Offset (Tag): 0x%08lx\n", *pulLogConfTag);
}
else if (RegDataType == REG_RESOURCE_REQUIREMENTS_LIST)
{
@ -4347,13 +4341,24 @@ PNP_GetNextLogConf(
goto done;
}
/* FIXME: Get the next tag */
/* Check if the next entry is available */
if (RegDataType == REG_RESOURCE_LIST)
{
DPRINT1("FIXME: REG_RESOURCE_LIST\n");
/* FIXME */
ret = CR_NO_MORE_LOG_CONF;
goto done;
DPRINT("REG_RESOURCE_LIST->Count %lu\n", ((PCM_RESOURCE_LIST)lpData)->Count);
/* Fail, if we are beyond the end of the list */
if (ulCurrentTag >= ((PCM_RESOURCE_LIST)lpData)->Count)
{
ret = CR_INVALID_LOG_CONF;
goto done;
}
/* Indicate that we reached the end of the list */
if (ulCurrentTag == ((PCM_RESOURCE_LIST)lpData)->Count - 1)
{
ret = CR_NO_MORE_LOG_CONF;
goto done;
}
}
else if (RegDataType == REG_RESOURCE_REQUIREMENTS_LIST)
{
@ -4363,6 +4368,9 @@ PNP_GetNextLogConf(
goto done;
}
/* Return the next tag value */
*pulNextTag = ulCurrentTag + 1;
done:
if (lpData != NULL)
HeapFree(GetProcessHeap(), 0, lpData);