[NTOS:MM] Quick fix: use SIZE_T instead of ULONG, because ULONG is 32-bit and on...

[reactos.git] / ntoskrnl / ke / wait.c

diff --git a/ntoskrnl/ke/wait.c b/ntoskrnl/ke/wait.c
index 2591cd1..ed81484 100644 (file)
--- a/ntoskrnl/ke/wait.c
+++ b/ntoskrnl/ke/wait.c
@@ -126,14 +126,14 @@ KiAcquireGuardedMutex(IN OUT PKGUARDED_MUTEX GuardedMutex)
 
     /* We depend on these bits being just right */
     C_ASSERT((GM_LOCK_WAITER_WOKEN * 2) == GM_LOCK_WAITER_INC);
-    
+
     /* Increase the contention count */
     GuardedMutex->Contention++;
-    
+
     /* Start by unlocking the Guarded Mutex */
     BitsToRemove = GM_LOCK_BIT;
     BitsToAdd = GM_LOCK_WAITER_INC;
-    
+
     /* Start change loop */
     for (;;)
     {
@@ -142,10 +142,10 @@ KiAcquireGuardedMutex(IN OUT PKGUARDED_MUTEX GuardedMutex)
                (BitsToRemove == (GM_LOCK_BIT | GM_LOCK_WAITER_WOKEN)));
         ASSERT((BitsToAdd == GM_LOCK_WAITER_INC) ||
                (BitsToAdd == GM_LOCK_WAITER_WOKEN));
-        
+
         /* Get the Count Bits */
         OldValue = GuardedMutex->Count;
-        
+
         /* Start internal bit change loop */
         for (;;)
         {
@@ -155,7 +155,7 @@ KiAcquireGuardedMutex(IN OUT PKGUARDED_MUTEX GuardedMutex)
                 /* Sanity check */
                 ASSERT((BitsToRemove == GM_LOCK_BIT) ||
                        ((OldValue & GM_LOCK_WAITER_WOKEN) != 0));
-                
+
                 /* Unlock it by removing the Lock Bit */
                 NewValue = OldValue ^ BitsToRemove;
                 NewValue = InterlockedCompareExchange(&GuardedMutex->Count,
@@ -172,15 +172,15 @@ KiAcquireGuardedMutex(IN OUT PKGUARDED_MUTEX GuardedMutex)
                                                       OldValue);
                 if (NewValue == OldValue) break;
             }
-            
+
             /* Old value changed, loop again */
             OldValue = NewValue;
         }
-        
+
         /* Now we have to wait for it */
         KeWaitForGate(&GuardedMutex->Gate, WrGuardedMutex, KernelMode);
         ASSERT((GuardedMutex->Count & GM_LOCK_WAITER_WOKEN) != 0);
-        
+
         /* Ok, the wait is done, so set the new bits */
         BitsToRemove = GM_LOCK_BIT | GM_LOCK_WAITER_WOKEN;
         BitsToAdd = GM_LOCK_WAITER_WOKEN;
@@ -267,6 +267,14 @@ Quickie:
 
 /* PUBLIC FUNCTIONS **********************************************************/
 
+BOOLEAN
+NTAPI
+KeIsWaitListEmpty(IN PVOID Object)
+{
+    UNIMPLEMENTED;
+    return FALSE;
+}
+
 /*
  * @implemented
  */
@@ -285,6 +293,11 @@ KeDelayExecutionThread(IN KPROCESSOR_MODE WaitMode,
     LARGE_INTEGER DueTime, NewDueTime, InterruptTime;
     ULONG Hand = 0;
 
+    if (Thread->WaitNext)
+        ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL);
+    else
+        ASSERT(KeGetCurrentIrql() <= APC_LEVEL);
+
     /* If this is a user-mode wait of 0 seconds, yield execution */
     if (!(Interval->QuadPart) && (WaitMode != KernelMode))
     {
@@ -292,7 +305,7 @@ KeDelayExecutionThread(IN KPROCESSOR_MODE WaitMode,
         if (!(Alertable) && !(Thread->ApcState.UserApcPending))
         {
             /* Yield execution */
-            NtYieldExecution();
+            return NtYieldExecution();
         }
     }
 
@@ -417,6 +430,13 @@ KeWaitForSingleObject(IN PVOID Object,
     PLARGE_INTEGER OriginalDueTime = Timeout;
     ULONG Hand = 0;
 
+    if (Thread->WaitNext)
+        ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL);
+    else
+        ASSERT(KeGetCurrentIrql() < DISPATCH_LEVEL ||
+               (KeGetCurrentIrql() == DISPATCH_LEVEL &&
+                Timeout && Timeout->QuadPart == 0));
+
     /* Check if the lock is already held */
     if (!Thread->WaitNext) goto WaitStart;
 
@@ -583,6 +603,18 @@ KeWaitForMultipleObjects(IN ULONG Count,
     LARGE_INTEGER DueTime = {{0}}, NewDueTime, InterruptTime;
     ULONG Index, Hand = 0;
 
+    if (Thread->WaitNext)
+        ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL);
+    else if (KeGetCurrentIrql() == DISPATCH_LEVEL &&
+             (!Timeout || Timeout->QuadPart != 0))
+    {
+        /* HACK: tcpip is broken and waits with spinlocks acquired (CORE-6473) */
+        DPRINT("%s called at DISPATCH_LEVEL with non-zero timeout!\n",
+               __FUNCTION__);
+    }
+    else
+        ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL);
+
     /* Make sure the Wait Count is valid */
     if (!WaitBlockArray)
     {