Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-04 20:50:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOS:PNP] Fix resource conflict detection

Browse source 
Only resources of HAL were checked against conflicts, not those of PnP Manager

Let IoReportResourceForDetection() make a silent conflict check.
Otherwise IopCheckResourceDescriptor() will always return 'no conflict'.

CORE-17789
This commit is contained in:
Hervé Poussineau 2021-10-07 21:45:10 +02:00
parent ea8cbbd4ca
commit 49358f3416
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ntoskrnl/io/pnpmgr/pnpreport.c
View file

@ -376,7 +376,7 @@ IoReportResourceForDetection(IN PDRIVER_OBJECT DriverObject,
ResourceList = DriverList;
/* Look for a resource conflict */
Status = IopDetectResourceConflict(ResourceList, FALSE, NULL);
Status = IopDetectResourceConflict(ResourceList, TRUE, NULL);
if (Status == STATUS_CONFLICTING_ADDRESSES)
{
/* Oh noes */

4
ntoskrnl/io/pnpmgr/pnpres.c
View file

@ -1264,7 +1264,7 @@ IopDetectResourceConflict(
PKEY_BASIC_INFORMATION KeyInformation;
PKEY_VALUE_PARTIAL_INFORMATION KeyValueInformation;
PKEY_VALUE_BASIC_INFORMATION KeyNameInformation;
ULONG ChildKeyIndex1 = 0, ChildKeyIndex2 = 0, ChildKeyIndex3 = 0;
ULONG ChildKeyIndex1 = 0, ChildKeyIndex2, ChildKeyIndex3;
NTSTATUS Status;
RtlInitUnicodeString(&KeyName, L"\\Registry\\Machine\\HARDWARE\\RESOURCEMAP");
@ -1332,6 +1332,7 @@ IopDetectResourceConflict(
if (!NT_SUCCESS(Status))
goto cleanup;
ChildKeyIndex2 = 0;
while (TRUE)
{
Status = ZwEnumerateKey(ChildKey2,
@ -1382,6 +1383,7 @@ IopDetectResourceConflict(
if (!NT_SUCCESS(Status))
goto cleanup;
ChildKeyIndex3 = 0;
while (TRUE)
{
Status = ZwEnumerateValueKey(ChildKey3,