[NTOS:MM]

- Output debug information before ASSERTing. CORE-7671
- FORCEINLINE belongs before the return type (-Wold-style-declaration)

svn path=/trunk/; revision=61646
This commit is contained in:
Thomas Faber 2014-01-16 16:56:30 +00:00
parent d75ff2425e
commit b1d778dfbb
2 changed files with 9 additions and 4 deletions

View file

@ -1006,8 +1006,8 @@ MI_WRITE_VALID_PTE(IN PMMPTE PointerPte,
// //
// Updates a valid PTE // Updates a valid PTE
// //
VOID
FORCEINLINE FORCEINLINE
VOID
MI_UPDATE_VALID_PTE(IN PMMPTE PointerPte, MI_UPDATE_VALID_PTE(IN PMMPTE PointerPte,
IN MMPTE TempPte) IN MMPTE TempPte)
{ {
@ -1035,8 +1035,8 @@ MI_WRITE_INVALID_PTE(IN PMMPTE PointerPte,
// //
// Erase the PTE completely // Erase the PTE completely
// //
VOID
FORCEINLINE FORCEINLINE
VOID
MI_ERASE_PTE(IN PMMPTE PointerPte) MI_ERASE_PTE(IN PMMPTE PointerPte)
{ {
/* Zero out the PTE */ /* Zero out the PTE */

View file

@ -1692,7 +1692,12 @@ MiQueryMemoryBasicInformation(IN HANDLE ProcessHandle,
if (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW) if (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW)
{ {
Status = MmQuerySectionView(MemoryArea, BaseAddress, &MemoryInfo, &ResultLength); 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 else
{ {
@ -1733,7 +1738,7 @@ MiQueryMemoryBasicInformation(IN HANDLE ProcessHandle,
ObDereferenceObject(TargetProcess); ObDereferenceObject(TargetProcess);
} }
/* Return the data, NtQueryInformation already probed it*/ /* Return the data, NtQueryInformation already probed it */
if (PreviousMode != KernelMode) if (PreviousMode != KernelMode)
{ {
_SEH2_TRY _SEH2_TRY