ntdll: Fix compilation on systems that don't support nameless structs.

[Francois Gouget]

---
 dlls/ntdll/rtl.c |   44 +++++++++++++++++++++++++-------------------
 include/winnt.h  |    4 ++--
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c
index 34a05b7..4d5c41d 100644
--- a/dlls/ntdll/rtl.c
+++ b/dlls/ntdll/rtl.c
@@ -40,6 +40,12 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
 
+#ifdef NONAMELESSSTRUCT
+# define S(x)  (x).s
+#else
+# define S(x)  (x)
+#endif
+
 static RTL_CRITICAL_SECTION peb_lock;
 static RTL_CRITICAL_SECTION_DEBUG critsect_debug =
 {
@@ -944,7 +950,7 @@ WORD WINAPI RtlQueryDepthSList(PSLIST_HEADER ListHeader)
     FIXME("stub\n");
     return NULL;
 #else
-    return ListHeader->Depth;
+    return S(*ListHeader).Depth;
 #endif
 }
 
@@ -955,7 +961,7 @@ PSLIST_ENTRY WINAPI RtlFirstEntrySList(const SLIST_HEADER* ListHeader)
     FIXME("stub\n");
     return NULL;
 #else
-    return ListHeader->Next.Next;
+    return S(*ListHeader).Next.Next;
 #endif
 }
 
@@ -967,17 +973,17 @@ PSLIST_ENTRY WINAPI RtlInterlockedFlushSList(PSLIST_HEADER ListHeader)
     FIXME("stub\n");
     return NULL;
 #else
-    if (ListHeader->Depth == 0)
+    if (S(*ListHeader).Depth == 0)
         return NULL;
     newHeader.Alignment = 0;
     do
     {
         oldHeader = *ListHeader;
-        newHeader.Sequence = ListHeader->Sequence + 1;
+        S(newHeader).Sequence = S(*ListHeader).Sequence + 1;
     } while (interlocked_cmpxchg64((__int64*)&ListHeader->Alignment,
                                    newHeader.Alignment,
                                    oldHeader.Alignment) != oldHeader.Alignment);
-    return oldHeader.Next.Next;
+    return S(oldHeader).Next.Next;
 #endif
 }
 
@@ -990,17 +996,17 @@ PSLIST_ENTRY WINAPI RtlInterlockedPushEntrySList(PSLIST_HEADER ListHeader,
     FIXME("stub\n");
     return NULL;
 #else
-    newHeader.Next.Next = ListEntry;
+    S(newHeader).Next.Next = ListEntry;
     do
     {
         oldHeader = *ListHeader;
-        ListEntry->Next = ListHeader->Next.Next;
-        newHeader.Depth = ListHeader->Depth + 1;
-        newHeader.Sequence = ListHeader->Sequence + 1;
+        ListEntry->Next = S(*ListHeader).Next.Next;
+        S(newHeader).Depth = S(*ListHeader).Depth + 1;
+        S(newHeader).Sequence = S(*ListHeader).Sequence + 1;
     } while (interlocked_cmpxchg64((__int64*)&ListHeader->Alignment,
                                    newHeader.Alignment,
                                    oldHeader.Alignment) != oldHeader.Alignment);
-    return oldHeader.Next.Next;
+    return S(oldHeader).Next.Next;
 #endif
 }
 
@@ -1016,15 +1022,15 @@ PSLIST_ENTRY WINAPI RtlInterlockedPopEntrySList(PSLIST_HEADER ListHeader)
     do
     {
         oldHeader = *ListHeader;
-        entry = ListHeader->Next.Next;
+        entry = S(*ListHeader).Next.Next;
         if (entry == NULL)
             return NULL;
         /* entry could be deleted by another thread */
         __TRY
         {
-            newHeader.Next.Next = entry->Next;
-            newHeader.Depth = ListHeader->Depth - 1;
-            newHeader.Sequence = ListHeader->Sequence + 1;
+            S(newHeader).Next.Next = entry->Next;
+            S(newHeader).Depth = S(*ListHeader).Depth - 1;
+            S(newHeader).Sequence = S(*ListHeader).Sequence + 1;
         }
         __EXCEPT_PAGE_FAULT
         {
@@ -1051,16 +1057,16 @@ PSLIST_ENTRY WINAPI RtlInterlockedPushListSList(PSLIST_HEADER ListHeader,
     FIXME("stub\n");
     return NULL;
 #else
-    newHeader.Next.Next = FirstEntry;
+    S(newHeader).Next.Next = FirstEntry;
     do
     {
         oldHeader = *ListHeader;
-        newHeader.Depth = ListHeader->Depth + Count;
-        newHeader.Sequence = ListHeader->Sequence + 1;
-        LastEntry->Next = ListHeader->Next.Next;
+        S(newHeader).Depth = S(*ListHeader).Depth + Count;
+        S(newHeader).Sequence = S(*ListHeader).Sequence + 1;
+        LastEntry->Next = S(*ListHeader).Next.Next;
     } while (interlocked_cmpxchg64((__int64*)&ListHeader->Alignment,
                                    newHeader.Alignment,
                                    oldHeader.Alignment) != oldHeader.Alignment);
-    return oldHeader.Next.Next;
+    return S(oldHeader).Next.Next;
 #endif
 }
diff --git a/include/winnt.h b/include/winnt.h
index 7536d8e..b86e851 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -609,7 +609,7 @@ typedef union DECLSPEC_ALIGN(16) _SLIST_HEADER {
     struct {
         ULONGLONG Alignment;
         ULONGLONG Region;
-    };
+    } DUMMYSTRUCTNAME;
     struct {
         ULONGLONG Depth:16;
         ULONGLONG Sequence:9;
@@ -642,7 +642,7 @@ typedef union _SLIST_HEADER {
         SLIST_ENTRY Next;
         WORD Depth;
         WORD Sequence;
-    };
+    } DUMMYSTRUCTNAME;
 } SLIST_HEADER, *PSLIST_HEADER;
 
 #endif
-- 
1.4.4.3