adding dvdevcod.h and fix a compiling issue with new dxdiag.dll on my hd

svn path=/trunk/; revision=19860

diff --git a/reactos/w32api/include/amvideo.h b/reactos/w32api/include/amvideo.h
index b8f1ccf..525f079 100644 (file)
--- a/reactos/w32api/include/amvideo.h
+++ b/reactos/w32api/include/amvideo.h
@@ -106,8 +106,8 @@ typedef struct tagAnalogVideoInfo
 #define DIBSIZE(BI)       ((BI).biHeight < 0 ? (-1)*(_DIBSIZE(BI)) : _DIBSIZE(BI))\r
 \r
 #define BIT_MASKS_MATCH(PBMIH1,PBMIH2)                                \\r
-        ((PBMIH2)->dwBitMasks[iGREEN] == (PBMIH1)->dwBitMasks[iGREEN]) &&    \\r
-        (((PBMIH2)->dwBitMasks[iRED] == (PBMIH1)->dwBitMasks[iRED]) &&        \     \r
+        ((PBMIH2)->dwBitMasks[iGREEN] == (PBMIH1)->dwBitMasks[iGREEN]) && \\r
+        (((PBMIH2)->dwBitMasks[iRED] == (PBMIH1)->dwBitMasks[iRED]) &&        \\r
         ((PBMIH2)->dwBitMasks[iBLUE] == (PBMIH1)->dwBitMasks[iBLUE]))\r
 \r
 #define    RESET_MASKS(PBMIH)            (ZeroMemory((PVOID)(PBMIH)->dwBitFields,SIZE_MASKS))\r
@@ -257,3 +257,4 @@ typedef struct _AM_FRAMESTEP_STEP
 }\r
 #endif\r
 #endif \r
+\r

diff --git a/reactos/w32api/include/dvdevcod.h b/reactos/w32api/include/dvdevcod.h
new file mode 100644 (file)
index 0000000..5eb4199
--- /dev/null
+++ b/reactos/w32api/include/dvdevcod.h
@@ -0,0 +1,60 @@
+\r
+#ifndef __DVDEVCOD__\r
+#define __DVDEVCOD__\r
+\r
+#define EC_DVDBASE                        0x0100\r
+#define EC_DVD_DOMAIN_CHANGE              (EC_DVDBASE + 0x01)\r
+#define EC_DVD_TITLE_CHANGE               (EC_DVDBASE + 0x02)\r
+#define EC_DVD_CHAPTER_START              (EC_DVDBASE + 0x03)\r
+#define EC_DVD_AUDIO_STREAM_CHANGE        (EC_DVDBASE + 0x04)\r
+#define EC_DVD_SUBPICTURE_STREAM_CHANGE   (EC_DVDBASE + 0x05)\r
+#define EC_DVD_ANGLE_CHANGE               (EC_DVDBASE + 0x06)\r
+#define EC_DVD_BUTTON_CHANGE              (EC_DVDBASE + 0x07)\r
+#define EC_DVD_VALID_UOPS_CHANGE          (EC_DVDBASE + 0x08)\r
+#define EC_DVD_STILL_ON                   (EC_DVDBASE + 0x09)\r
+#define EC_DVD_STILL_OFF                  (EC_DVDBASE + 0x0A)\r
+#define EC_DVD_CURRENT_TIME               (EC_DVDBASE + 0x0B)\r
+#define EC_DVD_ERROR                      (EC_DVDBASE + 0x0C)\r
+#define EC_DVD_WARNING                    (EC_DVDBASE + 0x0D)\r
+#define EC_DVD_CHAPTER_AUTOSTOP           (EC_DVDBASE + 0x0E)\r
+#define EC_DVD_NO_FP_PGC                  (EC_DVDBASE + 0x0F)\r
+#define EC_DVD_PLAYBACK_RATE_CHANGE       (EC_DVDBASE + 0x10)\r
+#define EC_DVD_PARENTAL_LEVEL_CHANGE      (EC_DVDBASE + 0x11)\r
+#define EC_DVD_PLAYBACK_STOPPED           (EC_DVDBASE + 0x12)\r
+#define EC_DVD_ANGLES_AVAILABLE           (EC_DVDBASE + 0x13)\r
+#define EC_DVD_PLAYPERIOD_AUTOSTOP        (EC_DVDBASE + 0x14)\r
+#define EC_DVD_BUTTON_AUTO_ACTIVATED      (EC_DVDBASE + 0x15)\r
+#define EC_DVD_CMD_START                  (EC_DVDBASE + 0x16)\r
+#define EC_DVD_CMD_END                    (EC_DVDBASE + 0x17)\r
+#define EC_DVD_DISC_EJECTED               (EC_DVDBASE + 0x18)\r
+#define EC_DVD_DISC_INSERTED              (EC_DVDBASE + 0x19)\r
+#define EC_DVD_CURRENT_HMSF_TIME          (EC_DVDBASE + 0x1A)\r
+#define EC_DVD_KARAOKE_MODE               (EC_DVDBASE + 0x1B)\r
+\r
+\r
+#ifndef EXCLUDE_DVDEVCODE_ENUMS\r
+typedef enum _tagDVD_WARNING \r
+{\r
+        DVD_WARNING_InvalidDVD1_0Disc  =1,\r
+        DVD_WARNING_FormatNotSupported =2,\r
+        DVD_WARNING_IllegalNavCommand  =3,\r
+        DVD_WARNING_Open               =4,           \r
+        DVD_WARNING_Seek               =5,           \r
+        DVD_WARNING_Read               =6            \r
+} DVD_WARNING;\r
+\r
+typedef enum _tagDVD_ERROR \r
+{\r
+        DVD_ERROR_Unexpected                              =1,         \r
+        DVD_ERROR_CopyProtectFail                         =2,    \r
+        DVD_ERROR_InvalidDVD1_0Disc                       =3,  \r
+        DVD_ERROR_InvalidDiscRegion                       =4,  \r
+        DVD_ERROR_LowParentalLevel                        =5,   \r
+        DVD_ERROR_MacrovisionFail                         =6,    \r
+        DVD_ERROR_IncompatibleSystemAndDecoderRegions     =7,                                    \r
+        DVD_ERROR_IncompatibleDiscAndDecoderRegions       =8\r
+                                                                        \r
+} DVD_ERROR;\r
+\r
+#endif\r
+#endif\r

