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

Timestamp:

Oct 6, 2000, 1:04:02 PM (25 years ago)

Author:

sandervl

Message:

console, pe loader + FormatMessage fixes

File:

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

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.55 2000-10-04 19:36:25 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.56 2000-10-06 11:04:02 sandervl Exp $ */
 
 /*
@@ -287 +287 @@
    if ((psh = (PIMAGE_SECTION_HEADER)SECTIONHDROFF (win32file)) != NULL) {
     dprintf((LOG, "*************************PE SECTIONS START**************************" ));
-    for (i=0; i<nSections; i++) { 
+    for (i=0; i<nSections; i++) 
+    { 
         dprintf((LOG, "Raw data size:        %x", psh[i].SizeOfRawData ));
         dprintf((LOG, "Virtual Address:      %x", psh[i].VirtualAddress ));
@@ -295 +296 @@
         dprintf((LOG, "Pointer to raw data:  %x", psh[i].PointerToRawData ));
         dprintf((LOG, "Section flags:        %x\n\n", psh[i].Characteristics ));
-        if(strcmp(psh[i].Name, ".reloc") == 0) {
+
+        if(IsSectionType(win32file, &psh[i], IMAGE_DIRECTORY_ENTRY_BASERELOC)) 
+        {
             dprintf((LOG, ".reloc" ));
             addSection(SECTION_RELOC, psh[i].PointerToRawData,
@@ -302 +305 @@
             continue;
         }
-        if(strcmp(psh[i].Name, ".edata") == 0) {
+        if(IsSectionType(win32file, &psh[i], IMAGE_DIRECTORY_ENTRY_EXPORT)) 
+        {
             dprintf((LOG, ".edata" ));
             addSection(SECTION_EXPORT, psh[i].PointerToRawData,
@@ -309 +313 @@
             continue;
         }
-        if(strcmp(psh[i].Name, ".rsrc") == 0) {
+        if(IsSectionType(win32file, &psh[i], IMAGE_DIRECTORY_ENTRY_RESOURCE)) 
+        {
             dprintf((LOG, ".rsrc" ));
             addSection(SECTION_RESOURCE, psh[i].PointerToRawData,
@@ -316 +321 @@
             continue;
         }
-        if(strcmp(psh[i].Name, ".tls") == 0)
+        if(IsSectionType(win32file, &psh[i], IMAGE_DIRECTORY_ENTRY_TLS))
         {
                 tlsDir = (IMAGE_TLS_DIRECTORY *)ImageDirectoryOffset(win32file, IMAGE_DIRECTORY_ENTRY_TLS);
@@ -326 +331 @@
                 continue;
         }
-
-        if(strcmp(psh[i].Name, ".debug") == 0) {
+        if(IsSectionType(win32file, &psh[i], IMAGE_DIRECTORY_ENTRY_DEBUG))  
+        {
             dprintf((LOG, ".rdebug" ));
             addSection(SECTION_DEBUG,  psh[i].PointerToRawData,
@@ -334 +339 @@
             continue;
         }
-        if(IsImportSection(win32file, &psh[i]))
+        if(IsSectionType(win32file, &psh[i], IMAGE_DIRECTORY_ENTRY_IMPORT)) 
         {
-          int type = SECTION_IMPORT;
+            int type = SECTION_IMPORT;
+
             dprintf((LOG, "Import Data Section" ));
             if(psh[i].Characteristics & IMAGE_SCN_CNT_CODE) {
@@ -348 +354 @@
         }
 
-            //KSO Sun 1998-08-09: Borland does not alway set the CODE flag for its "CODE" section
-        if(  psh[i].Characteristics & IMAGE_SCN_CNT_CODE ||
-            (psh[i].Characteristics & IMAGE_SCN_MEM_EXECUTE &&
-               !(psh[i].Characteristics & (IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_CNT_INITIALIZED_DATA))) //KSO: make sure its not marked as a datasection
+        //KSO Sun 1998-08-09: Borland does not alway set the CODE flag for its "CODE" section
+        if(psh[i].Characteristics & IMAGE_SCN_CNT_CODE ||
+           (psh[i].Characteristics & IMAGE_SCN_MEM_EXECUTE &&
+           !(psh[i].Characteristics & (IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_CNT_INITIALIZED_DATA))) //KSO: make sure its not marked as a datasection
             )
         {
@@ -394 +400 @@
   }
   else {
-        if(GetSectionHdrByName (win32file, &sh, ".rsrc"))
+        if(GetSectionHdrByImageDir(win32file, IMAGE_DIRECTORY_ENTRY_RESOURCE, &sh))
         {
             addSection(SECTION_RESOURCE, sh.PointerToRawData,
@@ -539 +545 @@
   //PH: get pResRootDir pointer correct first, since processImports may
   //    implicitly call functions depending on it.
-  if(GetSectionHdrByName (win32file, &sh, ".rsrc")) {
+  if(GetSectionHdrByImageDir(win32file, IMAGE_DIRECTORY_ENTRY_RESOURCE, &sh)) {
         //get offset in resource object of directory entry
         pResRootDir = (PIMAGE_RESOURCE_DIRECTORY)(sh.VirtualAddress + realBaseAddress);