[NTOS:MM] MiScanMemoryDescriptors(): Use the MiIsMemoryTypeInvisible() and MiIsMemoryTypeFree() helpers.

This commit is contained in:
Hermès Bélusca-Maïto 2024-11-28 21:11:24 +01:00
parent c53eb190c7
commit f395f87bb3
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0

View file

@ -421,20 +421,14 @@ MiScanMemoryDescriptors(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
/* Count this descriptor */ /* Count this descriptor */
MiNumberDescriptors++; MiNumberDescriptors++;
/* Check if this is invisible memory */ /* If this is invisible memory, skip this descriptor */
if ((Descriptor->MemoryType == LoaderFirmwarePermanent) || if (MiIsMemoryTypeInvisible(Descriptor->MemoryType))
(Descriptor->MemoryType == LoaderSpecialMemory) ||
(Descriptor->MemoryType == LoaderHALCachedMemory) ||
(Descriptor->MemoryType == LoaderBBTMemory))
{
/* Skip this descriptor */
continue; continue;
}
/* Check if this is bad memory */ /* Check if this isn't bad memory */
if (Descriptor->MemoryType != LoaderBad) if (Descriptor->MemoryType != LoaderBad)
{ {
/* Count this in the total of pages */ /* Count it in the physical pages */
MmNumberOfPhysicalPages += (PFN_COUNT)Descriptor->PageCount; MmNumberOfPhysicalPages += (PFN_COUNT)Descriptor->PageCount;
} }
@ -454,12 +448,9 @@ MiScanMemoryDescriptors(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
} }
/* Check if this is free memory */ /* Check if this is free memory */
if ((Descriptor->MemoryType == LoaderFree) || if (MiIsMemoryTypeFree(Descriptor->MemoryType))
(Descriptor->MemoryType == LoaderLoadedProgram) ||
(Descriptor->MemoryType == LoaderFirmwareTemporary) ||
(Descriptor->MemoryType == LoaderOsloaderStack))
{ {
/* Count it too free pages */ /* Count it in the free pages */
MiNumberOfFreePages += Descriptor->PageCount; MiNumberOfFreePages += Descriptor->PageCount;
/* Check if this is the largest memory descriptor */ /* Check if this is the largest memory descriptor */