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

Timestamp:

May 30, 2001, 3:36:07 AM (24 years ago)

Author:

phaller

Message:

.

File:

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

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.74 2001-04-19 08:32:49 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.75 2001-05-30 01:34:12 phaller Exp $ */
 
 /*
@@ -55 +55 @@
 #include <wprocess.h>
 
+#include <ccollection.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
 //otherwise.
-//#ifdef DEBUG
+
+// 2001-05-30 PH enabled this again
+#ifdef DEBUG
 #define COMMIT_ALL
-//#endif
+#endif
 
 char szErrorTitle[]     = "Odin";
@@ -139 +143 @@
     strcpy(szModule, OSLibStripPath(szFileName));
     strupr(szModule);
+
+    // create objects for fast API lookup
+    pLookupOrdinal = new CIndexLookupLimit(0, 65535);
+    pLookupName    = new CHashtableLookup(79);
 }
 //******************************************************************************
@@ -144 +152 @@
 Win32PeLdrImage::~Win32PeLdrImage()
 {
+    if (pLookupName)
+        delete pLookupName;
+
+    if (pLookupOrdinal)
+        delete pLookupOrdinal;
+
     if(memmap)
         delete memmap;
@@ -1340 +1354 @@
     }
   }
+
+  // resize the caches
+  pLookupOrdinal->shrink();
+  pLookupName->rehash();
+
   return(TRUE);
 }
@@ -1346 +1365 @@
 void Win32PeLdrImage::AddNameExport(ULONG virtaddr, char *apiname, ULONG ordinal, BOOL fAbsoluteAddress)
 {
- ULONG nsize;
+    ULONG nsize;
 
     if(nameexports == NULL) {
@@ -1362 +1381 @@
         free(tmp);
     }
-    if(fAbsoluteAddress) {//forwarders use absolute address
+
+    if(fAbsoluteAddress) //forwarders use absolute address
+    {
         curnameexport->virtaddr = virtaddr;
     }
-    else curnameexport->virtaddr = realBaseAddress + (virtaddr - oh.ImageBase);
+    else
+    {
+        curnameexport->virtaddr = realBaseAddress + (virtaddr - oh.ImageBase);
+    }
+
+    // add named export to the lookup cache
+    pLookupName->addElement(apiname, (void*)curnameexport->virtaddr);
+
+    // also add the ordinal export to the lookup cache
+    pLookupOrdinal->addElement(ordinal, (void*)curnameexport->virtaddr);
+
     curnameexport->ordinal  = ordinal;
     *(ULONG *)curnameexport->name = 0;
@@ -1380 +1411 @@
 void Win32PeLdrImage::AddOrdExport(ULONG virtaddr, ULONG ordinal, BOOL fAbsoluteAddress)
 {
-    if(ordexports == NULL) {
+    if(ordexports == NULL)
+    {
         ordexports   = (OrdExport *)malloc(nrOrdExports * sizeof(OrdExport));
         curordexport = ordexports;
     }
-    if(fAbsoluteAddress) {//forwarders use absolute address
+
+    if(fAbsoluteAddress)
+    {   //forwarders use absolute address
         curordexport->virtaddr = virtaddr;
     }
-    else curordexport->virtaddr = realBaseAddress + (virtaddr - oh.ImageBase);
+    else
+    {
+        curordexport->virtaddr = realBaseAddress + (virtaddr - oh.ImageBase);
+    }
+
+    // add ordinal export to the lookup cache
+    pLookupOrdinal->addElement((int)ordinal, (void*)curordexport->virtaddr);
 
     curordexport->ordinal  = ordinal;
@@ -1806 +1846 @@
 ULONG Win32PeLdrImage::getApi(char *name)
 {
-  ULONG       apiaddr, i, apilen;
-  char       *apiname;
-  char        tmp[4];
-  NameExport *curexport;
-  ULONG       ulAPIOrdinal;                      /* api requested by ordinal */
+    // ordinal export from the lookup cache
+    void* pNamed = pLookupName->getElement(name);
+    if (pNamed != NULL)
+        return (ULONG)pNamed;
+
+
+    ULONG       apiaddr, i, apilen;
+    char       *apiname;
+    char        tmp[4];
+    NameExport *curexport;
+    ULONG       ulAPIOrdinal;                    /* api requested by ordinal */
 
     apilen = strlen(name) + 1;
@@ -1829 +1875 @@
         {
             if(strcmp(curexport->name, apiname) == 0)
+            {
                 return(curexport->virtaddr);
+            }
         }
         curexport = (NameExport *)((ULONG)curexport->name + curexport->nlength);
@@ -1839 +1887 @@
 ULONG Win32PeLdrImage::getApi(int ordinal)
 {
- ULONG       apiaddr, i;
- OrdExport  *curexport;
- NameExport *nexport;
+    // ordinal export from the lookup cache
+    void* pOrdinal = pLookupOrdinal->getElement(ordinal);
+    if (pOrdinal != NULL)
+        return (ULONG)pOrdinal;
+
+    ULONG       apiaddr, i;
+    OrdExport  *curexport;
+    NameExport *nexport;
 
     curexport = ordexports;
-    for(i=0;i<nrOrdExports;i++) {
+    for(i=0;i<nrOrdExports;i++)
+    {
         if(curexport->ordinal == ordinal)
             return(curexport->virtaddr);
@@ -1851 +1905 @@
     //Name exports also contain an ordinal, so check this
     nexport = nameexports;
-    for(i=0;i<nrNameExports;i++) {
+    for(i=0;i<nrNameExports;i++)
+    {
         if(nexport->ordinal == ordinal)
+        {
             return(nexport->virtaddr);
+        }
 
         nexport = (NameExport *)((ULONG)nexport->name + nexport->nlength);