[ros-diffs] [greatlrd] 19860: adding dvdevcod.h and fix a compiling
issue with new dxdiag.dll on my hd
greatlrd at svn.reactos.com
greatlrd at svn.reactos.com
Sun Dec 4 13:42:05 CET 2005
adding dvdevcod.h and fix a compiling issue with new dxdiag.dll on my hd
Modified: trunk/reactos/w32api/include/amvideo.h
Added: trunk/reactos/w32api/include/dvdevcod.h
Modified: trunk/reactos/w32api/include/dxdiag.h
_____
Modified: trunk/reactos/w32api/include/amvideo.h
--- trunk/reactos/w32api/include/amvideo.h 2005-12-04 12:31:46 UTC
(rev 19859)
+++ trunk/reactos/w32api/include/amvideo.h 2005-12-04 12:41:54 UTC
(rev 19860)
@@ -106,8 +106,8 @@
#define DIBSIZE(BI) ((BI).biHeight < 0 ? (-1)*(_DIBSIZE(BI)) :
_DIBSIZE(BI))
#define BIT_MASKS_MATCH(PBMIH1,PBMIH2) \
- ((PBMIH2)->dwBitMasks[iGREEN] == (PBMIH1)->dwBitMasks[iGREEN])
&& \
- (((PBMIH2)->dwBitMasks[iRED] == (PBMIH1)->dwBitMasks[iRED]) &&
\
+ ((PBMIH2)->dwBitMasks[iGREEN] == (PBMIH1)->dwBitMasks[iGREEN])
&& \
+ (((PBMIH2)->dwBitMasks[iRED] == (PBMIH1)->dwBitMasks[iRED]) &&
\
((PBMIH2)->dwBitMasks[iBLUE] == (PBMIH1)->dwBitMasks[iBLUE]))
#define RESET_MASKS(PBMIH)
(ZeroMemory((PVOID)(PBMIH)->dwBitFields,SIZE_MASKS))
@@ -257,3 +257,4 @@
}
#endif
#endif
+
_____
Added: trunk/reactos/w32api/include/dvdevcod.h
--- trunk/reactos/w32api/include/dvdevcod.h 2005-12-04 12:31:46 UTC
(rev 19859)
+++ trunk/reactos/w32api/include/dvdevcod.h 2005-12-04 12:41:54 UTC
(rev 19860)
@@ -0,0 +1,60 @@
+
+#ifndef __DVDEVCOD__
+#define __DVDEVCOD__
+
+#define EC_DVDBASE 0x0100
+#define EC_DVD_DOMAIN_CHANGE (EC_DVDBASE + 0x01)
+#define EC_DVD_TITLE_CHANGE (EC_DVDBASE + 0x02)
+#define EC_DVD_CHAPTER_START (EC_DVDBASE + 0x03)
+#define EC_DVD_AUDIO_STREAM_CHANGE (EC_DVDBASE + 0x04)
+#define EC_DVD_SUBPICTURE_STREAM_CHANGE (EC_DVDBASE + 0x05)
+#define EC_DVD_ANGLE_CHANGE (EC_DVDBASE + 0x06)
+#define EC_DVD_BUTTON_CHANGE (EC_DVDBASE + 0x07)
+#define EC_DVD_VALID_UOPS_CHANGE (EC_DVDBASE + 0x08)
+#define EC_DVD_STILL_ON (EC_DVDBASE + 0x09)
+#define EC_DVD_STILL_OFF (EC_DVDBASE + 0x0A)
+#define EC_DVD_CURRENT_TIME (EC_DVDBASE + 0x0B)
+#define EC_DVD_ERROR (EC_DVDBASE + 0x0C)
+#define EC_DVD_WARNING (EC_DVDBASE + 0x0D)
+#define EC_DVD_CHAPTER_AUTOSTOP (EC_DVDBASE + 0x0E)
+#define EC_DVD_NO_FP_PGC (EC_DVDBASE + 0x0F)
+#define EC_DVD_PLAYBACK_RATE_CHANGE (EC_DVDBASE + 0x10)
+#define EC_DVD_PARENTAL_LEVEL_CHANGE (EC_DVDBASE + 0x11)
+#define EC_DVD_PLAYBACK_STOPPED (EC_DVDBASE + 0x12)
+#define EC_DVD_ANGLES_AVAILABLE (EC_DVDBASE + 0x13)
+#define EC_DVD_PLAYPERIOD_AUTOSTOP (EC_DVDBASE + 0x14)
+#define EC_DVD_BUTTON_AUTO_ACTIVATED (EC_DVDBASE + 0x15)
+#define EC_DVD_CMD_START (EC_DVDBASE + 0x16)
+#define EC_DVD_CMD_END (EC_DVDBASE + 0x17)
+#define EC_DVD_DISC_EJECTED (EC_DVDBASE + 0x18)
+#define EC_DVD_DISC_INSERTED (EC_DVDBASE + 0x19)
+#define EC_DVD_CURRENT_HMSF_TIME (EC_DVDBASE + 0x1A)
+#define EC_DVD_KARAOKE_MODE (EC_DVDBASE + 0x1B)
+
+
+#ifndef EXCLUDE_DVDEVCODE_ENUMS
+typedef enum _tagDVD_WARNING
+{
+ DVD_WARNING_InvalidDVD1_0Disc =1,
+ DVD_WARNING_FormatNotSupported =2,
+ DVD_WARNING_IllegalNavCommand =3,
+ DVD_WARNING_Open =4,
+ DVD_WARNING_Seek =5,
+ DVD_WARNING_Read =6
+} DVD_WARNING;
+
+typedef enum _tagDVD_ERROR
+{
+ DVD_ERROR_Unexpected =1,
+ DVD_ERROR_CopyProtectFail =2,
+ DVD_ERROR_InvalidDVD1_0Disc =3,
+ DVD_ERROR_InvalidDiscRegion =4,
+ DVD_ERROR_LowParentalLevel =5,
+ DVD_ERROR_MacrovisionFail =6,
+ DVD_ERROR_IncompatibleSystemAndDecoderRegions =7,
+ DVD_ERROR_IncompatibleDiscAndDecoderRegions =8
+
+} DVD_ERROR;
+
+#endif
+#endif
_____
Modified: trunk/reactos/w32api/include/dxdiag.h
--- trunk/reactos/w32api/include/dxdiag.h 2005-12-04 12:31:46 UTC
(rev 19859)
+++ trunk/reactos/w32api/include/dxdiag.h 2005-12-04 12:41:54 UTC
(rev 19860)
@@ -61,46 +61,10 @@
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;
+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
-
-/**********************************************************************
*******
* IDxDiagContainer interface
*/
#ifdef __WINESRC__
@@ -134,7 +98,7 @@
#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 @@
#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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20051204/27f59914/attachment.html
More information about the Ros-diffs
mailing list