Changeset 1535 for trunk/src/win32k/ldr/myldrOpen.cpp

Timestamp:

Nov 1, 1999, 12:57:09 AM (26 years ago)

Author:

bird

Message:

Updated option/argument handling.
Corrected a few bugs.

File:

• trunk/src/win32k/ldr/myldrOpen.cpp (modified) (7 diffs)

trunk/src/win32k/ldr/myldrOpen.cpp

@@ -1 @@
-/* $Id: myldrOpen.cpp,v 1.3 1999-10-27 02:02:58 bird Exp $
+/* $Id: myldrOpen.cpp,v 1.4 1999-10-31 23:57:06 bird Exp $
  *
  * myldrOpen - _ldrOpen.
@@ -23 +23 @@
 #include <stdlib.h>
 
-
 #include "log.h"
 #include <peexe.h>
@@ -33 +32 @@
 #include "ldr.h"
 #include "ldrCalls.h"
+#include "options.h"
 
 
@@ -52 +52 @@
         kprintf(("_ldrOpen:  phFile=%#.4x, flags=%#.8x, pszFn=%s\n", *phFile, param3, pszFilename));
 
-    if (rc == NO_ERROR)
+    if (rc == NO_ERROR && (options.fElf || options.fPE != FLAGS_PE_NOT || options.fScript))
     {
         static char achBuffer[sizeof(IMAGE_DOS_HEADER)];
         PIMAGE_DOS_HEADER   pMzHdr = (PIMAGE_DOS_HEADER)&achBuffer[0];
+        PIMAGE_NT_HEADERS   pNtHdrs = (PIMAGE_NT_HEADERS)&achBuffer[0]; /* oops. Last accessible field is OptionalHeader.FileAlignment */
         char               *pach = &achBuffer[0];
 
@@ -62 +63 @@
          * This costs up to two disk reads!
          */
