From: Stefan Ginsberg Date: Tue, 1 Sep 2015 08:41:39 +0000 (+0000) Subject: - Missed these. Goodbye NT_ASSERT. X-Git-Tag: ReactOS-0.4.0~1135 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=33f24ed20a940b85879cf5ae7c76b549e82c065b - Missed these. Goodbye NT_ASSERT. svn path=/trunk/; revision=68890 --- diff --git a/reactos/ntoskrnl/mm/section.c b/reactos/ntoskrnl/mm/section.c index 41d07614bb5..f25e3b76d7a 100644 --- a/reactos/ntoskrnl/mm/section.c +++ b/reactos/ntoskrnl/mm/section.c @@ -4190,7 +4190,7 @@ MiRosUnmapViewOfSection(IN PEPROCESS Process, (MemoryArea->Type != MEMORY_AREA_CACHE)) || MemoryArea->DeleteInProgress) { - if (MemoryArea) NT_ASSERT(MemoryArea->Type != MEMORY_AREA_OWNED_BY_ARM3); + if (MemoryArea) ASSERT(MemoryArea->Type != MEMORY_AREA_OWNED_BY_ARM3); MmUnlockAddressSpace(AddressSpace); return STATUS_NOT_MAPPED_VIEW; } @@ -4237,7 +4237,7 @@ MiRosUnmapViewOfSection(IN PEPROCESS Process, { DPRINT1("MmUnmapViewOfSegment failed for %p (Process %p) with %lx\n", SBaseAddress, Process, Status); - NT_ASSERT(NT_SUCCESS(Status)); + ASSERT(NT_SUCCESS(Status)); } } } @@ -4248,7 +4248,7 @@ MiRosUnmapViewOfSection(IN PEPROCESS Process, { DPRINT1("MmUnmapViewOfSegment failed for %p (Process %p) with %lx\n", BaseAddress, Process, Status); - NT_ASSERT(NT_SUCCESS(Status)); + ASSERT(NT_SUCCESS(Status)); } } @@ -4526,14 +4526,14 @@ MmMapViewOfSection(IN PVOID SectionObject, if (((ImageBase + ImageSize) > (ULONG_PTR)MmHighestUserAddress) || ((ImageBase + ImageSize) < ImageSize)) { - NT_ASSERT(*BaseAddress == NULL); + ASSERT(*BaseAddress == NULL); ImageBase = ALIGN_DOWN_BY((ULONG_PTR)MmHighestUserAddress - ImageSize, MM_VIRTMEM_GRANULARITY); NotAtBase = TRUE; } else if (ImageBase != ALIGN_DOWN_BY(ImageBase, MM_VIRTMEM_GRANULARITY)) { - NT_ASSERT(*BaseAddress == NULL); + ASSERT(*BaseAddress == NULL); ImageBase = ALIGN_DOWN_BY(ImageBase, MM_VIRTMEM_GRANULARITY); NotAtBase = TRUE; } @@ -4651,7 +4651,7 @@ MmMapViewOfSection(IN PVOID SectionObject, } MmUnlockAddressSpace(AddressSpace); - NT_ASSERT(*BaseAddress == ALIGN_DOWN_POINTER_BY(*BaseAddress, MM_VIRTMEM_GRANULARITY)); + ASSERT(*BaseAddress == ALIGN_DOWN_POINTER_BY(*BaseAddress, MM_VIRTMEM_GRANULARITY)); if (NotAtBase) Status = STATUS_IMAGE_NOT_AT_BASE; diff --git a/reactos/ntoskrnl/se/token.c b/reactos/ntoskrnl/se/token.c index 13c528efece..2a1bd550f23 100644 --- a/reactos/ntoskrnl/se/token.c +++ b/reactos/ntoskrnl/se/token.c @@ -123,7 +123,7 @@ SepUpdateSinglePrivilegeFlagToken( _In_ ULONG Index) { ULONG TokenFlag; - NT_ASSERT(Index < Token->PrivilegeCount); + ASSERT(Index < Token->PrivilegeCount); /* The high part of all values we are interested in is 0 */ if (Token->Privileges[Index].Luid.HighPart != 0) @@ -189,7 +189,7 @@ SepRemovePrivilegeToken( _In_ ULONG Index) { ULONG MoveCount; - NT_ASSERT(Index < Token->PrivilegeCount); + ASSERT(Index < Token->PrivilegeCount); /* Calculate the number of trailing privileges */ MoveCount = Token->PrivilegeCount - Index - 1;