Author: jgardou
Date: Sun Jun 2 11:52:15 2013
New Revision: 59141
URL:
http://svn.reactos.org/svn/reactos?rev=59141&view=rev
Log:
[NTOSKRNL/MM]
- Improve the stub for MEM_RESET case of NtAllocateVirtualMemory.
Fixes infinite loop for gecko-based application (including firefox19 and ReactOS/wine
mshtml implementation)
Modified:
trunk/reactos/ntoskrnl/mm/ARM3/virtual.c
Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sun Jun 2 11:52:15 2013
@@ -3859,13 +3859,7 @@
DPRINT1("MEM_TOP_DOWN not supported\n");
AllocationType &= ~MEM_TOP_DOWN;
}
- if ((AllocationType & MEM_RESET) == MEM_RESET)
- {
- /// @todo HACK: pretend success
- DPRINT("MEM_RESET not supported\n");
- Status = STATUS_SUCCESS;
- goto FailPathNoLock;
- }
+
if (Process->VmTopDown == 1)
{
DPRINT1("VmTopDown not supported\n");
@@ -4062,6 +4056,14 @@
{
DPRINT1("Could not find a VAD for this allocation\n");
Status = STATUS_CONFLICTING_ADDRESSES;
+ goto FailPath;
+ }
+
+ if ((AllocationType & MEM_RESET) == MEM_RESET)
+ {
+ /// @todo HACK: pretend success
+ DPRINT("MEM_RESET not supported\n");
+ Status = STATUS_SUCCESS;
goto FailPath;
}