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

[reactos.git] / ntoskrnl / ex / pushlock.c

diff --git a/ntoskrnl/ex/pushlock.c b/ntoskrnl/ex/pushlock.c
index e62b774..9ac77a1 100644 (file)
--- a/ntoskrnl/ex/pushlock.c
+++ b/ntoskrnl/ex/pushlock.c
@@ -245,11 +245,11 @@ ExpOptimizePushLockList(PEX_PUSH_LOCK PushLock,
             ExfWakePushLock(PushLock, OldValue);
             break;
         }
-        
+
         /* Get the wait block */
         WaitBlock = (PEX_PUSH_LOCK_WAIT_BLOCK)(OldValue.Value &
                                                ~EX_PUSH_LOCK_PTR_BITS);
-        
+
         /* Loop the blocks */
         FirstWaitBlock = WaitBlock;
         while (TRUE)
@@ -262,32 +262,32 @@ ExpOptimizePushLockList(PEX_PUSH_LOCK PushLock,
                 FirstWaitBlock->Last = LastWaitBlock;
                 break;
             }
-            
+
             /* Save the block */
             PreviousWaitBlock = WaitBlock;
-            
+
             /* Get the next block */
             WaitBlock = WaitBlock->Next;
-            
+
             /* Save the previous */
             WaitBlock->Previous = PreviousWaitBlock;
         }
-        
+
         /* Remove the wake bit */
         NewValue.Value = OldValue.Value &~ EX_PUSH_LOCK_WAKING;
-        
+
         /* Sanity checks */
         ASSERT(NewValue.Locked);
         ASSERT(!NewValue.Waking);
-        
+
         /* Update the value */
         NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr,
                                                          NewValue.Ptr,
                                                          OldValue.Ptr);
-        
+
         /* If we updated correctly, leave */
         if (NewValue.Value == OldValue.Value) break;
-        
+
         /* Update value */
         OldValue = NewValue;
     }
@@ -472,7 +472,8 @@ ExfAcquirePushLockExclusive(PEX_PUSH_LOCK PushLock)
 {
     EX_PUSH_LOCK OldValue = *PushLock, NewValue, TempValue;
     BOOLEAN NeedWake;
-    DEFINE_WAIT_BLOCK(WaitBlock);
+    EX_PUSH_LOCK_WAIT_BLOCK Block;
+    PEX_PUSH_LOCK_WAIT_BLOCK WaitBlock = &Block;
 
     /* Start main loop */
     for (;;)
@@ -523,7 +524,7 @@ ExfAcquirePushLockExclusive(PEX_PUSH_LOCK PushLock)
                                   EX_PUSH_LOCK_LOCK |
                                   EX_PUSH_LOCK_WAKING |
                                   EX_PUSH_LOCK_WAITING |
-                                  PtrToUlong(WaitBlock);
+                                  (ULONG_PTR)WaitBlock;
 
                 /* Check if the pushlock was already waking */
                 if (!OldValue.Waking) NeedWake = TRUE;
@@ -543,7 +544,7 @@ ExfAcquirePushLockExclusive(PEX_PUSH_LOCK PushLock)
                     NewValue.Value = EX_PUSH_LOCK_MULTIPLE_SHARED |
                                      EX_PUSH_LOCK_LOCK |
                                      EX_PUSH_LOCK_WAITING |
-                                     PtrToUlong(WaitBlock);
+                                     (ULONG_PTR)WaitBlock;
                 }
                 else
                 {
@@ -553,7 +554,7 @@ ExfAcquirePushLockExclusive(PEX_PUSH_LOCK PushLock)
                     /* Point to our wait block */
                     NewValue.Value = EX_PUSH_LOCK_LOCK |
                                      EX_PUSH_LOCK_WAITING |
-                                     PtrToUlong(WaitBlock);
+                                     (ULONG_PTR)WaitBlock;
                 }
             }
 
@@ -645,7 +646,8 @@ ExfAcquirePushLockShared(PEX_PUSH_LOCK PushLock)
 {
     EX_PUSH_LOCK OldValue = *PushLock, NewValue;
     BOOLEAN NeedWake;
-    DEFINE_WAIT_BLOCK(WaitBlock);
+    EX_PUSH_LOCK_WAIT_BLOCK Block;
+    PEX_PUSH_LOCK_WAIT_BLOCK WaitBlock = &Block;
 
     /* Start main loop */
     for (;;)
@@ -706,7 +708,7 @@ ExfAcquirePushLockShared(PEX_PUSH_LOCK PushLock)
                                                     EX_PUSH_LOCK_LOCK)) |
                                   EX_PUSH_LOCK_WAKING |
                                   EX_PUSH_LOCK_WAITING |
-                                  PtrToUlong(WaitBlock);
+                                  (ULONG_PTR)WaitBlock;
 
                 /* Check if the pushlock was already waking */
                 if (!OldValue.Waking) NeedWake = TRUE;
@@ -719,7 +721,7 @@ ExfAcquirePushLockShared(PEX_PUSH_LOCK PushLock)
                 /* Point to our wait block */
                 NewValue.Value = (OldValue.Value & EX_PUSH_LOCK_PTR_BITS) |
                                   EX_PUSH_LOCK_WAITING |
