Rafał Harabień : include/ddk: Fix memory layout of IRP and IO_STACK_LOCATION in wine64.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3acac5b2212c4d040ff2294e0a3e782a0af5e65a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3acac5b2212c4d040ff2294e0a...

Author: Rafał Harabień <rafalh1992(a)o2.pl>
Date:   Sun Nov 22 22:25:03 2015 +0100

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

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

---

 include/ddk/wdm.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
index 0c51527..fc296a6 100644
--- 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 */