Changeset 2072 for trunk/src

Timestamp:

Dec 14, 1999, 1:50:46 PM (26 years ago)

Author:

sandervl

Message:

memory map fixes

Location:

trunk/src/kernel32

Files:

• mmap.cpp (modified) (3 diffs)
• mmap.h (modified) (2 diffs)
• winimagepeldr.cpp (modified) (4 diffs)

trunk/src/kernel32/mmap.cpp

@@ -1 @@
-/* $Id: mmap.cpp,v 1.28 1999-12-13 19:28:14 sandervl Exp $ */
+/* $Id: mmap.cpp,v 1.29 1999-12-14 12:50:45 sandervl Exp $ */
 
 /*
@@ -237 +237 @@
   }
   else {
-        for(i=0;i<nrpages;i++) {
-                if(VirtualQuery((LPSTR)pageAddr, &memInfo, PAGE_SIZE) == 0) {
-                        dprintf(("Win32MemMap::commitPage: VirtualQuery (%x,%x) failed for %x", pageAddr, PAGE_SIZE));
+        ULONG sizeleft = nrpages*PAGE_SIZE;
+        while(sizeleft) {
+                if(VirtualQuery((LPSTR)pageAddr, &memInfo, sizeleft) == 0) {
+                        dprintf(("Win32MemMap::commitPage: VirtualQuery (%x,%x) failed", pageAddr, sizeleft));
                         goto fail;
                 }
@@ -247 +248 @@
                                 goto fail;
                 }
-                pageAddr += PAGE_SIZE;
+                memInfo.RegionSize = (memInfo.RegionSize+PAGE_SIZE-1) & ~0xfff;
+                pageAddr += memInfo.RegionSize;
+                sizeleft -= memInfo.RegionSize;
         }
   }

trunk/src/kernel32/mmap.h

@@ -1 @@
-/* $Id: mmap.h,v 1.12 1999-11-22 20:35:50 sandervl Exp $ */
+/* $Id: mmap.h,v 1.13 1999-12-14 12:50:46 sandervl Exp $ */
 
 /*
@@ -21 +21 @@
 
 //commit 4 pages at once when the app accesses it
-#define NRPAGES_TOCOMMIT        200
+#define NRPAGES_TOCOMMIT        16
 
 #define MEMMAP_ACCESS_READ      1

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.23 1999-12-13 19:28:15 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.24 1999-12-14 12:50:46 sandervl Exp $ */
 
 /*
@@ -241 +241 @@
   memmap = new Win32MemMap(this, realBaseAddress, imageSize);
   if(memmap == NULL || !memmap->Init(0)) {
-        strcpy(szErrorModule, OSLibStripPath(szFileName));
         goto failure;
   }
@@ -1356 +1355 @@
                 if(rc) {
                         dprintf((LOG, "DosLoadModule returned %X for %s\n", rc, szModuleFailure));
-                        sprintf(szErrorModule, "%s.DLL", szModuleFailure);
+                        sprintf(szErrorModule, "%s.DLL", szModuleFailure);
                         errorState = rc;
                         return(FALSE);
@@ -1381 +1380 @@
                 if(WinDll->init(0) == FALSE) {
                     dprintf((LOG, "Internal WinDll error ", WinDll->getError() ));
-                    strcpy(szErrorModule, OSLibStripPath(modname));
                     return(FALSE);
                 }