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

trunk/src/win32k/ldr/myldrClose.cpp

@@ -1 @@
-/* $Id: myldrClose.cpp,v 1.1 1999-09-06 02:20:01 bird Exp $
+/* $Id: myldrClose.cpp,v 1.2 1999-10-14 01:25:38 bird Exp $
  *
  * myldrClose - _ldrClose
@@ -18 +18 @@
 #include <os2.h>
 
+#include <memory.h>
+#include <stdlib.h>
+
+#include "log.h"
+#include <peexe.h>
+#include <exe386.h>
 #include "OS2Krnl.h"
-#include "log.h"
-#if 0
-    #include "lxFile.h"
-#else
-    #define LXFile class { public: BOOL queryIsModuleName(const char *) {return FALSE;}}
-#endif
+#include "pe2lx.h"
 #include "ldr.h"
 #include "ldrCalls.h"
@@ -41 +42 @@
     /* closes handle */
     kprintf(("_ldrClose: hFile = %.4x\n", hFile));
-    if (GetState(hFile) == HSTATE_CHECK)
-        freeUncertainEntry(hFile);
-    else
+    if (GetState(hFile) == HSTATE_OUR)
     {
-        if (GetState(hFile) == HSTATE_PE)
-        {
-            rc = deleteNode(hFile);
-            if (rc != NO_ERROR)
-                kprintf(("Funny! deleteNode failed rc = %d\n", rc));
-        }
+        rc = deleteNode(hFile);
+        if (rc != NO_ERROR)
+            kprintf(("Funny! deleteNode failed rc = %d\n", rc));
+
+        SetState(hFile, HSTATE_UNUSED);
     }
 
-    SetState(hFile, HSTATE_UNUSED);
     return _ldrClose(hFile);
 }