Changeset 4065 for branches/Grace/src

Timestamp:

Aug 22, 2000, 12:59:40 AM (25 years ago)

Author:

bird

Message:

Temporary checkin (backup).

Location:

branches/Grace/src/win32k/ldr

Files:

• myldrClose.cpp (modified) (3 diffs)
• mytkExecPgm.asm (modified) (3 diffs)
• mytkStartProcess.asm (added)

branches/Grace/src/win32k/ldr/myldrClose.cpp

@@ -1 @@
-/* $Id: myldrClose.cpp,v 1.5.4.1 2000-07-16 22:43:35 bird Exp $
+/* $Id: myldrClose.cpp,v 1.5.4.2 2000-08-21 22:59:39 bird Exp $
  *
  * myldrClose - ldrClose
@@ -31 +31 @@
 #include "ldrCalls.h"
 #include "ModuleBase.h"
+#include "Pe2Lx.h"
 
 
@@ -63 +64 @@
         #pragma info(restore)
     }
+    /*
+     * Invalidate the odin32path if kernel32 is closed.
+     *  (Might possible not be needed as Pe2Lx does invalides
+     *   the odin32path on object destruction.)
+     */
+    else if (Pe2Lx::getKernel32SFN() == hFile)
+        Pe2Lx::invalidateOdin32Path();
 
+    /*
+     * Finally call the real close function.
+     */
     return ldrClose(hFile);
 }

branches/Grace/src/win32k/ldr/mytkExecPgm.asm

@@ -1 @@
-; $Id: mytkExecPgm.asm,v 1.10.4.3 2000-08-19 14:37:16 bird Exp $
+; $Id: mytkExecPgm.asm,v 1.10.4.4 2000-08-21 22:59:40 bird Exp $
 ;
 ; mytkExecPgm - tkExecPgm overload
@@ -23 +23 @@
 
 ;
-;   Imported Functions
+;   Imported Functions and variables.
 ;
     extrn  _g_tkExecPgm:PROC
@@ -326 +326 @@
     ASSUME  ds:FLAT, es:FLAT            ; both ds and es are now FLAT
 
-    ;
-    ; Clear loader state, current exe module and tkExecPgm global data flag.
-    ;
+
+    ;
+    ; Clear loader semaphore.
+    ; and clear loader state, current exe module and tkExecPgm global data flag.
+    ;
+    cmp     fLdrSemTaken, 0             ; is the semaphore still taken?
+    je      tkepgm_callbehindret        ; jmp if not taken.
     mov     ulLDRState, 0               ; Clears loaderstate. (LDRSTATE_UNKNOWN)
     mov     pExeModule, 0               ; Sets the exemodule pointer to NULL.
     mov     fTkExecPgm, 0               ; Marks global data invalid.
-
-    ;
-    ; Clear loader semaphore.
-    ;
-    cmp     fLdrSemTaken, 0             ; is the semaphore still taken?
-    je      tkepgm_callbehindret        ; jmp if not taken.
+    call    near ptr FLAT:_LDRClearSem@0
     mov     fLdrSemTaken, 0             ; Loader semaphore is not taken any longer!
-    call    near ptr FLAT:_LDRClearSem@0
 
     ;