- Implement KiRecalculateDueTime to handle cases where a timeout wait has been interu...
[reactos.git] / reactos / ntoskrnl / ke / wait.c
index 9faf320..92749c2 100644 (file)
 /*
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS project
+ * PROJECT:         ReactOS Kernel
+ * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            ntoskrnl/ke/wait.c
- * PURPOSE:         Manages non-busy waiting
- *
- * PROGRAMMERS:     Alex Ionescu - Fixes and optimization.
- *                  Gunnar Dalsnes - Implementation
+ * PURPOSE:         Manages waiting for Dispatcher Objects
+ * PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
+ *                  Gunnar Dalsnes
  */
 
 /* INCLUDES ******************************************************************/
 
 #include <ntoskrnl.h>
-
 #define NDEBUG
 #include <internal/debug.h>
 
 /* GLOBALS ******************************************************************/
 
-static KSPIN_LOCK DispatcherDatabaseLock;
+KSPIN_LOCK DispatcherDatabaseLock;
+
+/* PRIVATE FUNCTIONS *********************************************************/
 
-/* Tells us if the Timer or Event is a Syncronization or Notification Object */
-#define TIMER_OR_EVENT_TYPE 0x7L
+VOID
+FASTCALL
+KiWaitSatisfyAll(PKWAIT_BLOCK FirstBlock)
+{
+    PKWAIT_BLOCK WaitBlock = FirstBlock;
+    PKTHREAD WaitThread = WaitBlock->Thread;
 
-/* One of the Reserved Wait Blocks, this one is for the Thread's Timer */
-#define TIMER_WAIT_BLOCK 0x3L
+    /* Loop through all the Wait Blocks, and wake each Object */
+    do
+    {
+        /* Make sure it hasn't timed out */
+        if (WaitBlock->WaitKey != STATUS_TIMEOUT)
+        {
+            /* Wake the Object */
+            KiSatisfyObjectWait((PKMUTANT)WaitBlock->Object, WaitThread);
+        }
 
-/* FUNCTIONS *****************************************************************/
+        /* Move to the next block */
+        WaitBlock = WaitBlock->NextWaitBlock;
+    } while (WaitBlock != FirstBlock);
+}
 
 VOID
-inline
 FASTCALL
