Changeset 4307 for trunk/src/win32k/include

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.

Location:

trunk/src/win32k/include

Files:

• LdrCalls.h (modified) (4 diffs)
• ModuleBase.h (modified) (2 diffs)
• options.h (modified) (6 diffs)
• pe2lx.h (modified) (2 diffs)

trunk/src/win32k/include/LdrCalls.h

@@ -1 @@
-/* $Id: LdrCalls.h,v 1.5 2000-09-08 21:34:11 bird Exp $
+/* $Id: LdrCalls.h,v 1.6 2000-09-22 09:22:37 bird Exp $
  *
  * Prototypes for the loader overrided function.
@@ -138 +138 @@
 /**
  * ldrOpenPath
+ *  pre 14053.
  * @returns   OS2 return code.
  *            pLdrLv->lv_sfn  is set to filename handle.
@@ -155 +156 @@
  *  endif
  */
-extern ULONG LDRCALL ldrOpenPath(   /* retd  0x10 */
+extern ULONG LDRCALL ldrOpenPath_old(   /* retd  0x10 */
     PCHAR       pachFilename,       /* ebp + 0x08 */
     USHORT      cchFilename,        /* ebp + 0x0c */
@@ -162 +163 @@
     );
 
-ULONG LDRCALL myldrOpenPath(PCHAR pachFilename, USHORT cchFilename, ldrlv_t *plv, PULONG pful);
+ULONG LDRCALL myldrOpenPath_old(PCHAR pachFilename, USHORT cchFilename, ldrlv_t *plv, PULONG pful);
+
+
+/**
+ * ldrOpenPath - ldrOpenPath for build 14053 and above.
+ *
+ * @returns   OS2 return code.
+ *            plv->lv_sfn  is set to filename handle.
+ * @param     pachFilename  Pointer to modulename. Not zero terminated!
+ * @param     cchFilename   Modulename length.
+ * @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.
+ *
+ * @sketch
+ * This is roughly what the original ldrOpenPath does:
+ *      Save pTCBCur->TCBFailErr.
+ *      if !CLASS_GLOBAL or miniifs then
+ *          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.
+ *              try open the modname
+ *              if successfull then break the loop.
+ *          endloop
+ *          Free buffer.
+ *      endif
+ *      Restore pTCBCur->TCBFailErr.
+ */
+extern ULONG LDRCALL ldrOpenPath(  /* retd  0x14 */
+    PCHAR       pachFilename,      /* ebp + 0x08 */
+    USHORT      cchFilename,       /* ebp + 0x0c */
+    ldrlv_t *   plv,               /* ebp + 0x10 */
+    PULONG      pful,              /* ebp + 0x14 */
+    ULONG       lLibPath           /* ebp + 0x18 */
+    );
+
+ULONG LDRCALL myldrOpenPath(PCHAR pachFilename, USHORT cchFilename, ldrlv_t *plv, PULONG pful, ULONG lLibPath);
 
 

trunk/src/win32k/include/ModuleBase.h

@@ -1 @@
-/* $Id: ModuleBase.h,v 1.4 2000-09-02 21:07:59 bird Exp $
+/* $Id: ModuleBase.h,v 1.5 2000-09-22 09:22:36 bird Exp $
  *
  * ModuleBase - Declaration of the Basic module class.
@@ -120 +120 @@
     virtual ULONG   applyFixups(PMTE pMTE, ULONG iObject, ULONG iPageTable, PVOID pvPage,
                                 ULONG ulPageAddress, PVOID pvPTDA); /*(ldrEnum32bitRelRecs)*/
-    virtual ULONG   openPath(PCHAR pachFilename, USHORT cchFilename, ldrlv_t *pLdrLv, PULONG pful); /* (ldrOpenPath) */
+    virtual ULONG   openPath(PCHAR pachFilename, USHORT cchFilename, ldrlv_t *pLdrLv, PULONG pful, ULONG lLibPath); /* (ldrOpenPath) */
     #ifndef RING0
     virtual ULONG   writeFile(PCSZ pszLXFilename);

trunk/src/win32k/include/options.h

@@ -1 @@
-/* $Id: options.h,v 1.11 2000-09-02 21:08:03 bird Exp $
+/* $Id: options.h,v 1.12 2000-09-22 09:22:37 bird Exp $
  *
  * Options.
@@ -9 +9 @@
  */
 
+/* NOINC */
 #ifndef _options_h_
 #define _options_h_
+/* INC */
 
 /*******************************************************************************
@@ -43 +45 @@
 #define CB_RES_MAX          ((unsigned long)1024*1024*10)  /*  10MB  */
 
+/* NOINC */
 /* default assignments */
 #define DEFAULT_OPTION_ASSIGMENTS                           \
@@ -82 +85 @@
 #define isSMPKernel()               (options.fKernel & KF_SMP)
 #define isUNIKernel()               !(options.fKernel & KF_SMP)
-
+/* INC */
 
 /*******************************************************************************
@@ -96 +99 @@
     /** @cat logging options */
     USHORT      usCom;                  /* Output port no. */
-    ULONG       fLogging;               /* Logging. */
+    USHORT      fLogging;               /* Logging. */
 
     /** @cat kernel selection */
@@ -134 +137 @@
 *   Global Variables                                                           *
 *******************************************************************************/
+/* NOINC */
 extern struct options DATA16_GLOBAL options;    /* defined in d16globals.c */
 #if defined(__IBMC__) || defined(__IBMCPP__)
     #pragma map( options , "_options"  )
 #endif
+/* INC */
 
+/* NOINC */
 #endif
+/* INC */
 

trunk/src/win32k/include/pe2lx.h

@@ -1 @@
-/* $Id: pe2lx.h,v 1.10 2000-09-02 21:08:03 bird Exp $
+/* $Id: pe2lx.h,v 1.11 2000-09-22 09:22:37 bird Exp $
  *
  * Pe2Lx class declarations. Ring 0 and Ring 3
@@ -66 +66 @@
     ULONG  applyFixups(PMTE pMTE, ULONG iObject, ULONG iPageTable, PVOID pvPage,
                        ULONG ulPageAddress, PVOID pvPTDA); /*(ldrEnum32bitRelRecs)*/
-    ULONG  openPath(PCHAR pachFilename, USHORT cchFilename, ldrlv_t *pLdrLv, PULONG pful); /* (ldrOpenPath) */
-    static ULONG  openPath2(PCHAR pachFilename, ULONG cchFilename, ldrlv_t *pLdrLv, PULONG pful, BOOL fOdin32PathValid);
+    ULONG  openPath(PCHAR pachFilename, USHORT cchFilename, ldrlv_t *pLdrLv, PULONG pful, ULONG lLibPath); /* (ldrOpenPath) */
+    static ULONG  openPath2(PCHAR pachFilename, ULONG cchFilename, ldrlv_t *pLdrLv, PULONG pful, ULONG lLibPath, BOOL fOdin32PathValid);
     #ifndef RING0
     ULONG  testApplyFixups();