Changeset 1467 for trunk/src/win32k/ldr/myldrRead.cpp

Timestamp:

Oct 27, 1999, 4:03:01 AM (26 years ago)

Author:

bird

Message:

Corrections to make win32k work.
(And now it does work, at least at my test machine...)

File:

• trunk/src/win32k/ldr/myldrRead.cpp (modified) (5 diffs)

trunk/src/win32k/ldr/myldrRead.cpp

@@ -1 @@
-/* $Id: myldrRead.cpp,v 1.3 1999-10-14 02:36:08 bird Exp $
+/* $Id: myldrRead.cpp,v 1.4 1999-10-27 02:02:58 bird Exp $
  *
  * myldrRead - _ldrRead.
@@ -27 +27 @@
 #include "OS2Krnl.h"
 #include "pe2lx.h"
+#include "avl.h"
 #include "ldrCalls.h"
 #include "ldr.h"
@@ -45 +46 @@
     if (GetState(hFile) == HSTATE_OUR)
     {
-        PPENODE pNode;
+        PMODULE pMod;
+        kprintf(("_ldrRead+: hF=%+04x off=%+08x pB=%+08x fl=%+08x cb=%+04x pMTE=%+08x\n",hFile,ulOffset,pBuffer,ulFlags,ulBytesToRead,pMTE));
 
-        pNode = getNodePtr(hFile);
-        if (pNode != NULL)
+        pMod = getModuleBySFN(hFile);
+        if (pMod != NULL)
         {
             /* I would love to have a pointer to the MTE */
-            if (pNode->pMTE == NULL && pMTE != NULL)
-                pNode->pMTE == pMTE;
+            if (pMod->pMTE == NULL && pMTE != NULL)
+                pMod->pMTE == pMTE;
 
             /* debug */
@@ -58 +60 @@
                 kprintf(("_ldrRead: Warning ulFlags = 0x%x (!= 0)\n", ulFlags));
 
-            rc = pNode->pPe2Lx->read(ulOffset, pBuffer, ulBytesToRead, ulFlags, pMTE);
+            if ((pMod->fFlags & MOD_TYPE_MASK) == MOD_TYPE_PE2LX)
+                rc = pMod->Data.pPe2Lx->read(ulOffset, pBuffer, ulBytesToRead, ulFlags, pMTE);
+            else
+            {
+                kprintf(("_ldrRead: Invalid module type, %#x\n", pMod->fFlags & MOD_TYPE_MASK));
+                rc = ERROR_READ_FAULT;
+            }
             return rc;
         }
@@ -67 +75 @@
     rc = _ldrRead(hFile, ulOffset, pBuffer, ulFlags, ulBytesToRead, pMTE);
 
-//  kprintf(("_ldrRead:  hF=%+04x off=%+08x pB=%+08x fl=%+08x cb=%+04x pMTE=%+08x rc=%d\n",hFile,ulOffset,pBuffer,ulFlags,ulBytesToRead,pMTE,rc));
+    #if 0
+    kprintf(("_ldrRead:  hF=%+04x off=%+08x pB=%+08x fl=%+08x cb=%+04x pMTE=%+08x rc=%d\n",
+             hFile,ulOffset,pBuffer,ulFlags,ulBytesToRead,pMTE,rc));
+    #endif
 
     return rc;