Changeset 2863 for trunk/src/kernel32/winimagepeldr.cpp

Timestamp:

Feb 23, 2000, 12:53:03 AM (26 years ago)

Author:

sandervl

Message:

Fixed bug in commitPage (winimagepeldr.cpp)

File:

• trunk/src/kernel32/winimagepeldr.cpp (modified) (10 diffs)

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.32 2000-02-22 19:12:53 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.33 2000-02-22 23:53:03 sandervl Exp $ */
 
 /*
@@ -19 +19 @@
  *
  */
-#define DEBUG
 #define INCL_DOSFILEMGR          /* File Manager values      */
 #define INCL_DOSMODULEMGR
@@ -570 +569 @@
  APIRET   rc;
 
-  rc = DosQueryMem((PVOID)virtAddress, &range, &attr);
-  if(rc) {
-        dprintf((LOG, "Win32PeLdrImage::commitPage: DosQueryMem for %x returned %d", virtAddress, rc));
-        return FALSE;
-  }
-  if(attr & PAG_COMMIT) {
-        dprintf((LOG, "Win32PeLdrImage::commitPage: Memory at 0x%x already committed!", virtAddress));
-        return FALSE;
-  }
-
   section = findSectionByOS2Addr(virtAddress);
   if(section == NULL) {
@@ -587 +576 @@
         section = findPreviousSectionByOS2Addr(virtAddress);
         if(section == NULL) {//access to header
+                offset     = 0;
                 fileoffset = virtAddress - realBaseAddress;
         }
         else {
-                offset = virtAddress - (section->realvirtaddr + section->virtualsize);
+                offset     = virtAddress - (section->realvirtaddr + section->virtualsize);
                 fileoffset = section->rawoffset + section->rawsize + offset;
         }
@@ -598 +588 @@
         offset      = virtAddress - section->realvirtaddr;
         sectionsize = section->virtualsize - offset;
+
         if(offset > section->rawsize || section->type == SECTION_UNINITDATA) {
                 //unintialized data (set to 0)
@@ -612 +603 @@
         }
   }
+  //Check range of pages with the same attributes starting at virtAddress
+  //(some pages might already have been loaded)
+  range = sectionsize;
+  rc = DosQueryMem((PVOID)virtAddress, &range, &attr);
+  if(rc) {
+        dprintf((LOG, "Win32PeLdrImage::commitPage: DosQueryMem for %x returned %d", virtAddress, rc));
+        return FALSE;
+  }
+  if(attr & PAG_COMMIT) {
+        dprintf((LOG, "Win32PeLdrImage::commitPage: Memory at 0x%x already committed!", virtAddress));
+        return FALSE;
+  }
+
   if(fPageCmd == SINGLE_PAGE) {
         size = min(size, PAGE_SIZE);
@@ -782 +786 @@
   realBaseAddress = 0;
 
-#if 1
   //Allocated in peldr.dll
   if(reservedMem && reservedMem == oh.ImageBase) {
@@ -788 +791 @@
         return TRUE;
   }
-#else
-  if(reservedMem && reservedMem <= oh.ImageBase &&
-     ((oh.ImageBase - reservedMem) + imageSize < PELDR_RESERVEDMEMSIZE))
-  {
-        //ok, it fits perfectly; free it now and allocate it below
-        DosFreeMem((PVOID)reservedMem);
-//              realBaseAddress = oh.ImageBase;
-//      return TRUE;
-  }
-#endif
 
   //Reserve enough space to store 4096 pointers to 1MB memory chunks
@@ -903 +896 @@
 
   virtAddress -= realBaseAddress;
-
+  //round size to next page boundary
+  size  = (size-1) & ~0xFFF;
+  size += PAGE_SIZE;
+ 
   if(prel) {
         j = 1;
@@ -971 +967 @@
                                 DosSetMem((PVOID)newpage, PAGE_SIZE, section->pageflags);
                         }
-
                 }
                 prel = (PIMAGE_BASE_RELOCATION)((char*)prel + prel->SizeOfBlock);