include/ddk: Add DVD_DESCRIPTOR_HEADER descriptor structure (try 3)

Alexandre Goujon ale.goujon at gmail.com
Wed Jun 20 13:13:21 CDT 2012


>From my last attempt, I simply deleted the zero-sized array member.
It replaces patch #87254 but if needed, I can resend the whole set of patches.
---
 include/ddk/ntddcdvd.h |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/include/ddk/ntddcdvd.h b/include/ddk/ntddcdvd.h
index 5313496..f6ce77b 100644
--- a/include/ddk/ntddcdvd.h
+++ b/include/ddk/ntddcdvd.h
@@ -113,7 +113,13 @@ typedef struct DVD_READ_STRUCTURE {
 
         /* From 0 to 4 */
         UCHAR LayerNumber;
-}DVD_READ_STRUCTURE, * PDVD_READ_STRUCTURE;
+} DVD_READ_STRUCTURE, *PDVD_READ_STRUCTURE;
+
+typedef struct _DVD_DESCRIPTOR_HEADER {
+    USHORT Length;
+    UCHAR Reserved[2];
+} DVD_DESCRIPTOR_HEADER, *PDVD_DESCRIPTOR_HEADER;
+C_ASSERT(sizeof(DVD_DESCRIPTOR_HEADER) == 4);
 
 typedef struct _DVD_LAYER_DESCRIPTOR
 {
@@ -154,6 +160,7 @@ typedef struct _DVD_LAYER_DESCRIPTOR
     /* 0 indicates no BCA data */
     UCHAR BCAFlag : 1;
 }DVD_LAYER_DESCRIPTOR, * PDVD_LAYER_DESCRIPTOR;
+C_ASSERT(sizeof(DVD_LAYER_DESCRIPTOR) == 17);
 
 typedef struct _DVD_COPYRIGHT_DESCRIPTOR
 {
-- 
1.7.9.5




More information about the wine-patches mailing list