diff --git a/reactos/ntoskrnl/mm/anonmem.c b/reactos/ntoskrnl/mm/anonmem.c
index 47806195202..b9a7005ab7d 100644
--- a/reactos/ntoskrnl/mm/anonmem.c
+++ b/reactos/ntoskrnl/mm/anonmem.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: anonmem.c,v 1.11 2003/04/26 23:13:32 hyperion Exp $
+/* $Id: anonmem.c,v 1.12 2003/04/28 10:37:39 gvg Exp $
  *
  * PROJECT:     ReactOS kernel
  * FILE:        ntoskrnl/mm/anonmem.c
@@ -877,10 +877,12 @@ MmQueryAnonMem(PMEMORY_AREA MemoryArea,
 			Address, &RegionBase);
   Info->AllocationBase = RegionBase;
   Info->AllocationProtect = Region->Protect;  /* FIXME */
-  Info->RegionSize = Region->Length;
+  Info->RegionSize = RegionBase + Region->Length - Info->BaseAddress;
   Info->State = Region->Type;
   Info->Protect = Region->Protect;
   Info->Type = MEM_PRIVATE;
+
+  *ResultLength = sizeof(MEMORY_BASIC_INFORMATION);
   return(STATUS_SUCCESS);
 }
 
diff --git a/reactos/ntoskrnl/mm/virtual.c b/reactos/ntoskrnl/mm/virtual.c
index 72e262900ca..d717ff3ca82 100644
--- a/reactos/ntoskrnl/mm/virtual.c
+++ b/reactos/ntoskrnl/mm/virtual.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: virtual.c,v 1.64 2002/09/08 10:23:37 chorns Exp $
+/* $Id: virtual.c,v 1.65 2003/04/28 10:37:40 gvg Exp $
  *
  * PROJECT:     ReactOS kernel
  * FILE:        ntoskrnl/mm/virtual.c
@@ -113,6 +113,7 @@ NtQueryVirtualMemory (IN HANDLE ProcessHandle,
 	 
 	 if (Length != sizeof(MEMORY_BASIC_INFORMATION))
 	   {
+	     MmUnlockAddressSpace(AddressSpace);
 	     ObDereferenceObject(Process);
 	     return(STATUS_INFO_LENGTH_MISMATCH);
 	   }