[ros-diffs] [sir_richard] 49036: [NTOS]: Hackfix a hack. Should get rid of the recent VAD assert in user32/bpp changes.

[sir_richard]

Author: sir_richard
Date: Thu Oct  7 17:35:25 2010
New Revision: 49036

URL: http://svn.reactos.org/svn/reactos?rev=49036&view=rev
Log:
[NTOS]: Hackfix a hack. Should get rid of the recent VAD assert in user32/bpp 
changes.

Modified:
    trunk/reactos/ntoskrnl/mm/marea.c

Modified: trunk/reactos/ntoskrnl/mm/marea.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=49036&r1=49035&r2=49036&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Thu Oct  7 17:35:25 2010
@@ -373,12 +373,23 @@
        Vad = ExAllocatePoolWithTag(NonPagedPool, sizeof(MMVAD), 'Fake');
        ASSERT(Vad);
        RtlZeroMemory(Vad, sizeof(MMVAD));
+       EndingAddress = (((ULONG_PTR)PBaseAddress + PRegionSize - 1) | 
(PAGE_SIZE - 1));
+         StartingAddress = (ULONG_PTR)PAGE_ALIGN(PBaseAddress);
+         
        Vad->StartingVpn = PAGE_ROUND_DOWN(marea->StartingAddress) >> 
PAGE_SHIFT;
-       Vad->EndingVpn = PAGE_ROUND_DOWN((ULONG_PTR)marea->EndingAddress - 1) 
>> PAGE_SHIFT;
-       if (Vad->EndingVpn < Vad->StartingVpn)
-       {
-           DPRINT1("Building a broken VAD. Data: %p %p %lx %lx\n", 
marea->StartingAddress, marea->EndingAddress, Vad->StartingVpn, Vad->EndingVpn);
-       }
+       /*
+        * For some strange reason, it is perfectly valid to create a MAREA 
from 0x1000 to... 0x1000.
+        * In a normal OS/Memory Manager, this would be retarded, but ReactOS 
allows this (how it works
+        * I don't even want to know).
+        */
+        if (marea->EndingAddress != marea->StartingAddress)
+        {
+            Vad->EndingVpn = PAGE_ROUND_DOWN((ULONG_PTR)marea->EndingAddress - 
1) >> PAGE_SHIFT;
+        }
+        else
+        {
+            Vad->EndingVpn = Vad->StartingVpn;
+        }
        Vad->u.VadFlags.Spare = 1;
        Vad->u.VadFlags.PrivateMemory = 1;
        MiInsertVad(Vad, MmGetAddressSpaceOwner(AddressSpace));