From efa152792de1999e6bee1402c45ffab64f2a0fe8 Mon Sep 17 00:00:00 2001 From: Thomas Bluemel Date: Sun, 4 Dec 2005 13:02:17 +0000 Subject: [PATCH 1/1] SVN maintainance: set eol-style to native svn path=/trunk/; revision=19863 --- reactos/w32api/include/activecf.h | 24 +++--- reactos/w32api/include/amaudio.h | 68 ++++++++--------- reactos/w32api/include/amparse.h | 40 +++++----- reactos/w32api/include/audevcod.h | 56 +++++++------- reactos/w32api/include/dv.h | 64 ++++++++-------- reactos/w32api/include/dvdevcod.h | 120 +++++++++++++++--------------- reactos/w32api/include/mediaerr.h | 22 +++--- 7 files changed, 197 insertions(+), 197 deletions(-) diff --git a/reactos/w32api/include/activecf.h b/reactos/w32api/include/activecf.h index d9ea0d0d188..8eb74c4fcd6 100644 --- a/reactos/w32api/include/activecf.h +++ b/reactos/w32api/include/activecf.h @@ -1,13 +1,13 @@ - -#ifndef __ACTIVECF__ -#define __ACTIVECF__ - -#define CFSTR_VFW_FILTERLIST "Video for Windows 4 Filters" - -typedef struct tagVFW_FILTERLIST -{ - UINT cFilters; - CLSID aClsId[1]; -} VFW_FILTERLIST; - + +#ifndef __ACTIVECF__ +#define __ACTIVECF__ + +#define CFSTR_VFW_FILTERLIST "Video for Windows 4 Filters" + +typedef struct tagVFW_FILTERLIST +{ + UINT cFilters; + CLSID aClsId[1]; +} VFW_FILTERLIST; + #endif \ No newline at end of file diff --git a/reactos/w32api/include/amaudio.h b/reactos/w32api/include/amaudio.h index b307c08ea82..fd502cee452 100644 --- a/reactos/w32api/include/amaudio.h +++ b/reactos/w32api/include/amaudio.h @@ -1,34 +1,34 @@ -#ifndef __AMAUDIO__ -#define __AMAUDIO__ - -#ifdef __cplusplus -extern "C" { -#endif - -#include -#include - -#undef INTERFACE -#define INTERFACE IAMDirectSound - -DECLARE_INTERFACE_(IAMDirectSound,IUnknown) -{ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *ppvObj) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - STDMETHOD(GetDirectSoundInterface)(THIS_ LPDIRECTSOUND *lplpds) PURE; - STDMETHOD(GetPrimaryBufferInterface)(THIS_ LPDIRECTSOUNDBUFFER *lplpdsb) PURE; - STDMETHOD(GetSecondaryBufferInterface)(THIS_ LPDIRECTSOUNDBUFFER *lplpdsb) PURE; - STDMETHOD(ReleaseDirectSoundInterface)(THIS_ LPDIRECTSOUND lpds) PURE; - STDMETHOD(ReleasePrimaryBufferInterface)(THIS_ LPDIRECTSOUNDBUFFER lpdsb) PURE; - STDMETHOD(ReleaseSecondaryBufferInterface)(THIS_ LPDIRECTSOUNDBUFFER lpdsb) PURE; - STDMETHOD(SetFocusWindow)(THIS_ HWND, BOOL) PURE ; - STDMETHOD(GetFocusWindow)(THIS_ HWND *, BOOL*) PURE ; -}; - - -#ifdef __cplusplus -} -#endif -#endif - +#ifndef __AMAUDIO__ +#define __AMAUDIO__ + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +#undef INTERFACE +#define INTERFACE IAMDirectSound + +DECLARE_INTERFACE_(IAMDirectSound,IUnknown) +{ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *ppvObj) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + STDMETHOD(GetDirectSoundInterface)(THIS_ LPDIRECTSOUND *lplpds) PURE; + STDMETHOD(GetPrimaryBufferInterface)(THIS_ LPDIRECTSOUNDBUFFER *lplpdsb) PURE; + STDMETHOD(GetSecondaryBufferInterface)(THIS_ LPDIRECTSOUNDBUFFER *lplpdsb) PURE; + STDMETHOD(ReleaseDirectSoundInterface)(THIS_ LPDIRECTSOUND lpds) PURE; + STDMETHOD(ReleasePrimaryBufferInterface)(THIS_ LPDIRECTSOUNDBUFFER lpdsb) PURE; + STDMETHOD(ReleaseSecondaryBufferInterface)(THIS_ LPDIRECTSOUNDBUFFER lpdsb) PURE; + STDMETHOD(SetFocusWindow)(THIS_ HWND, BOOL) PURE ; + STDMETHOD(GetFocusWindow)(THIS_ HWND *, BOOL*) PURE ; +}; + + +#ifdef __cplusplus +} +#endif +#endif + diff --git a/reactos/w32api/include/amparse.h b/reactos/w32api/include/amparse.h index e385f0a7a1b..dda9d2764ad 100644 --- a/reactos/w32api/include/amparse.h +++ b/reactos/w32api/include/amparse.h @@ -1,20 +1,20 @@ - -#ifndef __AMPARSE__ -#define __AMPARSE__ - -#ifdef __cplusplus -extern "C" { -#endif - -DECLARE_INTERFACE_(IAMParse, IUnknown) -{ - STDMETHOD(GetParseTime) (THIS_REFERENCE_TIME *prtCurrent) PURE; - STDMETHOD(SetParseTime) (THIS_REFERENCE_TIME rtCurrent) PURE; - STDMETHOD(Flush) (THIS) PURE; -}; - -DEFINE_GUID(IID_IAMParse, 0xC47A3420, 0x005C, 0x11D2, 0x90, 0x38, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x98); -#ifdef __cplusplus -} -#endif -#endif + +#ifndef __AMPARSE__ +#define __AMPARSE__ + +#ifdef __cplusplus +extern "C" { +#endif + +DECLARE_INTERFACE_(IAMParse, IUnknown) +{ + STDMETHOD(GetParseTime) (THIS_REFERENCE_TIME *prtCurrent) PURE; + STDMETHOD(SetParseTime) (THIS_REFERENCE_TIME rtCurrent) PURE; + STDMETHOD(Flush) (THIS) PURE; +}; + +DEFINE_GUID(IID_IAMParse, 0xC47A3420, 0x005C, 0x11D2, 0x90, 0x38, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x98); +#ifdef __cplusplus +} +#endif +#endif diff --git a/reactos/w32api/include/audevcod.h b/reactos/w32api/include/audevcod.h index b902d88f574..313ea7187f8 100644 --- a/reactos/w32api/include/audevcod.h +++ b/reactos/w32api/include/audevcod.h @@ -1,28 +1,28 @@ - -#ifndef __AUDEVCOD__ -#define __AUDEVCOD__ - -#define EC_SND_DEVICE_ERROR_BASE 0x0200 -#define EC_SNDDEV_IN_ERROR (EC_SND_DEVICE_ERROR_BASE + 0x00) -#define EC_SNDDEV_OUT_ERROR (EC_SND_DEVICE_ERROR_BASE + 0x01) - -typedef enum _tagSND_DEVICE_ERROR -{ - - SNDDEV_ERROR_Open =1, - SNDDEV_ERROR_Close =2, - SNDDEV_ERROR_GetCaps =3, - SNDDEV_ERROR_PrepareHeader =4, - SNDDEV_ERROR_UnprepareHeader =5, - SNDDEV_ERROR_Reset =6, - SNDDEV_ERROR_Restart =7, - SNDDEV_ERROR_GetPosition =8, - SNDDEV_ERROR_Write =9, - SNDDEV_ERROR_Pause =10, - SNDDEV_ERROR_Stop =11, - SNDDEV_ERROR_Start =12, - SNDDEV_ERROR_AddBuffer =13, - SNDDEV_ERROR_Query =14 - -} SNDDEV_ERR; -#endif // __AUDEVCOD__ + +#ifndef __AUDEVCOD__ +#define __AUDEVCOD__ + +#define EC_SND_DEVICE_ERROR_BASE 0x0200 +#define EC_SNDDEV_IN_ERROR (EC_SND_DEVICE_ERROR_BASE + 0x00) +#define EC_SNDDEV_OUT_ERROR (EC_SND_DEVICE_ERROR_BASE + 0x01) + +typedef enum _tagSND_DEVICE_ERROR +{ + + SNDDEV_ERROR_Open =1, + SNDDEV_ERROR_Close =2, + SNDDEV_ERROR_GetCaps =3, + SNDDEV_ERROR_PrepareHeader =4, + SNDDEV_ERROR_UnprepareHeader =5, + SNDDEV_ERROR_Reset =6, + SNDDEV_ERROR_Restart =7, + SNDDEV_ERROR_GetPosition =8, + SNDDEV_ERROR_Write =9, + SNDDEV_ERROR_Pause =10, + SNDDEV_ERROR_Stop =11, + SNDDEV_ERROR_Start =12, + SNDDEV_ERROR_AddBuffer =13, + SNDDEV_ERROR_Query =14 + +} SNDDEV_ERR; +#endif // __AUDEVCOD__ diff --git a/reactos/w32api/include/dv.h b/reactos/w32api/include/dv.h index a75db3faa83..1d8236338d4 100644 --- a/reactos/w32api/include/dv.h +++ b/reactos/w32api/include/dv.h @@ -1,32 +1,32 @@ - -#ifndef _DV_H_ -#define _DV_H_ - -typedef struct Tag_DVAudInfo -{ - BYTE bAudStyle[2]; - BYTE bAudQu[2]; - BYTE bNumAudPin; - WORD wAvgSamplesPerPinPerFrm[2]; - WORD wBlkMode; - WORD wDIFMode; - WORD wBlkDiv; -} DVAudInfo; - -#define DV_SD 0x00 -#define DV_HD 0x01 -#define DV_SL 0x02 -#define DV_CAP_AUD16Bits 0x00 -#define DV_CAP_AUD12Bits 0x01 -#define SIZE_DVINFO 0x20 -#define DV_DVSD_NTSC_FRAMESIZE 120000L -#define DV_DVSD_PAL_FRAMESIZE 144000L -#define DV_AUDIOMODE 0x00000F00 -#define DV_SMCHN 0x0000E000 -#define DV_STYPE 0x001F0000 -#define DV_NTSCPAL 0x00200000 -#define DV_AUDIOQU 0x07000000 -#define DV_AUDIOSMP 0x38000000 -#define DV_NTSC 0 -#define DV_PAL 1 -#endif + +#ifndef _DV_H_ +#define _DV_H_ + +typedef struct Tag_DVAudInfo +{ + BYTE bAudStyle[2]; + BYTE bAudQu[2]; + BYTE bNumAudPin; + WORD wAvgSamplesPerPinPerFrm[2]; + WORD wBlkMode; + WORD wDIFMode; + WORD wBlkDiv; +} DVAudInfo; + +#define DV_SD 0x00 +#define DV_HD 0x01 +#define DV_SL 0x02 +#define DV_CAP_AUD16Bits 0x00 +#define DV_CAP_AUD12Bits 0x01 +#define SIZE_DVINFO 0x20 +#define DV_DVSD_NTSC_FRAMESIZE 120000L +#define DV_DVSD_PAL_FRAMESIZE 144000L +#define DV_AUDIOMODE 0x00000F00 +#define DV_SMCHN 0x0000E000 +#define DV_STYPE 0x001F0000 +#define DV_NTSCPAL 0x00200000 +#define DV_AUDIOQU 0x07000000 +#define DV_AUDIOSMP 0x38000000 +#define DV_NTSC 0 +#define DV_PAL 1 +#endif diff --git a/reactos/w32api/include/dvdevcod.h b/reactos/w32api/include/dvdevcod.h index 5eb4199fc4b..eefe3b4f8b9 100644 --- a/reactos/w32api/include/dvdevcod.h +++ b/reactos/w32api/include/dvdevcod.h @@ -1,60 +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 + +#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 diff --git a/reactos/w32api/include/mediaerr.h b/reactos/w32api/include/mediaerr.h index 22eea872ba3..6130f44a327 100644 --- a/reactos/w32api/include/mediaerr.h +++ b/reactos/w32api/include/mediaerr.h @@ -1,11 +1,11 @@ -#ifndef _MEDIAERR_H_ -#define _MEDIAERR_H_ - -#define DMO_E_INVALIDSTREAMINDEX 0x80040201 -#define DMO_E_INVALIDTYPE 0x80040202 -#define DMO_E_TYPE_NOT_SET 0x80040203 -#define DMO_E_NOTACCEPTING 0x80040204 -#define DMO_E_TYPE_NOT_ACCEPTED 0x80040205 -#define DMO_E_NO_MORE_ITEMS 0x80040206 - -#endif _MEDIAERR_H_ +#ifndef _MEDIAERR_H_ +#define _MEDIAERR_H_ + +#define DMO_E_INVALIDSTREAMINDEX 0x80040201 +#define DMO_E_INVALIDTYPE 0x80040202 +#define DMO_E_TYPE_NOT_SET 0x80040203 +#define DMO_E_NOTACCEPTING 0x80040204 +#define DMO_E_TYPE_NOT_ACCEPTED 0x80040205 +#define DMO_E_NO_MORE_ITEMS 0x80040206 + +#endif _MEDIAERR_H_ -- 2.17.1