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

Timestamp:

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

Author:

sandervl

Message:

openfile, virtualquery + import name fixes

File:

• trunk/src/kernel32/mmap.cpp (modified) (3 diffs)

trunk/src/kernel32/mmap.cpp

@@ -1 @@
-/* $Id: mmap.cpp,v 1.37 2000-03-23 19:23:47 sandervl Exp $ */
+/* $Id: mmap.cpp,v 1.38 2000-03-28 17:11:49 sandervl Exp $ */
 
 /*
@@ -195 +195 @@
   if(hMemFile != -1) {
 //      for(i=0;i<nrpages;i++) {
-                if(VirtualQuery((LPSTR)pageAddr, &memInfo, nrpages*PAGE_SIZE) == 0) {
+                if(VirtualQuery((LPSTR)pageAddr, &memInfo, sizeof(MEMORY_BASIC_INFORMATION)) == 0) {
                         dprintf(("Win32MemMap::commitPage: VirtualQuery (%x,%x) failed for %x", pageAddr, nrpages*PAGE_SIZE));
                         goto fail;
                 }
+                memInfo.RegionSize = min(memInfo.RegionSize, nrpages*PAGE_SIZE);
                 //Only changes the state of the pages with the same attribute flags
                 //(returned in memInfo.RegionSize)
@@ -250 +251 @@
         ULONG sizeleft = nrpages*PAGE_SIZE;
         while(sizeleft) {
-                if(VirtualQuery((LPSTR)pageAddr, &memInfo, sizeleft) == 0) {
+
+                if(VirtualQuery((LPSTR)pageAddr, &memInfo, sizeof(MEMORY_BASIC_INFORMATION)) == 0) {
                         dprintf(("Win32MemMap::commitPage: VirtualQuery (%x,%x) failed", pageAddr, sizeleft));
                         goto fail;
                 }
+                memInfo.RegionSize = min(memInfo.RegionSize, sizeleft);
+
                 if(!(memInfo.State & MEM_COMMIT))
                 {//if it's already committed, then the app tried to write to it