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

Timestamp:

Jun 1, 2001, 3:21:13 AM (24 years ago)

Author:

phaller

Message:

Revert to old but optimized loader

File:

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

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.77 2001-05-30 08:23:21 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.78 2001-06-01 01:21:12 phaller Exp $ */
 
 /*
@@ -55 +55 @@
 #include <wprocess.h>
 
+
 //Define COMMIT_ALL to let the pe loader commit all sections of the image
 //This is very useful during debugging as you'll get lots of exceptions
@@ -110 +111 @@
     nrsections(0), imageSize(0), dwFlags(0), section(NULL),
     imageVirtBase(-1), realBaseAddress(0), imageVirtEnd(0),
-    nrNameExports(0), nrOrdExports(0), nameexports(NULL), ordexports(NULL),
-    memmap(NULL), pFixups(NULL), dwFixupSize(0), curnameexport(NULL), curordexport(NULL)
+    nrNameExports(0), nrOrdExports(0),
+    nameexports(NULL), ordexports(NULL),
+    curnameexport(NULL), curordexport(NULL),
+    memmap(NULL), pFixups(NULL), dwFixupSize(0)
 {
  HFILE  dllfile;
@@ -168 +171 @@
 BOOL Win32PeLdrImage::init(ULONG reservedMem)
 {
+    PERF_START(init)
+
  LPVOID win32file = NULL;
  ULONG  filesize, ulRead, ulNewPos;
@@ -217 +222 @@
     //Allocate memory to hold the entire image
     if(allocSections(reservedMem) == FALSE) {
-        dprintf((LOG, "Failed to allocate image memory for %s at %x, rc %d", szFileName, oh.ImageBase, errorState));;
+        dprintf((LOG, "Failed to allocate image memory for %s at %x, rc %d", szFileName, oh.ImageBase, errorState));
         goto failure;
     }
@@ -650 +655 @@
         }
     }
+
+    PERF_ELAPSED(init, "Win32PeLdrImage::init", szFileName)
+
+
     return(TRUE);
 
@@ -688 +697 @@
 //
 //******************************************************************************
+
+#define DOSREAD_IDEAL_SIZE 61440
+static inline APIRET _Optlink fastDosRead(HFILE hFile,
+                                          PVOID pAddress,
+                                          ULONG ulSize,
+                                          PULONG pulBytesRead)
+{
+    /* we better break the DosRead into multiple calls */
+    PBYTE  p = (PBYTE)pAddress;
+    ULONG  ulReadBytes;
+    APIRET rc;
+
+    *pulBytesRead = ulSize;
+
+    do
+    {
+        rc = DosRead(hFile,
+                     p,
+                     min(DOSREAD_IDEAL_SIZE, ulSize),
+                     &ulReadBytes);
+        if (rc != NO_ERROR)
+        {
+            /* in case of errors bail out */
+            *pulBytesRead = 0;
+            return rc;
+        }
+
+        ulSize -= ulReadBytes;
+        p += ulReadBytes;
+    }
+    while (ulSize > 0);
+
+    return NO_ERROR;
+}
+
+
 BOOL Win32PeLdrImage::commitPage(ULONG virtAddress, BOOL fWriteAccess, int fPageCmd)
 {
@@ -783 +828 @@
             goto fail;
         }
