Move the process object dereference from NtTerminateProcess to PspExitProcess (commen...

svn path=/trunk/; revision=14257

diff --git a/reactos/ntoskrnl/ps/kill.c b/reactos/ntoskrnl/ps/kill.c
index 2dd69d7..f191cd0 100644 (file)
--- a/reactos/ntoskrnl/ps/kill.c
+++ b/reactos/ntoskrnl/ps/kill.c
@@ -390,6 +390,10 @@ PspExitProcess(PEPROCESS Process)
     
     ObKillProcess(Process);
     KeSetProcess(&Process->Pcb, IO_NO_INCREMENT);
+
+    /* NOTE: This dereference corresponds to reference in NtTerminateProcess. */
+    ObDereferenceObject(Process);
+
     return(STATUS_SUCCESS);
 }
 
@@ -439,8 +443,13 @@ NtTerminateProcess(IN HANDLE ProcessHandle  OPTIONAL,
     /* Only master thread remains... kill it off */
     if (PsGetCurrentThread()->ThreadsProcess == Process) {
         
-        /* Unlock and dereference */
-        ObDereferenceObject(Process);
+        /*
+         * NOTE: Dereferencing of the Process structure takes place in
+         * PspExitProcess. If we would do it here the Win32 Process
+         * information would be destroyed before the Win32 Destroy
+         * thread/process callback is called.
+         */
+        
         PspExitThread(ExitStatus);
         return(STATUS_SUCCESS);
     }