Changeset 2501 for trunk/src/win32k/ldr/ldr.cpp

Timestamp:

Jan 22, 2000, 7:21:03 PM (26 years ago)

Author:

bird

Message:

Temporary backup checkin.

File:

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

trunk/src/win32k/ldr/ldr.cpp

@@ -1 @@
-/* $Id: ldr.cpp,v 1.6 1999-11-10 01:45:36 bird Exp $
+/* $Id: ldr.cpp,v 1.7 2000-01-22 18:21:01 bird Exp $
  *
  * ldr.cpp - Loader helpers.
@@ -83 +83 @@
 PMODULE     getModuleByMTE(PMTE pMTE)
 {
-    PMODULE pMod = (PMODULE)AVLGet(&pMTERoot, (AVLKEY)pMTE);
-    if (pMod == NULL)
-    {
+    #if 0
+        /* Not 100% sure that this will work correctly! */
+        PMODULE pMod = (PMODULE)AVLGet(&pMTERoot, (AVLKEY)pMTE);
+        if (pMod == NULL)
+        {
+            #ifdef DEBUG
+                if (pMTE <= (PMTE)0x10000)
+                {
+                    kprintf(("getModuleByMTE: invalid pMTE pointer - %#8x\n", pMTE));
+                    return NULL;
+                }
+            #endif
+            pMod = (PMODULE)AVLGet(&pSFNRoot, (AVLKEY)pMTE->mte_sfn);
+            if (pMod != NULL)
+            {
+                pMod->coreMTE.Key = (AVLKEY)pMTE;
+                pMod->fFlags |= MOD_FLAGS_IN_MTETREE;
+                AVLInsert(&pMTERoot, (PAVLNODECORE)((unsigned)pMod + offsetof(MODULE, coreMTE)));
+            }
+        }
+        else
+            pMod = (PMODULE)((unsigned)pMod - offsetof(MODULE, coreMTE));
+        return pMod;
+    #else
+        /* Use this for the time being. */
         #ifdef DEBUG
-        if (pMTE <= (PMTE)0x10000)
-        {
-            kprintf(("getModuleByMTE: invalid pMTE pointer - %#8x\n", pMTE));
-            return NULL;
-        }
+            if (pMTE <= (PMTE)0x10000)
+            {
+                kprintf(("getModuleByMTE: invalid pMTE pointer - %#8x\n", pMTE));
+                return NULL;
+            }
         #endif
-        pMod = (PMODULE)AVLGet(&pSFNRoot, (AVLKEY)pMTE->mte_sfn);
-        if (pMod != NULL)
-        {
-            pMod->coreMTE.Key = (AVLKEY)pMTE;
-            pMod->fFlags |= MOD_FLAGS_IN_MTETREE;
-            AVLInsert(&pMTERoot, (PAVLNODECORE)((unsigned)pMod + offsetof(MODULE, coreMTE)));
-        }
-    }
-    else
-        pMod = (PMODULE)((unsigned)pMod - offsetof(MODULE, coreMTE));
-    return pMod;
+        if (GetState(pMTE->mte_sfn) == HSTATE_OUR)
+            return (PMODULE)AVLGet(&pSFNRoot, (AVLKEY)pMTE->mte_sfn);
+
+        return NULL;
+    #endif
 }
 
@@ -149 +165 @@
             return ERROR_INVALID_PARAMETER;
         }
-        if ((fFlags & MOD_TYPE_MASK) == 0 || (fFlags  & ~MOD_TYPE_MASK) != 0)
+        if ((fFlags & MOD_TYPE_MASK) == 0 || (fFlags  & ~MOD_TYPE_MASK) != 0UL)
         {
             kprintf(("addModule: invalid parameter: fFlags = 0x%#8x\n", fFlags));
@@ -242 +258 @@
 {
     int rc = NO_ERROR;
-    int i;
 
     /* init state table */