Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-06 12:45:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NTOSKRNL]

Browse source 
Revert unwanted white space changes

svn path=/trunk/; revision=63451
This commit is contained in:
Timo Kreuzer 2014-05-25 20:10:31 +00:00
parent c53ac2a20b
commit dd982c4a66
1 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
reactos/ntoskrnl/mm/ARM3/virtual.c
View file

@ -4572,44 +4572,44 @@ NtAllocateVirtualMemory(IN HANDLE ProcessHandle,
{ {
Status = STATUS_NO_MEMORY; Status = STATUS_NO_MEMORY;
goto FailPath; goto FailPath;
}
} }
} else
else
{
/* Make sure it doesn't conflict with an existing allocation */
Result = MiCheckForConflictingNode(StartingAddress >> PAGE_SHIFT,
EndingAddress >> PAGE_SHIFT,
&Process->VadRoot,
&Parent);
if (Result == TableFoundNode)
{ {
// /* Make sure it doesn't conflict with an existing allocation */
// The address specified is in conflict! Result = MiCheckForConflictingNode(StartingAddress >> PAGE_SHIFT,
// EndingAddress >> PAGE_SHIFT,
Status = STATUS_CONFLICTING_ADDRESSES; &Process->VadRoot,
goto FailPath; &Parent);
if (Result == TableFoundNode)
{
//
// The address specified is in conflict!
//
Status = STATUS_CONFLICTING_ADDRESSES;
goto FailPath;
}
} }
}
// //
// Write out the VAD fields for this allocation // Write out the VAD fields for this allocation
// //
Vad->StartingVpn = StartingAddress >> PAGE_SHIFT; Vad->StartingVpn = StartingAddress >> PAGE_SHIFT;
Vad->EndingVpn = EndingAddress >> PAGE_SHIFT; Vad->EndingVpn = EndingAddress >> PAGE_SHIFT;
// //
// FIXME: Should setup VAD bitmap // FIXME: Should setup VAD bitmap
// //
Status = STATUS_SUCCESS; Status = STATUS_SUCCESS;
// //
// Lock the working set and insert the VAD into the process VAD tree // Lock the working set and insert the VAD into the process VAD tree
// //
MiLockProcessWorkingSetUnsafe(Process, CurrentThread); MiLockProcessWorkingSetUnsafe(Process, CurrentThread);
Vad->ControlArea = NULL; // For Memory-Area hack Vad->ControlArea = NULL; // For Memory-Area hack
Process->VadRoot.NodeHint = Vad; Process->VadRoot.NodeHint = Vad;
MiInsertNode(&Process->VadRoot, (PVOID)Vad, Parent, Result); MiInsertNode(&Process->VadRoot, (PVOID)Vad, Parent, Result);
MiUnlockProcessWorkingSetUnsafe(Process, CurrentThread); MiUnlockProcessWorkingSetUnsafe(Process, CurrentThread);
// //
// Make sure the actual region size is at least as big as the // Make sure the actual region size is at least as big as the