Author: sginsberg Date: Tue Sep 1 08:41:39 2015 New Revision: 68890
URL: http://svn.reactos.org/svn/reactos?rev=68890&view=rev Log: - Missed these. Goodbye NT_ASSERT.
Modified: trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/se/token.c
Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=6... ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Tue Sep 1 08:41:39 2015 @@ -4190,7 +4190,7 @@ (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 @@ { 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 @@ { 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 @@ 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 @@ }
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;
Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=688... ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Tue Sep 1 08:41:39 2015 @@ -123,7 +123,7 @@ _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 @@ _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;