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

Timestamp:

Nov 11, 1999, 8:10:09 PM (26 years ago)

Author:

sandervl

Message:

version loading fixes + heap corruption fix

File:

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

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.11 1999-11-09 14:19:47 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.12 1999-11-11 19:10:09 sandervl Exp $ */
 
 /*
@@ -73 +73 @@
     imageVirtBase(-1), realBaseAddress(0), imageVirtEnd(0),
     nrNameExports(0), nrOrdExports(0), nameexports(NULL), ordexports(NULL),
-    pResSection(NULL), fImgMapping(0)
+    fImgMapping(0)
 {
  HFILE  dllfile;
@@ -140 +140 @@
  ULONG  filesize, ulRead;
  PIMAGE_SECTION_HEADER psh;
+ IMAGE_SECTION_HEADER sh;
  IMAGE_TLS_DIRECTORY *tlsDir = NULL;
  int    nSections, i;
@@ -315 +316 @@
      }
    }
-   fout << "*************************PE SECTIONS END **************************" << endl;
-   imageSize += imageVirtBase - oh.ImageBase;
-   fout << "Total size of Image " << imageSize << endl;
-   fout << "imageVirtBase       " << imageVirtBase << endl;
-   fout << "imageVirtEnd        " << imageVirtEnd << endl;
-
-   //In case there are any gaps between sections, adjust size
-   if(imageSize != imageVirtEnd - oh.ImageBase) {
+  }
+  else {
+        if(GetSectionHdrByName (win32file, &sh, ".rsrc")) 
+        {
+            addSection(SECTION_RESOURCE, (char *)win32file+sh.PointerToRawData,
+                       sh.SizeOfRawData, sh.VirtualAddress + oh.ImageBase,
+                       sh.Misc.VirtualSize);
+        }
+  }
+  fout << "*************************PE SECTIONS END **************************" << endl;
+  imageSize += imageVirtBase - oh.ImageBase;
+  fout << "Total size of Image " << imageSize << endl;
+  fout << "imageVirtBase       " << imageVirtBase << endl;
+  fout << "imageVirtEnd        " << imageVirtEnd << endl;
+
+  //In case there are any gaps between sections, adjust size
+  if(imageSize != imageVirtEnd - oh.ImageBase) {
         fout << "imageSize != imageVirtEnd - oh.ImageBase!" << endl;
         imageSize = imageVirtEnd - oh.ImageBase;
-   }
-   if(allocSections(reservedMem) == FALSE) {
+  }
+  if(allocSections(reservedMem) == FALSE) {
         fout << "Failed to allocate image memory, rc " << errorState << endl;
         goto failure;
-   }
-   fout << "OS/2 base address " << realBaseAddress << endl;
-   if(storeSections((char *)win32file) == FALSE) {
+  }
+  fout << "OS/2 base address " << realBaseAddress << endl;
+  if(storeSections((char *)win32file) == FALSE) {
         fout << "Failed to store sections, rc " << errorState << endl;
         goto failure;
-   }
-   if(oh.AddressOfEntryPoint) {
+  }
+  if(oh.AddressOfEntryPoint) {
         entryPoint = realBaseAddress + oh.AddressOfEntryPoint;
-   }
-   else {
+  }
+  else {
         fout << "EntryPoint == NULL" << endl; 
         entryPoint = NULL;
-   }
-
+  }
+
+  if(loadType == REAL_LOAD) 
+  {
    if(tlsDir != NULL) {
     Section *sect = findSection(SECTION_TLS);
@@ -381 +393 @@
         }
    }
-
-   //SvL: Use pointer to image header as module handle now. Some apps needs this
-   hinstance = (HINSTANCE)realBaseAddress;
-  }
+  }
+
+  //SvL: Use pointer to image header as module handle now. Some apps needs this
+  hinstance = (HINSTANCE)realBaseAddress;
 
   //PH: get pResDir pointer correct first, since processImports may
   //    implicitly call functions depending on it.
-  IMAGE_SECTION_HEADER sh;
   if(GetSectionHdrByName (win32file, &sh, ".rsrc")) {
         //get offset in resource object of directory entry
         pResDir = (PIMAGE_RESOURCE_DIRECTORY)(sh.VirtualAddress + realBaseAddress);
-        pResourceSectionStart = (ULONG)pResSection->virtaddr - oh.ImageBase;
+        pResourceSectionStart = sh.VirtualAddress;
   }
 
@@ -401 +412 @@
         goto failure;
    }
-
-   //set final memory protection flags (storeSections sets them to read/write)
-   if(setMemFlags() == FALSE) {
+  }
+ 
+  //set final memory protection flags (storeSections sets them to read/write)
+  if(setMemFlags() == FALSE) {
         fout << "Failed to set memory protection" << endl;
         goto failure;
-   }
-   CloseHandle(fImgMapping);
-   fImgMapping = 0;
-  }
+  }
+  CloseHandle(fImgMapping);
+  fImgMapping = 0;
+
   return(TRUE);
 failure:
@@ -428 +440 @@
   section[nrsections].virtaddr       = virtaddress;
 
-  if(type == SECTION_RESOURCE) {
-        pResSection = &section[nrsections];
-  }
   virtsize   = ((virtsize - 1) & ~0xFFF) + PAGE_SIZE;
   imageSize += virtsize;