Changeset 22018 for trunk/src

Timestamp:

Sep 20, 2012, 4:34:09 PM (13 years ago)

Author:

abwillis

Message:

Ticket #89 InitializeSListHead

Location:

trunk/src

Files:

• kernel32/interlock.asm (modified) (1 diff)
• kernel32/kernel32.def (modified) (3 diffs)
• kernel32/kernel32dbg.def (modified) (3 diffs)
• ntdll/ntdll.def (modified) (2 diffs)
• ntdll/rtl.c (modified) (2 diffs)

trunk/src/kernel32/interlock.asm

@@ -123 +123 @@
 _InterlockedExchangeAdd@8 endp
 
+                public _interlocked_cmpxchg64
+_interlocked_cmpxchg64 proc near
+         push ebx;
+         push esi;
+        mov esi, 12[esp];
+        mov ebx, 16[esp];
+        mov ecx, 20[esp];
+        mov eax, 24[esp];
+        mov edx, 28[esp];
+        lock cmpxchg8b [esi];
+        pop esi;
+        pop ebx;
+        ret;
+_interlocked_cmpxchg64 endp
+
 CODE32          ENDS
 

trunk/src/kernel32/kernel32.def

@@ -47 +47 @@
   _O32_RegSetValue              = REGISTRY.42
   _O32_RegSetValueEx            = REGISTRY.43
+
+  InitializeSListHead           = NTDLL.RtlInitializeSListHead
+  InterlockedFlushSList         = NTDLL.RtlInterlockedFlushSList
+  InterlockedPopEntrySList      = NTDLL.RtlInterlockedPopEntrySList
+  InterlockedPushEntrySList     = NTDLL.RtlInterlockedPushEntrySList
+  QueryDepthSList               = NTDLL.RtlQueryDepthSList
 
 EXPORTS
@@ -1326 +1332 @@
     GetUserDefaultUILanguage   = "_GetUserDefaultUILanguage@0"       @3165
 
+    InitializeSListHead                                                               @3166
+    InterlockedFlushSList                                                          @3167
+    InterlockedPopEntrySList                                                      @3168
+    InterlockedPushEntrySList                                                    @3169
+    QueryDepthSList                                                                @3170
+
 ; RAS functions
     RasRegisterObjectTracking   = "_RasRegisterObjectTracking@24"    @3500
@@ -1364 +1376 @@
     "_ForceWin32TIB@0"                                            @3601 NONAME
     ___seh_handler                                                @3602 NONAME
+
+    interlocked_cmpxchg64     = "_interlocked_cmpxchg64"    @3603

trunk/src/kernel32/kernel32dbg.def

@@ -47 +47 @@
   _O32_RegSetValue              = REGISTRY.42
   _O32_RegSetValueEx            = REGISTRY.43
+
+  InitializeSListHead           = NTDLL.RtlInitializeSListHead
+  InterlockedFlushSList         = NTDLL.RtlInterlockedFlushSList
+  InterlockedPopEntrySList      = NTDLL.RtlInterlockedPopEntrySList
+  InterlockedPushEntrySList     = NTDLL.RtlInterlockedPushEntrySList
+  QueryDepthSList               = NTDLL.RtlQueryDepthSList
+
 
 EXPORTS
@@ -1326 +1333 @@
     GetUserDefaultUILanguage   = "_GetUserDefaultUILanguage@0"       @3165
 
+    InitializeSListHead                                                               @3166
+    InterlockedFlushSList                                                          @3167
+    InterlockedPopEntrySList                                                      @3168
+    InterlockedPushEntrySList                                                    @3169
+    QueryDepthSList                                                                @3170
+
 ; RAS functions
     RasRegisterObjectTracking   = "_RasRegisterObjectTracking@24"    @3500
@@ -1364 +1377 @@
     "_ForceWin32TIB@0"                                            @3601 NONAME
     ___seh_handler                                                @3602 NONAME
+
+    interlocked_cmpxchg64     = "_interlocked_cmpxchg64"    @3603

trunk/src/ntdll/ntdll.def

@@ -13 +13 @@
     "_RtlEnterCriticalSection@4"           = KERNEL32.EnterCriticalSection
     "_RtlDeleteCriticalSection@4"          = KERNEL32.DeleteCriticalSection
+
+    "_interlocked_cmpxchg64"               = KERNEL32.interlocked_cmpxchg64
 
 EXPORTS
@@ -1105 +1107 @@
     VerSetConditionMask          = "_VerSetConditionMask@16"            @2011
     RtlGetNtVersionNumbers       = "_RtlGetNtVersionNumbers@12"         @2012
