Changeset 92904 in vbox for trunk/src/VBox/Runtime/r3/win/vcc-fakes-kernel32.cpp

Timestamp:

Dec 14, 2021 10:11:51 PM (3 years ago)

Author:

vboxsync

Message:

IPRT/vcc-fakes-kernel32.cpp: Adjustments for W10 SDK. bugref:10116

File:

• trunk/src/VBox/Runtime/r3/win/vcc-fakes-kernel32.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/r3/win/vcc-fakes-kernel32.cpp

@@ -60 +60 @@
 #define DECL_KERNEL32(a_Type) extern "C" a_Type WINAPI
 
+#if defined(WDK_NTDDI_VERSION) && defined(NTDDI_WIN10)
+# if WDK_NTDDI_VERSION >= NTDDI_WIN10 /* In Windows 10 SDK the 'Sequence' field has been renamed to 'CpuId'. */
+#  define SLIST_HEADER_SEQUENCE_NOW_CALLED_CPUID
+# endif
+#endif
+
 
 
@@ -249 +255 @@
             SLIST_HEADER NewHead;
             NewHead.Alignment = 0;
+#ifdef SLIST_HEADER_SEQUENCE_NOW_CALLED_CPUID
+            NewHead.CpuId  = OldHead.CpuId + 1;
+#else
             NewHead.Sequence  = OldHead.Sequence + 1;
+#endif
             if (ASMAtomicCmpXchgU64(&pHead->Alignment, NewHead.Alignment, OldHead.Alignment))
             {
@@ -279 +289 @@
             }
             NewHead.Depth     = OldHead.Depth - 1;
+#ifdef SLIST_HEADER_SEQUENCE_NOW_CALLED_CPUID
+            NewHead.CpuId  = OldHead.CpuId + 1;
+#else
             NewHead.Sequence  = OldHead.Sequence + 1;
+#endif
             if (ASMAtomicCmpXchgU64(&pHead->Alignment, NewHead.Alignment, OldHead.Alignment))
                 break;
@@ -300 +314 @@
         NewHead.Next.Next = pEntry;
         NewHead.Depth     = OldHead.Depth + 1;
+#ifdef SLIST_HEADER_SEQUENCE_NOW_CALLED_CPUID
+        NewHead.CpuId  = OldHead.CpuId + 1;
+#else
         NewHead.Sequence  = OldHead.Sequence + 1;
+#endif
         if (ASMAtomicCmpXchgU64(&pHead->Alignment, NewHead.Alignment, OldHead.Alignment))
             break;