Changeset 6841 for branches/splittup/src/win32k/ldr/ldr.cpp

Timestamp:

Sep 27, 2001, 5:08:35 AM (24 years ago)

Author:

bird

Message:

Win32k/kKrnlLib splittup: done the major stuff.

File:

• branches/splittup/src/win32k/ldr/ldr.cpp (modified) (17 diffs)

branches/splittup/src/win32k/ldr/ldr.cpp

@@ -1 @@
-/* $Id: ldr.cpp,v 1.10 2001-02-10 11:11:45 bird Exp $
+/* $Id: ldr.cpp,v 1.10.2.1 2001-09-27 03:08:24 bird Exp $
  *
  * ldr.cpp - Loader helpers.
@@ -17 +17 @@
 #define INCL_OS2KRNL_PTDA
 #define INCL_OS2KRNL_LDR
+#define INCL_KKL_LOG
+#define INCL_KKL_AVL
+#define INCL_KKL_HEAP
 
 /*******************************************************************************
@@ -22 +25 @@
 *******************************************************************************/
 #include <os2.h>
+#include <peexe.h>
+#include <exe386.h>
+#include <OS2Krnl.h>
+#include <kKrnlLib.h>
 
 #include "devSegDf.h"
-#include "malloc.h"
-#include "new.h"
 #include <memory.h>
 #include <stdlib.h>
@@ -31 +36 @@
 #include <string.h>
 
-#include "log.h"
-#include "avl.h"
-#include <peexe.h>
-#include <exe386.h>
-#include "OS2Krnl.h"
 #include "ldr.h"
 #include "ModuleBase.h"
@@ -45 +45 @@
 *   Global Variables                                                           *
 *******************************************************************************/
-static PAVLNODECORE    pSFNRoot = NULL;
-static PAVLNODECORE    pMTERoot = NULL;
+static PAVLULNODECORE   pSFNRoot = NULL;
+static PAVLULNODECORE   pMTERoot = NULL;
 
 
@@ -81 +81 @@
  * @returns   Pointer to module node. If not found NULL.
  * @param     hFile  File handle of the module to be found.
- * @sketch    return a AVLGet on the pSFNRoot-tree.
+ * @sketch    return a AVLULGet on the pSFNRoot-tree.
  * @status    completely implemented.
  * @author    knut st. osmundsen
@@ -87 +87 @@
 PMODULE     getModuleBySFN(SFN hFile)
 {
-    return (PMODULE)AVLGet(&pSFNRoot, (AVLKEY)hFile);
+    return (PMODULE)AVLULGet(&pSFNRoot, (AVLULKEY)hFile);
 }
 
@@ -115 +115 @@
     #if 0
         /* Not 100% sure that this will work correctly! */
-        PMODULE pMod = (PMODULE)AVLGet(&pMTERoot, (AVLKEY)pMTE);
+        PMODULE pMod = (PMODULE)AVLULGet(&pMTERoot, (AVLULKEY)pMTE);
         if (pMod == NULL)
         {
@@ -125 +125 @@
                 }
             #endif
-            pMod = (PMODULE)AVLGet(&pSFNRoot, (AVLKEY)pMTE->mte_sfn);
+            pMod = (PMODULE)AVLULGet(&pSFNRoot, (AVLULKEY)pMTE->mte_sfn);
             if (pMod != NULL)
             {
-                pMod->coreMTE.Key = (AVLKEY)pMTE;
+                pMod->coreMTE.Key = (AVLULKEY)pMTE;
                 pMod->fFlags |= MOD_FLAGS_IN_MTETREE;
-                AVLInsert(&pMTERoot, (PAVLNODECORE)((unsigned)pMod + offsetof(MODULE, coreMTE)));
+                AVLInsert(&pMTERoot, (PAVLULNODECORE)((unsigned)pMod + offsetof(MODULE, coreMTE)));
             }
         }
@@ -146 +146 @@
         #endif
         if (GetState(pMTE->mte_sfn) == HSTATE_OUR)