-                                  PtrToUlong(WaitBlock);
+                                  (ULONG_PTR)WaitBlock;
             }
 
             /* Sanity check */
@@ -812,7 +814,7 @@ ExfReleasePushLock(PEX_PUSH_LOCK PushLock)
 
     /* Sanity check */
     ASSERT(OldValue.Locked);
-    
+
     /* Start main loop */
     while (TRUE)
     {
@@ -849,13 +851,13 @@ ExfReleasePushLock(PEX_PUSH_LOCK PushLock)
                 /* Get the wait block */
                 WaitBlock = (PEX_PUSH_LOCK_WAIT_BLOCK)(OldValue.Value &
                                                        ~EX_PUSH_LOCK_PTR_BITS);
-                
+
                 /* Loop until we find the last wait block */
                 while (TRUE)
                 {
                     /* Get the last wait block */
                     LastWaitBlock = WaitBlock->Last;
-                    
+
                     /* Did it exist? */
                     if (LastWaitBlock)
                     {
@@ -863,22 +865,22 @@ ExfReleasePushLock(PEX_PUSH_LOCK PushLock)
                         WaitBlock = LastWaitBlock;
                         break;
                     }
-                    
+
                     /* Keep searching */
                     WaitBlock = WaitBlock->Next;
                 }
-                
+
                 /* Make sure the Share Count is above 0 */
                 if (WaitBlock->ShareCount > 0)
                 {
                     /* This shouldn't be an exclusive wait block */
                     ASSERT(WaitBlock->Flags & EX_PUSH_LOCK_FLAGS_EXCLUSIVE);
-                    
+
                     /* Do the decrease and check if the lock isn't shared anymore */
                     if (InterlockedDecrement(&WaitBlock->ShareCount) > 0) return;
                 }
             }
-            
+
             /*
              * If nobody was waiting on the block, then we possibly reduced the number
              * of times the pushlock was shared, and we unlocked it.
@@ -895,10 +897,10 @@ ExfReleasePushLock(PEX_PUSH_LOCK PushLock)
                     NewValue.Value = OldValue.Value;
                     NewValue.MultipleShared = FALSE;
                     NewValue.Locked = FALSE;
-                    
+
                     /* Sanity check */
                     ASSERT(NewValue.Waking && !NewValue.Locked && !NewValue.MultipleShared);
-                    
+
                     /* Write the new value */
                     NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr,
                                                                      NewValue.Ptr,
@@ -911,20 +913,20 @@ ExfReleasePushLock(PEX_PUSH_LOCK PushLock)
                     NewValue.Value = OldValue.Value;
                     NewValue.MultipleShared = FALSE;
                     NewValue.Locked = FALSE;
-                    
+
                     /* It's not already waking, so add the wake bit */
                     NewValue.Waking = TRUE;
-                    
+
                     /* Sanity check */
                     ASSERT(NewValue.Waking && !NewValue.Locked && !NewValue.MultipleShared);
-                    
+
                     /* Write the new value */
                     WakeValue = NewValue;
                     NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr,
                                                                      NewValue.Ptr,
                                                                      OldValue.Ptr);
                     if (NewValue.Value != OldValue.Value) continue;
-                    
+
                     /* The write was successful. The pushlock is Unlocked and Waking */
                     ExfWakePushLock(PushLock, WakeValue);
                     return;
@@ -988,13 +990,13 @@ ExfReleasePushLockShared(PEX_PUSH_LOCK PushLock)
         /* Get the wait block */
         WaitBlock = (PEX_PUSH_LOCK_WAIT_BLOCK)(OldValue.Value &
                                                ~EX_PUSH_LOCK_PTR_BITS);
-        
+
         /* Loop until we find the last wait block */
         while (TRUE)
         {
             /* Get the last wait block */
             LastWaitBlock = WaitBlock->Last;
-            
+
             /* Did it exist? */
             if (LastWaitBlock)
             {
@@ -1002,7 +1004,7 @@ ExfReleasePushLockShared(PEX_PUSH_LOCK PushLock)
                 WaitBlock = LastWaitBlock;
                 break;
             }
-            
+
             /* Keep searching */
             WaitBlock = WaitBlock->Next;
         }
@@ -1128,7 +1130,7 @@ ExfReleasePushLockExclusive(PEX_PUSH_LOCK PushLock)
             NewValue.Value = OldValue.Value &~ EX_PUSH_LOCK_LOCK;
 
             /* Sanity check */
-            ASSERT(NewValue.Waking && !NewValue.Waiting);
+            ASSERT(NewValue.Waking || !NewValue.Waiting);
 
             /* Write the New Value */
             NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr,
@@ -1169,11 +1171,11 @@ ExfTryToWakePushLock(PEX_PUSH_LOCK PushLock)
      * and locked, don't do anything
      */
     if ((OldValue.Waking) || (OldValue.Locked) || !(OldValue.Waiting)) return;
-    
+
     /* Make it Waking */
     NewValue = OldValue;
     NewValue.Waking = TRUE;
-    
+
     /* Write the New Value */
     if (InterlockedCompareExchangePointer(&PushLock->Ptr,
                                           NewValue.Ptr,