diff options
Diffstat (limited to 'winsup/w32api/include/ddk/ntddcdvd.h')
| -rw-r--r-- | winsup/w32api/include/ddk/ntddcdvd.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/winsup/w32api/include/ddk/ntddcdvd.h b/winsup/w32api/include/ddk/ntddcdvd.h index 48a106bad..82c2a60ff 100644 --- a/winsup/w32api/include/ddk/ntddcdvd.h +++ b/winsup/w32api/include/ddk/ntddcdvd.h @@ -31,12 +31,9 @@ extern "C" { #endif -#pragma pack(push,4) - #include "ntddk.h" #include "ntddstor.h" - #define IOCTL_DVD_BASE FILE_DEVICE_DVD #define IOCTL_DVD_END_SESSION \ @@ -77,12 +74,14 @@ typedef enum DVD_STRUCTURE_FORMAT { DvdMaxDescriptor } DVD_STRUCTURE_FORMAT, *PDVD_STRUCTURE_FORMAT; +#include <pshpack1.h> typedef struct DVD_READ_STRUCTURE { LARGE_INTEGER BlockByteOffset; DVD_STRUCTURE_FORMAT Format; DVD_SESSION_ID SessionId; UCHAR LayerNumber; } DVD_READ_STRUCTURE, *PDVD_READ_STRUCTURE; +#include <poppack.h> typedef struct _DVD_DESCRIPTOR_HEADER { USHORT Length; @@ -90,6 +89,7 @@ typedef struct _DVD_DESCRIPTOR_HEADER { UCHAR Data[0]; } DVD_DESCRIPTOR_HEADER, *PDVD_DESCRIPTOR_HEADER; +#include <pshpack1.h> typedef struct _DVD_LAYER_DESCRIPTOR { UCHAR BookVersion : 4; UCHAR BookType : 4; @@ -108,6 +108,7 @@ typedef struct _DVD_LAYER_DESCRIPTOR { UCHAR BCAFlag : 1; UCHAR Reserved6; } DVD_LAYER_DESCRIPTOR, *PDVD_LAYER_DESCRIPTOR; +#include <poppack.h> typedef struct _DVD_COPYRIGHT_DESCRIPTOR { UCHAR CopyrightProtectionType; @@ -205,8 +206,6 @@ typedef struct _DVD_REGION { UCHAR ResetCount; } DVD_REGION, *PDVD_REGION; -#pragma pack(pop) - #ifdef __cplusplus } #endif |