[ros-diffs] 05/10: [XDK] Stop randomly packing structures half throughout ntifs.h / wdm.h Nothing in there should be packed!

[Timo Kreuzer]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=03c86af7d55d4e249e493d...

commit 03c86af7d55d4e249e493d61f4b110859085e400
Author:     Timo Kreuzer [e-mail]
AuthorDate: Sun Feb 11 21:48:36 2018 +0100
Commit:     Timo Kreuzer [e-mail]
CommitDate: Sun Jul 1 14:45:21 2018 +0200

[XDK] Stop randomly packing structures half throughout ntifs.h / wdm.h
    Nothing in there should be packed!
---
 sdk/include/xdk/iotypes.h        | 10 ++--------
 sdk/include/xdk/ntifs.template.h |  4 ----
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/sdk/include/xdk/iotypes.h b/sdk/include/xdk/iotypes.h
index 7f074f5199..d9032b7255 100644
--- a/sdk/include/xdk/iotypes.h
+++ b/sdk/include/xdk/iotypes.h
@@ -2741,9 +2741,6 @@ typedef struct _ACPI_INTERFACE_STANDARD2 {
   PUNREGISTER_FOR_DEVICE_NOTIFICATIONS2 UnregisterForDeviceNotifications;
 } ACPI_INTERFACE_STANDARD2, *PACPI_INTERFACE_STANDARD2;

-#if !defined(_AMD64_) && !defined(_IA64_)
-#include <pshpack4.h>
-#endif
 typedef struct _IO_STACK_LOCATION {
   UCHAR MajorFunction;
   UCHAR MinorFunction;
@@ -2813,8 +2810,8 @@ typedef struct _IO_STACK_LOCATION {
     } SetVolume;
     struct {
       ULONG OutputBufferLength;
-      ULONG InputBufferLength;
-      ULONG FsControlCode;
+      ULONG POINTER_ALIGNMENT InputBufferLength;
+      ULONG POINTER_ALIGNMENT FsControlCode;
       PVOID Type3InputBuffer;
     } FileSystemControl;
     struct {
@@ -2927,9 +2924,6 @@ typedef struct _IO_STACK_LOCATION {
   PIO_COMPLETION_ROUTINE CompletionRoutine;
   PVOID Context;
 } IO_STACK_LOCATION, *PIO_STACK_LOCATION;
-#if !defined(_AMD64_) && !defined(_IA64_)
-#include <poppack.h>
-#endif

/* IO_STACK_LOCATION.Control */

diff --git a/sdk/include/xdk/ntifs.template.h b/sdk/include/xdk/ntifs.template.h
index 7ad62ca88d..c38bf08ddb 100644
--- a/sdk/include/xdk/ntifs.template.h
+++ b/sdk/include/xdk/ntifs.template.h
@@ -1282,8 +1282,6 @@ typedef struct _QUERY_PATH_RESPONSE {
 #define IOCTL_VOLSNAP_FLUSH_AND_HOLD_WRITES             CTL_CODE(VOLSNAPCONTROLTYPE, 0, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)

/* FIXME : These definitions below don't belong here (or anywhere in ddk really) */
-#pragma pack(push,4)
-
 #ifndef VER_PRODUCTBUILD
 #define VER_PRODUCTBUILD 10000
 #endif
@@ -1789,8 +1787,6 @@ RtlSetSaclSecurityDescriptor (

#endif

-#pragma pack(pop)
-
 #ifdef __cplusplus
 }
 #endif