Dan Kegel : include: ntddcdvd.h structure naming, packing fixes.

[Alexandre Julliard]

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

Author: Dan Kegel <dank(a)kegel.com>
Date:   Mon Jan 23 09:13:13 2012 -0800

include: ntddcdvd.h structure naming, packing fixes.

---

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

diff --git a/include/ddk/ntddcdvd.h b/include/ddk/ntddcdvd.h
index 53e164f..5313496 100644
--- a/include/ddk/ntddcdvd.h
+++ b/include/ddk/ntddcdvd.h
@@ -49,6 +49,8 @@ typedef enum {
 
 typedef ULONG DVD_SESSION_ID, *PDVD_SESSION_ID;
 
+#include <pshpack1.h>
+
 typedef struct _DVD_COPY_PROTECT_KEY {
     ULONG KeyLength;
     DVD_SESSION_ID SessionId;
@@ -97,7 +99,7 @@ typedef enum _DVD_STRUCTURE_FORMAT
 	DvdMaxDescriptor
 } DVD_STRUCTURE_FORMAT, *PDVD_STRUCTURE_FORMAT;
 
-typedef struct _DVD_READ_STRUCTURE {
+typedef struct DVD_READ_STRUCTURE {
         /* Contains an offset to the logical block address of the descriptor to be retrieved. */
         LARGE_INTEGER BlockByteOffset;
 
@@ -151,8 +153,6 @@ typedef struct _DVD_LAYER_DESCRIPTOR
 
     /* 0 indicates no BCA data */
     UCHAR BCAFlag : 1;
-
-    UCHAR Reserved6;
 }DVD_LAYER_DESCRIPTOR, * PDVD_LAYER_DESCRIPTOR;
 
 typedef struct _DVD_COPYRIGHT_DESCRIPTOR
@@ -186,4 +186,6 @@ typedef struct _DVD_MANUFACTURER_DESCRIPTOR
 #define DVD_DISCKEY_SIZE 2048
 #define DVD_SECTOR_PROTECTED            0x00000020
 
+#include <poppack.h>
+
 #endif /* __NTDDCDVD_H */