-        rc = DosRead(hFile, (PVOID)virtAddress, size, &ulRead);
+
+        // 2001-05-31 PH
+        // ensure DosRead() does not have to read more
+        // than 65535 bytes, otherwise split into two requests!
+        rc = fastDosRead(hFile, (PVOID)virtAddress, size, &ulRead);
         if(rc) {
             DosExitCritSec();
@@ -1277 +1326 @@
 BOOL Win32PeLdrImage::processExports(char *win32file)
 {
- IMAGE_SECTION_HEADER    sh;
- PIMAGE_EXPORT_DIRECTORY ped;
- ULONG *ptrNames, *ptrAddress;
- USHORT *ptrOrd;
- BOOL fForwarder;
- int i;
+  PERF_START(processexports)
+
+  IMAGE_SECTION_HEADER    sh;
+  PIMAGE_EXPORT_DIRECTORY ped;
+  ULONG *ptrNames, *ptrAddress;
+  USHORT *ptrOrd;
+  BOOL fForwarder;
+  int i;
 
   /* get section header and pointer to data directory for .edata section */
   if((ped = (PIMAGE_EXPORT_DIRECTORY)ImageDirectoryOffset
-     (win32file, IMAGE_DIRECTORY_ENTRY_EXPORT)) != NULL &&
-     GetSectionHdrByImageDir(win32file, IMAGE_DIRECTORY_ENTRY_EXPORT, &sh) ) {
-
-        dprintf((LOG, "Exported Functions: " ));
+      (win32file, IMAGE_DIRECTORY_ENTRY_EXPORT)) != NULL &&
+     GetSectionHdrByImageDir(win32file, IMAGE_DIRECTORY_ENTRY_EXPORT, &sh) ) 
+  {
+
+    dprintf((LOG, "Exported Functions: " ));
     ptrOrd     = (USHORT *)((ULONG)ped->AddressOfNameOrdinals +
                             (ULONG)win32file);
     ptrNames   = (ULONG *)((ULONG)ped->AddressOfNames +
-                            (ULONG)win32file);
+                           (ULONG)win32file);
     ptrAddress = (ULONG *)((ULONG)ped->AddressOfFunctions +
-                            (ULONG)win32file);
+                           (ULONG)win32file);
     nrOrdExports  = ped->NumberOfFunctions;
     nrNameExports = ped->NumberOfNames;
-
+    
     int   ord, RVAExport;
     char *name;
     for(i=0;i<ped->NumberOfNames;i++)
     {
-    fForwarder = FALSE;
-        ord        = ptrOrd[i] + ped->Base;
-        name       = (char *)((ULONG)ptrNames[i] + (ULONG)win32file);
-        RVAExport  = ptrAddress[ptrOrd[i]];
-
-        /* forwarder? ulRVA within export directory. */
-        if(RVAExport > oh.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress &&
-           RVAExport < oh.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress
-                       + oh.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].Size)
-        {
-            fForwarder = AddForwarder(oh.ImageBase + RVAExport, name, ord);
-        }
-    if(!fForwarder) {
-            //points to code (virtual address relative to oh.ImageBase
-            AddNameExport(oh.ImageBase + RVAExport, name, ord);
-            dprintf((LOG, "address 0x%x %s @%d (0x%08x)", RVAExport, name, ord, realBaseAddress + RVAExport));
-        }
-    }
+      fForwarder = FALSE;
+      ord        = ptrOrd[i] + ped->Base;
+      name       = (char *)((ULONG)ptrNames[i] + (ULONG)win32file);
+      RVAExport  = ptrAddress[ptrOrd[i]];
+
+      /* forwarder? ulRVA within export directory. */
+      if(RVAExport > oh.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress &&
+         RVAExport < oh.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress
+         + oh.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].Size)
+      {
+        fForwarder = AddForwarder(oh.ImageBase + RVAExport, name, ord);
+      }
+      
+      if(!fForwarder) 
+      {
+        //points to code (virtual address relative to oh.ImageBase
+        AddNameExport(oh.ImageBase + RVAExport, name, ord);
+        dprintf((LOG, "address 0x%x %s @%d (0x%08x)", RVAExport, name, ord, realBaseAddress + RVAExport));
+      }
+    }
+    
     for(i=0;i<max(ped->NumberOfNames,ped->NumberOfFunctions);i++)
     {
-    fForwarder = FALSE;
-        ord = ped->Base + i;  //Correct??
-        RVAExport = ptrAddress[i];
-        /* forwarder? ulRVA within export directory. */
-        if(RVAExport > oh.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress &&
-           RVAExport < oh.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress
-                       + oh.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].Size)
-        {
-            fForwarder = AddForwarder(oh.ImageBase + RVAExport, NULL, ord);
-        }
-    if(!fForwarder && RVAExport) {
-            //points to code (virtual address relative to oh.ImageBase
-            dprintf((LOG, "ord %d at 0x%08x (0x%08x)", ord, RVAExport, realBaseAddress + RVAExport));
-            AddOrdExport(oh.ImageBase + RVAExport, ord);
-        }
-    }
-  }
+      fForwarder = FALSE;
+      ord = ped->Base + i;  //Correct??
+      RVAExport = ptrAddress[i];
+      /* forwarder? ulRVA within export directory. */
+      if(RVAExport > oh.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress &&
+         RVAExport < oh.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress
+         + oh.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].Size)
+      {
+        fForwarder = AddForwarder(oh.ImageBase + RVAExport, NULL, ord);
+      }
+      
+      if(!fForwarder && RVAExport) 
+      {
+        //points to code (virtual address relative to oh.ImageBase
+        dprintf((LOG, "ord %d at 0x%08x (0x%08x)", ord, RVAExport, realBaseAddress + RVAExport));
+        AddOrdExport(oh.ImageBase + RVAExport, ord);
+      }
+    }
+  }
+
+  PERF_ELAPSED(processexports, "Win32PeLdrImage::processExports", getModuleName())
+
   return(TRUE);
 }
