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

Timestamp:

Mar 31, 2001, 1:59:09 AM (24 years ago)

Author:

sandervl

Message:

Fix for loading executable with sections not starting on page boundary (LOAD_LIBRARY_AS_DATAFILE)

File:

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

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.70 2001-03-19 19:27:13 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.71 2001-03-30 23:59:09 sandervl Exp $ */
 
 /*
@@ -410 +410 @@
         if(GetSectionHdrByImageDir(win32file, IMAGE_DIRECTORY_ENTRY_RESOURCE, &sh))
         {
+            dprintf((LOG, "*************************PE SECTIONS START**************************" ));
+            dprintf((LOG, "Raw data size:        %x", sh.SizeOfRawData ));
+            dprintf((LOG, "Virtual Address:      %x", sh.VirtualAddress ));
+            dprintf((LOG, "Virtual Address Start:%x", sh.VirtualAddress+oh.ImageBase ));
+            dprintf((LOG, "Virtual Address End:  %x", sh.VirtualAddress+oh.ImageBase+sh.Misc.VirtualSize ));
+            dprintf((LOG, "Virtual Size:         %x", sh.Misc.VirtualSize ));
+            dprintf((LOG, "Pointer to raw data:  %x", sh.PointerToRawData ));
+            dprintf((LOG, "Section flags:        %x\n\n", sh.Characteristics ));
             addSection(SECTION_RESOURCE, sh.PointerToRawData,
                        sh.SizeOfRawData, sh.VirtualAddress + oh.ImageBase,
@@ -447 +455 @@
     }
 
-    if(realBaseAddress != oh.ImageBase) {
+    if(realBaseAddress != oh.ImageBase && !(dwFlags & FLAG_PELDR_LOADASDATAFILE)) {
         pFixups     = (PIMAGE_BASE_RELOCATION)ImageDirectoryOffset(win32file, IMAGE_DIRECTORY_ENTRY_BASERELOC);
         dwFixupSize = ImageDirectorySize(win32file, IMAGE_DIRECTORY_ENTRY_BASERELOC);
@@ -684 +692 @@
  Section *section;
  ULONG    offset, size, sectionsize, protflags, fileoffset, range, attr;
- ULONG    ulNewPos, ulRead;
+ ULONG    ulNewPos, ulRead, orgVirtAddress = virtAddress;
  APIRET   rc;
 
@@ -691 +699 @@
 
     section = findSectionByOS2Addr(virtAddress);
+    if(section == NULL) {
+        section = findSectionByOS2Addr(orgVirtAddress);
+        if(section) {
+            virtAddress = orgVirtAddress;
+        }
+    }
     if(section == NULL) {
         size        = 4096;