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

Timestamp:

Oct 10, 2000, 7:14:09 PM (25 years ago)

Author:

sandervl

Message:

pe loader fixes, add system32\drivers dir during installation, add build date + time during kernel32 load

File:

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

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.59 2000-10-09 18:35:26 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.60 2000-10-10 17:14:08 sandervl Exp $ */
 
 /*
@@ -14 +14 @@
  *       (circular dependencies; have to check what NT does)
  *
- * NOTE: RSRC_LOAD is a special flag to only load the resource directory
+ * NOTE: FLAG_PELDR_LOADASDATAFILE is a special flag to only load the resource directory
  *       of a PE image. Processing imports, sections etc is not done.
- *       Nor is it put into the linked list of dlls (if it's a dll).
  *       This is useful for GetVersionSize/Resource in case it wants to
  *       get version info of an image that is not loaded.
@@ -103 +102 @@
 //******************************************************************************
 //******************************************************************************
-Win32PeLdrImage::Win32PeLdrImage(char *pszFileName, BOOL isExe, int loadtype) :
+Win32PeLdrImage::Win32PeLdrImage(char *pszFileName, BOOL isExe) :
     Win32ImageBase(-1),
-    nrsections(0), imageSize(0),
+    nrsections(0), imageSize(0), dwFlags(0),
     imageVirtBase(-1), realBaseAddress(0), imageVirtEnd(0),
     nrNameExports(0), nrOrdExports(0), nameexports(NULL), ordexports(NULL),
@@ -111 +110 @@
 {
  HFILE  dllfile;
-
-  loadType = loadtype;
 
   strcpy(szFileName, pszFileName);
@@ -282 +279 @@
   nSections = NR_SECTIONS(win32file);
 
-  if(loadType == REAL_LOAD)
+  if(!(dwFlags & FLAG_PELDR_LOADASDATAFILE))
   {
    imageSize = 0;
@@ -307 +304 @@
         if(IsSectionType(win32file, &psh[i], IMAGE_DIRECTORY_ENTRY_EXPORT)) 
         {
-            dprintf((LOG, ".edata" ));
-            addSection(SECTION_EXPORT, psh[i].PointerToRawData,
-                   psh[i].SizeOfRawData, psh[i].VirtualAddress + oh.ImageBase,
-                   psh[i].Misc.VirtualSize, psh[i].Characteristics);
-            continue;
+            //SvL: Angus.exe has empty export section that's really an
+            //     uninitialized data section
+            if(psh[i].SizeOfRawData) {
+                 dprintf((LOG, ".edata" ));
+                 addSection(SECTION_EXPORT, psh[i].PointerToRawData,
+                      psh[i].SizeOfRawData, psh[i].VirtualAddress + oh.ImageBase,
+                      psh[i].Misc.VirtualSize, psh[i].Characteristics);
+                 continue;
+            }
         }
         if(IsSectionType(win32file, &psh[i], IMAGE_DIRECTORY_ENTRY_RESOURCE)) 
@@ -439 +440 @@
   }
 
-  if(loadType == REAL_LOAD)
+  if(!(dwFlags & FLAG_PELDR_LOADASDATAFILE))
   {
    if(tlsDir = (IMAGE_TLS_DIRECTORY *)ImageDirectoryOffset(win32file, IMAGE_DIRECTORY_ENTRY_TLS)) 
@@ -554 +555 @@
   }
 
-  if (loadType == REAL_LOAD)
+  if(!(dwFlags & (FLAG_PELDR_LOADASDATAFILE | FLAG_PELDR_SKIPIMPORTS)))
   {
-   if(processImports((char *)win32file) == FALSE) {
-        dprintf((LOG, "Failed to process imports!" ));
-        goto failure;
-   }
-  }
-
+        if(processImports((char *)win32file) == FALSE) {
+             dprintf((LOG, "Failed to process imports!" ));
+             goto failure;
+        }
+  }
   return(TRUE);
+
 failure:
   if(memmap) {
@@ -730 +731 @@
 
   //SvL: We don't care where the image is loaded for resource lookup
-  if(fh.Characteristics & IMAGE_FILE_RELOCS_STRIPPED && loadType == REAL_LOAD) {
+  if(fh.Characteristics & IMAGE_FILE_RELOCS_STRIPPED && !(dwFlags & FLAG_PELDR_LOADASDATAFILE)) {
         return allocFixedMem(reservedMem);
   }
@@ -898 +899 @@
 
         case SECTION_READONLYDATA:
+        case SECTION_EXPORT:
         default:
                 section[i].pageflags = PAG_READ;
                 break;
         }
+        if(section[i].flags & (IMAGE_SCN_CNT_INITIALIZED_DATA|IMAGE_SCN_CNT_UNINITIALIZED_DATA)) {
+                //SvL: sometimes i.e. import/export sections also contain data
+                //     must make them read/write
+                section[i].pageflags = PAG_WRITE;
+        }
+
   }
   return(TRUE);
@@ -1486 +1494 @@
   {
     dprintf((LOG, "Module %s", pszCurModule ));
-    dprintf((LOG, "ForwarderChain: %x", pID[i].ForwarderChain));
+    if(pID[i].ForwarderChain) {
+        dprintf((LOG, "ForwarderChain: %x", pID[i].ForwarderChain));
+    }
     //  a) check that OriginalFirstThunk not is 0 and look for Borland-styled PE
     if (i == 0)