Changeset 1678 for trunk/src/win32k/ldr

Timestamp:

Nov 10, 1999, 2:45:38 AM (26 years ago)

Author:

bird

Message:

Some bugsfixes - Yield is disabled.
Added parameters.
Correcte moduleheaders.
Introduced a new base class for virtual lx modules + some elf sketches.

Location:

trunk/src/win32k/ldr

Files:

• ModuleBase.cpp (added)
• ldr.cpp (modified) (6 diffs)
• myLDRQAppType.cpp (modified) (1 diff)
• myldrClose.cpp (modified) (3 diffs)
• myldrOpen.cpp (modified) (4 diffs)
• myldrRead.cpp (modified) (3 diffs)

trunk/src/win32k/ldr/ldr.cpp

@@ -1 @@
-/* $Id: ldr.cpp,v 1.5 1999-10-31 23:57:05 bird Exp $
+/* $Id: ldr.cpp,v 1.6 1999-11-10 01:45:36 bird Exp $
  *
  * ldr.cpp - Loader helpers.
  *
  * Copyright (c)  1999 knut  St.  osmundsen
+ *
+ * Project Odin Software License can be found in LICENSE.TXT
  *
  */
@@ -29 +31 @@
 #include <exe386.h>
 #include "OS2Krnl.h"
+#include "ModuleBase.h"
 #include "pe2lx.h"
 #include "avl.h"
@@ -125 +128 @@
  * @param     pMTE    Pointer to MTE. NULL is valid.
  * @param     fFlags  Type flags for the fFlags field in the node.
- * @param     pvData  Pointer to data.
+ * @param     pModObj Pointer to module object.
  * @sketch    DEBUG: check that the module doesn't exists and parameter check.
  *            (try) Allocate a new node. (return errorcode on failure)
@@ -135 +138 @@
  * @author    knut st. osmundsen
  */
-ULONG       addModule(SFN hFile, PMTE pMTE, ULONG fFlags, void *pvData)
+ULONG       addModule(SFN hFile, PMTE pMTE, ULONG fFlags, ModuleBase *pModObj)
 {
     PMODULE pMod;
@@ -166 +169 @@
     pMod->pMTE = pMTE;
     pMod->fFlags = fFlags;
-    pMod->Data.pv = pvData;
+    pMod->Data.pModule = pModObj;
 
     /* insert the module node into the tree(s) */
@@ -248 +251 @@
     pMTERoot = NULL;
 
-    /* Pe2Lx logging. */
-    Pe2Lx::ulInfoLevel = options.ulInfoLevel;
+    /* ModuleBase logging. */
+    ModuleBase::ulInfoLevel = options.ulInfoLevel;
 
     return rc;

trunk/src/win32k/ldr/myLDRQAppType.cpp

@@ -1 @@
-/* $Id: myLDRQAppType.cpp,v 1.1 1999-09-06 02:20:01 bird Exp $
+/* $Id: myLDRQAppType.cpp,v 1.2 1999-11-10 01:45:36 bird Exp $
  *
  * _myLDRQAppType - _LDRQAppType overload.
  *
  * Copyright (c) 1998-1999 knut  St.  osmundsen
+ *
+ * Project Odin Software License can be found in LICENSE.TXT
  *
  */

trunk/src/win32k/ldr/myldrClose.cpp

@@ -1 @@
-/* $Id: myldrClose.cpp,v 1.3 1999-10-27 02:02:58 bird Exp $
+/* $Id: myldrClose.cpp,v 1.4 1999-11-10 01:45:36 bird Exp $
  *
  * myldrClose - _ldrClose
  *
  * Copyright (c) 1998-1999 knut st. osmundsen
+ *
+ * Project Odin Software License can be found in LICENSE.TXT
  *
  */
@@ -25 +27 @@
 #include <exe386.h>
 #include "OS2Krnl.h"
-#include "pe2lx.h"
 #include "avl.h"
+#include "ModuleBase.h"
 #include "ldr.h"
 #include "ldrCalls.h"
@@ -45 +47 @@
     if (GetState(hFile) == HSTATE_OUR)
     {
+        #ifdef DEBUG
+        PMODULE pMod = getModuleBySFN(hFile);
+        if (pMod != NULL)
+            pMod->Data.pModule->dumpVirtualLxFile();
+        else
+            kprintf(("_ldrClose: getModuleBySFN failed!!!"));
+        #endif
+
         rc = removeModule(hFile);
         if (rc != NO_ERROR)

trunk/src/win32k/ldr/myldrOpen.cpp

@@ -1 @@
-/* $Id: myldrOpen.cpp,v 1.4 1999-10-31 23:57:06 bird Exp $
+/* $Id: myldrOpen.cpp,v 1.5 1999-11-10 01:45:36 bird Exp $
  *
  * myldrOpen - _ldrOpen.
  *
  * Copyright (c) 1998-1999 knut st. osmundsen
+ *
+ * Project Odin Software License can be found in LICENSE.TXT
  *
  */
@@ -27 +29 @@
 #include <exe386.h>
 #include "OS2Krnl.h"
+#include "ModuleBase.h"
 #include "pe2lx.h"
 #include "elf.h"
@@ -128 +131 @@
                 }
                 else
-                    if (*pach == '#')
+                    if (*pach == '#' && pach[1] == '!')
                     {
                         /* unix styled script...? Must be more than 64 bytes long? No options. firstline < 64 bytes. */
-                        char *pszStart = pach+1;
+                        char *pszStart = pach+2;
                         char *pszEnd;
                         kprintf(("_ldrOpen: unix script?\n"));
@@ -142 +145 @@
                         if (*pszStart != '\0' && *pszStart != '\r' && *pszStart != '\n')
                         {   /* find end-of-word */
+                            pszEnd = pszStart + 1;
                             while (*pszEnd != '\0' && *pszEnd != '\n' && *pszEnd != '\r'
                                    && *pszEnd != '\t' && *pszEnd != ' ')
                                 pszEnd++;
-                            *pszEnd = '\0';
                             if (*pszEnd != '\0')
                             {
+                                *pszEnd = '\0';
                                 kprintf(("_ldrOpen: unix script - opening %s\n", pszStart));
                                 _ldrClose(*phFile);

trunk/src/win32k/ldr/myldrRead.cpp

@@ -1 @@
-/* $Id: myldrRead.cpp,v 1.4 1999-10-27 02:02:58 bird Exp $
+/* $Id: myldrRead.cpp,v 1.5 1999-11-10 01:45:36 bird Exp $
  *
  * myldrRead - _ldrRead.
  *
  * Copyright (c) 1998-1999 knut st. osmundsen
+ *
+ * Project Odin Software License can be found in LICENSE.TXT
  *
  */
@@ -26 +28 @@
 #include <exe386.h>
 #include "OS2Krnl.h"
+#include "ModuleBase.h"
 #include "pe2lx.h"
 #include "avl.h"
@@ -61 +64 @@
 
             if ((pMod->fFlags & MOD_TYPE_MASK) == MOD_TYPE_PE2LX)
-                rc = pMod->Data.pPe2Lx->read(ulOffset, pBuffer, ulBytesToRead, ulFlags, pMTE);
+                rc = pMod->Data.pModule->read(ulOffset, pBuffer, ulBytesToRead, ulFlags, pMTE);
             else
             {