-        rc = _ldrRead(*phFile, 0UL, pMzHdr, 0UL, sizeof(*pMzHdr), NULL);
+        rc = _ldrRead(*phFile, 0UL, pMzHdr, 0UL, sizeof(IMAGE_DOS_HEADER), NULL);
         if (rc == NO_ERROR)
         {
-            if (pMzHdr->e_magic == IMAGE_DOS_SIGNATURE &&
-                pMzHdr->e_lfanew > sizeof(IMAGE_DOS_HEADER) && pMzHdr->e_lfanew < 0x04000000UL) /* Larger than 64 bytes and less that 64MB. */
-            {   /* MZ header found */
-                /* read */
-                rc = _ldrRead(*phFile, pMzHdr->e_lfanew, pMzHdr, 0UL, 4UL, NULL);
+            if ((pMzHdr->e_magic == IMAGE_DOS_SIGNATURE &&
+                 pMzHdr->e_lfanew > sizeof(IMAGE_DOS_HEADER) && pMzHdr->e_lfanew < 0x04000000UL) /* Larger than 64 bytes and less that 64MB. */
+                || *(PULONG)pach == IMAGE_NT_SIGNATURE)
+            {   /* MZ or PE header found */
+                if (options.fPE == FLAGS_PE_NOT)
+                    return NO_ERROR;
+
+                if (*(PULONG)pach != IMAGE_NT_SIGNATURE)
+                    rc = _ldrRead(*phFile, pMzHdr->e_lfanew, pach, 0UL, sizeof(achBuffer), NULL);
+
                 if (rc == NO_ERROR && *(PULONG)pach == IMAGE_NT_SIGNATURE)
                 {   /* PE signature found */
-                    PMODULE pMod;
-
                     kprintf(("_ldrOpen: PE executable...\n"));
-                    #pragma info(none)
-                    if (/* invoke pe.exe or do conversion now? */ 1)
-                    {   /* pe2lx - win32k */
-                    #pragma info(restore)
+                    if (options.fPE == FLAGS_PE_PE2LX
+                        || (options.fPE == FLAGS_PE_MIXED
+                            && !((pNtHdrs->FileHeader.Characteristics & IMAGE_FILE_DLL == 0UL)
+                                 && pNtHdrs->OptionalHeader.ImageBase >= 0x04000000UL /* 64MB */
+                                 )
+                            )
+                        )
+                    {   /* pe2lx */
                         Pe2Lx * pPe2Lx = new Pe2Lx(*phFile);
                         if (pPe2Lx != NULL)
@@ -101 +109 @@
                     }
                     else
-                    {   /* pe.exe */
-                        kprintf(("_ldrOpen: pe.exe - opening\n"));
-                        _ldrClose(*phFile);
-                        rc = _ldrOpen(phFile, "pe.exe", param3);  /* path....! problems! */
-                        kprintf(("_ldrOpen: pe.exe - open returned with rc = %d\n", rc));
-                    }
+                        if (options.fPE == FLAGS_PE_PE || options.fPE == FLAGS_PE_MIXED)
+                        {   /* pe.exe */
+                            kprintf(("_ldrOpen: pe.exe - opening\n"));
+                            _ldrClose(*phFile);
+                            rc = _ldrOpen(phFile, "pe.exe", param3);  /* path....! problems! */
+                            kprintf(("_ldrOpen: pe.exe - open returned with rc = %d\n", rc));
+                            return rc;
+                        }
                 }
                 rc = NO_ERROR;
@@ -112 +122 @@
             else
             {
-                if (*pach == '#')
-                {
-                    /* unix styled script...? must be more than 64 bytes long.... */
-                    char *pszStart = pach+1;
-                    char *pszEnd;
-                    kprintf(("_ldrOpen: unix script?\n"));
-                    /* skip blanks */
-                    while (*pszStart != '\0' && (*pszStart == ' ' || *pszStart == '\t'))
-                        pszStart++;
-                    if (*pszStart != '\0' && *pszStart != '\r' && *pszStart != '\n')
-                    {   /* find end-of-word */
-                        while (*pszEnd != '\0' && *pszEnd != '\n' && *pszEnd != '\r'
-                               && *pszEnd != '\t' && *pszEnd != ' ')
-                            pszEnd++;
-                        *pszEnd = '\0';
-                        kprintf(("_ldrOpen: unix script - opening %s\n", pszStart));
-                        _ldrClose(*phFile);
-                        rc = _ldrOpen(phFile, pszStart, param3);
-                        kprintf(("_ldrOpen: unix script - open returned with rc = %d\n", rc));
-                    }
-                    else
-                        kprintf(("_ldrOpen: unix script - unexpected end of line/file. (line: %.10s\n", pach));
-                }
-                else if (pach[0] == ELFMAG0 && pach[1] == ELFMAG1 && pach[2] == ELFMAG2 && pach[3] == ELFMAG3)
+                if (pach[0] == ELFMAG0 && pach[1] == ELFMAG1 && pach[2] == ELFMAG2 && pach[3] == ELFMAG3)
                 {
                     /* ELF signature found */
                     kprintf(("_ldrOpen: ELF executable! - not implemented yet!\n"));
                 }
+                else
+                    if (*pach == '#')
+                    {
+                        /* unix styled script...? Must be more than 64 bytes long? No options. firstline < 64 bytes. */
+                        char *pszStart = pach+1;
+                        char *pszEnd;
+                        kprintf(("_ldrOpen: unix script?\n"));
+
+                        achBuffer[sizeof(achBuffer)-1] = '\0'; /* just to make sure we don't read to much... */
+
+                        /* skip blanks */
+                        while (*pszStart != '\0' && (*pszStart == ' ' || *pszStart == '\t'))
+                            pszStart++;
+                        if (*pszStart != '\0' && *pszStart != '\r' && *pszStart != '\n')
+                        {   /* find end-of-word */
+                            while (*pszEnd != '\0' && *pszEnd != '\n' && *pszEnd != '\r'
+                                   && *pszEnd != '\t' && *pszEnd != ' ')
+                                pszEnd++;
+                            *pszEnd = '\0';
+                            if (*pszEnd != '\0')
+                            {
+                                kprintf(("_ldrOpen: unix script - opening %s\n", pszStart));
+                                _ldrClose(*phFile);
+                                rc = _ldrOpen(phFile, pszStart, param3);
+                                kprintf(("_ldrOpen: unix script - open returned with rc = %d\n", rc));
+                            }
+                        }
+                        else
+                            kprintf(("_ldrOpen: unix script - unexpected end of line/file. (line: %.10s\n", pach));
+                    }
             }
         }