Changeset 3259 for trunk/src/kernel32/virtual.cpp

Timestamp:

Mar 28, 2000, 7:11:50 PM (25 years ago)

Author:

sandervl

Message:

openfile, virtualquery + import name fixes

File:

• trunk/src/kernel32/virtual.cpp (modified) (4 diffs)

trunk/src/kernel32/virtual.cpp

@@ -1 @@
-/* $Id: virtual.cpp,v 1.28 2000-02-16 14:22:46 sandervl Exp $ */
+/* $Id: virtual.cpp,v 1.29 2000-03-28 17:11:50 sandervl Exp $ */
 
 /*
@@ -553 +553 @@
   LPVOID lpBase;
 
-  if(pmbiBuffer == NULL || cbLength == 0) // check parameters
-  {
-    return 0;                             // nothing to return
-  }
+  if(pmbiBuffer == NULL || cbLength != sizeof(MEMORY_BASIC_INFORMATION)) // check parameters
+  {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return 0;                             // nothing to return
+  }
+  SetLastError(ERROR_SUCCESS);
 
   // determine exact page range
   lpBase = (LPVOID)((ULONG)lpvAddress & 0xFFFFF000);
-  cbRangeSize = cbLength & ~0x00000FFF;   // assuming intel page sizes :)
-  if(cbLength & 0x00000FFF)
-    cbRangeSize += PAGE_SIZE;
+  cbRangeSize = -1;
 
   rc = OSLibDosQueryMem(lpBase,
@@ -569 +569 @@
   if(rc)
   {
-    dprintf(("VirtualQuery - OSLibDosQueryMem %x %x returned %d\n",
-             lpBase,
-             cbLength,
-             rc));
-    return 0;
+        dprintf(("VirtualQuery - OSLibDosQueryMem %x %x returned %d\n",
+                  lpBase, cbLength, rc));
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return 0;
   }
 
@@ -607 +606 @@
 
   if(!(dAttr & PAG_SHARED))
-    pmbiBuffer->Type = MEM_PRIVATE;
+        pmbiBuffer->Type = MEM_PRIVATE;
 
   //TODO: This is not correct: AllocationProtect should contain the protection
   //      flags used in the initial call to VirtualAlloc
   pmbiBuffer->AllocationProtect = pmbiBuffer->Protect;
-  if(dAttr & PAG_BASE)
-    pmbiBuffer->AllocationBase = lpBase;
+  if(dAttr & PAG_BASE) {
+        pmbiBuffer->AllocationBase = lpBase;
+  }
   else
   {
-    while(lpBase > 0)
-    {
-      rc = OSLibDosQueryMem(lpBase, &cbRangeSize, &dAttr);
-      if(rc)
-      {
-         dprintf(("VirtualQuery - OSLibDosQueryMem %x %x returned %d\n",
-                  lpBase,
-                  cbLength,
-                  rc));
-         break;
-      }
-      if(dAttr & PAG_BASE)
-      {
-         pmbiBuffer->AllocationBase = lpBase;
-         break;
-      }
-      lpBase = (LPVOID)((ULONG)lpBase - PAGE_SIZE);
-   }
+        while(lpBase > 0)
+        {
+                rc = OSLibDosQueryMem(lpBase, &cbRangeSize, &dAttr);
+                if(rc) {
+                        dprintf(("VirtualQuery - OSLibDosQueryMem %x %x returned %d\n",
+                                  lpBase, cbLength, rc));
+                        break;
+                }
+                if(dAttr & PAG_BASE) {
+                        pmbiBuffer->AllocationBase = lpBase;
+                        break;
+                }
+                lpBase = (LPVOID)((ULONG)lpBase - PAGE_SIZE);
+        }
   }
   return sizeof(MEMORY_BASIC_INFORMATION);