diff --git a/reactos/w32api/include/dxdiag.h b/reactos/w32api/include/dxdiag.h
index f221303..eca63ba 100644 (file)
--- a/reactos/w32api/include/dxdiag.h
+++ b/reactos/w32api/include/dxdiag.h
@@ -61,44 +61,8 @@ DEFINE_GUID(IID_IDxDiagProvider,    0x9C6B4CB0, 0x23F8, 0x49CC, 0xA3, 0xED, 0x45
 DEFINE_GUID(IID_IDxDiagContainer,   0x7D0F462F, 0x4064, 0x4862, 0xBC, 0x7F, 0x93, 0x3E, 0x50, 0x58, 0xC1, 0x0F);
 
 /* typedef definitions */
-//typedef struct IDxDiagProvider      IDxDiagProvider,   *LPDXDIAGPROVIDER,   *PDXDIAGPROVIDER;
-//typedef struct IDxDiagContainer     IDxDiagContainer,  *LPDXDIAGCONTAINER,  *PDXDIAGCONTAINER;
-typedef struct IDxDiagProvider *LPDXDIAGPROVIDER, *PDXDIAGPROVIDER;
-typedef struct IDxDiagContainer *LPDXDIAGCONTAINER, *PDXDIAGCONTAINER;
-
-/*****************************************************************************
- * IDxDiagProvider interface
- */
-#define INTERFACE IDxDiagProvider
-DECLARE_INTERFACE_(IDxDiagProvider,IUnknown)
-{
-    /*** IUnknown methods ***/
-    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-    STDMETHOD_(ULONG,Release)(THIS) PURE;
-    /*** IDxDiagProvider methods ***/
-    STDMETHOD(Initialize)(THIS_ DXDIAG_INIT_PARAMS* pParams) PURE;
-    STDMETHOD(GetRootContainer)(THIS_ LPDXDIAGCONTAINER* ppInstance) PURE;
-};
-#undef INTERFACE
-
-#if !defined(__cplusplus) || defined(CINTERFACE)
-/*** IUnknown methods ***/
-#define        IDxDiagProvider_QueryInterface(p,a,b)                (p)->lpVtbl->QueryInterface(p,a,b)
-#define        IDxDiagProvider_AddRef(p)                            (p)->lpVtbl->AddRef(p)
-#define        IDxDiagProvider_Release(p)                           (p)->lpVtbl->Release(p)
-/*** IDxDiagProvider methods ***/
-#define IDxDiagProvider_Initialize(p,a,b)                    (p)->lpVtbl->Initialize(p,a,b)
-#define IDxDiagProvider_GetRootContainer(p,a)                (p)->lpVtbl->GetRootContainer(p,a)
-#else
-/*** IUnknown methods ***/
-#define        IDxDiagProvider_QueryInterface(p,a,b)                (p)->QueryInterface(a,b)
-#define        IDxDiagProvider_AddRef(p)                            (p)->AddRef()
-#define        IDxDiagProvider_Release(p)                           (p)->Release()
-/*** IDxDiagProvider methods ***/
-#define IDxDiagProvider_Initialize(p,a,b)                    (p)->Initialize(a,b)
-#define IDxDiagProvider_GetRootContainer(p,a)                (p)->GetRootContainer(a)
-#endif
+typedef struct IDxDiagProvider *LPDXDIAGPROVIDER,   *PDXDIAGPROVIDER;
+typedef struct IDxDiagContainer *LPDXDIAGCONTAINER,  *PDXDIAGCONTAINER;
 
 /*****************************************************************************
  * IDxDiagContainer interface
@@ -134,7 +98,7 @@ DECLARE_INTERFACE_(IDxDiagContainer,IUnknown)
 #define IDxDiagContainer_EnumChildContainerNames(p,a,b,c)    (p)->lpVtbl->EnumChildContainerNames(p,a,b,c)
 #define IDxDiagContainer_GetChildContainer(p,a,b)            (p)->lpVtbl->GetChildContainer(p,a,b)
 #define IDxDiagContainer_GetNumberOfProps(p,a)               (p)->lpVtbl->GetNumberOfProps(p,a)
-#define IDxDiagContainer_EnumProps(p,a,b)                    (p)->lpVtbl->EnumProps(p,a,b,c)
+#define IDxDiagContainer_EnumPropNames(p,a,b,c)              (p)->lpVtbl->EnumPropNames(p,a,b,c)
 #define IDxDiagContainer_GetProp(p,a,b)                      (p)->lpVtbl->GetProp(p,a,b)
 #else
 /*** IUnknown methods ***/
@@ -146,10 +110,44 @@ DECLARE_INTERFACE_(IDxDiagContainer,IUnknown)
 #define IDxDiagContainer_EnumChildContainerNames(p,a,b,c)    (p)->EnumChildContainerNames(a,b,c)
 #define IDxDiagContainer_GetChildContainer(p,a,b)            (p)->GetChildContainer(a,b)
 #define IDxDiagContainer_GetNumberOfProps(p,a)               (p)->GetNumberOfProps(a)
-#define IDxDiagContainer_EnumProps(p,a,b)                    (p)->EnumProps(a,b,c)
+#define IDxDiagContainer_EnumPropNames(p,a,b,c)              (p)->EnumPropNames(a,b,c)
 #define IDxDiagContainer_GetProp(p,a,b)                      (p)->GetProp(a,b)
 #endif
 
+/*****************************************************************************
+ * IDxDiagProvider interface
+ */
+#define INTERFACE IDxDiagProvider
+DECLARE_INTERFACE_(IDxDiagProvider,IUnknown)
+{
+    /*** IUnknown methods ***/
+    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+    STDMETHOD_(ULONG,Release)(THIS) PURE;
+    /*** IDxDiagProvider methods ***/
+    STDMETHOD(Initialize)(THIS_ DXDIAG_INIT_PARAMS* pParams) PURE;
+    STDMETHOD(GetRootContainer)(THIS_ IDxDiagContainer** ppInstance) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define        IDxDiagProvider_QueryInterface(p,a,b)                (p)->lpVtbl->QueryInterface(p,a,b)
+#define        IDxDiagProvider_AddRef(p)                            (p)->lpVtbl->AddRef(p)
+#define        IDxDiagProvider_Release(p)                           (p)->lpVtbl->Release(p)
+/*** IDxDiagProvider methods ***/
+#define IDxDiagProvider_Initialize(p,a)                      (p)->lpVtbl->Initialize(p,a)
+#define IDxDiagProvider_GetRootContainer(p,a)                (p)->lpVtbl->GetRootContainer(p,a)
+#else
+/*** IUnknown methods ***/
+#define        IDxDiagProvider_QueryInterface(p,a,b)                (p)->QueryInterface(a,b)
+#define        IDxDiagProvider_AddRef(p)                            (p)->AddRef()
+#define        IDxDiagProvider_Release(p)                           (p)->Release()
+/*** IDxDiagProvider methods ***/
+#define IDxDiagProvider_Initialize(p,a)                      (p)->Initialize(a)
+#define IDxDiagProvider_GetRootContainer(p,a)                (p)->GetRootContainer(a)
+#endif
+
 #ifdef __cplusplus
 }
 #endif