From 08c981ba5380b53b20aa262567a3631421bad51c Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Sun, 2 Nov 2003 03:09:06 +0000
Subject: [PATCH] Do not hold the PiThreadListLock spinlock while calling
 KeDispatchObjectWait() because the latter will acquire the spinlock. This
 fixes bug #31.

svn path=/trunk/; revision=6505
---
 reactos/ntoskrnl/ps/kill.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/reactos/ntoskrnl/ps/kill.c b/reactos/ntoskrnl/ps/kill.c
index 07d45a63702..055af71ac44 100644
--- a/reactos/ntoskrnl/ps/kill.c
+++ b/reactos/ntoskrnl/ps/kill.c
@@ -1,4 +1,4 @@
-/* $Id: kill.c,v 1.66 2003/11/02 01:16:21 ekohl Exp $
+/* $Id: kill.c,v 1.67 2003/11/02 03:09:06 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -158,18 +158,17 @@ PsTerminateCurrentThread(NTSTATUS ExitStatus)
    PKTHREAD Thread;
    PLIST_ENTRY current_entry;
    PKMUTANT Mutant;
-   
 
-   DPRINT("terminating %x\n",CurrentThread);
    KeAcquireSpinLock(&PiThreadListLock, &oldIrql);
 
    CurrentThread = PsGetCurrentThread();
-   
+   DPRINT("terminating %x\n",CurrentThread);
+
    CurrentThread->ExitStatus = ExitStatus;
    Thread = KeGetCurrentThread();
    KeCancelTimer(&Thread->Timer);
    KeReleaseSpinLock(&PiThreadListLock, oldIrql);
-   
+
    /* abandon all owned mutants */
    current_entry = Thread->MutantListHead.Flink;
    while (current_entry != &Thread->MutantListHead)
@@ -183,12 +182,12 @@ PsTerminateCurrentThread(NTSTATUS ExitStatus)
 	current_entry = Thread->MutantListHead.Flink;
      }
 
-   KeAcquireSpinLock(&PiThreadListLock, &oldIrql);
-   
-   KeAcquireDispatcherDatabaseLockAtDpcLevel();
+   oldIrql = KeAcquireDispatcherDatabaseLock();
    CurrentThread->Tcb.DispatcherHeader.SignalState = TRUE;
    KeDispatcherObjectWake(&CurrentThread->Tcb.DispatcherHeader);
-   KeReleaseDispatcherDatabaseLockFromDpcLevel ();
+   KeReleaseDispatcherDatabaseLock (oldIrql);
+
+   KeAcquireSpinLock(&PiThreadListLock, &oldIrql);
 
    ExpSwapThreadEventPair(CurrentThread, NULL); /* Release the associated eventpair object, if there was one */
    KeRemoveAllWaitsThread (CurrentThread, STATUS_UNSUCCESSFUL, FALSE);