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

Timestamp:

Nov 29, 1999, 1:05:03 AM (26 years ago)

Author:

bird

Message:

Implemented EnumResourceNamesA/W.

File:

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

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.18 1999-11-27 00:05:39 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.19 1999-11-29 00:04:06 bird Exp $ */
 
 /*
@@ -279 +279 @@
   nSections = NR_SECTIONS(win32file);
 
-  if(loadType == REAL_LOAD) 
+  if(loadType == REAL_LOAD)
   {
    imageSize = 0;
@@ -389 +389 @@
   }
   else {
-        if(GetSectionHdrByName (win32file, &sh, ".rsrc")) 
+        if(GetSectionHdrByName (win32file, &sh, ".rsrc"))
         {
             addSection(SECTION_RESOURCE, sh.PointerToRawData,
@@ -407 +407 @@
         imageSize = imageVirtEnd - oh.ImageBase;
   }
-  if(imageSize < oh.SizeOfImage) { 
+  if(imageSize < oh.SizeOfImage) {
         imageSize = oh.SizeOfImage;
   }
@@ -416 +416 @@
   }
   else {
-        fout << "EntryPoint == NULL" << endl; 
+        fout << "EntryPoint == NULL" << endl;
         entryPoint = NULL;
   }
@@ -426 +426 @@
   }
 
-  if(loadType == REAL_LOAD) 
+  if(loadType == REAL_LOAD)
   {
    if(tlsDir != NULL) {
@@ -485 +485 @@
         //get offset in resource object of directory entry
         pResDir = (PIMAGE_RESOURCE_DIRECTORY)(sh.VirtualAddress + realBaseAddress);
-        pResourceSectionStart = sh.VirtualAddress;
-  }
-
-  if (loadType == REAL_LOAD) 
+        ulRVAResourceSection = sh.VirtualAddress;
+  }
+
+  if (loadType == REAL_LOAD)
   {
    if(processImports((char *)win32file) == FALSE) {
@@ -495 +495 @@
    }
   }
- 
+
   return(TRUE);
 failure:
@@ -543 +543 @@
                 fileoffset = section->rawoffset + section->rawsize + offset;
         }
-  }  
+  }
   else {
         protflags   = section->pageflags;
@@ -552 +552 @@
                 size = 0;
                 fileoffset = -1;
-        }  
+        }
         else {
                 size = section->rawsize-offset;
@@ -709 +709 @@
         }
   }
-  if(index == -1) 
+  if(index == -1)
         return NULL;
 
@@ -804 +804 @@
 
   for(i=0;i<nrsections;i++) {
-        switch(section[i].type) 
+        switch(section[i].type)
         {
         case SECTION_CODE:
@@ -855 +855 @@
                         int fixupsize = 0;
 
-                        switch(type) 
+                        switch(type)
                         {
                         case IMAGE_REL_BASED_HIGHLOW:
@@ -864 +864 @@
                                 fixupsize = 2;
                                 break;
-                        }                       
-                        //If the fixup crosses the final page boundary, 
-                        //then we have to load another page 
-                        if(prel->VirtualAddress + offset + fixupsize > virtAddress + size) 
+                        }
+                        //If the fixup crosses the final page boundary,
+                        //then we have to load another page
+                        if(prel->VirtualAddress + offset + fixupsize > virtAddress + size)
                         {
                                 newpage  = realBaseAddress + prel->VirtualAddress + offset + fixupsize;
@@ -877 +877 @@
                                         dprintf(("::setFixups -> section == NULL!!"));
                                         return FALSE;
-                                }               
+                                }
                                 //SvL: Read page from disk
                                 commitPage(newpage, TRUE, SINGLE_PAGE);
@@ -885 +885 @@
                         }
 
-                        switch(type) 
+                        switch(type)
                         {
                         case IMAGE_REL_BASED_ABSOLUTE:
@@ -903 +903 @@
                                 break;
                         }
-                        if(prel->VirtualAddress + offset + fixupsize > virtAddress + size) 
+                        if(prel->VirtualAddress + offset + fixupsize > virtAddress + size)
                         {
                                 //SvL: Restore original page protection flags
@@ -1308 +1308 @@
     {  //not found, so load it
         char modname[CCHMAXPATH];
-        
+
         strcpy(modname, pszCurModule);
         //rename dll if necessary (i.e. OLE32 -> OLE32OS2)
@@ -1441 +1441 @@
   NameExport *curexport;
   ULONG       ulAPIOrdinal;                      /* api requested by ordinal */
-  
+
   apilen = strlen(name) + 1;
-  if(apilen < 4) 
+  if(apilen < 4)
   {
         *(ULONG *)tmp = 0;
@@ -1452 +1452 @@
 
   curexport = nameexports;
-  for(i=0; i<nrNameExports; i++) 
+  for(i=0; i<nrNameExports; i++)
   {
-    if(apilen == curexport->nlength && 
-       *(ULONG *)curexport->name == *(ULONG *)name) 
+    if(apilen == curexport->nlength &&
+       *(ULONG *)curexport->name == *(ULONG *)name)
     {
-        if(strcmp(curexport->name, name) == 0) 
+        if(strcmp(curexport->name, name) == 0)
                 return(curexport->virtaddr);
     }
@@ -1478 +1478 @@
         curexport++;
   }
-  //Name exports also contain an ordinal, so check this 
+  //Name exports also contain an ordinal, so check this
   nexport = nameexports;
   for(i=0;i<nrNameExports;i++) {