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

Timestamp:

May 30, 2001, 5:31:48 AM (24 years ago)

Author:

phaller

Message:

.

File:

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

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.75 2001-05-30 01:34:12 phaller Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.76 2001-05-30 03:28:02 phaller Exp $ */
 
 /*
@@ -61 +61 @@
 //otherwise.
 
-// 2001-05-30 PH enabled this again
-#ifdef DEBUG
+//#ifdef DEBUG
 #define COMMIT_ALL
-#endif
+//#endif
 
 char szErrorTitle[]     = "Odin";
@@ -114 +113 @@
     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),
+    memmap(NULL), pFixups(NULL), dwFixupSize(0)
 {
  HFILE  dllfile;
@@ -168 +167 @@
     if(realBaseAddress)
         DosFreeMem((PVOID)realBaseAddress);
-
-    if(nameexports)
-        free(nameexports);
-
-    if(ordexports)
-        free(ordexports);
 
     if(section)
@@ -1313 +1306 @@
     nrNameExports = ped->NumberOfNames;
 
+    // as we now know the exact size of the export caches, resize them
+    pLookupName->setSize(nrNameExports);
+
     int   ord, RVAExport;
     char *name;
@@ -1365 +1361 @@
 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);
-    }
+    ULONG uv;
 
     if(fAbsoluteAddress) //forwarders use absolute address
-    {
-        curnameexport->virtaddr = virtaddr;
+        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);
+}
+//******************************************************************************
+//******************************************************************************
+void Win32PeLdrImage::AddOrdExport(ULONG virtaddr, ULONG ordinal, BOOL fAbsoluteAddress)
+{
+    ULONG uv;
+    if(fAbsoluteAddress)
+    {   //forwarders use absolute address
+        uv = virtaddr;
     }
     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;
-    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);
+        uv = realBaseAddress + (virtaddr - oh.ImageBase);
     }
 
     // add ordinal export to the lookup cache
-    pLookupOrdinal->addElement((int)ordinal, (void*)curordexport->virtaddr);
-
-    curordexport->ordinal  = ordinal;
-    curordexport++;
+    pLookupOrdinal->addElement((int)ordinal, (void*)uv);
 }
 //******************************************************************************
@@ -1848 +1807 @@
     // 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;
-    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);
+    return (ULONG)pNamed;
 }
 //******************************************************************************
@@ -1889 +1815 @@
     // 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++)
-    {
-        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);
+    return (ULONG)pOrdinal;
 }
 //******************************************************************************