Author: tfaber
Date: Sun Nov 17 21:58:48 2013
New Revision: 61022
URL:
http://svn.reactos.org/svn/reactos?rev=61022&view=rev
Log:
[NTOS:MM]
- Fix some MSVC warnings
Modified:
trunk/reactos/ntoskrnl/mm/ARM3/pool.c
trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c
Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Sun Nov 17 21:58:48 2013
@@ -724,8 +724,9 @@
(FreeEntry->Size << PAGE_SHIFT));
/* Remove the item from the list, depending if pool is protected */
- MmProtectFreedNonPagedPool ?
- MiProtectedPoolRemoveEntryList(&FreeEntry->List) :
+ if (MmProtectFreedNonPagedPool)
+ MiProtectedPoolRemoveEntryList(&FreeEntry->List);
+ else
RemoveEntryList(&FreeEntry->List);
//
@@ -738,8 +739,9 @@
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 */
- MmProtectFreedNonPagedPool ?
- MiProtectedPoolInsertList(&MmNonPagedPoolFreeListHead[i],
&FreeEntry->List, TRUE) :
+ if (MmProtectFreedNonPagedPool)
+ MiProtectedPoolInsertList(&MmNonPagedPoolFreeListHead[i],
&FreeEntry->List, TRUE);
+ else
InsertTailList(&MmNonPagedPoolFreeListHead[i],
&FreeEntry->List);
/* Is freed non paged pool protected? */
@@ -1085,8 +1087,9 @@
FreePages += FreeEntry->Size;
/* Remove the item from the list, depending if pool is protected */
- MmProtectFreedNonPagedPool ?
- MiProtectedPoolRemoveEntryList(&FreeEntry->List) :
+ if (MmProtectFreedNonPagedPool)
+ MiProtectedPoolRemoveEntryList(&FreeEntry->List);
+ else
RemoveEntryList(&FreeEntry->List);
}
@@ -1165,8 +1168,9 @@
if (FreeEntry->Size < (MI_MAX_FREE_PAGE_LISTS - 1))
{
/* Remove the item from the list, depending if pool is protected */
- MmProtectFreedNonPagedPool ?
- MiProtectedPoolRemoveEntryList(&FreeEntry->List) :
+ if (MmProtectFreedNonPagedPool)
+ MiProtectedPoolRemoveEntryList(&FreeEntry->List);
+ else
RemoveEntryList(&FreeEntry->List);
//
@@ -1181,8 +1185,9 @@
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 */
- MmProtectFreedNonPagedPool ?
- MiProtectedPoolInsertList(&MmNonPagedPoolFreeListHead[i],
&FreeEntry->List, TRUE) :
+ if (MmProtectFreedNonPagedPool)
+ MiProtectedPoolInsertList(&MmNonPagedPoolFreeListHead[i],
&FreeEntry->List, TRUE);
+ else
InsertTailList(&MmNonPagedPoolFreeListHead[i],
&FreeEntry->List);
}
else
@@ -1212,8 +1217,9 @@
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 */
- MmProtectFreedNonPagedPool ?
- MiProtectedPoolInsertList(&MmNonPagedPoolFreeListHead[i],
&FreeEntry->List, TRUE) :
+ if (MmProtectFreedNonPagedPool)
+ MiProtectedPoolInsertList(&MmNonPagedPoolFreeListHead[i],
&FreeEntry->List, TRUE);
+ else
InsertTailList(&MmNonPagedPoolFreeListHead[i], &FreeEntry->List);
}
Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Sun Nov 17 21:58:48 2013
@@ -557,8 +557,10 @@
OldIrql = KeAcquireSpinLockRaiseToSynch(&PsLoadedModuleSpinLock);
/* Insert or remove from the list */
- Insert ? InsertTailList(&PsLoadedModuleList, &LdrEntry->InLoadOrderLinks)
:
- RemoveEntryList(&LdrEntry->InLoadOrderLinks);
+ if (Insert)
+ InsertTailList(&PsLoadedModuleList, &LdrEntry->InLoadOrderLinks);
+ else
+ RemoveEntryList(&LdrEntry->InLoadOrderLinks);
/* Release locks */
KeReleaseSpinLock(&PsLoadedModuleSpinLock, OldIrql);