+
+    RtlFirstEntrySList               = "_RtlFirstEntrySList@4"                  @2013
+    RtlInitializeSListHead           = "_RtlInitializeSListHead@4"               @2014
+    RtlInterlockedFlushSList       = "_RtlInterlockedFlushSList@4"         @2015
+    RtlInterlockedPopEntrySList   = "_RtlInterlockedPopEntrySList@4"     @2016
+    RtlInterlockedPushEntrySList  = "_RtlInterlockedPushEntrySList@8"    @2017
+    RtlInterlockedPushListSList    = "_RtlInterlockedPushListSList@16"    @2018
+    RtlQueryDepthSList             = "_RtlQueryDepthSList@4"               @2019

trunk/src/ntdll/rtl.c

@@ -31 +31 @@
 #include "winreg.h"
 #include "heapstring.h"
+#include "win/winnt.h"
+#include "win/wine/exception.h"
 
 #include <misc.h>
@@ -698 +700 @@
   return ~crc;
 }
+
+/*************************************************************************
+ * RtlInitializeSListHead   [NTDLL.@]
+ */
+VOID WINAPI RtlInitializeSListHead(PSLIST_HEADER list)
+{
+    list->Alignment = 0;
+}
+
+/*************************************************************************
+ * RtlQueryDepthSList   [NTDLL.@]
+ */
+WORD WINAPI RtlQueryDepthSList(PSLIST_HEADER list)
+{
+    return list->Depth;
+}
+
+/*************************************************************************
+ * RtlFirstEntrySList   [NTDLL.@]
+ */
+PSLIST_ENTRY WINAPI RtlFirstEntrySList(const SLIST_HEADER* list)
+{
+    return list->Next.Next;
+}
+
+/*************************************************************************
+ * RtlInterlockedFlushSList   [NTDLL.@]
+ */
+PSLIST_ENTRY WINAPI RtlInterlockedFlushSList(PSLIST_HEADER list)
+{
+    SLIST_HEADER old, new;
+
+    if (!list->Depth) return NULL;
+    new.Alignment = 0;
+    do
+    {
+        old = *list;
+        new.Sequence = old.Sequence + 1;
+    } while (interlocked_cmpxchg64((__int64 *)&list->Alignment, new.Alignment,
+                                   old.Alignment) != old.Alignment);
+    return old.Next.Next;
+}
+
+/*************************************************************************
+ * RtlInterlockedPushEntrySList   [NTDLL.@]
+ */
+PSLIST_ENTRY WINAPI RtlInterlockedPushEntrySList(PSLIST_HEADER list, PSLIST_ENTRY entry)
+{
+    SLIST_HEADER old, new;
+
+    new.Next.Next = entry;
+    do
+    {
+        old = *list;
+        entry->Next = old.Next.Next;
+        new.Depth = old.Depth + 1;
+        new.Sequence = old.Sequence + 1;
+    } while (interlocked_cmpxchg64((__int64 *)&list->Alignment, new.Alignment,
+                                   old.Alignment) != old.Alignment);
+    return old.Next.Next;
+}
+
+/*************************************************************************
+ * RtlInterlockedPopEntrySList   [NTDLL.@]
+ */
+PSLIST_ENTRY WINAPI RtlInterlockedPopEntrySList(PSLIST_HEADER list)
+{
+    SLIST_HEADER old, new;
+    PSLIST_ENTRY entry;
+
+    do
+    {
+        old = *list;
+        if (!(entry = old.Next.Next)) return NULL;
+        /* entry could be deleted by another thread */
+        __TRY
+        {
+            new.Next.Next = entry->Next;
+            new.Depth = old.Depth - 1;
+            new.Sequence = old.Sequence + 1;
+        }
+        __EXCEPT_PAGE_FAULT
+        {
+        }
+        __ENDTRY
+    } while (interlocked_cmpxchg64((__int64 *)&list->Alignment, new.Alignment,
+                                   old.Alignment) != old.Alignment);
+    return entry;
+}
+
+/*************************************************************************
+ * RtlInterlockedPushListSList   [NTDLL.@]
+ */
+PSLIST_ENTRY WINAPI RtlInterlockedPushListSList(PSLIST_HEADER list, PSLIST_ENTRY first,
+                                                PSLIST_ENTRY last, ULONG count)
+{
+    SLIST_HEADER old, new;
+
+    new.Next.Next = first;
+    do
+    {
+        old = *list;
+        new.Depth = old.Depth + count;
+        new.Sequence = old.Sequence + 1;
+        last->Next = old.Next.Next;
+    } while (interlocked_cmpxchg64((__int64 *)&list->Alignment, new.Alignment,
+                                   old.Alignment) != old.Alignment);
+    return old.Next.Next;
+}