Sync with trunk (r48545)

[reactos.git] / include / xdk / iofuncs.h

diff --git a/include/xdk/iofuncs.h b/include/xdk/iofuncs.h
index 526dab3..5116cd6 100644 (file)
--- a/include/xdk/iofuncs.h
+++ b/include/xdk/iofuncs.h
@@ -562,8 +562,8 @@ $if (_NTDDK_)
  */
 #define IoDeassignArcName IoDeleteSymbolicLink
 
-VOID
 FORCEINLINE
+VOID
 NTAPI
 IoInitializeDriverCreateContext(
   PIO_DRIVER_CREATE_CONTEXT DriverContext)
@@ -2308,8 +2308,8 @@ IoIsFileObjectIgnoringSharing(
 $endif (_NTDDK_)
 $if (_NTIFS_)
 
-VOID
 FORCEINLINE
+VOID
 NTAPI
 IoInitializePriorityInfo(
   IN PIO_PRIORITY_INFO PriorityInfo)
@@ -2435,7 +2435,11 @@ IoSkipCurrentIrpStackLocation(
 {
   ASSERT(Irp->CurrentLocation <= Irp->StackCount);
   Irp->CurrentLocation++;
+#ifdef NONAMELESSUNION
+  Irp->Tail.Overlay.s.u.CurrentStackLocation++;
+#else
   Irp->Tail.Overlay.CurrentStackLocation++;
+#endif
 }
 
 FORCEINLINE
@@ -2445,7 +2449,11 @@ IoSetNextIrpStackLocation(
 {
   ASSERT(Irp->CurrentLocation > 0);
   Irp->CurrentLocation--;
+#ifdef NONAMELESSUNION
+  Irp->Tail.Overlay.s.u.CurrentStackLocation--;
+#else
   Irp->Tail.Overlay.CurrentStackLocation--;
+#endif
 }
 
 FORCEINLINE
@@ -2454,7 +2462,11 @@ IoGetNextIrpStackLocation(
   IN PIRP Irp)
 {
   ASSERT(Irp->CurrentLocation > 0);
+#ifdef NONAMELESSUNION
+  return ((Irp)->Tail.Overlay.s.u.CurrentStackLocation - 1 );
+#else
   return ((Irp)->Tail.Overlay.CurrentStackLocation - 1 );
+#endif
 }
 
 FORCEINLINE
@@ -2545,7 +2557,11 @@ IoGetCurrentIrpStackLocation(
   IN PIRP Irp)
 {
   ASSERT(Irp->CurrentLocation <= Irp->StackCount + 1);
+#ifdef NONAMELESSUNION
+  return Irp->Tail.Overlay.s.u.CurrentStackLocation;
+#else
   return Irp->Tail.Overlay.CurrentStackLocation;
+#endif
 }
 
 FORCEINLINE
@@ -2582,8 +2598,8 @@ IoMarkIrpPending(
   IoInitializeRemoveLockEx(Lock, AllocateTag, MaxLockedMinutes, \
     HighWatermark, sizeof(IO_REMOVE_LOCK))
 
-VOID
 FORCEINLINE
+VOID
 IoInitializeDpcRequest(
   IN PDEVICE_OBJECT DeviceObject,
   IN PIO_DPC_ROUTINE DpcRoutine)
@@ -2636,8 +2652,8 @@ IoGetRemainingStackSize(VOID)
 }
 
 #if (NTDDI_VERSION >= NTDDI_WS03)
-VOID
 FORCEINLINE
+VOID
 IoInitializeThreadedDpcRequest(
   IN PDEVICE_OBJECT DeviceObject,
   IN PIO_DPC_ROUTINE DpcRoutine)