Merge 16596 (hbirr) from trunk: Replaced KERNEL_BASE by MmSystemRangeStart. Modified: branches/ros-branch-0_2_7/reactos/ntoskrnl/ke/i386/exp.c Modified: branches/ros-branch-0_2_7/reactos/ntoskrnl/mm/marea.c _____
Modified: branches/ros-branch-0_2_7/reactos/ntoskrnl/ke/i386/exp.c --- branches/ros-branch-0_2_7/reactos/ntoskrnl/ke/i386/exp.c 2005-08-03 16:17:15 UTC (rev 17008) +++ branches/ros-branch-0_2_7/reactos/ntoskrnl/ke/i386/exp.c 2005-08-03 17:05:36 UTC (rev 17009) @@ -469,7 +469,7 @@
* Complete CPU context */ { - unsigned int cr2; + ULONG_PTR cr2; NTSTATUS Status; ULONG Esp0;
@@ -528,7 +528,7 @@ */ if (ExceptionNr == 14) { - if (Ke386NoExecute && Tf->ErrorCode & 0x10 && cr2 >= KERNEL_BASE) + if (Ke386NoExecute && Tf->ErrorCode & 0x10 && cr2 >= (ULONG_PTR)MmSystemRangeStart) { KEBUGCHECKWITHTF(ATTEMPTED_EXECUTE_OF_NOEXECUTE_MEMORY, 0, 0, 0, 0, Tf); } _____
Modified: branches/ros-branch-0_2_7/reactos/ntoskrnl/mm/marea.c --- branches/ros-branch-0_2_7/reactos/ntoskrnl/mm/marea.c 2005-08-03 16:17:15 UTC (rev 17008) +++ branches/ros-branch-0_2_7/reactos/ntoskrnl/mm/marea.c 2005-08-03 17:05:36 UTC (rev 17009) @@ -971,7 +971,7 @@
*BaseAddress = MM_ROUND_DOWN(*BaseAddress, Granularity);
if (AddressSpace->LowestAddress == MmSystemRangeStart && - *BaseAddress < (PVOID)KERNEL_BASE) + *BaseAddress < MmSystemRangeStart) { CHECKPOINT; return STATUS_ACCESS_VIOLATION;