Changeset 5910 for trunk/src

Timestamp:

Jun 5, 2001, 9:36:28 PM (24 years ago)

Author:

phaller

Message:

Fix ordinal exports

Location:

trunk/src/kernel32

Files:

• winimagepeldr.cpp (modified) (5 diffs)
• winimagepeldr.h (modified) (2 diffs)

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.81 2001-06-05 16:44:46 phaller Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.82 2001-06-05 19:36:28 phaller Exp $ */
 
 /*
@@ -111 +111 @@
     imageVirtBase(-1), realBaseAddress(0), imageVirtEnd(0),
     nrNameExports(0), nrOrdExports(0), nameexports(NULL), ordexports(NULL),
-    memmap(NULL), pFixups(NULL), dwFixupSize(0), curnameexport(NULL), curordexport(NULL)
+    memmap(NULL), pFixups(NULL), dwFixupSize(0), curnameexport(NULL), curordexport(NULL),
+    nrOrdExportsRegistered(0)
 {
  HFILE  dllfile;
@@ -1383 +1384 @@
     }
   }
+  
   return(TRUE);
 }
@@ -1434 +1436 @@
     curordexport->ordinal  = ordinal;
     curordexport++;
+    nrOrdExportsRegistered++;
 }
 //******************************************************************************
@@ -1882 +1885 @@
 ULONG Win32PeLdrImage::getApi(int ordinal)
 {
- ULONG       apiaddr, i;
- OrdExport  *curexport;
- NameExport *nexport;
-
-    curexport = ordexports;
+  ULONG       apiaddr, i;
+  OrdExport  *curexport;
+  NameExport *nexport;
+  register int iDiff;
+
+  curexport = ordexports;
   
-#if 1
-  /* accelerated resolving of ordinal exports
-   * is based on the assumption the ordinal export
-   * table is always sorted ascending.
-   *
-   * When the step size is too small, we continue
-   * with the linear search.
-   */
-  
-  // start in the middle of the tree
-  i = nrOrdExports >> 1;
-  int iStep = i;
-  
-  for(;;)
+  i = 0;
+  if (nrOrdExportsRegistered > 1000)
   {
-    int iThisExport = curexport[i].ordinal;
-    
-    iStep >>= 1;                    // next step will be narrower
-
-    if (iThisExport < ordinal)
-      i += iStep;                   // move farther down the list
-    else
-      if (iThisExport == ordinal)   // found the export?
-        return curexport[i].virtaddr;
-      else
-        i -= iStep;                 // move farther up the list
-
-    // if we're in the direct neighbourhood search linearly
-    if (iStep <= 1)
-    {
-      // decide if we're to search backward or forward
-      if (ordinal > curexport[i].ordinal)
-      {
-        // As a certain number of exports are 0 at the end
-        // of the array, this case will hit fairly often.
-        // the last comparison will send the loop off into the
-        // wrong direction!
-        if (curexport[i].ordinal == 0)
-        {
-          // start over with plain dump search
-          for(i = 0; i < nrOrdExports; i++)
-          {
-            if(curexport[i].ordinal == ordinal)
-              return(curexport[i].virtaddr);
-          }
-          break; // not found yet!
-        }
-        
-        for (;i<nrOrdExports;i++) // scan forward
-        {
-          iThisExport = curexport[i].ordinal;
-          if(iThisExport == ordinal)
-            return(curexport[i].virtaddr);
-          else
-            if (iThisExport > ordinal)
-            {
-              // Oops, cannot find the ordinal in the sorted list
-              break;
-            }
-        }
+    for(i=0;i<nrOrdExportsRegistered;i+=1000) {
+      iDiff = curexport[i].ordinal - ordinal;
+      if(iDiff > 0) {
+        if(i) i -= 1000;
+        break;
       }
       else
-      {
-        for (;i>=0;i--) // scan backward
-        {
-          iThisExport = curexport[i].ordinal;
-          if(curexport[i].ordinal == ordinal)
-            return(curexport[i].virtaddr);
-          else
-            if (iThisExport < ordinal)
-              // Oops, cannot find the ordinal in the sorted list
-              break;
-        }
+        if(iDiff == 0)
+          return(curexport[i].virtaddr);
+    }
+    if (i > nrOrdExportsRegistered) i -= 1000;
+  }
+
+  if (nrOrdExportsRegistered > 100)
+  {
+    for(i;i<nrOrdExportsRegistered;i+=100) {
+      iDiff = curexport[i].ordinal - ordinal;
+      if(iDiff > 0) {
+        if(i) i -= 100;
+        break;
       }
-      
-      // not found yet.
-      break;
-    }
+      else
+        if(iDiff == 0)
+          return(curexport[i].virtaddr);
+    }
+    if (i > nrOrdExportsRegistered) i -= 100;
   }
-#endif
+
+  if (nrOrdExportsRegistered > 10)
+  {
+    for(i;i<nrOrdExportsRegistered;i+=10) {
+      iDiff = curexport[i].ordinal - ordinal;
+      if(iDiff > 0) {
+        if(i) i -= 10;
+        break;
+      }
+      else
+        if(iDiff == 0)
+          return(curexport[i].virtaddr);
+    }
+    if (i > nrOrdExportsRegistered) i -= 10;
+  }
   
-  
-#if 0
-    i = 0;    
-    if(nrOrdExports > 1000) {
-        for(i=0;i<nrOrdExports;i+=1000) {
-            if(curexport[i].ordinal == ordinal)
-                return(curexport[i].virtaddr);
-            else
-            if(ordinal < curexport[i].ordinal) {
-                if(i) i -= 1000;
-                break;
-            }
-        }
-        if(i >= nrOrdExports) i -= 1000;
-    }
-
-    if(nrOrdExports > 100) {
-        for(i;i<nrOrdExports;i+=100) {
-            if(curexport[i].ordinal == ordinal)
-                return(curexport[i].virtaddr);
-            else
-            if(ordinal < curexport[i].ordinal) {
-                if(i) i -= 100;
-                break;
-            }
-        }
-        if(i >= nrOrdExports) i -= 100;
-    }
-
-    if(nrOrdExports > 10) {
-        for(i;i<nrOrdExports;i+=10) {
-            if(curexport[i].ordinal == ordinal)
-                return(curexport[i].virtaddr);
-            else
-            if(ordinal < curexport[i].ordinal) {
-                if(i) i -= 10;
-                break;
-            }
-        }
-        if(i >= nrOrdExports) i -= 10;
-    }
-#endif
-  
-#if 0
-    for(i;i<nrOrdExports;i++) {
-        if(curexport[i].ordinal == ordinal)
-            return(curexport[i].virtaddr);
-    }
-#endif
-
-    //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);
+  for(i;i<nrOrdExportsRegistered;i++) {
+    if(curexport[i].ordinal == ordinal)
+      return(curexport[i].virtaddr);
+  }
+
+  //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);
 }
 //******************************************************************************

trunk/src/kernel32/winimagepeldr.h

@@ -1 @@
-/* $Id: winimagepeldr.h,v 1.13 2001-06-01 08:22:34 sandervl Exp $ */
+/* $Id: winimagepeldr.h,v 1.14 2001-06-05 19:36:28 phaller Exp $ */
 
 /*
@@ -131 +131 @@
         ULONG                 nrNameExports, nameExportSize;
         ULONG                 nrOrdExports;
+        ULONG                 nrOrdExportsRegistered;
         NameExport           *nameexports, *curnameexport;
         OrdExport            *ordexports, *curordexport;