Fix kernel-mode executive atom implementation (mostly add SEH and tidy up the code...

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

diff --git a/reactos/ntoskrnl/ex/list.c b/reactos/ntoskrnl/ex/list.c
index ddb57fc..fd2e678 100644 (file)
--- a/reactos/ntoskrnl/ex/list.c
+++ b/reactos/ntoskrnl/ex/list.c
@@ -446,10 +446,10 @@ InterlockedPopEntrySList(IN PSLIST_HEADER ListHead)
 {
   SLIST_HEADER newslh, oldslh;
   PSLIST_ENTRY le;
-  
+
   do
   {
-    oldslh = *ListHead;
+    oldslh = *(volatile SLIST_HEADER *)ListHead;
     le = oldslh.Next.Next;
     if(le == NULL)
     {
@@ -459,9 +459,9 @@ InterlockedPopEntrySList(IN PSLIST_HEADER ListHead)
     newslh.Sequence = oldslh.Sequence + 1;
     newslh.Depth = oldslh.Depth - 1;
     newslh.Next.Next = MmSafeReadPtr(&le->Next);
-  } while(ExfInterlockedCompareExchange64(&ListHead->Alignment,
-                                          &newslh.Alignment,
-                                          &oldslh.Alignment) != oldslh.Alignment);
+  } while(ExfInterlockedCompareExchange64((PLONGLONG)&ListHead->Alignment,
+                                          (PLONGLONG)&newslh.Alignment,
+                                          (PLONGLONG)&oldslh.Alignment) != (LONGLONG)oldslh.Alignment);
 
   return le;
 }
@@ -476,18 +476,18 @@ InterlockedPushEntrySList(IN PSLIST_HEADER ListHead,
                           IN PSLIST_ENTRY ListEntry)
 {
   SLIST_HEADER newslh, oldslh;
-  
+
   newslh.Next.Next = ListEntry;
-  
+
   do
   {
-    oldslh = *ListHead;
+    oldslh = *(volatile SLIST_HEADER *)ListHead;
     newslh.Depth = oldslh.Depth + 1;
     newslh.Sequence = oldslh.Sequence + 1;
     ListEntry->Next = oldslh.Next.Next;
-  } while(ExfInterlockedCompareExchange64(&ListHead->Alignment,
-                                          &newslh.Alignment,
-                                          &oldslh.Alignment) != oldslh.Alignment);
+  } while(ExfInterlockedCompareExchange64((PLONGLONG)&ListHead->Alignment,
+                                          (PLONGLONG)&newslh.Alignment,
+                                          (PLONGLONG)&oldslh.Alignment) != (LONGLONG)oldslh.Alignment);
 
   return oldslh.Next.Next;
 }