Changeset 1273 for trunk/src/win32k/ldr/ldr.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/ldr.cpp (modified) (8 diffs)

trunk/src/win32k/ldr/ldr.cpp

@@ -1 @@
-/* $Id: ldr.cpp,v 1.1 1999-09-06 02:20:00 bird Exp $
+/* $Id: ldr.cpp,v 1.2 1999-10-14 01:25:38 bird Exp $
  *
  * ldr.cpp - Loader helper functions a structures.
@@ -18 +18 @@
 *******************************************************************************/
 #include <os2.h>
-#include <string.h>
 
 #include "malloc.h"
 #include "new.h"
+#include <memory.h>
+#include <stdlib.h>
+
 #include "log.h"
-#include "pefile.h"
-#include "lx.h"
+#include <peexe.h>
+#include <exe386.h>
+#include "OS2Krnl.h"
+#include "pe2lx.h"
 #include "ldr.h"
 
@@ -31 +35 @@
 *   Global Variables                                                           *
 *******************************************************************************/
-unsigned char   ahStates[MAX_FILE_HANDLES/4];
-UNCERTAIN       ahUncertain[MAX_UNCERTAIN_FILES];
 PPENODE         pPE;
+unsigned char   achHandleStates[MAX_FILE_HANDLES/8];
 
 
@@ -40 +43 @@
 *******************************************************************************/
 static PPENODE  findNodePtr2(PPENODE pRoot, const char *pszFilename);
-static ULONG    freeNode(PPENODE pNode);
 static ULONG    depth(PPENODE pNode);
-
-
-/**
- * Get a free entry in the ahUncertain table.
- * @returns   Index to free entry in the ahUncertain table.
- */
-ULONG getFreeUncertainEntry(void)
-{
-    ULONG i;
-
-    i = 0;
-    while (i < MAX_UNCERTAIN_FILES && ahUncertain[i].hFile != 0xFFFF)
-        i++;
-
-    return i < MAX_UNCERTAIN_FILES ? i : -1;
-}
-
-
-/**
- * Free uncertain entry.
- * Mark entry with hFile in the uncertain table as unused
- * @returns   NO_ERROR on success, -1 on error.
- * @param     hFile  Filehandle (key) to free.
- */
-ULONG freeUncertainEntry(SFN hFile)
-{
-    int i;
-    int rc;
-
-    i = 0;
-    while (i < MAX_UNCERTAIN_FILES && ahUncertain[i].hFile != hFile)
-        i++;
-
-    if (i < MAX_UNCERTAIN_FILES && ahUncertain[i].hFile == hFile)
-    {
-        ahUncertain[i].hFile = 0xFFFF;
-        ahUncertain[i].offsetNEHdr = 0;
-        ahUncertain[i].fMZ = 0;
-        ahUncertain[i].fPE = 0;
-        free(ahUncertain[i].pszName);
-        ahUncertain[i].pszName = NULL;
-        rc = NO_ERROR;
-    }
-    else
-        rc  = -1;
-    return rc;
-}
-
-
-/**
- * Find the uncertain entry for hFile
- * @returns   Index into ahUncertain if found. ~0UL on error.
- * @param     hFile  Filehandle (key) to find.
- */
-ULONG findUncertainEntry(SFN hFile)
-{
-    int i = 0;
-    while (i < MAX_UNCERTAIN_FILES && ahUncertain[i].hFile != hFile)
-        i++;
-
-    return i < MAX_UNCERTAIN_FILES ? (ULONG)i : ~0UL;
-}
 
 
@@ -322 +262 @@
 
     /*depth first search thru the whole tree */
-    if ( pRoot == NULL || pRoot->lxfile.queryIsModuleName(pszFilename))
+    if (pRoot == NULL || pRoot->pPe2Lx->queryIsModuleName(pszFilename))
         return pRoot;
 
@@ -344 +284 @@
     pNode = new PENODE;
     if (pNode == NULL)
-        kprintf(("allocateNode: malloc returned an NULL-pointer\n"));
+        kprintf(("allocateNode: new returned a NULL-pointer\n"));
 
     return pNode;
@@ -355 +295 @@
  * @param     pNode  Pointer to node which is to be freed.
  */
-static ULONG freeNode(PPENODE pNode)
+ULONG freeNode(PPENODE pNode)
 {
     if (pNode != NULL)
@@ -404 +344 @@
 
     /* init state table */
-    for (i = 0; i < MAX_FILE_HANDLES/4; i++)
-        ahStates[i] = 0;
-
-    /* init uncertain files */
-    for (i = 0; i < MAX_UNCERTAIN_FILES; i++)
-    {
-        ahUncertain[i].hFile = 0xFFFF;
-        ahUncertain[i].offsetNEHdr = 0;
-        ahUncertain[i].fMZ = 0;
-        ahUncertain[i].fPE = 0;
-        ahUncertain[i].pszName = NULL;
-    }
+    memset(&achHandleStates[0], 0, sizeof(achHandleStates));
 
     /* init pPEFiles* */