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

Timestamp:

Oct 14, 1999, 3:25:39 AM (26 years ago)

Author:

bird

Message:

Pe2Lx rewrite changes in win32k.
Pluss some makefile/depend changes.

File:

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

trunk/src/win32k/ldr/myldrRead.cpp

@@ -1 @@
-/* $Id: myldrRead.cpp,v 1.1 1999-09-06 02:20:01 bird Exp $
+/* $Id: myldrRead.cpp,v 1.2 1999-10-14 01:25:39 bird Exp $
  *
  * myldrRead - _ldrRead.
@@ -18 +18 @@
 #include <os2.h>
 
-#include "pefile.h"
-#include "lx.h"
+#include <memory.h>
+#include <stdlib.h>
+
 #include "log.h"
 #include "dev32.h"
+#include <peexe.h>
+#include <exe386.h>
+#include "OS2Krnl.h"
+#include "pe2lx.h"
+#include "ldrCalls.h"
 #include "ldr.h"
-#include "ldrCalls.h"
-
 
 
@@ -37 +41 @@
 {
     ULONG   rc;
-    ULONG   ulRead;
-    int     i;
-    PPENODE pNode;
 
-    /* check if this is an PE-file */
-    if (GetState(hFile) == HSTATE_PE)
+    /* Check if this is an overrided handle */
+    if (GetState(hFile) == HSTATE_OUR)
     {
+        PPENODE pNode;
+
         pNode = getNodePtr(hFile);
         if (pNode != NULL)
@@ -51 +54 @@
                 pNode->pMTE == pMTE;
 
-            /*debug*/
+            /* debug */
             if (ulFlags != 0)
                 kprintf(("_ldrRead: Warning ulFlags = 0x%x (!= 0)\n", ulFlags));
-            rc = pNode->lxfile.read(ulOffset, pBuffer, ulBytesToRead, (PULONG)SSToDS(&ulRead), ulFlags);
+
+            rc = pNode->pPe2Lx->read(ulOffset, pBuffer, ulBytesToRead, ulFlags);
             return rc;
         }
         else
-            kprintf(("_ldrRead:  DON'T PANIC! - I can't get Node ptr!\n"));
+            kprintf(("_ldrRead:  DON'T PANIC! - but I can't get Node ptr! - This is really an IPE!\n"));
     }
-
 
     rc = _ldrRead( hFile, ulOffset, pBuffer, ulFlags, ulBytesToRead, pMTE );
@@ -66 +69 @@
 //  kprintf(("_ldrRead:  hF=%+04x off=%+08x pB=%+08x fl=%+08x cb=%+04x pMTE=%+08x rc=%d\n",hFile,ulOffset,pBuffer,ulFlags,ulBytesToRead,pMTE,rc));
 
-    /* check if file is uncertain - try make it certain */
-    if (GetState(hFile) == HSTATE_CHECK)
-    {
-        i = findUncertainEntry(hFile);
-        if (!ahUncertain[i].fMZ && ulOffset == 0 && ulBytesToRead >= 0x40)
-        {
-            /* Stage 1: */
-            if (((PUSHORT)pBuffer)[0] == IMAGE_DOS_SIGNATURE)
-            {   /* MZ */
-                ahUncertain[i].offsetNEHdr = *(PULONG)((ULONG)pBuffer+0x3c); /*Need more verification???*/
-                ahUncertain[i].fMZ = 1;
-                //kprintf(("_ldrRead:  Yeah! Detected MZ file - offset of NEHdr=%#x.\n", ahUncertain[i].offsetNEHdr));
-            }
-            else
-            {   /* CERTAIN: not a PE-file */
-                SetState(hFile, HSTATE_NOT_PE);
-                freeUncertainEntry(hFile);
-            }
-        }
-        else
-        {
-            if (ahUncertain[i].fMZ && ulOffset == ahUncertain[i].offsetNEHdr && ulBytesToRead == sizeof(struct e32_exe))
-            {
-                /* Stage 2: */
-                if (LXFile::isPEFile((PIMAGE_SIG_FILE_HEADER)pBuffer))
-                {
-                    kprintf(("_ldrRead:  Yeah! Detected PE file.\n"));
-                    if (!fQAppType)
-                    {
-                        pNode = allocateNode();
-                        if (pNode != NULL)
-                        {
-                            /* setup node */
-                            pNode->hFile = hFile;   //key - but yes it is duplicateded in lxfile
-                            pNode->pMTE = pMTE;
-                            insertNode(pNode);
-                            SetState(hFile, HSTATE_PE);
-                            pNode->lxfile.SetModuleName(ahUncertain[i].pszName);
-
-                            /* initiate lxfile */
-                            if (pNode->lxfile.init(hFile, (PIMAGE_SIG_FILE_HEADER)pBuffer, ahUncertain[i].offsetNEHdr))
-                            {
-                                /* init ok - do read */
-                                ULONG read;
-                                /*debug*/
-                                if (ulFlags != 0)
-                                    kprintf(("_ldrRead: Warning ulFlags = 0x%x (!= 0)\n", ulFlags));
-                                rc = pNode->lxfile.read(ulOffset, pBuffer, ulBytesToRead, (PULONG)SSToDS(&read), ulFlags);
-                            }
-                            else
-                            {
-                                /* init failed - complain */
-                                kprintf(("_ldrRead:  opps! lxfile.init() failed!\n"));
-                            }
-                        }
-                        else
-                        {
-                            /* to not enter an unstable state - free all and mark as no pefile*/
-                            SetState(hFile, HSTATE_NOT_PE);
-                            kprintf(("_ldrRead:  oops! could not allocate a Node for this file - why?\n"));
-                        }
-                    }
-                    else
-                    {
-                        kprintf(("_ldrRead: Building an QAppType-Header!\n"));
-                        LXFile::buildQAppTypeHeader((struct e32_exe*)pBuffer);
-                        SetState(hFile, HSTATE_NOT_PE);
-                    }
-                }
-                else
-                {
-                    /* CERTAIN: not a pefile! */
-                    SetState(hFile,HSTATE_NOT_PE);
-                }
-                freeUncertainEntry(hFile);
-            }
-        }
-    }
-
     return rc;
 }