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

[NTOSKRNL]

Browse source 
Don't declare a variable in the moddle of a function, MSVC gets very angry about that.

svn path=/branches/cmake-bringup/; revision=49604
This commit is contained in:
Timo Kreuzer 2010-11-15 23:43:28 +00:00
parent 440627d3df
commit c4c880d59c
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ntoskrnl/mm/ARM3/vadnode.c
View file

@ -98,11 +98,13 @@ MiInsertNode(IN PMM_AVL_TABLE Table,
IN PMMADDRESS_NODE Parent, IN PMMADDRESS_NODE Parent,
IN TABLE_SEARCH_RESULT Result) IN TABLE_SEARCH_RESULT Result)
{ {
PMMVAD Vad;
/* Insert it into the tree */ /* Insert it into the tree */
RtlpInsertAvlTreeNode(Table, NewNode, Parent, Result); RtlpInsertAvlTreeNode(Table, NewNode, Parent, Result);
/* Now insert an ARM3 MEMORY_AREA for this node, unless the insert was already from the MEMORY_AREA code */ /* Now insert an ARM3 MEMORY_AREA for this node, unless the insert was already from the MEMORY_AREA code */
PMMVAD Vad = (PMMVAD)NewNode; Vad = (PMMVAD)NewNode;
if (Vad->u.VadFlags.Spare == 0) if (Vad->u.VadFlags.Spare == 0)
{ {
NTSTATUS Status; NTSTATUS Status;
@ -166,6 +168,8 @@ NTAPI
MiRemoveNode(IN PMMADDRESS_NODE Node, MiRemoveNode(IN PMMADDRESS_NODE Node,
IN PMM_AVL_TABLE Table) IN PMM_AVL_TABLE Table)
{ {
PMMVAD Vad;
/* Call the AVL code */ /* Call the AVL code */
RtlpDeleteAvlTreeNode(Table, Node); RtlpDeleteAvlTreeNode(Table, Node);
@ -181,7 +185,7 @@ MiRemoveNode(IN PMMADDRESS_NODE Node,
} }
/* Free the node from ReactOS view as well */ /* Free the node from ReactOS view as well */
PMMVAD Vad = (PMMVAD)Node; Vad = (PMMVAD)Node;
if (Vad->u.VadFlags.Spare == 0) if (Vad->u.VadFlags.Spare == 0)
{ {
PMEMORY_AREA MemoryArea; PMEMORY_AREA MemoryArea;

3
ntoskrnl/mm/marea.c
View file

@ -374,8 +374,9 @@ MmInsertMemoryArea(
/* Build a lame VAD if this is a user-space allocation */ /* Build a lame VAD if this is a user-space allocation */
if ((marea->EndingAddress < MmSystemRangeStart) && (marea->Type != MEMORY_AREA_OWNED_BY_ARM3)) if ((marea->EndingAddress < MmSystemRangeStart) && (marea->Type != MEMORY_AREA_OWNED_BY_ARM3))
{ {
ASSERT(marea->Type == MEMORY_AREA_VIRTUAL_MEMORY || marea->Type == MEMORY_AREA_SECTION_VIEW);
PMMVAD Vad; PMMVAD Vad;
ASSERT(marea->Type == MEMORY_AREA_VIRTUAL_MEMORY || marea->Type == MEMORY_AREA_SECTION_VIEW);
Vad = ExAllocatePoolWithTag(NonPagedPool, sizeof(MMVAD), 'Fake'); Vad = ExAllocatePoolWithTag(NonPagedPool, sizeof(MMVAD), 'Fake');
ASSERT(Vad); ASSERT(Vad);
RtlZeroMemory(Vad, sizeof(MMVAD)); RtlZeroMemory(Vad, sizeof(MMVAD));