Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 01:35:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTSOKRNL]

Browse source 
Remove a broken ASSERT. Fixes MSVC build


svn path=/trunk/; revision=55903
This commit is contained in:
Timo Kreuzer 2012-02-28 17:50:21 +00:00
parent ec76cc0bc3
commit 35784af061
1 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
reactos/ntoskrnl/mm/ARM3/pagfault.c
View file

@ -936,9 +936,6 @@ MmArmAccessFault(IN BOOLEAN StoreInstruction,
/* Right now, we only handle scenarios where the PDE is totally empty */ /* Right now, we only handle scenarios where the PDE is totally empty */
ASSERT(PointerPde->u.Long == 0); ASSERT(PointerPde->u.Long == 0);
/* Right now, we expect a valid protection mask on the VAD */
ASSERT(ProtectionCode != MM_NOACCESS);
/* And go dispatch the fault on the PDE. This should handle the demand-zero */ /* And go dispatch the fault on the PDE. This should handle the demand-zero */
#if MI_TRACE_PFNS #if MI_TRACE_PFNS
UserPdeFault = TRUE; UserPdeFault = TRUE;
@ -976,7 +973,7 @@ MmArmAccessFault(IN BOOLEAN StoreInstruction,
/* Make sure it's not a prototype PTE */ /* Make sure it's not a prototype PTE */
ASSERT(TempPte.u.Soft.Prototype == 0); ASSERT(TempPte.u.Soft.Prototype == 0);
/* Check if this address range belongs to a valid allocation (VAD) */ /* Check if this address range belongs to a valid allocation (VAD) */
ProtoPte = MiCheckVirtualAddress(Address, &ProtectionCode, &Vad); ProtoPte = MiCheckVirtualAddress(Address, &ProtectionCode, &Vad);
if (ProtectionCode == MM_NOACCESS) if (ProtectionCode == MM_NOACCESS)
@ -1108,37 +1105,37 @@ MmGetExecuteOptions(IN PULONG ExecuteOptions)
ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL);
*ExecuteOptions = 0; *ExecuteOptions = 0;
if (CurrentProcess->Flags.ExecuteDisable) if (CurrentProcess->Flags.ExecuteDisable)
{ {
*ExecuteOptions |= MEM_EXECUTE_OPTION_DISABLE; *ExecuteOptions |= MEM_EXECUTE_OPTION_DISABLE;
} }
if (CurrentProcess->Flags.ExecuteEnable) if (CurrentProcess->Flags.ExecuteEnable)
{ {
*ExecuteOptions |= MEM_EXECUTE_OPTION_ENABLE; *ExecuteOptions |= MEM_EXECUTE_OPTION_ENABLE;
} }
if (CurrentProcess->Flags.DisableThunkEmulation) if (CurrentProcess->Flags.DisableThunkEmulation)
{ {
*ExecuteOptions |= MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION; *ExecuteOptions |= MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION;
} }
if (CurrentProcess->Flags.Permanent) if (CurrentProcess->Flags.Permanent)
{ {
*ExecuteOptions |= MEM_EXECUTE_OPTION_PERMANENT; *ExecuteOptions |= MEM_EXECUTE_OPTION_PERMANENT;
} }
if (CurrentProcess->Flags.ExecuteDispatchEnable) if (CurrentProcess->Flags.ExecuteDispatchEnable)
{ {
*ExecuteOptions |= MEM_EXECUTE_OPTION_EXECUTE_DISPATCH_ENABLE; *ExecuteOptions |= MEM_EXECUTE_OPTION_EXECUTE_DISPATCH_ENABLE;
} }
if (CurrentProcess->Flags.ImageDispatchEnable) if (CurrentProcess->Flags.ImageDispatchEnable)
{ {
*ExecuteOptions |= MEM_EXECUTE_OPTION_IMAGE_DISPATCH_ENABLE; *ExecuteOptions |= MEM_EXECUTE_OPTION_IMAGE_DISPATCH_ENABLE;
} }
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }