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

Timestamp:

May 30, 2001, 10:23:22 AM (24 years ago)

Author:

sandervl

Message:

put back old lookup code; renamed new files

File:

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

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.76 2001-05-30 03:28:02 phaller Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.77 2001-05-30 08:23:21 sandervl 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
 #define COMMIT_ALL
@@ -113 +110 @@
     nrsections(0), imageSize(0), dwFlags(0), section(NULL),
     imageVirtBase(-1), realBaseAddress(0), imageVirtEnd(0),
-    nrNameExports(0), nrOrdExports(0),
-    memmap(NULL), pFixups(NULL), dwFixupSize(0)
+    nrNameExports(0), nrOrdExports(0), nameexports(NULL), ordexports(NULL),
+    memmap(NULL), pFixups(NULL), dwFixupSize(0), curnameexport(NULL), curordexport(NULL)
 {
  HFILE  dllfile;
@@ -142 +139 @@
     strcpy(szModule, OSLibStripPath(szFileName));
     strupr(szModule);
-
-    // create objects for fast API lookup
-    pLookupOrdinal = new CIndexLookupLimit(0, 65535);
-    pLookupName    = new CHashtableLookup(79);
 }
 //******************************************************************************
@@ -151 +144 @@
 Win32PeLdrImage::~Win32PeLdrImage()
 {
-    if (pLookupName)
-        delete pLookupName;
-
-    if (pLookupOrdinal)
-        delete pLookupOrdinal;
-
     if(memmap)
         delete memmap;
@@ -167 +154 @@
     if(realBaseAddress)
         DosFreeMem((PVOID)realBaseAddress);
+
+    if(nameexports)
+        free(nameexports);
+
+    if(ordexports)
+        free(ordexports);
 
     if(section)
@@ -1306 +1299 @@
     nrNameExports = ped->NumberOfNames;
 
-    // as we now know the exact size of the export caches, resize them
-    pLookupName->setSize(nrNameExports);
-
     int   ord, RVAExport;
     char *name;
@@ -1350 +1340 @@
     }
   }
-
-  // resize the caches
-  pLookupOrdinal->shrink();
-  pLookupName->rehash();
-
   return(TRUE);
 }
@@ -1361 +1346 @@
 void Win32PeLdrImage::AddNameExport(ULONG virtaddr, char *apiname, ULONG ordinal, BOOL fAbsoluteAddress)
 {
-    ULONG uv;
-
-    if(fAbsoluteAddress) //forwarders use absolute address
-        uv = virtaddr;
-    else
-        uv = realBaseAddress + (virtaddr - oh.ImageBase);
-
-    // add named export to the lookup cache
-    pLookupName->addElement(apiname, (void*)uv);
-
-    // also add the ordinal export to the lookup cache
-    pLookupOrdinal->addElement(ordinal, (void*)uv);
+ 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);
 }
 //******************************************************************************
@@ -1378 +1380 @@
 void Win32PeLdrImage::AddOrdExport(ULONG virtaddr, ULONG ordinal, BOOL fAbsoluteAddress)
 {
-    ULONG uv;
-    if(fAbsoluteAddress)
-    {   //forwarders use absolute address
-        uv = virtaddr;
-    }
-    else
-    {
-        uv = realBaseAddress + (virtaddr - oh.ImageBase);
-    }
-
-    // add ordinal export to the lookup cache
-    pLookupOrdinal->addElement((int)ordinal, (void*)uv);
+    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++;
 }
 //******************************************************************************
@@ -1805 +1806 @@
 ULONG Win32PeLdrImage::getApi(char *name)
 {
-    // ordinal export from the lookup cache
-    void* pNamed = pLookupName->getElement(name);
-    return (ULONG)pNamed;
+  ULONG       apiaddr, i, apilen;
+  char       *apiname;
+  char        tmp[4];
+  NameExport *curexport;
+  ULONG       ulAPIOrdinal;                      /* api requested by ordinal */
+
+    apilen = strlen(name) + 1;
+    if(apilen < 4)
+    {
+        *(ULONG *)tmp = 0;
+        strcpy(tmp, name);
+        apiname = tmp;
+        apilen  = 4;
+    }
+    else  apiname = name;
+
+    curexport = nameexports;
+    for(i=0; i<nrNameExports; i++)
+    {
+        if(apilen == curexport->nlength &&
+           *(ULONG *)curexport->name == *(ULONG *)apiname)
+        {
+            if(strcmp(curexport->name, apiname) == 0)
+                return(curexport->virtaddr);
+        }
+        curexport = (NameExport *)((ULONG)curexport->name + curexport->nlength);
+    }
+    return(0);
 }
 //******************************************************************************
@@ -1813 +1839 @@
 ULONG Win32PeLdrImage::getApi(int ordinal)
 {
-    // ordinal export from the lookup cache
-    void* pOrdinal = pLookupOrdinal->getElement(ordinal);
-    return (ULONG)pOrdinal;
+ 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);
 }
 //******************************************************************************