Changeset 5053 for trunk/tools/common/kFilePE.cpp

Timestamp:

Feb 2, 2001, 9:45:42 AM (25 years ago)

Author:

bird

Message:

Corrected kFileLX and kFilePE constructors.
Made kDump.exe work again.
Added import module dump to kFilePE.

File:

• trunk/tools/common/kFilePE.cpp (modified) (8 diffs)

trunk/tools/common/kFilePE.cpp

@@ -41 +41 @@
 /**
  * Constructs a kFilePE object for a file.
- * @param     phFile  File to create object from.
+ * @param     pFile     File to create object from.
  * @remark    throws errorcode (TODO: errorhandling.)
  */
-kFilePE::kFilePE(FILE *phFile) throw(int) : pvBase(NULL),
+kFilePE::kFilePE(kFile *pFile) throw(int) : pvBase(NULL),
     pDosHdr(NULL), pFileHdr(NULL), pOptHdr(NULL), paDataDir(NULL), paSectionHdr(NULL),
     pExportDir(NULL),
@@ -62 +62 @@
 
     /* read dos-header - assumes there is one */
-    if (!fseek(phFile, 0, SEEK_SET)
-        && fread(&doshdr, sizeof(doshdr), 1, phFile) == 1
+    if (   pFile->readAt(&doshdr, sizeof(doshdr), 0) 
         && doshdr.e_magic == IMAGE_DOS_SIGNATURE
         && doshdr.e_lfanew > sizeof(doshdr)
@@ -71 +70 @@
 
         /* read pe headers */
-        if (!fseek(phFile, doshdr.e_lfanew, SEEK_SET)
-            && fread(&pehdr, sizeof(pehdr), 1, phFile) == 1
+        if (   pFile->readAt(&pehdr, sizeof(pehdr), doshdr.e_lfanew)
             && pehdr.Signature == IMAGE_NT_SIGNATURE
             && pehdr.FileHeader.SizeOfOptionalHeader == sizeof(IMAGE_OPTIONAL_HEADER)
@@ -78 +76 @@
         {
             /* create mapping */
-            pvBase = malloc((size_t)pehdr.OptionalHeader.SizeOfImage);
+            pvBase = calloc((size_t)pehdr.OptionalHeader.SizeOfImage, 1);
             if (pvBase != NULL)
             {
-                memset(pvBase, 0, (size_t)pehdr.OptionalHeader.SizeOfImage);
                 /*
                 printf("%ld\n", pehdr.OptionalHeader.SizeOfHeaders);
@@ -88 +85 @@
                        sizeof(IMAGE_NT_HEADERS) + sizeof(IMAGE_SECTION_HEADER) * pehdr.FileHeader.NumberOfSections);
                 */
-                if (!fseek(phFile, 0, SEEK_SET)
-                    && fread(pvBase, (size_t)pehdr.OptionalHeader.SizeOfHeaders, 1, phFile) == 1
-                    )
+                if (pFile->readAt(pvBase, pehdr.OptionalHeader.SizeOfHeaders, 0))
                 {
                     /* read sections */
@@ -105 +100 @@
 
                         cbSection = min(pSectionHdr->Misc.VirtualSize, pSectionHdr->SizeOfRawData);
-                        if (cbSection
-                            &&
-                             (fseek(phFile, pSectionHdr->PointerToRawData, SEEK_SET)
-                             ||
-                             fread((void*)((ULONG)pvBase + pSectionHdr->VirtualAddress), (size_t)cbSection, 1, phFile) != 1
-                             )
+                        if (    cbSection
+                            &&  !pFile->readAt((char*)pvBase + pSectionHdr->VirtualAddress, 
+                                               cbSection, 
+                                               pSectionHdr->PointerToRawData)
                             )
                         {
@@ -286 +279 @@
                      paSectionHdr[i].Characteristics
                      );
-
-    }
+    }
+    pOut->printf("\n");
 
 
@@ -328 +321 @@
 
     /*
+     * Dump Import Directory if present.
+     */
+    if (pImportDir)
+    {
+        pOut->printf("Import Directory\n"
+                     "----------------\n");
+        
+        PIMAGE_IMPORT_DESCRIPTOR pCur = pImportDir;
+        while (pCur->u.Characteristics != 0)
+        {
+            pOut->printf("%s\n", (char*)pvBase + pCur->Name);
+            pCur++;
+        }
+    }   
+
+
+    /*
      * Dump TLS directory if present
      */