Author: tfaber
Date: Thu Jan 16 16:56:30 2014
New Revision: 61646
URL:
http://svn.reactos.org/svn/reactos?rev=61646&view=rev
Log:
[NTOS:MM]
- Output debug information before ASSERTing. CORE-7671
- FORCEINLINE belongs before the return type (-Wold-style-declaration)
Modified:
trunk/reactos/ntoskrnl/mm/ARM3/miarm.h
trunk/reactos/ntoskrnl/mm/ARM3/virtual.c
Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Thu Jan 16 16:56:30 2014
@@ -1006,8 +1006,8 @@
//
// Updates a valid PTE
//
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
MI_UPDATE_VALID_PTE(IN PMMPTE PointerPte,
IN MMPTE TempPte)
{
@@ -1035,8 +1035,8 @@
//
// Erase the PTE completely
//
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
MI_ERASE_PTE(IN PMMPTE PointerPte)
{
/* Zero out the PTE */
Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Thu Jan 16 16:56:30 2014
@@ -1692,7 +1692,12 @@
if (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW)
{
Status = MmQuerySectionView(MemoryArea, BaseAddress, &MemoryInfo,
&ResultLength);
- ASSERT(NT_SUCCESS(Status));
+ if (!NT_SUCCESS(Status))
+ {
+ DPRINT1("MmQuerySectionView failed. MemoryArea=%p (%p-%p),
BaseAddress=%p",
+ MemoryArea, MemoryArea->StartingAddress,
MemoryArea->EndingAddress, BaseAddress);
+ NT_ASSERT(NT_SUCCESS(Status));
+ }
}
else
{
@@ -1733,7 +1738,7 @@
ObDereferenceObject(TargetProcess);
}
- /* Return the data, NtQueryInformation already probed it*/
+ /* Return the data, NtQueryInformation already probed it */
if (PreviousMode != KernelMode)
{
_SEH2_TRY