Changeset 4307 for trunk/src/win32k/ldr/myldrOpenPath.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/myldrOpenPath.cpp (modified) (9 diffs)

trunk/src/win32k/ldr/myldrOpenPath.cpp

@@ -1 @@
-/* $Id: myldrOpenPath.cpp,v 1.2 2000-09-02 21:08:10 bird Exp $
+/* $Id: myldrOpenPath.cpp,v 1.3 2000-09-22 09:22:40 bird Exp $
  *
  * myldrOpenPath - ldrOpenPath used to open executables we'll override
@@ -41 +41 @@
 
 /**
+ * ldrOpenPath.
  * myldrOpenPath - opens file eventually searching loader specific paths
  *
@@ -49 +50 @@
  * @param     plv           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()
+ *                          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:
@@ -55 +67 @@
  *          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.
@@ -60 +76 @@
  *              if successfull then break the loop.
  *          endloop
+ *          Free buffer.
  *      endif
  *      Restore pTCBCur->TCBFailErr.
@@ -65 +82 @@
  *
  */
-ULONG LDRCALL myldrOpenPath( /* retd  0x10 */
+ULONG LDRCALL myldrOpenPath(       /* retd  0x14 */
     PCHAR       pachFilename,       /* ebp + 0x08 */
     USHORT      cchFilename,        /* ebp + 0x0c */
     ldrlv_t *   plv,                /* ebp + 0x10 */
-    PULONG      pful                /* ebp + 0x14 */
+    PULONG      pful,               /* ebp + 0x14 */
+    ULONG       lLibPath            /* ebp + 0x18 */
     )
 {
@@ -89 +107 @@
                  pachFilename, cchFilename, plv, pful
                  ));
-        return ldrOpenPath(pachFilename, cchFilename, plv, pful);
+        return ldrOpenPath(pachFilename, cchFilename, plv, pful, lLibPath);
     }
     #endif
@@ -156 +174 @@
              */
             USHORT  TCBFailErr_save = tcbGetTCBFailErr(tcbGetCur());
-            rc = pExe->Data.pModule->openPath(pachFilename, cchFilename, plv, pful);
+            rc = pExe->Data.pModule->openPath(pachFilename, cchFilename, plv, pful, lLibPath);
             tcbSetTCBFailErr(tcbGetCur(), TCBFailErr_save);
         }
         else
-            rc = ldrOpenPath(pachFilename, cchFilename, plv, pful);
+            rc = ldrOpenPath(pachFilename, cchFilename, plv, pful, lLibPath);
     }
     else
-        rc = ldrOpenPath(pachFilename, cchFilename, plv, pful);
+        rc = ldrOpenPath(pachFilename, cchFilename, plv, pful, lLibPath);
 
 
@@ -176 +194 @@
 
 
+/**
+ * Wrapper for the old (pre 14053) versions.
+ * the new parameter is set to 3.
+ */
+ULONG LDRCALL myldrOpenPath_old( /* retd  0x10 */
+    PCHAR       pachFilename,    /* ebp + 0x08 */
+    USHORT      cchFilename,     /* ebp + 0x0c */
+    ldrlv_t *   plv,             /* ebp + 0x10 */
+    PULONG      pful             /* ebp + 0x14 */
+    )
+{
+    return myldrOpenPath(pachFilename, cchFilename, plv, pful, 3);
+}
+
+