Changeset 4307 for trunk/src/win32k/ldr/ModuleBase.cpp

Timestamp:

Sep 22, 2000, 11:22:43 AM (25 years ago)

Author:

bird

Message:

Corrected problem with kernel build 14053. (new parameter to ldrOpenPath)
Added symbols for 14053 and 8266.

File:

• trunk/src/win32k/ldr/ModuleBase.cpp (modified) (3 diffs)

trunk/src/win32k/ldr/ModuleBase.cpp

@@ -1 @@
-/* $Id: ModuleBase.cpp,v 1.4 2000-09-02 21:08:06 bird Exp $
+/* $Id: ModuleBase.cpp,v 1.5 2000-09-22 09:22:39 bird Exp $
  *
  * ModuleBase - Implementetation.
@@ -174 +174 @@
  * @param     pLdrLv        Loader local variables? (Struct from KERNEL.SDF)
  * @param     pful          Pointer to flags which are passed on to ldrOpen.
+ * @param     lLibPath      New parameter in build 14053(/8266?)
+ *                          ldrGetMte calls with 1
+ *                          ldrOpenNewExe calls with 3
+ *                          This is compared to the initial libpath index.
+ *                              The libpath index is:
+ *                                  BEGINLIBPATH    1
+ *                                  LIBPATH         2
+ *                                  ENDLIBPATH      3
+ *                              The initial libpath index is either 1 or 2.
+ *                          Currently we'll ignore it. (I don't know why ldrGetMte calls ldrOpenPath...)
  * @sketch
  * This is roughly what the original ldrOpenPath does:
+ *      Save pTCBCur->TCBFailErr.
  *      if !CLASS_GLOBAL or miniifs then
- *          ldrOpen(pachModName)
+ *          ldrOpen(pachFilename)
  *      else
+ *          if beglibpath != NULL then path = 1 else path = 2
+ *          if (lLibPath < path)
+ *              return ERROR_FILE_NOT_FOUND; (2)
+ *          Allocate buffer.
  *          loop until no more libpath elements
  *              get next libpath element and add it to the modname.
@@ -184 +199 @@
  *              if successfull then break the loop.
  *          endloop
+ *          Free buffer.
  *      endif
- */
-ULONG  ModuleBase::openPath(PCHAR pachFilename, USHORT cchFilename, ldrlv_t *pLdrLv, PULONG pful) /* (ldrOpenPath) */
+ *      Restore pTCBCur->TCBFailErr.
+ */
+ULONG  ModuleBase::openPath(PCHAR pachFilename, USHORT cchFilename, ldrlv_t *pLdrLv, PULONG pful, ULONG lLibPath) /* (ldrOpenPath) */
 {
     #ifdef RING0
     printf("ModuleBase::openPath:\n");
-    return ldrOpenPath(pachFilename, cchFilename, pLdrLv, pful);
+    return ldrOpenPath(pachFilename, cchFilename, pLdrLv, pful, lLibPath);
     #else
     NOREF(pachFilename);