From b1d778dfbb3526abf87799e74a74fa31e15e428a Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Thu, 16 Jan 2014 16:56:30 +0000 Subject: [PATCH] [NTOS:MM] - Output debug information before ASSERTing. CORE-7671 - FORCEINLINE belongs before the return type (-Wold-style-declaration) svn path=/trunk/; revision=61646 --- reactos/ntoskrnl/mm/ARM3/miarm.h | 4 ++-- reactos/ntoskrnl/mm/ARM3/virtual.c | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/reactos/ntoskrnl/mm/ARM3/miarm.h b/reactos/ntoskrnl/mm/ARM3/miarm.h index 0ec38ed1b97..fbdfeabaa56 100644 --- a/reactos/ntoskrnl/mm/ARM3/miarm.h +++ b/reactos/ntoskrnl/mm/ARM3/miarm.h @@ -1006,8 +1006,8 @@ MI_WRITE_VALID_PTE(IN PMMPTE PointerPte, // // Updates a valid PTE // -VOID FORCEINLINE +VOID MI_UPDATE_VALID_PTE(IN PMMPTE PointerPte, IN MMPTE TempPte) { @@ -1035,8 +1035,8 @@ MI_WRITE_INVALID_PTE(IN PMMPTE PointerPte, // // Erase the PTE completely // -VOID FORCEINLINE +VOID MI_ERASE_PTE(IN PMMPTE PointerPte) { /* Zero out the PTE */ diff --git a/reactos/ntoskrnl/mm/ARM3/virtual.c b/reactos/ntoskrnl/mm/ARM3/virtual.c index 6afcfc82e98..88b4fa0edab 100644 --- a/reactos/ntoskrnl/mm/ARM3/virtual.c +++ b/reactos/ntoskrnl/mm/ARM3/virtual.c @@ -1692,7 +1692,12 @@ MiQueryMemoryBasicInformation(IN HANDLE ProcessHandle, 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 @@ MiQueryMemoryBasicInformation(IN HANDLE ProcessHandle, ObDereferenceObject(TargetProcess); } - /* Return the data, NtQueryInformation already probed it*/ + /* Return the data, NtQueryInformation already probed it */ if (PreviousMode != KernelMode) { _SEH2_TRY