@@ -1346 +1406 @@
 void Win32PeLdrImage::AddNameExport(ULONG virtaddr, char *apiname, ULONG ordinal, BOOL fAbsoluteAddress)
 {
- ULONG nsize;
-
-    if(nameexports == NULL) {
-        nameExportSize= 4096;
-        nameexports   = (NameExport *)malloc(nameExportSize);
-        curnameexport = nameexports;
-    }
-    nsize = (ULONG)curnameexport - (ULONG)nameexports;
-    if(nsize + sizeof(NameExport) + strlen(apiname) > nameExportSize) {
-        nameExportSize += 4096;
-        char *tmp = (char *)nameexports;
-        nameexports = (NameExport *)malloc(nameExportSize);
-        memcpy(nameexports, tmp, nsize);
-        curnameexport = (NameExport *)((ULONG)nameexports + nsize);
-        free(tmp);
-    }
-    if(fAbsoluteAddress) {//forwarders use absolute address
-        curnameexport->virtaddr = virtaddr;
-    }
-    else curnameexport->virtaddr = realBaseAddress + (virtaddr - oh.ImageBase);
-    curnameexport->ordinal  = ordinal;
-    *(ULONG *)curnameexport->name = 0;
-    strcpy(curnameexport->name, apiname);
-
-    curnameexport->nlength = strlen(apiname) + 1;
-    if(curnameexport->nlength < sizeof(curnameexport->name))
-        curnameexport->nlength = sizeof(curnameexport->name);
-
-    curnameexport = (NameExport *)((ULONG)curnameexport->name + curnameexport->nlength);
-}
-//******************************************************************************
-//******************************************************************************
-void Win32PeLdrImage::AddOrdExport(ULONG virtaddr, ULONG ordinal, BOOL fAbsoluteAddress)
-{
-    if(ordexports == NULL) {
-        ordexports   = (OrdExport *)malloc(nrOrdExports * sizeof(OrdExport));
-        curordexport = ordexports;
-    }
-    if(fAbsoluteAddress) {//forwarders use absolute address
-        curordexport->virtaddr = virtaddr;
-    }
-    else curordexport->virtaddr = realBaseAddress + (virtaddr - oh.ImageBase);
-
-    curordexport->ordinal  = ordinal;
-    curordexport++;
-}
-//******************************************************************************
-//******************************************************************************
-BOOL Win32PeLdrImage::AddForwarder(ULONG virtaddr, char *apiname, ULONG ordinal)
-{
- char         *forward = (char *)(realBaseAddress + (virtaddr - oh.ImageBase));
- char         *forwarddll, *forwardapi;
- Win32DllBase *WinDll;
- DWORD         exportaddr;
- int           forwardord;
-
-    forwarddll = strdup(forward);
-    if(forwarddll == NULL) {
-        return FALSE;
-    }
-    forwardapi = strchr(forwarddll, '.');
-    if(forwardapi == NULL) {
-        goto fail;
-    }
-    *forwardapi++ = 0;
-    if(strlen(forwarddll) == 0 || strlen(forwardapi) == 0) {
-        goto fail;
-    }
-    WinDll = Win32DllBase::findModule(forwarddll);
-    if(WinDll == NULL) {
-        WinDll = loadDll(forwarddll);
-        if(WinDll == NULL) {
-            dprintf((LOG, "ERROR: couldn't find forwarder %s.%s", forwarddll, forwardapi));
-            goto fail;
-        }
-    }
-    //check if name or ordinal forwarder
+  ULONG nsize;
+  int iApiNameLength = strlen(apiname);
+
+  if(nameexports == NULL) 
+  {
+    nameExportSize= 4096;
+    nameexports   = (NameExport *)malloc(nameExportSize);
+    curnameexport = nameexports;
+  }
+  
+  nsize = (ULONG)curnameexport - (ULONG)nameexports;
+  if(nsize + sizeof(NameExport) + iApiNameLength > nameExportSize)
+  {
+    nameExportSize += 4096;
+    char *tmp = (char *)nameexports;
+    nameexports = (NameExport *)malloc(nameExportSize);
+    memcpy(nameexports, tmp, nsize);
+    curnameexport = (NameExport *)((ULONG)nameexports + nsize);
+    free(tmp);
+  }
+  
+  if(fAbsoluteAddress) //forwarders use absolute address
+    curnameexport->virtaddr = virtaddr;
+  else
+    curnameexport->virtaddr = realBaseAddress + (virtaddr - oh.ImageBase);
+  
+  curnameexport->ordinal  = ordinal;
+  *(ULONG *)curnameexport->name = 0;
+  strcpy(curnameexport->name, apiname);
+
+  curnameexport->nlength = iApiNameLength + 1;
+  if(curnameexport->nlength < sizeof(curnameexport->name))
+    curnameexport->nlength = sizeof(curnameexport->name);
+
+  curnameexport = (NameExport *)((ULONG)curnameexport->name + curnameexport->nlength);
+}
+//******************************************************************************
+//******************************************************************************
+void Win32PeLdrImage::AddOrdExport(ULONG virtaddr, 
+                                   ULONG ordinal, 
+                                   BOOL fAbsoluteAddress)
+{
+  if(ordexports == NULL) 
+  {
+    ordexports   = (OrdExport *)malloc(nrOrdExports * sizeof(OrdExport));
+    curordexport = ordexports;
+  }
+  
+  if(fAbsoluteAddress) //forwarders use absolute address
+    curordexport->virtaddr = virtaddr;
+  else 
+    curordexport->virtaddr = realBaseAddress + (virtaddr - oh.ImageBase);
+
+  curordexport->ordinal  = ordinal;
+  curordexport++;
+}
+//******************************************************************************
+//******************************************************************************
+BOOL Win32PeLdrImage::AddForwarder(ULONG virtaddr, 
+                                   char *apiname, 
+                                   ULONG ordinal)
+{
+  char         *forward = (char *)(realBaseAddress + (virtaddr - oh.ImageBase));
+  char         *forwarddll, *forwardapi, *forwardapi0;
+  Win32DllBase *WinDll;
+  DWORD         exportaddr;
+  int           forwardord;
+  int           iForwardApiLength; /* save strlen result */
+    
+// 2001-06-01 PH
+// we do exactly know which character we replace: the "." is zeroed
+// so we can cheaply restore the name at the end of the method.
+//  forwarddll = strdup(forward);
+//  if(forwarddll == NULL)
+//  {
+//    return FALSE;
+//  }
+  forwarddll = forward;
+    
+  forwardapi = strchr(forwarddll, '.');
+  if(forwardapi == NULL) 
+  {
+    goto fail;
+  }
+  *forwardapi0 = 0;
+  forwardapi=forwardapi0++;
+  iForwardApiLength = strlen(forwardapi);
+  
+  if(strlen(forwarddll) == 0 || iForwardApiLength == 0) 
+  {
+    goto fail;
+  }
+  
+  WinDll = Win32DllBase::findModule(forwarddll);
+  if(WinDll == NULL) 
+  {
+    WinDll = loadDll(forwarddll);
+    if(WinDll == NULL) 
+    {
+      dprintf((LOG, "ERROR: couldn't find forwarder %s.%s", forwarddll, forwardapi));
+      goto fail;
+    }
+  }
+  
+  //check if name or ordinal forwarder
+  if(*forwardapi >= '0' && *forwardapi <= '9') 
+  {
+    forwardord = atoi(forwardapi);
+  }
+  else
     forwardord = 0;
-    if(*forwardapi >= '0' && *forwardapi <= '9') {
-        forwardord = atoi(forwardapi);
-    }
-    if(forwardord != 0 || (strlen(forwardapi) == 1 && *forwardapi == '0')) {
-        exportaddr = WinDll->getApi(forwardord);
-    }
-    else  exportaddr = WinDll->getApi(forwardapi);
-
-    if(apiname) {
-        dprintf((LOG, "address 0x%x %s @%d (0x%08x) forwarder %s.%s", virtaddr - oh.ImageBase, apiname, ordinal, virtaddr, forwarddll, forwardapi));
-        AddNameExport(exportaddr, apiname, ordinal, TRUE);
-    }
-    else {
-        dprintf((LOG, "address 0x%x @%d (0x%08x) forwarder %s.%s", virtaddr - oh.ImageBase, ordinal, virtaddr, forwarddll, forwardapi));
-         AddOrdExport(exportaddr, ordinal, TRUE);
-    }
-    free(forwarddll);
-    return TRUE;
-
-fail:
-  free(forwarddll);
+  
+  if(forwardord != 0 || (iForwardApiLength == 1 && *forwardapi == '0')) 
+    exportaddr = WinDll->getApi(forwardord);
+  else  
+    exportaddr = WinDll->getApi(forwardapi);
+
+  if(apiname) 
+  {
+    dprintf((LOG, "address 0x%x %s @%d (0x%08x) forwarder %s.%s", virtaddr - oh.ImageBase, apiname, ordinal, virtaddr, forwarddll, forwardapi));
+    AddNameExport(exportaddr, apiname, ordinal, TRUE);
+  }
+  else 
+  {
+    dprintf((LOG, "address 0x%x @%d (0x%08x) forwarder %s.%s", virtaddr - oh.ImageBase, ordinal, virtaddr, forwarddll, forwardapi));
+    AddOrdExport(exportaddr, ordinal, TRUE);
+  }
+
+//  free(forwarddll);
+  *forwardapi0 = '.';
+  return TRUE;
+
+  fail:
+//  free(forwarddll);
+  *forwardapi0 = '.';
   return FALSE;
 }
