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

Timestamp:

Mar 4, 2011, 11:08:35 PM (14 years ago)

Author:

dmik

Message:

kernel32: VirtualQuery: Succeed with MEM_FREE for one page when querying
an unallocated address in the private arena (for which DosQueryMem fails
with ERROR_INVALID_ADDRESS).

File:

• trunk/src/kernel32/virtual.cpp (modified) (1 diff)

trunk/src/kernel32/virtual.cpp

@@ -722 +722 @@
     if(rc==487)
     {
-        dprintf(("VirtualQuery - OSLibDosQueryMem %x %x returned %d, REMOVING ERROR!\n",
-                  lpBase, cbLength, rc));
-        SetLastError(0);
-        return 0;
+        // On OS/2, ERROR_INVALID_ADDRESS (478) is returned for unallocated or
+        // freed private memory (for unallocated shared memory DosQueryMem
+        // succeeds with PAG_FREE). However on Windows (per MSDN), VirtualQuery
+        // succeeds with MEM_FREE for any address that is within the addressable
+        // space of the process. Provide a rough simulation here.
+
+        dprintf(("WARNING: VirtualQuery: OSLibDosQueryMem(0x%08X,%d) returned %d, "
+                 "returning MEM_FREE for one page!",
+                 lpBase, cbLength, rc));
+
+        memset(pmbiBuffer, 0, sizeof(MEMORY_BASIC_INFORMATION));
+        pmbiBuffer->BaseAddress = lpBase;
+        pmbiBuffer->RegionSize  = 0x1000;
+        pmbiBuffer->State       = MEM_FREE;
+        return sizeof(MEMORY_BASIC_INFORMATION);
     }
     if(rc)