Changeset 12461

Timestamp:

Nov 29, 1999, 1:33:38 AM (25 years ago)

Author:

bird

Message:

Made sure Kernel32 is the first entry in the import module name table.

File:

• tags/trunk/src/win32k/pe2lx/pe2lx.cpp (modified) (6 diffs)

tags/trunk/src/win32k/pe2lx/pe2lx.cpp ¶

@@ -1 @@
-/* $Id: pe2lx.cpp,v 1.11 1999-11-16 18:07:55 bird Exp $
+/* $Id: pe2lx.cpp,v 1.12 1999-11-29 00:33:38 bird Exp $
  *
  * Pe2Lx class implementation. Ring 0 and Ring 3
@@ -1708 +1708 @@
  *            Check and read directories for imports and relocations.
  *            Create necessary Buffered RVA Readers.
+ *            Make sure kernel32 is the first imported module.
  *            Initiate the import variables (if any imports):
  *                Loop thru the import descriptiors looking for the lowest FirstThunk RVA. (ulRVAOrgFirstThunk and ulRVAFirstThunk)
@@ -1870 +1871 @@
     }
 
+    /* Make sure kernel32 is the first imported module */
+    if (rc == NO_ERROR)
+        rc = addModule("KERNEL32.DLL", (PULONG)SSToDS(&ul));
+
     /* initiate the import variables */
     if (fImports && rc == NO_ERROR)
@@ -1906 +1911 @@
 
     /* read start of the first basereloc chunk */
-    if (fBaseRelocs)
+    if (fBaseRelocs && rc == NO_ERROR)
         rc = pRelocReader->readAtRVA(ulRVABaseReloc, SSToDS(&BaseReloc), sizeof(BaseReloc));
+
 
     /*
@@ -3493 +3499 @@
  *            IF no enough memory THEN (try) allocate more.
  *            IF Function ordinal THEN convert it to an ordinal number.
+ *            Make sure kernel32 is the first imported module.
  *            Add module name.
  *            IF not forwarder to ordinal THEN Add name to imported procedure table.
@@ -3606 +3613 @@
     else
         ulFnOrdinal = 0; /* not ordinal! */
+
+    /* Make sure kernel32 is the first imported module */
+    if (offCurImpModuleName == 0)
+    {
+        rc = addModule("KERNEL32.DLL", (PULONG)SSToDS(&ulModuleOrdinal));
+        if (rc != NO_ERROR)
+            return rc;
+    }
 
     /* Add module name. */