[NTOS:MM]

- Fix some MSVC warnings

svn path=/trunk/; revision=61022
This commit is contained in:
Thomas Faber 2013-11-17 21:58:48 +00:00
parent 09d35bf4fe
commit c4046fb227
2 changed files with 22 additions and 14 deletions

View file

@ -724,8 +724,9 @@ MiAllocatePoolPages(IN POOL_TYPE PoolType,
(FreeEntry->Size << PAGE_SHIFT)); (FreeEntry->Size << PAGE_SHIFT));
/* Remove the item from the list, depending if pool is protected */ /* Remove the item from the list, depending if pool is protected */
MmProtectFreedNonPagedPool ? if (MmProtectFreedNonPagedPool)
MiProtectedPoolRemoveEntryList(&FreeEntry->List) : MiProtectedPoolRemoveEntryList(&FreeEntry->List);
else
RemoveEntryList(&FreeEntry->List); RemoveEntryList(&FreeEntry->List);
// //
@ -738,8 +739,9 @@ MiAllocatePoolPages(IN POOL_TYPE PoolType,
if (i >= MI_MAX_FREE_PAGE_LISTS) i = MI_MAX_FREE_PAGE_LISTS - 1; if (i >= MI_MAX_FREE_PAGE_LISTS) i = MI_MAX_FREE_PAGE_LISTS - 1;
/* Insert the entry into the free list head, check for prot. pool */ /* Insert the entry into the free list head, check for prot. pool */
MmProtectFreedNonPagedPool ? if (MmProtectFreedNonPagedPool)
MiProtectedPoolInsertList(&MmNonPagedPoolFreeListHead[i], &FreeEntry->List, TRUE) : MiProtectedPoolInsertList(&MmNonPagedPoolFreeListHead[i], &FreeEntry->List, TRUE);
else
InsertTailList(&MmNonPagedPoolFreeListHead[i], &FreeEntry->List); InsertTailList(&MmNonPagedPoolFreeListHead[i], &FreeEntry->List);
/* Is freed non paged pool protected? */ /* Is freed non paged pool protected? */
@ -1085,8 +1087,9 @@ MiFreePoolPages(IN PVOID StartingVa)
FreePages += FreeEntry->Size; FreePages += FreeEntry->Size;
/* Remove the item from the list, depending if pool is protected */ /* Remove the item from the list, depending if pool is protected */
MmProtectFreedNonPagedPool ? if (MmProtectFreedNonPagedPool)
MiProtectedPoolRemoveEntryList(&FreeEntry->List) : MiProtectedPoolRemoveEntryList(&FreeEntry->List);
else
RemoveEntryList(&FreeEntry->List); RemoveEntryList(&FreeEntry->List);
} }
@ -1165,8 +1168,9 @@ MiFreePoolPages(IN PVOID StartingVa)
if (FreeEntry->Size < (MI_MAX_FREE_PAGE_LISTS - 1)) if (FreeEntry->Size < (MI_MAX_FREE_PAGE_LISTS - 1))
{ {
/* Remove the item from the list, depending if pool is protected */ /* Remove the item from the list, depending if pool is protected */
MmProtectFreedNonPagedPool ? if (MmProtectFreedNonPagedPool)
MiProtectedPoolRemoveEntryList(&FreeEntry->List) : MiProtectedPoolRemoveEntryList(&FreeEntry->List);
else
RemoveEntryList(&FreeEntry->List); RemoveEntryList(&FreeEntry->List);
// //
@ -1181,8 +1185,9 @@ MiFreePoolPages(IN PVOID StartingVa)
if (i >= MI_MAX_FREE_PAGE_LISTS) i = MI_MAX_FREE_PAGE_LISTS - 1; if (i >= MI_MAX_FREE_PAGE_LISTS) i = MI_MAX_FREE_PAGE_LISTS - 1;
/* Insert the entry into the free list head, check for prot. pool */ /* Insert the entry into the free list head, check for prot. pool */
MmProtectFreedNonPagedPool ? if (MmProtectFreedNonPagedPool)
MiProtectedPoolInsertList(&MmNonPagedPoolFreeListHead[i], &FreeEntry->List, TRUE) : MiProtectedPoolInsertList(&MmNonPagedPoolFreeListHead[i], &FreeEntry->List, TRUE);
else
InsertTailList(&MmNonPagedPoolFreeListHead[i], &FreeEntry->List); InsertTailList(&MmNonPagedPoolFreeListHead[i], &FreeEntry->List);
} }
else else
@ -1212,8 +1217,9 @@ MiFreePoolPages(IN PVOID StartingVa)
if (i >= MI_MAX_FREE_PAGE_LISTS) i = MI_MAX_FREE_PAGE_LISTS - 1; if (i >= MI_MAX_FREE_PAGE_LISTS) i = MI_MAX_FREE_PAGE_LISTS - 1;
/* Insert the entry into the free list head, check for prot. pool */ /* Insert the entry into the free list head, check for prot. pool */
MmProtectFreedNonPagedPool ? if (MmProtectFreedNonPagedPool)
MiProtectedPoolInsertList(&MmNonPagedPoolFreeListHead[i], &FreeEntry->List, TRUE) : MiProtectedPoolInsertList(&MmNonPagedPoolFreeListHead[i], &FreeEntry->List, TRUE);
else
InsertTailList(&MmNonPagedPoolFreeListHead[i], &FreeEntry->List); InsertTailList(&MmNonPagedPoolFreeListHead[i], &FreeEntry->List);
} }

View file

@ -557,8 +557,10 @@ MiProcessLoaderEntry(IN PLDR_DATA_TABLE_ENTRY LdrEntry,
OldIrql = KeAcquireSpinLockRaiseToSynch(&PsLoadedModuleSpinLock); OldIrql = KeAcquireSpinLockRaiseToSynch(&PsLoadedModuleSpinLock);
/* Insert or remove from the list */ /* Insert or remove from the list */
Insert ? InsertTailList(&PsLoadedModuleList, &LdrEntry->InLoadOrderLinks) : if (Insert)
RemoveEntryList(&LdrEntry->InLoadOrderLinks); InsertTailList(&PsLoadedModuleList, &LdrEntry->InLoadOrderLinks);
else
RemoveEntryList(&LdrEntry->InLoadOrderLinks);
/* Release locks */ /* Release locks */
KeReleaseSpinLock(&PsLoadedModuleSpinLock, OldIrql); KeReleaseSpinLock(&PsLoadedModuleSpinLock, OldIrql);