-KiCheckAlertability(BOOLEAN Alertable,
-                    PKTHREAD CurrentThread,
-                    KPROCESSOR_MODE WaitMode,
-                    PNTSTATUS Status)
+KiWaitTest(IN PVOID ObjectPointer,
+           IN KPRIORITY Increment)
 {
-    /* At this point, we have to do a wait, so make sure we can make the thread Alertable if requested */
-    if (Alertable) {
+    PLIST_ENTRY WaitEntry;
+    PLIST_ENTRY WaitList;
+    PKWAIT_BLOCK CurrentWaitBlock;
+    PKWAIT_BLOCK NextWaitBlock;
+    PKTHREAD WaitThread;
+    PKMUTANT FirstObject = ObjectPointer, Object;
+
+    /* Loop the Wait Entries */
+    WaitList = &FirstObject->Header.WaitListHead;
+    WaitEntry = WaitList->Flink;
+    while ((FirstObject->Header.SignalState > 0) &&
+           (WaitEntry != WaitList))
+    {
+        /* Get the current wait block */
+        CurrentWaitBlock = CONTAINING_RECORD(WaitEntry,
+                                             KWAIT_BLOCK,
+                                             WaitListEntry);
+        WaitThread = CurrentWaitBlock->Thread;
 
-        /* If the Thread is Alerted, set the Wait Status accordingly */
-        if (CurrentThread->Alerted[(int)WaitMode]) {
+        /* Check the current Wait Mode */
+        if (CurrentWaitBlock->WaitType == WaitAny)
+        {
+            /* Easy case, satisfy only this wait */
+            WaitEntry = WaitEntry->Blink;
+            KiSatisfyObjectWait(FirstObject, WaitThread);
+        }
+        else
+        {
+            /* Everything must be satisfied */
+            NextWaitBlock = CurrentWaitBlock->NextWaitBlock;
 
-            CurrentThread->Alerted[(int)WaitMode] = FALSE;
-            DPRINT("Thread was Alerted\n");
-            *Status = STATUS_ALERTED;
+            /* Loop first to make sure they are valid */
+            while (NextWaitBlock != CurrentWaitBlock)
+            {
+                /* Make sure this isn't a timeout block */
+                if (NextWaitBlock->WaitKey != STATUS_TIMEOUT)
+                {
+                    /* Get the object */
+                    Object = NextWaitBlock->Object;
+
+                    /* Check if this is a mutant */
+                    if ((Object->Header.Type == MutantObject) &&
+                        (Object->Header.SignalState <= 0) &&
+                        (WaitThread == Object->OwnerThread))
+                    {
+                        /* It's a signaled mutant */
+                    }
+                    else if (Object->Header.SignalState <= 0)
+                    {
+                        /* Skip the unwaiting */
+                        goto SkipUnwait;
+                    }
+                }
 
-        /* If there are User APCs Pending, then we can't really be alertable */
-        } else if ((!IsListEmpty(&CurrentThread->ApcState.ApcListHead[UserMode])) &&
-                    (WaitMode == UserMode)) {
+                /* Go to the next Wait block */
+                NextWaitBlock = NextWaitBlock->NextWaitBlock;
+            }
 
-            DPRINT("APCs are Pending\n");
-            CurrentThread->ApcState.UserApcPending = TRUE;
-            *Status = STATUS_USER_APC;
+            /* All the objects are signaled, we can satisfy */
+            WaitEntry = WaitEntry->Blink;
+            KiWaitSatisfyAll(CurrentWaitBlock);
         }
 
-    /* If there are User APCs Pending and we are waiting in usermode, then we must notify the caller */
-    } else if ((CurrentThread->ApcState.UserApcPending) && (WaitMode == UserMode)) {
-            DPRINT("APCs are Pending\n");
-            *Status = STATUS_USER_APC;
+        /* All waits satisfied, unwait the thread */
+        KiAbortWaitThread(WaitThread, CurrentWaitBlock->WaitKey, Increment);
+
+SkipUnwait:
+        /* Next entry */
+        WaitEntry = WaitEntry->Flink;
     }
 }
 
+/* Must be called with the dispatcher lock held */
+VOID
+FASTCALL
+KiAbortWaitThread(IN PKTHREAD Thread,
+                  IN NTSTATUS WaitStatus,
+                  IN KPRIORITY Increment)
+{
+    PKWAIT_BLOCK WaitBlock;
+    PKTIMER Timer;
+    LONG NewPriority;
+
+    /* Update wait status */
+    Thread->WaitStatus |= WaitStatus;
+
+    /* Remove the Wait Blocks from the list */
+    WaitBlock = Thread->WaitBlockList;
+    do
+    {
+        /* Remove it */
+        RemoveEntryList(&WaitBlock->WaitListEntry);
+
+        /* Go to the next one */
+        WaitBlock = WaitBlock->NextWaitBlock;
+    } while (WaitBlock != Thread->WaitBlockList);
+
+    /* Remove the thread from the wait list! */
+    if (Thread->WaitListEntry.Flink) RemoveEntryList(&Thread->WaitListEntry);
+
+    /* Check if there's a Thread Timer */
+    Timer = &Thread->Timer;
+    if (Timer->Header.Inserted)
+    {
+        /* Remove the timer */
+        Timer->Header.Inserted = FALSE;
+        RemoveEntryList(&Timer->TimerListEntry);
+        //KiRemoveTimer(Timer);
+    }
+
+    /* Increment the Queue's active threads */
+    if (Thread->Queue) Thread->Queue->CurrentCount++;
+
+    /* Check if this is a non-RT thread */
+    if (Thread->Priority < LOW_REALTIME_PRIORITY)
+    {
+        /* Check if boosting is enabled and we can boost */
+        if (!(Thread->DisableBoost) && !(Thread->PriorityDecrement))
+        {
+            /* We can boost, so calculate the new priority */
+            NewPriority = Thread->BasePriority + Increment;
+            if (NewPriority > Thread->Priority)
+            {
+                /* Make sure the new priority wouldn't push the thread to RT */
+                if (NewPriority >= LOW_REALTIME_PRIORITY)
+                {
+                    /* Set it just before the RT zone */
+                    Thread->Priority = LOW_REALTIME_PRIORITY - 1;
+                }
+                else
+                {
+                    /* Otherwise, set our calculated priority */
+                    Thread->Priority = NewPriority;
+                }
+            }
+        }
+
+        /* Check if this is a high-priority thread */
+        if (Thread->BasePriority >= 14)
+        {
+            /* It is, simply reset the quantum */
+            Thread->Quantum = Thread->QuantumReset;
+        }
+        else
+        {
+            /* Otherwise, decrease quantum */
+            Thread->Quantum--;
+            if (Thread->Quantum <= 0)
+            {
+                /* We've went below 0, reset it */
+                Thread->Quantum = Thread->QuantumReset;
+
+                /* Apply per-quantum priority decrement */
+                Thread->Priority -= (Thread->PriorityDecrement + 1);
+                if (Thread->Priority < Thread->BasePriority)
+                {
+                    /* We've went too low, reset it */
+                    Thread->Priority = Thread->BasePriority;
+                }
+
+                /* Delete per-quantum decrement */
+                Thread->PriorityDecrement = 0;
+            }
+        }
+    }
+    else
+    {
+        /* For real time threads, just reset the quantum */
+        Thread->Quantum = Thread->QuantumReset;
+    }
+
+    /* Reschedule the Thread */
+    KiReadyThread(Thread);
+}
+
+VOID
+FASTCALL
+KiAcquireFastMutex(IN PFAST_MUTEX FastMutex)
+{
+    /* Increase contention count */
+    FastMutex->Contention++;
+
+    /* Wait for the event */
+    KeWaitForSingleObject(&FastMutex->Gate,
+                          WrMutex,
+                          KernelMode,
+                          FALSE,
+                          NULL);
+}
+
+VOID
+FASTCALL
+KiExitDispatcher(IN KIRQL OldIrql)
+{
+    /* Check if it's the idle thread */
+    if (!(KeIsExecutingDpc()) &&
+        (OldIrql < DISPATCH_LEVEL) &&
+        (KeGetCurrentThread()) &&
+        (KeGetCurrentThread() == KeGetCurrentPrcb()->IdleThread))
+    {
+        /* Dispatch a new thread */
+        KiDispatchThreadNoLock(Ready);
+    }
+    else
+    {
+        /* Otherwise just release the lock */
+        KeReleaseDispatcherDatabaseLockFromDpcLevel();
+    }
+
+    /* Lower irql back */
+    KeLowerIrql(OldIrql);
+}
+
+/* PUBLIC FUNCTIONS **********************************************************/
+
 /*
  * @implemented
- *
- * FUNCTION: Puts the current thread into an alertable or nonalertable
- * wait state for a given internal
- * ARGUMENTS:
- *          WaitMode = Processor mode in which the caller is waiting
- *          Altertable = Specifies if the wait is alertable
- *          Interval = Specifies the interval to wait
- * RETURNS: Status
  */
 NTSTATUS
-STDCALL
-KeDelayExecutionThread(KPROCESSOR_MODE WaitMode,
-                       BOOLEAN Alertable,
-                       PLARGE_INTEGER Interval)
+NTAPI
+KeDelayExecutionThread(IN KPROCESSOR_MODE WaitMode,
+                       IN BOOLEAN Alertable,
+                       IN PLARGE_INTEGER Interval OPTIONAL)
 {
     PKWAIT_BLOCK TimerWaitBlock;
     PKTIMER ThreadTimer;
     PKTHREAD CurrentThread = KeGetCurrentThread();
-    NTSTATUS Status;
-
-    DPRINT("Entering KeDelayExecutionThread\n");
+    NTSTATUS WaitStatus = STATUS_SUCCESS;
+    BOOLEAN Swappable;
+    PLARGE_INTEGER OriginalDueTime = Interval;
+    LARGE_INTEGER DueTime, NewDueTime;
 
     /* Check if the lock is already held */
-    if (CurrentThread->WaitNext)  {
-
+    if (CurrentThread->WaitNext)
+    {
         /* Lock is held, disable Wait Next */
-        DPRINT("Lock is held\n");
         CurrentThread->WaitNext = FALSE;
-
-    } else {
-
+    }
+    else
+    {
         /* Lock not held, acquire it */
-        DPRINT("Lock is not held, acquiring\n");
         CurrentThread->WaitIrql = KeAcquireDispatcherDatabaseLock();
     }
 
@@ -103,805 +294,571 @@ KeDelayExecutionThread(KPROCESSOR_MODE WaitMode,
     TimerWaitBlock = &CurrentThread->WaitBlock[TIMER_WAIT_BLOCK];
 
     /* Start Wait Loop */
-    do {
+    do
+    {
+        /* Check if a kernel APC is pending and we're below APC_LEVEL */
+        if ((CurrentThread->ApcState.KernelApcPending) &&
+            !(CurrentThread->SpecialApcDisable) &&
+            (CurrentThread->WaitIrql < APC_LEVEL))
+        {
+            /* Unlock the dispatcher */
+            KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql);
+        }
+        else
+        {
+            /* Check if we can do an alertable wait, if requested */
+            KiCheckAlertability();
+
+            /* Check if we can swap the thread's stack */
+            CurrentThread->WaitListEntry.Flink = NULL;
+            KiCheckThreadStackSwap(WaitMode, CurrentThread, Swappable);
 
-        /* We are going to wait no matter what (that's the point), so test Alertability */
-        KiCheckAlertability(Alertable, CurrentThread, KernelMode, &Status);
+            /* Set status */
+            CurrentThread->WaitStatus = STATUS_WAIT_0;
 
-        /* Set Timer */
-        ThreadTimer = &CurrentThread->Timer;
+            /* Set Timer */
+            ThreadTimer = &CurrentThread->Timer;
 
-        /* Setup the Wait Block */
-        CurrentThread->WaitBlockList = TimerWaitBlock;
-        TimerWaitBlock->Object = (PVOID)ThreadTimer;
-        TimerWaitBlock->Thread = CurrentThread;
-        TimerWaitBlock->WaitKey = (USHORT)STATUS_TIMEOUT;
-        TimerWaitBlock->WaitType = WaitAny;
-        TimerWaitBlock->NextWaitBlock = TimerWaitBlock;
+            /* Setup the Wait Block */
+            CurrentThread->WaitBlockList = TimerWaitBlock;
+            TimerWaitBlock->NextWaitBlock = TimerWaitBlock;
 
-        /* Link the timer to this Wait Block */
-        InitializeListHead(&ThreadTimer->Header.WaitListHead);
-        InsertTailList(&ThreadTimer->Header.WaitListHead, &TimerWaitBlock->WaitListEntry);
+            /* Link the timer to this Wait Block */
+            ThreadTimer->Header.WaitListHead.Flink =
+                &TimerWaitBlock->WaitListEntry;
+            ThreadTimer->Header.WaitListHead.Blink =
+                &TimerWaitBlock->WaitListEntry;
 
-        /* Insert the Timer into the Timer Lists and enable it */
-        if (!KiInsertTimer(ThreadTimer, *Interval)) {
+            /* Insert the Timer into the Timer Lists and enable it */
+            if (!KiInsertTimer(ThreadTimer, *Interval))
+            {
+                /* FIXME: We should find a new ready thread */
+                WaitStatus = STATUS_SUCCESS;
+                break;
+            }
 
-            /* FIXME: The timer already expired, we should find a new ready thread */
-            Status = STATUS_SUCCESS;
-            break;
-        }
+            /* Save due time */
+            DueTime.QuadPart = ThreadTimer->DueTime.QuadPart;
 
-        /* Handle Kernel Queues */
-        if (CurrentThread->Queue) {
+            /* Handle Kernel Queues */
+            if (CurrentThread->Queue) KiWakeQueue(CurrentThread->Queue);
 
-            DPRINT("Waking Queue\n");
-            KiWakeQueue(CurrentThread->Queue);
-        }
+            /* Setup the wait information */
+            CurrentThread->Alertable = Alertable;
+            CurrentThread->WaitMode = WaitMode;
+            CurrentThread->WaitReason = DelayExecution;
+            CurrentThread->WaitTime = ((PLARGE_INTEGER)&KeTickCount)->LowPart;
+            CurrentThread->State = Waiting;
 
-        /* Block the Thread */
-        DPRINT("Blocking the Thread: %d, %d, %x\n", Alertable, WaitMode, KeGetCurrentThread());
-        KiBlockThread(&Status,
-                      Alertable,
-                      WaitMode,
-                      DelayExecution);
+            /* Find a new thread to run */
+            KiAddThreadToWaitList(CurrentThread, Swappable);
+            WaitStatus = KiSwapThread();
+            ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL);
 
-        /* Check if we were executing an APC or if we timed out */
-        if (Status != STATUS_KERNEL_APC) {
+            /* Check if we were executing an APC or if we timed out */
+            if (WaitStatus != STATUS_KERNEL_APC)
+            {
+                /* This is a good thing */
+                if (WaitStatus == STATUS_TIMEOUT) WaitStatus = STATUS_SUCCESS;
 
-            /* This is a good thing */
-            if (Status == STATUS_TIMEOUT) Status = STATUS_SUCCESS;
+                /* Return Status */
+                return WaitStatus;
+            }
 
-            /* Return Status */
-            return Status;
+            /* Recalculate due times */
+            Interval = KiRecalculateDueTime(OriginalDueTime,
+                                            &DueTime,
+                                            &NewDueTime);
         }
 
-        DPRINT("Looping Again\n");
+        /* Acquire again the lock */
         CurrentThread->WaitIrql = KeAcquireDispatcherDatabaseLock();
-
     } while (TRUE);
 
     /* Release the Lock, we are done */
-    DPRINT("Returning from KeDelayExecutionThread(), %x. Status: %d\n", KeGetCurrentThread(), Status);
     KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql);
-    return Status;
+    return WaitStatus;
 }
 
 /*
  * @implemented
- *
- * FUNCTION: Puts the current thread into a wait state until the
- * given dispatcher object is set to signalled
- * ARGUMENTS:
- *         Object = Object to wait on
- *         WaitReason = Reason for the wait (debugging aid)
- *         WaitMode = Can be KernelMode or UserMode, if UserMode then
- *                    user-mode APCs can be delivered and the thread's
- *                    stack can be paged out
- *         Altertable = Specifies if the wait is a alertable
- *         Timeout = Optional timeout value
- * RETURNS: Status
  */
 NTSTATUS
-STDCALL
-KeWaitForSingleObject(PVOID Object,
-                      KWAIT_REASON WaitReason,
-                      KPROCESSOR_MODE WaitMode,
-                      BOOLEAN Alertable,
-                      PLARGE_INTEGER Timeout)
+NTAPI
+KeWaitForSingleObject(IN PVOID Object,
+                      IN KWAIT_REASON WaitReason,
+                      IN KPROCESSOR_MODE WaitMode,
+                      IN BOOLEAN Alertable,
+                      IN PLARGE_INTEGER Timeout OPTIONAL)
 {
-    PDISPATCHER_HEADER CurrentObject;
+    PKMUTANT CurrentObject;
     PKWAIT_BLOCK WaitBlock;
     PKWAIT_BLOCK TimerWaitBlock;
     PKTIMER ThreadTimer;
     PKTHREAD CurrentThread = KeGetCurrentThread();
-    NTSTATUS Status;
-    NTSTATUS WaitStatus;
-
-    DPRINT("Entering KeWaitForSingleObject\n");
+    NTSTATUS WaitStatus = STATUS_SUCCESS;
+    BOOLEAN Swappable;
+    LARGE_INTEGER DueTime, NewDueTime;
+    PLARGE_INTEGER OriginalDueTime = Timeout;
 
     /* Check if the lock is already held */
-    if (CurrentThread->WaitNext)  {
-
+    if (CurrentThread->WaitNext)
+    {
         /* Lock is held, disable Wait Next */
-        DPRINT("Lock is held\n");
         CurrentThread->WaitNext = FALSE;
-
-    } else {
-
+    }
+    else
+    {
         /* Lock not held, acquire it */
-        DPRINT("Lock is not held, acquiring\n");
         CurrentThread->WaitIrql = KeAcquireDispatcherDatabaseLock();
     }
 
     /* Start the actual Loop */
-    do {
-
-        /* Get the current Wait Status */
-        WaitStatus = CurrentThread->WaitStatus;
-
-        /* Append wait block to the KTHREAD wait block list */
-        CurrentThread->WaitBlockList = WaitBlock = &CurrentThread->WaitBlock[0];
-
-        /* Get the Current Object */
-        CurrentObject = (PDISPATCHER_HEADER)Object;
-
-        /* FIXME:
-         * Temporary hack until my Object Manager re-write. Basically some objects, like
-         * the File Object, but also LPCs and others, are actually waitable on their event.
-         * The Object Manager sets this up in The ObjectTypeInformation->DefaultObject member,
-         * by using pretty much the same kind of hack as us. Normal objects point to themselves
-         * in that pointer. Then, NtWaitForXXX will populate the WaitList that gets sent to us by
-         * using ->DefaultObject, so the proper actual objects will be sent to us. Until then however,
-         * I will keep this hack here, since there's no need to make an interim hack until the rewrite
-         * -- Alex Ionescu 24/02/05
-         */
-        if (CurrentObject->Type == IO_TYPE_FILE) {
-
-            DPRINT1("Hack used: %x\n", &((PFILE_OBJECT)CurrentObject)->Event);
-            CurrentObject = (PDISPATCHER_HEADER)(&((PFILE_OBJECT)CurrentObject)->Event);
+    WaitBlock = &CurrentThread->WaitBlock[0];
+    do
+    {
+        /* Check if a kernel APC is pending and we're below APC_LEVEL */
+        if ((CurrentThread->ApcState.KernelApcPending) &&
+            !(CurrentThread->SpecialApcDisable) &&
+            (CurrentThread->WaitIrql < APC_LEVEL))
+        {
+            /* Unlock the dispatcher */
+            KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql);
         }
+        else
+        {
+            /* Set default status */
+            CurrentThread->WaitStatus = STATUS_WAIT_0;
 
-        /* Check if the Object is Signaled */
-        if (KiIsObjectSignaled(CurrentObject, CurrentThread)) {
-
-            /* Just unwait this guy and exit */
-            if (CurrentObject->SignalState != MINLONG) {
-
-                /* It has a normal signal state, so unwait it and return */
-                KiSatisfyObjectWait(CurrentObject, CurrentThread);
-                Status = STATUS_WAIT_0;
-                goto WaitDone;
-
-            } else {
-
-                /* Is this a Mutant? */
-                if (CurrentObject->Type == MutantObject) {
-
-                    /* According to wasm.ru, we must raise this exception (tested and true) */
-                    KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql);
-                    ExRaiseStatus(STATUS_MUTANT_LIMIT_EXCEEDED);
+            /* Get the Current Object */
+            CurrentObject = (PKMUTANT)Object;
+
+            /* Check if it's a mutant */
+            if (CurrentObject->Header.Type == MutantObject)
+            {
+                /* Check its signal state or if we own it */
+                if ((CurrentObject->Header.SignalState > 0) ||
+                    (CurrentThread == CurrentObject->OwnerThread))
+                {
+                    /* Just unwait this guy and exit */
+                    if (CurrentObject->Header.SignalState != (LONG)MINLONG)
+                    {
+                        /* It has a normal signal state. Unwait and return */
+                        KiSatisfyMutantWait(CurrentObject, CurrentThread);
+                        WaitStatus = CurrentThread->WaitStatus;
+                        goto DontWait;
+                    }
+                    else
+                    {
+                        /* Raise an exception (see wasm.ru) */
+                        KeReleaseDispatcherDatabaseLock(CurrentThread->
+                                                        WaitIrql);
+                        ExRaiseStatus(STATUS_MUTANT_LIMIT_EXCEEDED);
+                   }
                 }
             }
-        }
-
-        /* Set up the Wait Block */
-        WaitBlock->Object = CurrentObject;
-        WaitBlock->Thread = CurrentThread;
-        WaitBlock->WaitKey = (USHORT)(STATUS_WAIT_0);
-        WaitBlock->WaitType = WaitAny;
-        WaitBlock->NextWaitBlock = WaitBlock;
-
-        /* Make sure we can satisfy the Alertable request */
-        KiCheckAlertability(Alertable, CurrentThread, WaitMode, &Status);
-
-        /* Set the Wait Status */
-        CurrentThread->WaitStatus = Status;
-
-        /* Enable the Timeout Timer if there was any specified */
-        if (Timeout != NULL) {
-
-            /* However if 0 timeout was specified, then we must fail since we need to peform a wait */
-            if (!Timeout->QuadPart) {
-
-                /* Return a timeout */
-                Status = STATUS_TIMEOUT;
-                goto WaitDone;
+            else if (CurrentObject->Header.SignalState > 0)
+            {
+                /* Another satisfied object */
+                KiSatisfyNonMutantWait(CurrentObject, CurrentThread);
+                WaitStatus = STATUS_WAIT_0;
+                goto DontWait;
             }
 
-            /* Point to Timer Wait Block and Thread Timer */
-            TimerWaitBlock = &CurrentThread->WaitBlock[TIMER_WAIT_BLOCK];
-            ThreadTimer = &CurrentThread->Timer;
-
-            /* Connect the Timer Wait Block */
-            WaitBlock->NextWaitBlock = TimerWaitBlock;
+            /* Append wait block to the KTHREAD wait block list */
+            CurrentThread->WaitBlockList = WaitBlock;
 
-            /* Set up the Timer Wait Block */
-            TimerWaitBlock->Object = (PVOID)ThreadTimer;
-            TimerWaitBlock->Thread = CurrentThread;
-            TimerWaitBlock->WaitKey = STATUS_TIMEOUT;
-            TimerWaitBlock->WaitType = WaitAny;
-            TimerWaitBlock->NextWaitBlock = WaitBlock;
-
-            /* Link the timer to this Wait Block */
-            InitializeListHead(&ThreadTimer->Header.WaitListHead);
-            InsertTailList(&ThreadTimer->Header.WaitListHead, &TimerWaitBlock->WaitListEntry);
-
-            /* Insert the Timer into the Timer Lists and enable it */
-            if (!KiInsertTimer(ThreadTimer, *Timeout)) {
+            /* Set up the Wait Block */
+            WaitBlock->Object = CurrentObject;
+            WaitBlock->WaitKey = (USHORT)(STATUS_SUCCESS);
+            WaitBlock->WaitType = WaitAny;
+
+            /* Make sure we can satisfy the Alertable request */
+            KiCheckAlertability();
+
+            /* Check if we can swap the thread's stack */
+            CurrentThread->WaitListEntry.Flink = NULL;
+            KiCheckThreadStackSwap(WaitMode, CurrentThread, Swappable);
+
+            /* Enable the Timeout Timer if there was any specified */
+            if (Timeout)
+            {
+                /* Fail if the timeout interval is actually 0 */
+                if (!Timeout->QuadPart)
+                {
+                    /* Return a timeout */
+                    WaitStatus = STATUS_TIMEOUT;
+                    goto DontWait;
+                }
 
-                /* Return a timeout if we couldn't insert the timer for some reason */
-                Status = STATUS_TIMEOUT;
-                goto WaitDone;
-            }
-        }
+                /* Point to Timer Wait Block and Thread Timer */
+                TimerWaitBlock = &CurrentThread->WaitBlock[TIMER_WAIT_BLOCK];
+                ThreadTimer = &CurrentThread->Timer;
 
-        /* Link the Object to this Wait Block */
-        InsertTailList(&CurrentObject->WaitListHead, &WaitBlock->WaitListEntry);
+                /* Connect the Timer Wait Block */
+                WaitBlock->NextWaitBlock = TimerWaitBlock;
 
-        /* Handle Kernel Queues */
-        if (CurrentThread->Queue) {
+                /* Set up the Timer Wait Block */
+                TimerWaitBlock->NextWaitBlock = WaitBlock;
 
-            DPRINT("Waking Queue\n");
-            KiWakeQueue(CurrentThread->Queue);
-        }
+                /* Link the timer to this Wait Block */
+                ThreadTimer->Header.WaitListHead.Flink =
+                    &TimerWaitBlock->WaitListEntry;
+                ThreadTimer->Header.WaitListHead.Blink =
+                    &TimerWaitBlock->WaitListEntry;
 
-        /* Block the Thread */
-        DPRINT("Blocking the Thread: %d, %d, %d, %x\n", Alertable, WaitMode, WaitReason, KeGetCurrentThread());
-        KiBlockThread(&Status,
-                      Alertable,
-                      WaitMode,
-                      (UCHAR)WaitReason);
+                /* Insert the Timer into the Timer Lists and enable it */
+                if (!KiInsertTimer(ThreadTimer, *Timeout))
+                {
+                    /* Return a timeout if we couldn't insert the timer */
+                    WaitStatus = STATUS_TIMEOUT;
+                    goto DontWait;
+                }
 
-        /* Check if we were executing an APC */
-        if (Status != STATUS_KERNEL_APC) {
+                /* Set the current due time */
+                DueTime.QuadPart = ThreadTimer->DueTime.QuadPart;
+            }
+            else
+            {
+                /* No timer block, so just set our wait block as next */
+                WaitBlock->NextWaitBlock = WaitBlock;
+            }
 
-            /* Return Status */
-            return Status;
+            /* Link the Object to this Wait Block */
+            InsertTailList(&CurrentObject->Header.WaitListHead,
+                           &WaitBlock->WaitListEntry);
+
+            /* Handle Kernel Queues */
+            if (CurrentThread->Queue) KiWakeQueue(CurrentThread->Queue);
+
+            /* Setup the wait information */
+            CurrentThread->Alertable = Alertable;
+            CurrentThread->WaitMode = WaitMode;
+            CurrentThread->WaitReason = WaitReason;
+            CurrentThread->WaitTime = ((PLARGE_INTEGER)&KeTickCount)->LowPart;
+            CurrentThread->State = Waiting;
+
+            /* Find a new thread to run */
+            KiAddThreadToWaitList(CurrentThread, Swappable);
+            WaitStatus = KiSwapThread();
+            ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL);
+
+            /* Check if we were executing an APC */
+            if (WaitStatus != STATUS_KERNEL_APC) return WaitStatus;
+
+            /* Check if we had a timeout */
+            if (Timeout)
+            {
+                /* Recalculate due times */
+                Timeout = KiRecalculateDueTime(OriginalDueTime,
+                                               &DueTime,
+                                               &NewDueTime);
+            }
         }
 
-        DPRINT("Looping Again\n");
+        /* Acquire again the lock */
         CurrentThread->WaitIrql = KeAcquireDispatcherDatabaseLock();
-
     } while (TRUE);
 
-WaitDone:
     /* Release the Lock, we are done */
-    DPRINT("Returning from KeWaitForMultipleObjects(), %x. Status: %d\n", KeGetCurrentThread(), Status);
     KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql);
-    return Status;
+    return WaitStatus;
+
+DontWait:
+    /* Adjust the Quantum */
+    KiAdjustQuantumThread(CurrentThread);
+
+    /* Release & Return */
+    KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql);
+    return WaitStatus;
 }
 
 /*
  * @implemented
  */
-NTSTATUS STDCALL
-KeWaitForMultipleObjects(ULONG Count,
-                         PVOID Object[],
-                         WAIT_TYPE WaitType,
-                         KWAIT_REASON WaitReason,
-                         KPROCESSOR_MODE WaitMode,
-                         BOOLEAN Alertable,
-                         PLARGE_INTEGER Timeout,
-                         PKWAIT_BLOCK WaitBlockArray)
+NTSTATUS
+NTAPI
+KeWaitForMultipleObjects(IN ULONG Count,
+                         IN PVOID Object[],
+                         IN WAIT_TYPE WaitType,
+                         IN KWAIT_REASON WaitReason,
+                         IN KPROCESSOR_MODE WaitMode,
+                         IN BOOLEAN Alertable,
+                         IN PLARGE_INTEGER Timeout OPTIONAL,
+                         OUT PKWAIT_BLOCK WaitBlockArray OPTIONAL)
 {
-    PDISPATCHER_HEADER CurrentObject;
+    PKMUTANT CurrentObject;
     PKWAIT_BLOCK WaitBlock;
     PKWAIT_BLOCK TimerWaitBlock;
     PKTIMER ThreadTimer;
     PKTHREAD CurrentThread = KeGetCurrentThread();
     ULONG AllObjectsSignaled;
     ULONG WaitIndex;
-    NTSTATUS Status;
-    NTSTATUS WaitStatus;
-
-    DPRINT("Entering KeWaitForMultipleObjects(Count %lu Object[] %p) "
-            "PsGetCurrentThread() %x, Timeout %x\n", Count, Object, PsGetCurrentThread(), Timeout);
+    NTSTATUS WaitStatus = STATUS_SUCCESS;
+    BOOLEAN Swappable;
+    PLARGE_INTEGER OriginalDueTime = Timeout;
+    LARGE_INTEGER DueTime, NewDueTime;
 
     /* Set the Current Thread */
     CurrentThread = KeGetCurrentThread();
 
     /* Check if the lock is already held */
-    if (CurrentThread->WaitNext)  {
-
+    if (CurrentThread->WaitNext)
+    {
         /* Lock is held, disable Wait Next */
-        DPRINT("Lock is held\n");
         CurrentThread->WaitNext = FALSE;
-
-    } else {
-
+    }
+    else
+    {
         /* Lock not held, acquire it */
-        DPRINT("Lock is not held, acquiring\n");
         CurrentThread->WaitIrql = KeAcquireDispatcherDatabaseLock();
     }
 
-    /* Make sure the Wait Count is valid for the Thread and Maximum Wait Objects */
-    if (!WaitBlockArray) {
-
+    /* Make sure the Wait Count is valid */
+    if (!WaitBlockArray)
+    {
         /* Check in regards to the Thread Object Limit */
-        if (Count > THREAD_WAIT_OBJECTS) {
-
+        if (Count > THREAD_WAIT_OBJECTS)
+        {
+            /* Bugcheck */
             KEBUGCHECK(MAXIMUM_WAIT_OBJECTS_EXCEEDED);
         }
 
         /* Use the Thread's Wait Block */
         WaitBlockArray = &CurrentThread->WaitBlock[0];
-
-    } else {
-
-        /* Using our own Block Array. Check in regards to System Object Limit */
-        if (Count > MAXIMUM_WAIT_OBJECTS) {
-
+    }
+    else
+    {
+        /* Using our own Block Array, so check with the System Object Limit */
+        if (Count > MAXIMUM_WAIT_OBJECTS)
+        {
+            /* Bugcheck */
             KEBUGCHECK(MAXIMUM_WAIT_OBJECTS_EXCEEDED);
         }
     }
 
     /* Start the actual Loop */
-    do {
-
-        /* Get the current Wait Status */
-        WaitStatus = CurrentThread->WaitStatus;
-
-        /* Append wait block to the KTHREAD wait block list */
-        CurrentThread->WaitBlockList = WaitBlock = WaitBlockArray;
-
-        /* Check if the wait is (already) satisfied */
-        AllObjectsSignaled = TRUE;
-
-        /* First, we'll try to satisfy the wait directly */
-        for (WaitIndex = 0; WaitIndex < Count; WaitIndex++) {
-
-            /* Get the Current Object */
-            CurrentObject = (PDISPATCHER_HEADER)Object[WaitIndex];
-
-            /* FIXME:
-             * Temporary hack until my Object Manager re-write. Basically some objects, like
-             * the File Object, but also LPCs and others, are actually waitable on their event.
-             * The Object Manager sets this up in The ObjectTypeInformation->DefaultObject member,
-             * by using pretty much the same kind of hack as us. Normal objects point to themselves
-             * in that pointer. Then, NtWaitForXXX will populate the WaitList that gets sent to us by
-             * using ->DefaultObject, so the proper actual objects will be sent to us. Until then however,
-             * I will keep this hack here, since there's no need to make an interim hack until the rewrite
-             * -- Alex Ionescu 24/02/05
-             */
-            if (CurrentObject->Type == IO_TYPE_FILE) {
-
-                CurrentObject = (PDISPATCHER_HEADER)(&((PFILE_OBJECT)CurrentObject)->Event);
-            }
-
-            /* Check if the Object is Signaled */
-            if (KiIsObjectSignaled(CurrentObject, CurrentThread)) {
-
-                /* Check what kind of wait this is */
-                if (WaitType == WaitAny) {
-
-                    /* This is a Wait Any, so just unwait this guy and exit */
-                    if (CurrentObject->SignalState != MINLONG) {
-
-                        /* It has a normal signal state, so unwait it and return */
-                        KiSatisfyObjectWait(CurrentObject, CurrentThread);
-                        Status = STATUS_WAIT_0 | WaitIndex;
-                        goto WaitDone;
-
-                    } else {
-
-                        /* Is this a Mutant? */
-                        if (CurrentObject->Type == MutantObject) {
-
-                            /* According to wasm.ru, we must raise this exception (tested and true) */
-                            KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql);
+    do
+    {
+        /* Check if a kernel APC is pending and we're below APC_LEVEL */
+        if ((CurrentThread->ApcState.KernelApcPending) &&
+            !(CurrentThread->SpecialApcDisable) &&
+            (CurrentThread->WaitIrql < APC_LEVEL))
+        {
+            /* Unlock the dispatcher */
+            KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql);
+        }
+        else
+        {
+            /* Append wait block to the KTHREAD wait block list */
+            CurrentThread->WaitBlockList = WaitBlock = WaitBlockArray;
+
+            /* Set default wait status */
+            CurrentThread->WaitStatus = STATUS_WAIT_0;
+
+            /* Check if the wait is (already) satisfied */
+            AllObjectsSignaled = TRUE;
+
+            /* First, we'll try to satisfy the wait directly */
+            for (WaitIndex = 0; WaitIndex < Count; WaitIndex++)
+            {
+                /* Get the Current Object */
+                CurrentObject = (PKMUTANT)Object[WaitIndex];
+
+                /* Check the type of wait */
+                if (WaitType == WaitAny)
+                {
+                    /* Check if the Object is a mutant */
+                    if (CurrentObject->Header.Type == MutantObject)
+                    {
+                        /* Check if it's signaled */
+                        if ((CurrentObject->Header.SignalState > 0) ||
+                            (CurrentThread == CurrentObject->OwnerThread))
+                        {
+                            /* This is a Wait Any, so unwait this and exit */
+                            if (CurrentObject->Header.SignalState !=
+                                (LONG)MINLONG)
+                            {
+                                /* Normal signal state, unwait it and return */
+                                KiSatisfyMutantWait(CurrentObject,
+                                                    CurrentThread);
+                                WaitStatus = CurrentThread->WaitStatus |
+                                             WaitIndex;
+                                goto DontWait;
+                            }
+                            else
+                            {
+                                /* Raise an exception (see wasm.ru) */
+                                KeReleaseDispatcherDatabaseLock(CurrentThread->
+                                                                WaitIrql);
+                                ExRaiseStatus(STATUS_MUTANT_LIMIT_EXCEEDED);
+                            }
+                        }
+                    }
+                    else if (CurrentObject->Header.SignalState > 0)
+                    {
+                        /* Another signaled object, unwait and return */
+                        KiSatisfyNonMutantWait(CurrentObject, CurrentThread);
+                        WaitStatus = WaitIndex;
+                        goto DontWait;
+                    }
+                }
+                else
+                {
+                    /* Check if we're dealing with a mutant again */
+                    if (CurrentObject->Header.Type == MutantObject)
+                    {
+                        /* Check if it has an invalid count */
+                        if ((CurrentThread == CurrentObject->OwnerThread) &&
+                            (CurrentObject->Header.SignalState == MINLONG))
+                        {
+                            /* Raise an exception */
+                            KeReleaseDispatcherDatabaseLock(CurrentThread->
+                                                            WaitIrql);
                             ExRaiseStatus(STATUS_MUTANT_LIMIT_EXCEEDED);
                         }
+                        else if ((CurrentObject->Header.SignalState <= 0) &&
+                                 (CurrentThread != CurrentObject->OwnerThread))
+                        {
+                            /* We don't own it, can't satisfy the wait */
+                            AllObjectsSignaled = FALSE;
+                        }
+                    }
+                    else if (CurrentObject->Header.SignalState <= 0)
+                    {
+                        /* Not signaled, can't satisfy */
+                        AllObjectsSignaled = FALSE;
                     }
                 }
 
-            } else {
+                /* Set up a Wait Block for this Object */
+                WaitBlock->Object = CurrentObject;
+                WaitBlock->Thread = CurrentThread;
+                WaitBlock->WaitKey = (USHORT)WaitIndex;
+                WaitBlock->WaitType = (USHORT)WaitType;
+                WaitBlock->NextWaitBlock = WaitBlock + 1;
 
-                /* One of the objects isn't signaled... if this is a WaitAll, we will fail later */
-                AllObjectsSignaled = FALSE;
+                /* Move to the next Wait Block */
+                WaitBlock = WaitBlock->NextWaitBlock;
             }
 
-            /* Set up a Wait Block for this Object */
-            WaitBlock->Object = CurrentObject;
-            WaitBlock->Thread = CurrentThread;
-            WaitBlock->WaitKey = (USHORT)(STATUS_WAIT_0 + WaitIndex);
-            WaitBlock->WaitType = (USHORT)WaitType;
-            WaitBlock->NextWaitBlock = WaitBlock + 1;
-
-            /* Move to the next Wait Block */
-            WaitBlock = WaitBlock->NextWaitBlock;
-        }
-
-        /* Return to the Root Wait Block */
-        WaitBlock--;
-        WaitBlock->NextWaitBlock = WaitBlockArray;
-
-        /* Check if this is a Wait All and all the objects are signaled */
-        if ((WaitType == WaitAll) && (AllObjectsSignaled)) {
-
             /* Return to the Root Wait Block */
-            WaitBlock = CurrentThread->WaitBlockList;
-
-            /* Satisfy their Waits and return to the caller */
-            KiSatisifyMultipleObjectWaits(WaitBlock);
-            Status = STATUS_WAIT_0;
-            goto WaitDone;
-        }
-
-        /* Make sure we can satisfy the Alertable request */
-        KiCheckAlertability(Alertable, CurrentThread, WaitMode, &Status);
-
-        /* Set the Wait Status */
-        CurrentThread->WaitStatus = Status;
-
-        /* Enable the Timeout Timer if there was any specified */
-        if (Timeout != NULL) {
-
-            /* However if 0 timeout was specified, then we must fail since we need to peform a wait */
-            if (!Timeout->QuadPart) {
-
-                /* Return a timeout */
-                Status = STATUS_TIMEOUT;
-                goto WaitDone;
-            }
-
-            /* Point to Timer Wait Block and Thread Timer */
-            TimerWaitBlock = &CurrentThread->WaitBlock[TIMER_WAIT_BLOCK];
-            ThreadTimer = &CurrentThread->Timer;
-
-            /* Connect the Timer Wait Block */
-            WaitBlock->NextWaitBlock = TimerWaitBlock;
-
-            /* Set up the Timer Wait Block */
-            TimerWaitBlock->Object = (PVOID)ThreadTimer;
-            TimerWaitBlock->Thread = CurrentThread;
-            TimerWaitBlock->WaitKey = STATUS_TIMEOUT;
-            TimerWaitBlock->WaitType = WaitAny;
-            TimerWaitBlock->NextWaitBlock = WaitBlockArray;
-
-            /* Link the timer to this Wait Block */
-            InitializeListHead(&ThreadTimer->Header.WaitListHead);
-
-            /* Insert the Timer into the Timer Lists and enable it */
-            if (!KiInsertTimer(ThreadTimer, *Timeout)) {
-
-                /* Return a timeout if we couldn't insert the timer for some reason */
-                Status = STATUS_TIMEOUT;
-                goto WaitDone;
+            WaitBlock--;
+            WaitBlock->NextWaitBlock = WaitBlockArray;
+
+            /* Check if this is a Wait All and all the objects are signaled */
+            if ((WaitType == WaitAll) && (AllObjectsSignaled))
+            {
+                /* Return to the Root Wait Block */
+                WaitBlock = CurrentThread->WaitBlockList;
+
+                /* Satisfy their Waits and return to the caller */
+                KiWaitSatisfyAll(WaitBlock);
+                WaitStatus = CurrentThread->WaitStatus;
+                goto DontWait;
             }
-        }
 
-        /* Insert into Object's Wait List*/
-        WaitBlock = CurrentThread->WaitBlockList;
-        do {
+            /* Make sure we can satisfy the Alertable request */
+            KiCheckAlertability();
+
+            /* Check if we can swap the thread's stack */
+            CurrentThread->WaitListEntry.Flink = NULL;
+            KiCheckThreadStackSwap(WaitMode, CurrentThread, Swappable);
+
+            /* Enable the Timeout Timer if there was any specified */
+            if (Timeout)
+            {
+                /* Make sure the timeout interval isn't actually 0 */
+                if (!Timeout->QuadPart)
+                {
+                    /* Return a timeout */
+                    WaitStatus = STATUS_TIMEOUT;
+                    goto DontWait;
+                }
 
-            /* Get the Current Object */
-            CurrentObject = WaitBlock->Object;
+                /* Point to Timer Wait Block and Thread Timer */
+                TimerWaitBlock = &CurrentThread->WaitBlock[TIMER_WAIT_BLOCK];
+                ThreadTimer = &CurrentThread->Timer;
 
-            /* Link the Object to this Wait Block */
-            InsertTailList(&CurrentObject->WaitListHead, &WaitBlock->WaitListEntry);
+                /* Connect the Timer Wait Block */
+                WaitBlock->NextWaitBlock = TimerWaitBlock;
 
-            /* Move to the next Wait Block */
-            WaitBlock = WaitBlock->NextWaitBlock;
-        } while (WaitBlock != WaitBlockArray);
+                /* Set up the Timer Wait Block */
+                TimerWaitBlock->NextWaitBlock = WaitBlockArray;
 
-        /* Handle Kernel Queues */
-        if (CurrentThread->Queue) {
+                /* Initialize the list head */
+                InitializeListHead(&ThreadTimer->Header.WaitListHead);
 
-            DPRINT("Waking Queue\n");
-            KiWakeQueue(CurrentThread->Queue);
-        }
+                /* Insert the Timer into the Timer Lists and enable it */
+                if (!KiInsertTimer(ThreadTimer, *Timeout))
+                {
+                    /* Return a timeout if we couldn't insert the timer */
+                    WaitStatus = STATUS_TIMEOUT;
+                    goto DontWait;
+                }
 
-        /* Block the Thread */
-        DPRINT("Blocking the Thread: %d, %d, %d, %x\n", Alertable, WaitMode, WaitReason, KeGetCurrentThread());
-        KiBlockThread(&Status,
-                      Alertable,
-                      WaitMode,
-                      (UCHAR)WaitReason);
+                /* Set the current due time */
+                DueTime.QuadPart = ThreadTimer->DueTime.QuadPart;
+            }
 
-        /* Check if we were executing an APC */
-        if (Status != STATUS_KERNEL_APC) {
+            /* Insert into Object's Wait List*/
+            WaitBlock = CurrentThread->WaitBlockList;
+            do
+            {
+                /* Get the Current Object */
+                CurrentObject = WaitBlock->Object;
+
+                /* Link the Object to this Wait Block */
+                InsertTailList(&CurrentObject->Header.WaitListHead,
+                               &WaitBlock->WaitListEntry);
+
+                /* Move to the next Wait Block */
+                WaitBlock = WaitBlock->NextWaitBlock;
+            } while (WaitBlock != WaitBlockArray);
+
+            /* Handle Kernel Queues */
+            if (CurrentThread->Queue) KiWakeQueue(CurrentThread->Queue);
+
+            /* Setup the wait information */
+            CurrentThread->Alertable = Alertable;
+            CurrentThread->WaitMode = WaitMode;
+            CurrentThread->WaitReason = WaitReason;
+            CurrentThread->WaitTime = ((PLARGE_INTEGER)&KeTickCount)->LowPart;
+            CurrentThread->State = Waiting;
+
+            /* Find a new thread to run */
+            KiAddThreadToWaitList(CurrentThread, Swappable);
+            WaitStatus = KiSwapThread();
+            ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL);
+
+            /* Check if we were executing an APC */
+            if (WaitStatus != STATUS_KERNEL_APC) return WaitStatus;
+
+            /* Check if we had a timeout */
+            if (Timeout)
+            {
+                /* Recalculate due times */
+                Timeout = KiRecalculateDueTime(OriginalDueTime,
+                                               &DueTime,
+                                               &NewDueTime);
+            }
 
-            /* Return Status */
-            return Status;
+            /* Acquire again the lock */
+            CurrentThread->WaitIrql = KeAcquireDispatcherDatabaseLock();
         }
-
-        DPRINT("Looping Again\n");
-        CurrentThread->WaitIrql = KeAcquireDispatcherDatabaseLock();
-
     } while (TRUE);
 
-WaitDone:
     /* Release the Lock, we are done */
-    DPRINT("Returning from KeWaitForMultipleObjects(), %x. Status: %d\n", KeGetCurrentThread(), Status);
     KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql);
-    return Status;
-}
-
-VOID
-FASTCALL
-KiSatisfyObjectWait(PDISPATCHER_HEADER Object,
-                    PKTHREAD Thread)
-
-{
-    /* Special case for Mutants */
-    if (Object->Type == MutantObject) {
-
-        /* Decrease the Signal State */
-        Object->SignalState--;
-
-        /* Check if it's now non-signaled */
-        if (Object->SignalState == 0) {
-
-            /* Set the Owner Thread */
-            ((PKMUTANT)Object)->OwnerThread = Thread;
-
-            /* Disable APCs if needed */
-            Thread->KernelApcDisable -= ((PKMUTANT)Object)->ApcDisable;
-
-            /* Check if it's abandoned */
-            if (((PKMUTANT)Object)->Abandoned) {
-
-                /* Unabandon it */
-                ((PKMUTANT)Object)->Abandoned = FALSE;
-
-                /* Return Status */
-                Thread->WaitStatus = STATUS_ABANDONED;
-            }
-
-            /* Insert it into the Mutant List */
-            InsertHeadList(&Thread->MutantListHead, &((PKMUTANT)Object)->MutantListEntry);
-        }
-
-    } else if ((Object->Type & TIMER_OR_EVENT_TYPE) == EventSynchronizationObject) {
-
-        /* These guys (Syncronization Timers and Events) just get un-signaled */
-        Object->SignalState = 0;
-
-    } else if (Object->Type == SemaphoreObject) {
-
-        /* These ones can have multiple signalings, so we only decrease it */
-        Object->SignalState--;
-    }
-}
-
-VOID
-FASTCALL
-KiWaitTest(PDISPATCHER_HEADER Object,
-           KPRIORITY Increment)
-{
-    PLIST_ENTRY WaitEntry;
-    PLIST_ENTRY WaitList;
-    PKWAIT_BLOCK CurrentWaitBlock;
-    PKWAIT_BLOCK NextWaitBlock;
-    PKTHREAD WaitThread;
-
-    /* Loop the Wait Entries */
-    DPRINT("KiWaitTest for Object: %x\n", Object);
-    WaitList = &Object->WaitListHead;
-    WaitEntry = WaitList->Flink;
-    while ((WaitEntry != WaitList) && (Object->SignalState > 0)) {
-
-        /* Get the current wait block */
-        CurrentWaitBlock = CONTAINING_RECORD(WaitEntry, KWAIT_BLOCK, WaitListEntry);
-        WaitThread = CurrentWaitBlock->Thread;
-
-        /* Check the current Wait Mode */
-        if (CurrentWaitBlock->WaitType == WaitAny) {
-
-            /* Easy case, satisfy only this wait */
-            DPRINT("Satisfiying a Wait any\n");
-            WaitEntry = WaitEntry->Blink;
-            KiSatisfyObjectWait(Object, WaitThread);
-
-        } else {
-
-            /* Everything must be satisfied */
-            DPRINT("Checking for a Wait All\n");
-            NextWaitBlock = CurrentWaitBlock->NextWaitBlock;
-
-            /* Loop first to make sure they are valid */
-            while (NextWaitBlock != CurrentWaitBlock) {
-
-                /* Check if the object is signaled */
-                DPRINT("Checking: %x %d\n", NextWaitBlock->Object, Object->SignalState);
-                if (!KiIsObjectSignaled(NextWaitBlock->Object, WaitThread)) {
-
-                    /* It's not, move to the next one */
-                    DPRINT("One of the object is non-signaled, sorry.\n");
-                    goto SkipUnwait;
-                }
-
-                /* Go to the next Wait block */
-                NextWaitBlock = NextWaitBlock->NextWaitBlock;
-            }
-
-            /* All the objects are signaled, we can satisfy */
-            DPRINT("Satisfiying a Wait All\n");
-            WaitEntry = WaitEntry->Blink;
-            KiSatisifyMultipleObjectWaits(CurrentWaitBlock);
-        }
-
-        /* All waits satisfied, unwait the thread */
-        DPRINT("Unwaiting the Thread\n");
-        KiAbortWaitThread(WaitThread, CurrentWaitBlock->WaitKey, Increment);
-
-SkipUnwait:
-        /* Next entry */
-        WaitEntry = WaitEntry->Flink;
-    }
-
-    DPRINT("Done\n");
-}
-
-/* Must be called with the dispatcher lock held */
-VOID
-FASTCALL
-KiAbortWaitThread(PKTHREAD Thread,
-                  NTSTATUS WaitStatus,
-                  KPRIORITY Increment)
-{
-    PKWAIT_BLOCK WaitBlock;
-
-    /* If we are blocked, we must be waiting on something also */
-    DPRINT("KiAbortWaitThread: %x, Status: %x, %x \n", Thread, WaitStatus, Thread->WaitBlockList);
-    ASSERT((Thread->State == Waiting) == (Thread->WaitBlockList != NULL));
-
-    /* Remove the Wait Blocks from the list */
-    DPRINT("Removing waits\n");
-    WaitBlock = Thread->WaitBlockList;
-    do {
-
-        /* Remove it */
-        DPRINT("Removing Waitblock: %x, %x\n", WaitBlock, WaitBlock->NextWaitBlock);
-        RemoveEntryList(&WaitBlock->WaitListEntry);
-
-        /* Go to the next one */
-        WaitBlock = WaitBlock->NextWaitBlock;
-    } while (WaitBlock != Thread->WaitBlockList);
-
-    /* Check if there's a Thread Timer */
-    if (Thread->Timer.Header.Inserted) {
-
-        /* Cancel the Thread Timer with the no-lock fastpath */
-        DPRINT("Removing the Thread's Timer\n");
-        Thread->Timer.Header.Inserted = FALSE;
-        RemoveEntryList(&Thread->Timer.TimerListEntry);
-    }
+    return WaitStatus;
 
-    /* Increment the Queue's active threads */
-    if (Thread->Queue) {
-
-        DPRINT("Incrementing Queue's active threads\n");
-        Thread->Queue->CurrentCount++;
-    }
-
-    /* Reschedule the Thread */
-    DPRINT("Unblocking the Thread\n");
-    KiUnblockThread(Thread, &WaitStatus, 0);
-}
-
-BOOLEAN
-inline
-FASTCALL
-KiIsObjectSignaled(PDISPATCHER_HEADER Object,
-                   PKTHREAD Thread)
-{
-    /* Mutants are...well...mutants! */
-   if (Object->Type == MutantObject) {
-
-        /*
-         * Because Cutler hates mutants, they are actually signaled if the Signal State is <= 0
-         * Well, only if they are recursivly acquired (i.e if we own it right now).
-         * Of course, they are also signaled if their signal state is 1.
-         */
-        if ((Object->SignalState <= 0 && ((PKMUTANT)Object)->OwnerThread == Thread) ||
-            (Object->SignalState == 1)) {
-
-            /* Signaled Mutant */
-            return (TRUE);
-
-        } else {
+DontWait:
+    /* Adjust the Quantum */
+    KiAdjustQuantumThread(CurrentThread);
 
-            /* Unsignaled Mutant */
-            return (FALSE);
-        }
-    }
-
-    /* Any other object is not a mutated freak, so let's use logic */
-   return (!Object->SignalState <= 0);
-}
-
-BOOL
-inline
-FASTCALL
-KiIsObjectWaitable(PVOID Object)
-{
-    POBJECT_HEADER Header;
-    Header = BODY_TO_HEADER(Object);
-
-    if (Header->ObjectType == ExEventObjectType ||
-        Header->ObjectType == ExIoCompletionType ||
-        Header->ObjectType == ExMutantObjectType ||
-        Header->ObjectType == ExSemaphoreObjectType ||
-        Header->ObjectType == ExTimerType ||
-        Header->ObjectType == PsProcessType ||
-        Header->ObjectType == PsThreadType ||
-        Header->ObjectType == IoFileObjectType) {
-
-        return TRUE;
-
-    } else {
-
-        return FALSE;
-    }
-}
-
-VOID
-inline
-FASTCALL
-KiSatisifyMultipleObjectWaits(PKWAIT_BLOCK WaitBlock)
-{
-    PKWAIT_BLOCK FirstBlock = WaitBlock;
-    PKTHREAD WaitThread = WaitBlock->Thread;
-
-    /* Loop through all the Wait Blocks, and wake each Object */
-    do {
-
-        /* Wake the Object */
-        KiSatisfyObjectWait(WaitBlock->Object, WaitThread);
-        WaitBlock = WaitBlock->NextWaitBlock;
-    } while (WaitBlock != FirstBlock);
-}
-
-VOID
-inline
-FASTCALL
-KeInitializeDispatcherHeader(DISPATCHER_HEADER* Header,
-                             ULONG Type,
-                             ULONG Size,
-                             ULONG SignalState)
-{
-    Header->Type = (UCHAR)Type;
-    Header->Absolute = 0;
-    Header->Inserted = 0;
-    Header->Size = (UCHAR)Size;
-    Header->SignalState = SignalState;
-    InitializeListHead(&(Header->WaitListHead));
-}
-
-KIRQL
-inline
-FASTCALL
-KeAcquireDispatcherDatabaseLock(VOID)
-{
-    KIRQL OldIrql;
-
-    KeAcquireSpinLock (&DispatcherDatabaseLock, &OldIrql);
-    return OldIrql;
-}
-
-VOID
-inline
-FASTCALL
-KeAcquireDispatcherDatabaseLockAtDpcLevel(VOID)
-{
-    KeAcquireSpinLockAtDpcLevel (&DispatcherDatabaseLock);
-}
-
-VOID
-inline
-FASTCALL
-KeInitializeDispatcher(VOID)
-{
-    /* Initialize the Dispatcher Lock */
-    KeInitializeSpinLock(&DispatcherDatabaseLock);
-}
-
-VOID
-inline
-FASTCALL
-KeReleaseDispatcherDatabaseLock(KIRQL OldIrql)
-{
-    /* If it's the idle thread, dispatch */
-    if (!KeIsExecutingDpc() && OldIrql < DISPATCH_LEVEL && KeGetCurrentThread() != NULL &&
-        KeGetCurrentThread() == KeGetCurrentPrcb()->IdleThread) {
-
-        KiDispatchThreadNoLock(Ready);
-        KeLowerIrql(OldIrql);
-
-    } else {
-
-        /* Just release the spin lock */
-        KeReleaseSpinLock(&DispatcherDatabaseLock, OldIrql);
-    }
-}
-
-VOID
-inline
-FASTCALL
-KeReleaseDispatcherDatabaseLockFromDpcLevel(VOID)
-{
-    KeReleaseSpinLockFromDpcLevel(&DispatcherDatabaseLock);
+    /* Release & Return */
+    KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql);
+    return WaitStatus;
 }
 
 /* EOF */