include/ddk: Fix memory layout of IRP and IO_STACK_LOCATION in wine64.

Signed-off-by: Rafał Harabień <rafalh1992@o2.pl> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

include/ddk: Fix memory layout of IRP and IO_STACK_LOCATION in wine64.
3acac5b2 · Rafał Harabień · Alexandre Julliard · 46e94c8d · 3acac5b2
Commit 3acac5b2 authored Nov 22, 2015 by Rafał Harabień Committed by Alexandre Julliard Nov 23, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

wdm.h include/ddk/wdm.h +5 -3

No files found.
--- a/include/ddk/wdm.h
+++ b/include/ddk/wdm.h
@@ -400,7 +400,6 @@ typedef struct _KAPC {
  BOOLEAN  Inserted;
 } KAPC, *PKAPC, *RESTRICTED_POINTER PRKAPC;

-#include <pshpack1.h>
 typedef struct _IRP {
  CSHORT  Type;
  USHORT  Size;
@@ -456,7 +455,6 @@ typedef struct _IRP {
  } Tail;
 } IRP;
 typedef struct _IRP *PIRP;
-#include <poppack.h>

 typedef VOID (WINAPI *PINTERFACE_REFERENCE)(
  PVOID  Context);
@@ -833,7 +831,9 @@ typedef NTSTATUS (WINAPI *PIO_COMPLETION_ROUTINE)(
 #define SL_INVOKE_ON_SUCCESS            0x40
 #define SL_INVOKE_ON_ERROR              0x80

-#include <pshpack1.h>
+#if !defined(_WIN64)
+#include <pshpack4.h>
+#endif
 typedef struct _IO_STACK_LOCATION {
  UCHAR  MajorFunction;
  UCHAR  MinorFunction;
@@ -974,7 +974,9 @@ typedef struct _IO_STACK_LOCATION {
  PIO_COMPLETION_ROUTINE  CompletionRoutine;
  PVOID  Context;
 } IO_STACK_LOCATION, *PIO_STACK_LOCATION;
+#if !defined(_WIN64)
 #include <poppack.h>
+#endif

 /* MDL definitions */