-            return (PMODULE)AVLGet(&pSFNRoot, (AVLKEY)pMTE->mte_sfn);
+            return (PMODULE)AVLULGet(&pSFNRoot, (AVLULKEY)pMTE->mte_sfn);
 
         return NULL;
@@ -209 +209 @@
     PMODULE pMod;
     #ifdef DEBUG
-        if (AVLGet(&pSFNRoot, (AVLKEY)hFile) != NULL)
+        if (AVLULGet(&pSFNRoot, (AVLULKEY)hFile) != NULL)
             kprintf(("addModule: Module allready present in the SFN-tree!\n"));
         if (hFile == 0)
@@ -232 +232 @@
 
     /* fill in the module node. */
-    pMod->coreKey.Key = (AVLKEY)hFile;
+    pMod->coreKey.Key = (AVLULKEY)hFile;
     pMod->hFile = hFile;
     pMod->pMTE = pMTE;
@@ -239 +239 @@
 
     /* insert the module node into the tree(s) */
-    AVLInsert(&pSFNRoot, (PAVLNODECORE)pMod);
+    AVLULInsert(&pSFNRoot, (PAVLULNODECORE)pMod);
     if (pMTE != NULL)
     {
-        pMod->coreMTE.Key = (AVLKEY)pMTE;
+        pMod->coreMTE.Key = (AVLULKEY)pMTE;
         pMod->fFlags |= MOD_FLAGS_IN_MTETREE;
-        AVLInsert(&pMTERoot, (PAVLNODECORE)((unsigned)pMod + offsetof(MODULE, coreMTE)));
+        AVLULInsert(&pMTERoot, (PAVLULNODECORE)((unsigned)pMod + offsetof(MODULE, coreMTE)));
     }
 
@@ -265 +265 @@
 ULONG      removeModule(SFN hFile)
 {
-    PMODULE pMod = (PMODULE)AVLRemove(&pSFNRoot, (AVLKEY)hFile);
+    PMODULE pMod = (PMODULE)AVLULRemove(&pSFNRoot, (AVLULKEY)hFile);
     if (pMod == NULL)
     {
@@ -275 +275 @@
     if (pMod->fFlags & MOD_FLAGS_IN_MTETREE)
     {
-        if (AVLRemove(&pMTERoot, (AVLKEY)pMod->pMTE) == NULL)
-        {
-            kprintf(("removeModule: MOD_FLAGS_IN_MTETREE set but AVLRemove returns NULL\n"));
+        if (AVLULRemove(&pMTERoot, (AVLULKEY)pMod->pMTE) == NULL)
+        {
+            kprintf(("removeModule: MOD_FLAGS_IN_MTETREE set but AVLULRemove returns NULL\n"));
         }
     }
@@ -333 +333 @@
          * Then get the pMTE, and access the smte_path to get a pointer to the executable path.
          */
-        PPTDA   pPTDACur;               /* Pointer to the current (system context) PTDA */
+        PPTDA   pPTDA1;                 /* Pointer to the current (system context) PTDA */
         PPTDA   pPTDA;                  /* PTDA in question. */
         HMTE    hMTE = NULLHANDLE;      /* Modulehandle of the executable module. */
@@ -343 +343 @@
          *  IF no pPTDAExecChild THEN  get hMte for the current PTDA.
          */
-        pPTDACur = ptdaGetCur();
-        if (pPTDACur != NULL)
-        {
-            pPTDA = ptdaGet_pPTDAExecChild(pPTDACur);
+        pPTDA1 = ptdaGetCur();
+        if (pPTDA1 != NULL)
+        {
+            pPTDA = ptdaGet_pPTDAExecChild(pPTDA1);
             if (pPTDA != NULL && fExecChild)
                 hMTE = ptdaGet_ptda_module(pPTDA);
             if (hMTE == NULLHANDLE)
-                hMTE = ptdaGet_ptda_module(pPTDACur);
+                hMTE = ptdaGet_ptda_module(pPTDA1);
         }
         else