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

Timestamp:

Aug 24, 2000, 3:36:29 AM (25 years ago)

Author:

bird

Message:

Tested and corrected bugs.

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.6 2000-08-22 03:00:22 bird Exp $
+/* $Id: pe2lx.cpp,v 1.18.4.7 2000-08-24 01:36:26 bird Exp $
  *
  * Pe2Lx class implementation. Ring 0 and Ring 3
@@ -1328 +1328 @@
     #ifdef RING0
     #if 1
+    initOdin32Path();
     return ldrOpenPath(pachModname, cchModname, pLdrLv, pfl);
     #else
@@ -4696 +4697 @@
 BOOL Pe2Lx::initOdin32Path()
 {
-    #if 0
+    #ifdef RING0
     APIRET rc;
     PMTE   pMTE;
@@ -4708 +4709 @@
      */
     pMTE = NULL;
-    rc = ldrFindModule("KERNEL32", 8, CLASS_GLOBAL, &pMTE);
+    rc = ldrFindModule("KERNEL32", 8, CLASS_GLOBAL, (PPMTE)SSToDS(&pMTE));
     if (rc == NO_ERROR && pMTE != NULL && pMTE->mte_swapmte != NULL)
     {
@@ -4744 +4745 @@
     ul = options.fNoLoader;
     options.fNoLoader = TRUE;
-    rc = ldrOpenPath("KERNEL32", 8, &lv, &ful);
+    lv.lv_class = CLASS_GLOBAL;
+    rc = ldrOpenPath("KERNEL32", 8, (ldrlv_t*)SSToDS(&lv), (PULONG)SSToDS(&ful));
     options.fNoLoader = ul;
     if (rc == NO_ERROR)
@@ -4754 +4756 @@
          * We'll close the file handle first of course.
          */
+        rc = setOdin32Path(ldrpFileNameBuf);
         ldrClose(lv.lv_sfn);
-        return setOdin32Path(ldrpFileNameBuf);
+        return rc;
     }