Changeset 3988 for branches/GRACE/src/win32k/pe2lx/pe2lx.cpp

Timestamp:

Aug 11, 2000, 4:26:59 AM (25 years ago)

Author:

bird

Message:

Made it compile by disabling some unfinished code.

File:

• branches/GRACE/src/win32k/pe2lx/pe2lx.cpp (modified) (6 diffs)

branches/GRACE/src/win32k/pe2lx/pe2lx.cpp

@@ -1 @@
-/* $Id: pe2lx.cpp,v 1.18.4.1 2000-07-16 22:43:41 bird Exp $
+/* $Id: pe2lx.cpp,v 1.18.4.2 2000-08-11 02:26:59 bird Exp $
  *
  * Pe2Lx class implementation. Ring 0 and Ring 3
@@ -1283 +1283 @@
 /**
  * openPath - opens file eventually searching loader specific paths.
- * This method is only called for DLLs. DosLoadModule and Imports.
- *
- * This base implementation simply calls ldrOpenPath.
+ * This method is only called for DLLs. (DosLoadModule and Imports.)
+ *
  *
  * @returns   OS2 return code.
@@ -1307 +1306 @@
 ULONG  Pe2Lx::openPath(PCHAR pachModname, USHORT cchModname, ldrlv_t *pLdrLv, PULONG pfl) /* (ldrOpenPath) */
 {
-    #ifdef RING0
+    #if 0 //def RING0
 
     /* These defines sets the order the paths and pathlists are examined. */
@@ -1322 +1321 @@
     #define FINDDLL_LAST            FINDDLL_ENDLIBPATH
 
-    struct
+    struct _LocalVars
     {
         char    sz[CCHMAXPATH];
@@ -1335 +1334 @@
     pLdrLv->lv_sfn = 0xffff;
     initOdin32Path();
-    pVar = rmalloc(sizeof(*pVars));
-    if (pVar == NULL)
+    pVars = (struct _LocalVars*)rmalloc(sizeof(struct _LocalVars));
+    if (pVars == NULL)
         return ERROR_NOT_ENOUGH_MEMORY;
 
@@ -1347 +1346 @@
      * Loop thru the paths and pathlists searching them for the filename.
      */
-    for (iPath = FINDDLL_FIRST; iPath <= FINDDLL_LAST; iPath++)
+    for (int iPath = FINDDLL_FIRST; iPath <= FINDDLL_LAST; iPath++)
     {
         APIRET          rc;             /* Returncode from OS/2 APIs. */