@@ -1451 +1547 @@
 Win32DllBase *Win32PeLdrImage::loadDll(char *pszCurModule)
 {
+    PERF_START(loaddll)
+
  Win32DllBase *WinDll = NULL;
  char modname[CCHMAXPATH];
@@ -1538 +1636 @@
     dprintf((LOG, "**********************************************************************" ));
 
+
+    PERF_ELAPSED(loaddll, "Win32PeLdrImage::loadDll", pszCurModule)
+
     return WinDll;
 }
@@ -1550 +1651 @@
 BOOL Win32PeLdrImage::processImports(char *win32file)
 {
+    PERF_START(processimports)
+
  PIMAGE_IMPORT_DESCRIPTOR pID;
  IMAGE_SECTION_HEADER     shID;
@@ -1773 +1876 @@
 
   free(pszModules);
+
+  PERF_ELAPSED(processimports, "Win32PeLdrImage::processImports", getModuleName())
+
   return TRUE;
 }
@@ -1811 +1917 @@
   NameExport *curexport;
   ULONG       ulAPIOrdinal;                      /* api requested by ordinal */
-
+  
     apilen = strlen(name) + 1;
     if(apilen < 4)
@@ -1828 +1934 @@
            *(ULONG *)curexport->name == *(ULONG *)apiname)
         {
-            if(strcmp(curexport->name, apiname) == 0)
-                return(curexport->virtaddr);
+          if(strcmp(curexport->name, apiname) == 0)
+          {
+            return(curexport->virtaddr);
+          }
         }
         curexport = (NameExport *)((ULONG)curexport->name + curexport->nlength);
