From 3acac5b2212c4d040ff2294e0a3e782a0af5e65a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Harabie=C5=84?= <rafalh1992@o2.pl>
Date: Sun, 22 Nov 2015 22:25:03 +0100
Subject: [PATCH] include/ddk: Fix memory layout of IRP and IO_STACK_LOCATION
 in wine64.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rafał Harabień <rafalh1992@o2.pl>
Signed-off-by: Alexandre Julliard <julliard@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 0c5152729eb..fc296a615bb 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 */