@@ -1839 +1947 @@
 ULONG Win32PeLdrImage::getApi(int ordinal)
 {
- ULONG       apiaddr, i;
- OrdExport  *curexport;
- NameExport *nexport;
-
-    curexport = ordexports;
-    for(i=0;i<nrOrdExports;i++) {
-        if(curexport->ordinal == ordinal)
-            return(curexport->virtaddr);
-        curexport++;
-    }
-    //Name exports also contain an ordinal, so check this
-    nexport = nameexports;
-    for(i=0;i<nrNameExports;i++) {
-        if(nexport->ordinal == ordinal)
-            return(nexport->virtaddr);
-
-        nexport = (NameExport *)((ULONG)nexport->name + nexport->nlength);
-    }
-    return(0);
+  ULONG       apiaddr, i;
+  OrdExport  *curexport;
+  NameExport *nexport;
+
+  curexport = ordexports;
+  for(i=0;i<nrOrdExports;i++)
+  {
+    if(curexport->ordinal == ordinal)
+      return(curexport->virtaddr);
+    curexport++;
+  }
+  
+  //Name exports also contain an ordinal, so check this
+  nexport = nameexports;
+  for(i=0;i<nrNameExports;i++) 
+  {
+    if(nexport->ordinal == ordinal)
+      return(nexport->virtaddr);
+
+    nexport = (NameExport *)((ULONG)nexport->name + nexport->nlength);
+  }
+  return(0);
 }
 //******************************************************************************