Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 26904: - set svn:eol-style native
by janderwald＠svn.reactos.org 26 May '07

26 May '07

Author: janderwald Date: Sat May 26 19:14:07 2007 New Revision: 26904 URL: http://svn.reactos.org/svn/reactos?rev=26904&view=rev Log: - set svn:eol-style native Modified: trunk/reactos/include/dxsdk/aviriff.h (contents, props changed) trunk/reactos/include/dxsdk/dmdls.h (contents, props changed) trunk/reactos/include/dxsdk/dxdiag.h (contents, props changed) Modified: trunk/reactos/include/dxsdk/aviriff.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/aviriff.h?re… ============================================================================== --- trunk/reactos/include/dxsdk/aviriff.h (original) +++ trunk/reactos/include/dxsdk/aviriff.h Sat May 26 19:14:07 2007 @@ -1,307 +1,307 @@ - - - - -#if !defined AVIRIFF_H -#define AVIRIFF_H - -#if !defined NUMELMS - #define NUMELMS(aa) (sizeof(aa)/sizeof((aa)[0])) -#endif - -#include <pshpack2.h> - -#define FCC(ch4) ((((DWORD)(ch4) & 0xFF) << 24) | (((DWORD)(ch4) & 0xFF00) << 8) | (((DWORD)(ch4) & 0xFF0000) >> 8) | (((DWORD)(ch4) & 0xFF000000) >> 24)) -#define RIFFROUND(cb) ((cb) + ((cb)&1)) -#define RIFFNEXT(pChunk) (LPRIFFCHUNK)((LPBYTE)(pChunk) + sizeof(RIFFCHUNK) + RIFFROUND(((LPRIFFCHUNK)pChunk)->cb)) -#define TIMECODE_RATE_30DROP 0 -#define TIMECODE_SMPTE_BINARY_GROUP 0x07 -#define TIMECODE_SMPTE_COLOR_FRAME 0x08 -#define AVI_INDEX_OF_INDEXES 0x00 -#define AVI_INDEX_OF_CHUNKS 0x01 -#define AVI_INDEX_OF_TIMED_CHUNKS 0x02 -#define AVI_INDEX_OF_SUB_2FIELD 0x03 -#define AVI_INDEX_IS_DATA 0x80 -#define AVI_INDEX_SUB_DEFAULT 0x00 -#define AVI_INDEX_SUB_2FIELD 0x01 -#define STDINDEXSIZE 0x4000 -#define NUMINDEX(wLongsPerEntry) ((STDINDEXSIZE-32)/4/(wLongsPerEntry)) -#define NUMINDEXFILL(wLongsPerEntry) ((STDINDEXSIZE/4) - NUMINDEX(wLongsPerEntry)) -#define Valid_SUPERINDEX(pi) (*(DWORD *)(&((pi)->wLongsPerEntry)) == (4 | (AVI_INDEX_OF_INDEXES << 24))) -#define AVISTDINDEX_DELTAFRAME ( 0x80000000) -#define AVISTDINDEX_SIZEMASK (~0x80000000) - -#ifndef ckidSTREAMHEADER - #define ckidSTREAMHEADER FCC('strh') -#endif - -#ifndef ckidSTREAMFORMAT - #define ckidSTREAMFORMAT FCC('strf') -#endif - -#define ckidMAINAVIHEADER FCC('avih') -#define ckidODML FCC('odml') -#define ckidAVIEXTHEADER FCC('dmlh') -#define ckidSTREAMLIST FCC('strl') -#define ckidAVIOLDINDEX FCC('idx1') -#define ckidAVISUPERINDEX FCC('indx') - -#ifndef TIMECODE_DEFINED -#define TIMECODE_DEFINED - typedef union _timecode - { - struct - { - WORD wFrameRate; - WORD wFrameFract; - LONG cFrames; - }; - DWORDLONG qw; - } TIMECODE; -#endif - - -typedef struct _riffchunk -{ - FOURCC fcc; - DWORD cb; - } RIFFCHUNK, *LPRIFFCHUNK; - -typedef struct _rifflist -{ - FOURCC fcc; - DWORD cb; - FOURCC fccListType; -} RIFFLIST, *LPRIFFLIST; - -typedef struct _avimainheader -{ - FOURCC fcc; - DWORD cb; - DWORD dwMicroSecPerFrame; - DWORD dwMaxBytesPerSec; - DWORD dwPaddingGranularity; - DWORD dwFlags; - #define AVIF_HASINDEX 0x00000010 - #define AVIF_MUSTUSEINDEX 0x00000020 - #define AVIF_ISINTERLEAVED 0x00000100 - #define AVIF_TRUSTCKTYPE 0x00000800 - #define AVIF_WASCAPTUREFILE 0x00010000 - #define AVIF_COPYRIGHTED 0x00020000 - DWORD dwTotalFrames; - DWORD dwInitialFrames; - DWORD dwStreams; - DWORD dwSuggestedBufferSize; - DWORD dwWidth; - DWORD dwHeight; - DWORD dwReserved[4]; -} AVIMAINHEADER; - -typedef struct _aviextheader -{ - FOURCC fcc; - DWORD cb; - DWORD dwGrandFrames; - DWORD dwFuture[61]; -} AVIEXTHEADER; - -typedef struct _avistreamheader -{ - FOURCC fcc; - DWORD cb; - FOURCC fccType; - #ifndef streamtypeVIDEO - #define streamtypeVIDEO FCC('vids') - #define streamtypeAUDIO FCC('auds') - #define streamtypeMIDI FCC('mids') - #define streamtypeTEXT FCC('txts') - #endif - - FOURCC fccHandler; - DWORD dwFlags; - #define AVISF_DISABLED 0x00000001 - #define AVISF_VIDEO_PALCHANGES 0x00010000 - - WORD wPriority; - WORD wLanguage; - DWORD dwInitialFrames; - DWORD dwScale; - DWORD dwRate; - DWORD dwStart; - DWORD dwLength; - DWORD dwSuggestedBufferSize; - DWORD dwQuality; - DWORD dwSampleSize; - struct - { - short int left; - short int top; - short int right; - short int bottom; - } rcFrame; -} AVISTREAMHEADER; - -#pragma warning(disable:4200) - -typedef struct _avioldindex -{ - FOURCC fcc; - DWORD cb; - struct _avioldindex_entry - { - DWORD dwChunkId; - DWORD dwFlags; - - #ifndef AVIIF_LIST - #define AVIIF_LIST 0x00000001 - #define AVIIF_KEYFRAME 0x00000010 - #endif - - #define AVIIF_NO_TIME 0x00000100 - #define AVIIF_COMPRESSOR 0x0FFF0000 - DWORD dwOffset; - DWORD dwSize; - } aIndex[]; -} AVIOLDINDEX; - -typedef struct _timecodedata -{ - TIMECODE time; - DWORD dwSMPTEflags; - DWORD dwUser; -} TIMECODEDATA; - -typedef struct _avimetaindex -{ - FOURCC fcc; - UINT cb; - WORD wLongsPerEntry; - BYTE bIndexSubType; - BYTE bIndexType; - DWORD nEntriesInUse; - DWORD dwChunkId; - DWORD dwReserved[3]; - DWORD adwIndex[]; -} AVIMETAINDEX; - - -typedef struct _avisuperindex -{ - FOURCC fcc; - UINT cb; - WORD wLongsPerEntry; - BYTE bIndexSubType; - BYTE bIndexType; - DWORD nEntriesInUse; - DWORD dwChunkId; - DWORD dwReserved[3]; - struct _avisuperindex_entry - { - DWORDLONG qwOffset; - DWORD dwSize; - DWORD dwDuration; - } aIndex[NUMINDEX(4)]; -} AVISUPERINDEX; - -typedef struct _avistdindex_entry -{ - DWORD dwOffset; - DWORD dwSize; -} AVISTDINDEX_ENTRY; - -typedef struct _avistdindex -{ - FOURCC fcc; - UINT cb; - WORD wLongsPerEntry; - BYTE bIndexSubType; - BYTE bIndexType; - DWORD nEntriesInUse; - DWORD dwChunkId; - DWORDLONG qwBaseOffset; - DWORD dwReserved_3; - AVISTDINDEX_ENTRY aIndex[NUMINDEX(2)]; -} AVISTDINDEX; - - -typedef struct _avitimedindex_entry -{ - DWORD dwOffset; - DWORD dwSize; - DWORD dwDuration; -} AVITIMEDINDEX_ENTRY; - -typedef struct _avitimedindex -{ - FOURCC fcc; - UINT cb; - WORD wLongsPerEntry; - BYTE bIndexSubType; - BYTE bIndexType; - DWORD nEntriesInUse; - DWORD dwChunkId; - DWORDLONG qwBaseOffset; - DWORD dwReserved_3; - AVITIMEDINDEX_ENTRY aIndex[NUMINDEX(3)]; - DWORD adwTrailingFill[NUMINDEXFILL(3)]; -} AVITIMEDINDEX; - -typedef struct _avitimecodeindex -{ - FOURCC fcc; - UINT cb; - WORD wLongsPerEntry; - BYTE bIndexSubType; - BYTE bIndexType; - DWORD nEntriesInUse; - DWORD dwChunkId; - DWORD dwReserved[3]; - TIMECODEDATA aIndex[NUMINDEX(sizeof(TIMECODEDATA)/sizeof(LONG))]; -} AVITIMECODEINDEX; - - -typedef struct _avitcdlindex_entry -{ - DWORD dwTick; - TIMECODE time; - DWORD dwSMPTEflags; - DWORD dwUser; - TCHAR szReelId[12]; -} AVITCDLINDEX_ENTRY; - -typedef struct _avitcdlindex -{ - FOURCC fcc; - UINT cb; - WORD wLongsPerEntry; - BYTE bIndexSubType; - BYTE bIndexType; - DWORD nEntriesInUse; - DWORD dwChunkId; - DWORD dwReserved[3]; - AVITCDLINDEX_ENTRY aIndex[NUMINDEX(7)]; - DWORD adwTrailingFill[NUMINDEXFILL(7)]; -} AVITCDLINDEX; - -typedef struct _avifieldindex_chunk -{ - FOURCC fcc; - DWORD cb; - WORD wLongsPerEntry; - BYTE bIndexSubType; - BYTE bIndexType; - DWORD nEntriesInUse; - DWORD dwChunkId; - DWORDLONG qwBaseOffset; - DWORD dwReserved3; - struct _avifieldindex_entry - { - DWORD dwOffset; - DWORD dwSize; - DWORD dwOffsetField2; - } aIndex[]; -} AVIFIELDINDEX, *PAVIFIELDINDEX; - -#include <poppack.h> - + + + + +#if !defined AVIRIFF_H +#define AVIRIFF_H + +#if !defined NUMELMS + #define NUMELMS(aa) (sizeof(aa)/sizeof((aa)[0])) +#endif + +#include <pshpack2.h> + +#define FCC(ch4) ((((DWORD)(ch4) & 0xFF) << 24) | (((DWORD)(ch4) & 0xFF00) << 8) | (((DWORD)(ch4) & 0xFF0000) >> 8) | (((DWORD)(ch4) & 0xFF000000) >> 24)) +#define RIFFROUND(cb) ((cb) + ((cb)&1)) +#define RIFFNEXT(pChunk) (LPRIFFCHUNK)((LPBYTE)(pChunk) + sizeof(RIFFCHUNK) + RIFFROUND(((LPRIFFCHUNK)pChunk)->cb)) +#define TIMECODE_RATE_30DROP 0 +#define TIMECODE_SMPTE_BINARY_GROUP 0x07 +#define TIMECODE_SMPTE_COLOR_FRAME 0x08 +#define AVI_INDEX_OF_INDEXES 0x00 +#define AVI_INDEX_OF_CHUNKS 0x01 +#define AVI_INDEX_OF_TIMED_CHUNKS 0x02 +#define AVI_INDEX_OF_SUB_2FIELD 0x03 +#define AVI_INDEX_IS_DATA 0x80 +#define AVI_INDEX_SUB_DEFAULT 0x00 +#define AVI_INDEX_SUB_2FIELD 0x01 +#define STDINDEXSIZE 0x4000 +#define NUMINDEX(wLongsPerEntry) ((STDINDEXSIZE-32)/4/(wLongsPerEntry)) +#define NUMINDEXFILL(wLongsPerEntry) ((STDINDEXSIZE/4) - NUMINDEX(wLongsPerEntry)) +#define Valid_SUPERINDEX(pi) (*(DWORD *)(&((pi)->wLongsPerEntry)) == (4 | (AVI_INDEX_OF_INDEXES << 24))) +#define AVISTDINDEX_DELTAFRAME ( 0x80000000) +#define AVISTDINDEX_SIZEMASK (~0x80000000) + +#ifndef ckidSTREAMHEADER + #define ckidSTREAMHEADER FCC('strh') +#endif + +#ifndef ckidSTREAMFORMAT + #define ckidSTREAMFORMAT FCC('strf') +#endif + +#define ckidMAINAVIHEADER FCC('avih') +#define ckidODML FCC('odml') +#define ckidAVIEXTHEADER FCC('dmlh') +#define ckidSTREAMLIST FCC('strl') +#define ckidAVIOLDINDEX FCC('idx1') +#define ckidAVISUPERINDEX FCC('indx') + +#ifndef TIMECODE_DEFINED +#define TIMECODE_DEFINED + typedef union _timecode + { + struct + { + WORD wFrameRate; + WORD wFrameFract; + LONG cFrames; + }; + DWORDLONG qw; + } TIMECODE; +#endif + + +typedef struct _riffchunk +{ + FOURCC fcc; + DWORD cb; + } RIFFCHUNK, *LPRIFFCHUNK; + +typedef struct _rifflist +{ + FOURCC fcc; + DWORD cb; + FOURCC fccListType; +} RIFFLIST, *LPRIFFLIST; + +typedef struct _avimainheader +{ + FOURCC fcc; + DWORD cb; + DWORD dwMicroSecPerFrame; + DWORD dwMaxBytesPerSec; + DWORD dwPaddingGranularity; + DWORD dwFlags; + #define AVIF_HASINDEX 0x00000010 + #define AVIF_MUSTUSEINDEX 0x00000020 + #define AVIF_ISINTERLEAVED 0x00000100 + #define AVIF_TRUSTCKTYPE 0x00000800 + #define AVIF_WASCAPTUREFILE 0x00010000 + #define AVIF_COPYRIGHTED 0x00020000 + DWORD dwTotalFrames; + DWORD dwInitialFrames; + DWORD dwStreams; + DWORD dwSuggestedBufferSize; + DWORD dwWidth; + DWORD dwHeight; + DWORD dwReserved[4]; +} AVIMAINHEADER; + +typedef struct _aviextheader +{ + FOURCC fcc; + DWORD cb; + DWORD dwGrandFrames; + DWORD dwFuture[61]; +} AVIEXTHEADER; + +typedef struct _avistreamheader +{ + FOURCC fcc; + DWORD cb; + FOURCC fccType; + #ifndef streamtypeVIDEO + #define streamtypeVIDEO FCC('vids') + #define streamtypeAUDIO FCC('auds') + #define streamtypeMIDI FCC('mids') + #define streamtypeTEXT FCC('txts') + #endif + + FOURCC fccHandler; + DWORD dwFlags; + #define AVISF_DISABLED 0x00000001 + #define AVISF_VIDEO_PALCHANGES 0x00010000 + + WORD wPriority; + WORD wLanguage; + DWORD dwInitialFrames; + DWORD dwScale; + DWORD dwRate; + DWORD dwStart; + DWORD dwLength; + DWORD dwSuggestedBufferSize; + DWORD dwQuality; + DWORD dwSampleSize; + struct + { + short int left; + short int top; + short int right; + short int bottom; + } rcFrame; +} AVISTREAMHEADER; + +#pragma warning(disable:4200) + +typedef struct _avioldindex +{ + FOURCC fcc; + DWORD cb; + struct _avioldindex_entry + { + DWORD dwChunkId; + DWORD dwFlags; + + #ifndef AVIIF_LIST + #define AVIIF_LIST 0x00000001 + #define AVIIF_KEYFRAME 0x00000010 + #endif + + #define AVIIF_NO_TIME 0x00000100 + #define AVIIF_COMPRESSOR 0x0FFF0000 + DWORD dwOffset; + DWORD dwSize; + } aIndex[]; +} AVIOLDINDEX; + +typedef struct _timecodedata +{ + TIMECODE time; + DWORD dwSMPTEflags; + DWORD dwUser; +} TIMECODEDATA; + +typedef struct _avimetaindex +{ + FOURCC fcc; + UINT cb; + WORD wLongsPerEntry; + BYTE bIndexSubType; + BYTE bIndexType; + DWORD nEntriesInUse; + DWORD dwChunkId; + DWORD dwReserved[3]; + DWORD adwIndex[]; +} AVIMETAINDEX; + + +typedef struct _avisuperindex +{ + FOURCC fcc; + UINT cb; + WORD wLongsPerEntry; + BYTE bIndexSubType; + BYTE bIndexType; + DWORD nEntriesInUse; + DWORD dwChunkId; + DWORD dwReserved[3]; + struct _avisuperindex_entry + { + DWORDLONG qwOffset; + DWORD dwSize; + DWORD dwDuration; + } aIndex[NUMINDEX(4)]; +} AVISUPERINDEX; + +typedef struct _avistdindex_entry +{ + DWORD dwOffset; + DWORD dwSize; +} AVISTDINDEX_ENTRY; + +typedef struct _avistdindex +{ + FOURCC fcc; + UINT cb; + WORD wLongsPerEntry; + BYTE bIndexSubType; + BYTE bIndexType; + DWORD nEntriesInUse; + DWORD dwChunkId; + DWORDLONG qwBaseOffset; + DWORD dwReserved_3; + AVISTDINDEX_ENTRY aIndex[NUMINDEX(2)]; +} AVISTDINDEX; + + +typedef struct _avitimedindex_entry +{ + DWORD dwOffset; + DWORD dwSize; + DWORD dwDuration; +} AVITIMEDINDEX_ENTRY; + +typedef struct _avitimedindex +{ + FOURCC fcc; + UINT cb; + WORD wLongsPerEntry; + BYTE bIndexSubType; + BYTE bIndexType; + DWORD nEntriesInUse; + DWORD dwChunkId; + DWORDLONG qwBaseOffset; + DWORD dwReserved_3; + AVITIMEDINDEX_ENTRY aIndex[NUMINDEX(3)]; + DWORD adwTrailingFill[NUMINDEXFILL(3)]; +} AVITIMEDINDEX; + +typedef struct _avitimecodeindex +{ + FOURCC fcc; + UINT cb; + WORD wLongsPerEntry; + BYTE bIndexSubType; + BYTE bIndexType; + DWORD nEntriesInUse; + DWORD dwChunkId; + DWORD dwReserved[3]; + TIMECODEDATA aIndex[NUMINDEX(sizeof(TIMECODEDATA)/sizeof(LONG))]; +} AVITIMECODEINDEX; + + +typedef struct _avitcdlindex_entry +{ + DWORD dwTick; + TIMECODE time; + DWORD dwSMPTEflags; + DWORD dwUser; + TCHAR szReelId[12]; +} AVITCDLINDEX_ENTRY; + +typedef struct _avitcdlindex +{ + FOURCC fcc; + UINT cb; + WORD wLongsPerEntry; + BYTE bIndexSubType; + BYTE bIndexType; + DWORD nEntriesInUse; + DWORD dwChunkId; + DWORD dwReserved[3]; + AVITCDLINDEX_ENTRY aIndex[NUMINDEX(7)]; + DWORD adwTrailingFill[NUMINDEXFILL(7)]; +} AVITCDLINDEX; + +typedef struct _avifieldindex_chunk +{ + FOURCC fcc; + DWORD cb; + WORD wLongsPerEntry; + BYTE bIndexSubType; + BYTE bIndexType; + DWORD nEntriesInUse; + DWORD dwChunkId; + DWORDLONG qwBaseOffset; + DWORD dwReserved3; + struct _avifieldindex_entry + { + DWORD dwOffset; + DWORD dwSize; + DWORD dwOffsetField2; + } aIndex[]; +} AVIFIELDINDEX, *PAVIFIELDINDEX; + +#include <poppack.h> + #endif Propchange: trunk/reactos/include/dxsdk/aviriff.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/dxsdk/dmdls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dmdls.h?rev=… ============================================================================== --- trunk/reactos/include/dxsdk/dmdls.h (original) +++ trunk/reactos/include/dxsdk/dmdls.h Sat May 26 19:14:07 2007 @@ -1,175 +1,175 @@ -ifndef _DMDLS_ -#define _DMDLS_ - -#include "dls1.h" - -#define DMUS_DOWNLOADINFO_INSTRUMENT 1 -#define DMUS_DOWNLOADINFO_WAVE 2 -#define DMUS_DOWNLOADINFO_INSTRUMENT2 3 -#define DMUS_DOWNLOADINFO_WAVEARTICULATION 4 -#define DMUS_DOWNLOADINFO_STREAMINGWAVE 5 -#define DMUS_DOWNLOADINFO_ONESHOTWAVE 6 -#define DMUS_DEFAULT_SIZE_OFFSETTABLE 1 -#define DMUS_INSTRUMENT_GM_INSTRUMENT (1 << 0) -#define DMUS_MIN_DATA_SIZE 4 - -typedef long PCENT; -typedef long GCENT; -typedef long TCENT; -typedef long PERCENT; -typedef LONGLONG REFERENCE_TIME; -typedef REFERENCE_TIME *LPREFERENCE_TIME; - -#ifndef MAKE_FOURCC - #define MAKEFOURCC(ch0, ch1, ch2, ch3) ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 )) - typedef DWORD FOURCC; -#endif - - -typedef struct _DMUS_LFOPARAMS -{ - PCENT pcFrequency; - TCENT tcDelay; - GCENT gcVolumeScale; - PCENT pcPitchScale; - GCENT gcMWToVolume; - PCENT pcMWToPitch; -} DMUS_LFOPARAMS; - -typedef struct _DMUS_VEGPARAMS -{ - TCENT tcAttack; - TCENT tcDecay; - PERCENT ptSustain; - TCENT tcRelease; - TCENT tcVel2Attack; - TCENT tcKey2Decay; -} DMUS_VEGPARAMS; - -typedef struct _DMUS_PEGPARAMS -{ - TCENT tcAttack; - TCENT tcDecay; - PERCENT ptSustain; - TCENT tcRelease; - TCENT tcVel2Attack; - TCENT tcKey2Decay; - PCENT pcRange; -} DMUS_PEGPARAMS; - -typedef struct _DMUS_MSCPARAMS -{ - PERCENT ptDefaultPan; -} DMUS_MSCPARAMS; - -typedef struct _DMUS_DOWNLOADINFO -{ - DWORD dwDLType; - DWORD dwDLId; - DWORD dwNumOffsetTableEntries; - DWORD cbSize; -} DMUS_DOWNLOADINFO; - -typedef struct _DMUS_OFFSETTABLE -{ - ULONG ulOffsetTable[DMUS_DEFAULT_SIZE_OFFSETTABLE]; -} DMUS_OFFSETTABLE; - -typedef struct _DMUS_INSTRUMENT -{ - ULONG ulPatch; - ULONG ulFirstRegionIdx; - ULONG ulGlobalArtIdx; - ULONG ulFirstExtCkIdx; - ULONG ulCopyrightIdx; - ULONG ulFlags; -} DMUS_INSTRUMENT; - -typedef struct _DMUS_REGION -{ - RGNRANGE RangeKey; - RGNRANGE RangeVelocity; - USHORT fusOptions; - USHORT usKeyGroup; - ULONG ulRegionArtIdx; - ULONG ulNextRegionIdx; - ULONG ulFirstExtCkIdx; - WAVELINK WaveLink; - WSMPL WSMP; - WLOOP WLOOP[1]; -} DMUS_REGION; - -typedef struct _DMUS_NOTERANGE -{ - DWORD dwLowNote; - DWORD dwHighNote; -} DMUS_NOTERANGE, *LPDMUS_NOTERANGE; - -typedef struct _DMUS_COPYRIGHT -{ - ULONG cbSize; - BYTE byCopyright[DMUS_MIN_DATA_SIZE]; -} DMUS_COPYRIGHT; - - -typedef struct _DMUS_EXTENSIONCHUNK -{ - ULONG cbSize; - ULONG ulNextExtCkIdx; - FOURCC ExtCkID; - BYTE byExtCk[DMUS_MIN_DATA_SIZE]; -} DMUS_EXTENSIONCHUNK; - - -typedef struct _DMUS_WAVE -{ - ULONG ulFirstExtCkIdx; - ULONG ulCopyrightIdx; - ULONG ulWaveDataIdx; - WAVEFORMATEX WaveformatEx; -} DMUS_WAVE; - -typedef struct _DMUS_WAVEDATA -{ - ULONG cbSize; - BYTE byData[DMUS_MIN_DATA_SIZE]; -} DMUS_WAVEDATA; - -typedef struct _DMUS_ARTICULATION -{ - ULONG ulArt1Idx; - ULONG ulFirstExtCkIdx; -} DMUS_ARTICULATION; - -typedef struct _DMUS_ARTICULATION2 -{ - ULONG ulArtIdx; - ULONG ulFirstExtCkIdx; - ULONG ulNextArtIdx; -} DMUS_ARTICULATION2; - -typedef struct _DMUS_WAVEDL -{ - ULONG cbWaveData; -} DMUS_WAVEDL, *LPDMUS_WAVEDL; - -typedef struct _DMUS_ARTICPARAMS -{ - DMUS_LFOPARAMS LFO; - DMUS_VEGPARAMS VolEG; - DMUS_PEGPARAMS PitchEG; - DMUS_MSCPARAMS Misc; -} DMUS_ARTICPARAMS; - -typedef struct _DMUS_WAVEARTDL -{ - ULONG ulDownloadIdIdx; - ULONG ulBus; - ULONG ulBuffers; - ULONG ulMasterDLId; - USHORT usOptions; -} DMUS_WAVEARTDL, *LPDMUS_WAVEARTDL; - - -#endif - +ifndef _DMDLS_ +#define _DMDLS_ + +#include "dls1.h" + +#define DMUS_DOWNLOADINFO_INSTRUMENT 1 +#define DMUS_DOWNLOADINFO_WAVE 2 +#define DMUS_DOWNLOADINFO_INSTRUMENT2 3 +#define DMUS_DOWNLOADINFO_WAVEARTICULATION 4 +#define DMUS_DOWNLOADINFO_STREAMINGWAVE 5 +#define DMUS_DOWNLOADINFO_ONESHOTWAVE 6 +#define DMUS_DEFAULT_SIZE_OFFSETTABLE 1 +#define DMUS_INSTRUMENT_GM_INSTRUMENT (1 << 0) +#define DMUS_MIN_DATA_SIZE 4 + +typedef long PCENT; +typedef long GCENT; +typedef long TCENT; +typedef long PERCENT; +typedef LONGLONG REFERENCE_TIME; +typedef REFERENCE_TIME *LPREFERENCE_TIME; + +#ifndef MAKE_FOURCC + #define MAKEFOURCC(ch0, ch1, ch2, ch3) ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 )) + typedef DWORD FOURCC; +#endif + + +typedef struct _DMUS_LFOPARAMS +{ + PCENT pcFrequency; + TCENT tcDelay; + GCENT gcVolumeScale; + PCENT pcPitchScale; + GCENT gcMWToVolume; + PCENT pcMWToPitch; +} DMUS_LFOPARAMS; + +typedef struct _DMUS_VEGPARAMS +{ + TCENT tcAttack; + TCENT tcDecay; + PERCENT ptSustain; + TCENT tcRelease; + TCENT tcVel2Attack; + TCENT tcKey2Decay; +} DMUS_VEGPARAMS; + +typedef struct _DMUS_PEGPARAMS +{ + TCENT tcAttack; + TCENT tcDecay; + PERCENT ptSustain; + TCENT tcRelease; + TCENT tcVel2Attack; + TCENT tcKey2Decay; + PCENT pcRange; +} DMUS_PEGPARAMS; + +typedef struct _DMUS_MSCPARAMS +{ + PERCENT ptDefaultPan; +} DMUS_MSCPARAMS; + +typedef struct _DMUS_DOWNLOADINFO +{ + DWORD dwDLType; + DWORD dwDLId; + DWORD dwNumOffsetTableEntries; + DWORD cbSize; +} DMUS_DOWNLOADINFO; + +typedef struct _DMUS_OFFSETTABLE +{ + ULONG ulOffsetTable[DMUS_DEFAULT_SIZE_OFFSETTABLE]; +} DMUS_OFFSETTABLE; + +typedef struct _DMUS_INSTRUMENT +{ + ULONG ulPatch; + ULONG ulFirstRegionIdx; + ULONG ulGlobalArtIdx; + ULONG ulFirstExtCkIdx; + ULONG ulCopyrightIdx; + ULONG ulFlags; +} DMUS_INSTRUMENT; + +typedef struct _DMUS_REGION +{ + RGNRANGE RangeKey; + RGNRANGE RangeVelocity; + USHORT fusOptions; + USHORT usKeyGroup; + ULONG ulRegionArtIdx; + ULONG ulNextRegionIdx; + ULONG ulFirstExtCkIdx; + WAVELINK WaveLink; + WSMPL WSMP; + WLOOP WLOOP[1]; +} DMUS_REGION; + +typedef struct _DMUS_NOTERANGE +{ + DWORD dwLowNote; + DWORD dwHighNote; +} DMUS_NOTERANGE, *LPDMUS_NOTERANGE; + +typedef struct _DMUS_COPYRIGHT +{ + ULONG cbSize; + BYTE byCopyright[DMUS_MIN_DATA_SIZE]; +} DMUS_COPYRIGHT; + + +typedef struct _DMUS_EXTENSIONCHUNK +{ + ULONG cbSize; + ULONG ulNextExtCkIdx; + FOURCC ExtCkID; + BYTE byExtCk[DMUS_MIN_DATA_SIZE]; +} DMUS_EXTENSIONCHUNK; + + +typedef struct _DMUS_WAVE +{ + ULONG ulFirstExtCkIdx; + ULONG ulCopyrightIdx; + ULONG ulWaveDataIdx; + WAVEFORMATEX WaveformatEx; +} DMUS_WAVE; + +typedef struct _DMUS_WAVEDATA +{ + ULONG cbSize; + BYTE byData[DMUS_MIN_DATA_SIZE]; +} DMUS_WAVEDATA; + +typedef struct _DMUS_ARTICULATION +{ + ULONG ulArt1Idx; + ULONG ulFirstExtCkIdx; +} DMUS_ARTICULATION; + +typedef struct _DMUS_ARTICULATION2 +{ + ULONG ulArtIdx; + ULONG ulFirstExtCkIdx; + ULONG ulNextArtIdx; +} DMUS_ARTICULATION2; + +typedef struct _DMUS_WAVEDL +{ + ULONG cbWaveData; +} DMUS_WAVEDL, *LPDMUS_WAVEDL; + +typedef struct _DMUS_ARTICPARAMS +{ + DMUS_LFOPARAMS LFO; + DMUS_VEGPARAMS VolEG; + DMUS_PEGPARAMS PitchEG; + DMUS_MSCPARAMS Misc; +} DMUS_ARTICPARAMS; + +typedef struct _DMUS_WAVEARTDL +{ + ULONG ulDownloadIdIdx; + ULONG ulBus; + ULONG ulBuffers; + ULONG ulMasterDLId; + USHORT usOptions; +} DMUS_WAVEARTDL, *LPDMUS_WAVEARTDL; + + +#endif + Propchange: trunk/reactos/include/dxsdk/dmdls.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/dxsdk/dxdiag.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dxdiag.h?rev… ============================================================================== --- trunk/reactos/include/dxsdk/dxdiag.h (original) +++ trunk/reactos/include/dxsdk/dxdiag.h Sat May 26 19:14:07 2007 @@ -1,93 +1,93 @@ -#ifndef _DXDIAG_H_ -#define _DXDIAG_H_ - -#include <ole2.h> - -#define DXDIAG_DX9_SDK_VERSION 111 - -#ifdef __cplusplus -extern "C" { -#endif - - -DEFINE_GUID(CLSID_DxDiagProvider, 0xA65B8071, 0x3BFE, 0x4213, 0x9A, 0x5B, 0x49, 0x1D, 0xA4, 0x46, 0x1C, 0xA7); -DEFINE_GUID(IID_IDxDiagProvider, 0x9C6B4CB0, 0x23F8, 0x49CC, 0xA3, 0xED, 0x45, 0xA5, 0x50, 0x00, 0xA6, 0xD2); -DEFINE_GUID(IID_IDxDiagContainer, 0x7D0F462F, 0x4064, 0x4862, 0xBC, 0x7F, 0x93, 0x3E, 0x50, 0x58, 0xC1, 0x0F); - -typedef struct _DXDIAG_INIT_PARAMS -{ - DWORD dwSize; - DWORD dwDxDiagHeaderVersion; - BOOL bAllowWHQLChecks; - VOID* pReserved; -} DXDIAG_INIT_PARAMS; - - - -typedef struct IDxDiagContainer *LPDXDIAGCONTAINER, *PDXDIAGCONTAINER; -#undef INTERFACE -#define INTERFACE IDxDiagContainer -DECLARE_INTERFACE_(IDxDiagContainer,IUnknown) -{ - - STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID *ppvObj) PURE; - STDMETHOD_(ULONG,AddRef) (THIS) PURE; - STDMETHOD_(ULONG,Release) (THIS) PURE; - STDMETHOD(GetNumberOfChildContainers) (THIS_ DWORD *pdwCount) PURE; - STDMETHOD(EnumChildContainerNames) (THIS_ DWORD dwIndex, LPWSTR pwszContainer, DWORD cchContainer) PURE; - STDMETHOD(GetChildContainer) (THIS_ LPCWSTR pwszContainer, IDxDiagContainer **ppInstance) PURE; - STDMETHOD(GetNumberOfProps) (THIS_ DWORD *pdwCount) PURE; - STDMETHOD(EnumPropNames) (THIS_ DWORD dwIndex, LPWSTR pwszPropName, DWORD cchPropName) PURE; - STDMETHOD(GetProp) (THIS_ LPCWSTR pwszPropName, VARIANT *pvarProp) PURE; -}; - - typedef struct IDxDiagProvider *LPDXDIAGPROVIDER, *PDXDIAGPROVIDER; -#undef INTERFACE -#define INTERFACE IDxDiagProvider -DECLARE_INTERFACE_(IDxDiagProvider,IUnknown) -{ - STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID *ppvObj) PURE; - STDMETHOD_(ULONG,AddRef) (THIS) PURE; - STDMETHOD_(ULONG,Release) (THIS) PURE; - STDMETHOD(Initialize) (THIS_ DXDIAG_INIT_PARAMS* pParams) PURE; - STDMETHOD(GetRootContainer) (THIS_ IDxDiagContainer **ppInstance) PURE; -}; - -#define DXDIAG_E_INSUFFICIENT_BUFFER ((HRESULT)0x8007007AL) -#if !defined(__cplusplus) || defined(CINTERFACE) - #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) - #define IDxDiagProvider_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b) - #define IDxDiagProvider_GetRootContainer(p,a) (p)->lpVtbl->GetRootContainer(p,a) - #define IDxDiagContainer_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) - #define IDxDiagContainer_AddRef(p) (p)->lpVtbl->AddRef(p) - #define IDxDiagContainer_Release(p) (p)->lpVtbl->Release(p) - #define IDxDiagContainer_GetNumberOfChildContainers(p,a) (p)->lpVtbl->GetNumberOfChildContainers(p,a) - #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_GetProp(p,a,b) (p)->lpVtbl->GetProp(p,a,b) -#else - #define IDxDiagProvider_QueryInterface(p,a,b) (p)->QueryInterface(p,a,b) - #define IDxDiagProvider_AddRef(p) (p)->AddRef(p) - #define IDxDiagProvider_Release(p) (p)->Release(p) - #define IDxDiagProvider_Initialize(p,a,b) (p)->Initialize(p,a,b) - #define IDxDiagProvider_GetRootContainer(p,a) (p)->GetRootContainer(p,a) - #define IDxDiagContainer_QueryInterface(p,a,b) (p)->QueryInterface(p,a,b) - #define IDxDiagContainer_AddRef(p) (p)->AddRef(p) - #define IDxDiagContainer_Release(p) (p)->Release(p) - #define IDxDiagContainer_GetNumberOfChildContainers(p,a) (p)->GetNumberOfChildContainers(p,a) - #define IDxDiagContainer_EnumChildContainerNames(p,a,b,c) (p)->EnumChildContainerNames(p,a,b,c) - #define IDxDiagContainer_GetChildContainer(p,a,b) (p)->GetChildContainer(p,a,b) - #define IDxDiagContainer_GetNumberOfProps(p,a) (p)->GetNumberOfProps(p,a) - #define IDxDiagContainer_EnumProps(p,a,b) (p)->EnumProps(p,a,b,c) - #define IDxDiagContainer_GetProp(p,a,b) (p)->GetProp(p,a,b) -#endif - -#ifdef __cplusplus -} -#endif - -#endif +#ifndef _DXDIAG_H_ +#define _DXDIAG_H_ + +#include <ole2.h> + +#define DXDIAG_DX9_SDK_VERSION 111 + +#ifdef __cplusplus +extern "C" { +#endif + + +DEFINE_GUID(CLSID_DxDiagProvider, 0xA65B8071, 0x3BFE, 0x4213, 0x9A, 0x5B, 0x49, 0x1D, 0xA4, 0x46, 0x1C, 0xA7); +DEFINE_GUID(IID_IDxDiagProvider, 0x9C6B4CB0, 0x23F8, 0x49CC, 0xA3, 0xED, 0x45, 0xA5, 0x50, 0x00, 0xA6, 0xD2); +DEFINE_GUID(IID_IDxDiagContainer, 0x7D0F462F, 0x4064, 0x4862, 0xBC, 0x7F, 0x93, 0x3E, 0x50, 0x58, 0xC1, 0x0F); + +typedef struct _DXDIAG_INIT_PARAMS +{ + DWORD dwSize; + DWORD dwDxDiagHeaderVersion; + BOOL bAllowWHQLChecks; + VOID* pReserved; +} DXDIAG_INIT_PARAMS; + + + +typedef struct IDxDiagContainer *LPDXDIAGCONTAINER, *PDXDIAGCONTAINER; +#undef INTERFACE +#define INTERFACE IDxDiagContainer +DECLARE_INTERFACE_(IDxDiagContainer,IUnknown) +{ + + STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID *ppvObj) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD(GetNumberOfChildContainers) (THIS_ DWORD *pdwCount) PURE; + STDMETHOD(EnumChildContainerNames) (THIS_ DWORD dwIndex, LPWSTR pwszContainer, DWORD cchContainer) PURE; + STDMETHOD(GetChildContainer) (THIS_ LPCWSTR pwszContainer, IDxDiagContainer **ppInstance) PURE; + STDMETHOD(GetNumberOfProps) (THIS_ DWORD *pdwCount) PURE; + STDMETHOD(EnumPropNames) (THIS_ DWORD dwIndex, LPWSTR pwszPropName, DWORD cchPropName) PURE; + STDMETHOD(GetProp) (THIS_ LPCWSTR pwszPropName, VARIANT *pvarProp) PURE; +}; + + typedef struct IDxDiagProvider *LPDXDIAGPROVIDER, *PDXDIAGPROVIDER; +#undef INTERFACE +#define INTERFACE IDxDiagProvider +DECLARE_INTERFACE_(IDxDiagProvider,IUnknown) +{ + STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID *ppvObj) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD(Initialize) (THIS_ DXDIAG_INIT_PARAMS* pParams) PURE; + STDMETHOD(GetRootContainer) (THIS_ IDxDiagContainer **ppInstance) PURE; +}; + +#define DXDIAG_E_INSUFFICIENT_BUFFER ((HRESULT)0x8007007AL) +#if !defined(__cplusplus) || defined(CINTERFACE) + #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) + #define IDxDiagProvider_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b) + #define IDxDiagProvider_GetRootContainer(p,a) (p)->lpVtbl->GetRootContainer(p,a) + #define IDxDiagContainer_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) + #define IDxDiagContainer_AddRef(p) (p)->lpVtbl->AddRef(p) + #define IDxDiagContainer_Release(p) (p)->lpVtbl->Release(p) + #define IDxDiagContainer_GetNumberOfChildContainers(p,a) (p)->lpVtbl->GetNumberOfChildContainers(p,a) + #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_GetProp(p,a,b) (p)->lpVtbl->GetProp(p,a,b) +#else + #define IDxDiagProvider_QueryInterface(p,a,b) (p)->QueryInterface(p,a,b) + #define IDxDiagProvider_AddRef(p) (p)->AddRef(p) + #define IDxDiagProvider_Release(p) (p)->Release(p) + #define IDxDiagProvider_Initialize(p,a,b) (p)->Initialize(p,a,b) + #define IDxDiagProvider_GetRootContainer(p,a) (p)->GetRootContainer(p,a) + #define IDxDiagContainer_QueryInterface(p,a,b) (p)->QueryInterface(p,a,b) + #define IDxDiagContainer_AddRef(p) (p)->AddRef(p) + #define IDxDiagContainer_Release(p) (p)->Release(p) + #define IDxDiagContainer_GetNumberOfChildContainers(p,a) (p)->GetNumberOfChildContainers(p,a) + #define IDxDiagContainer_EnumChildContainerNames(p,a,b,c) (p)->EnumChildContainerNames(p,a,b,c) + #define IDxDiagContainer_GetChildContainer(p,a,b) (p)->GetChildContainer(p,a,b) + #define IDxDiagContainer_GetNumberOfProps(p,a) (p)->GetNumberOfProps(p,a) + #define IDxDiagContainer_EnumProps(p,a,b) (p)->EnumProps(p,a,b,c) + #define IDxDiagContainer_GetProp(p,a,b) (p)->GetProp(p,a,b) +#endif + +#ifdef __cplusplus +} +#endif + +#endif Propchange: trunk/reactos/include/dxsdk/dxdiag.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 26903: adding austream.idl and ddstream.idl comptaible with ms dxsdk 2004 dec
by greatlrd＠svn.reactos.org 26 May '07

26 May '07

Author: greatlrd Date: Sat May 26 15:51:45 2007 New Revision: 26903 URL: http://svn.reactos.org/svn/reactos?rev=26903&view=rev Log: adding austream.idl and ddstream.idl comptaible with ms dxsdk 2004 dec Added: trunk/reactos/include/dxsdk/austream.idl (with props) trunk/reactos/include/dxsdk/ddstream.idl (with props) Removed: trunk/reactos/include/psdk/austream.h trunk/reactos/include/psdk/austream.idl trunk/reactos/include/psdk/ddstream.h trunk/reactos/include/psdk/ddstream.idl Modified: trunk/reactos/include/dxsdk/ (props changed) trunk/reactos/include/dxsdk/dxsdk.rbuild Propchange: trunk/reactos/include/dxsdk/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sat May 26 15:51:45 2007 @@ -1,1 +1,3 @@ +austream.h mmstream.h +ddstream.h Added: trunk/reactos/include/dxsdk/austream.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/austream.idl… ============================================================================== --- trunk/reactos/include/dxsdk/austream.idl (added) +++ trunk/reactos/include/dxsdk/austream.idl Sat May 26 15:51:45 2007 @@ -1,0 +1,64 @@ + +import "unknwn.idl"; +import "mmstream.idl"; + +// hack +cpp_quote("#if 0") +typedef struct tWAVEFORMATEX WAVEFORMATEX; +cpp_quote ("#endif") + +interface IAudioMediaStream; +interface IAudioStreamSample; +interface IMemoryData; +interface IAudioData; + +[ +object, +local, +uuid(f7537560-a3be-11d0-8212-00c04fc32c45), +pointer_default(unique) +] + +interface IAudioMediaStream : IMediaStream +{ + HRESULT GetFormat([out] WAVEFORMATEX *pWaveFormatCurrent); + HRESULT SetFormat([in] const WAVEFORMATEX *lpWaveFormat); + HRESULT CreateSample([in] IAudioData *pAudioData, [in] DWORD dwFlags, [out] IAudioStreamSample **ppSample); +} + +[ +object, +local, +uuid(54c719c0-af60-11d0-8212-00c04fc32c45), +pointer_default(unique) +] + +interface IAudioData : IMemoryData +{ + HRESULT GetFormat([out] WAVEFORMATEX *pWaveFormatCurrent); + HRESULT SetFormat([in] const WAVEFORMATEX *lpWaveFormat); +} + +[ +object, +local, +uuid(327fc560-af60-11d0-8212-00c04fc32c45), +pointer_default(unique) +] +interface IMemoryData : IUnknown +{ + HRESULT SetBuffer([in] DWORD cbSize, [in] BYTE *pbData, [in] DWORD dwFlags); + HRESULT GetInfo([out] DWORD *pdwLength, [out] BYTE **ppbData, [out] DWORD *pcbActualData); + HRESULT SetActual([in] DWORD cbDataValid); +} + +[ +object, +local, +uuid(345fee00-aba5-11d0-8212-00c04fc32c45), +pointer_default(unique) +] +interface IAudioStreamSample : IStreamSample +{ + HRESULT GetAudioData([out] IAudioData **ppAudio); +} Propchange: trunk/reactos/include/dxsdk/austream.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/ddstream.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/ddstream.idl… ============================================================================== --- trunk/reactos/include/dxsdk/ddstream.idl (added) +++ trunk/reactos/include/dxsdk/ddstream.idl Sat May 26 15:51:45 2007 @@ -1,0 +1,50 @@ + +import "unknwn.idl"; +import "mmstream.idl"; + +cpp_quote("#if 0") +typedef void * LPDDSURFACEDESC; +typedef struct tDDSURFACEDESC DDSURFACEDESC; +cpp_quote("#endif") +cpp_quote("#include <ddraw.h>") + +enum +{ + DDSFF_PROGRESSIVERENDER = 0x00000001 +}; + +interface IDirectDraw; +interface IDirectDrawSurface; +interface IDirectDrawPalette; +interface IDirectDrawMediaStream; +interface IDirectDrawStreamSample; + + [ +object, +local, +uuid(F4104FCF-9A70-11d0-8FDE-00C04FD9189D), +pointer_default(unique) +] +interface IDirectDrawStreamSample : IStreamSample +{ + HRESULT GetSurface([out] IDirectDrawSurface ** ppDirectDrawSurface, [out] RECT * pRect); + HRESULT SetRect([in] const RECT * pRect); +}; + +[ +object, +local, +uuid(F4104FCE-9A70-11d0-8FDE-00C04FD9189D), +pointer_default(unique) +] +interface IDirectDrawMediaStream : IMediaStream +{ + HRESULT GetFormat([out] DDSURFACEDESC *pDDSDCurrent, [out] IDirectDrawPalette **ppDirectDrawPalette, [out] DDSURFACEDESC *pDDSDDesired, [out] DWORD *pdwFlags); + HRESULT SetFormat([in] const DDSURFACEDESC *pDDSurfaceDesc, [in] IDirectDrawPalette *pDirectDrawPalette); + HRESULT GetDirectDraw([out] IDirectDraw **ppDirectDraw); + HRESULT SetDirectDraw([in] IDirectDraw *pDirectDraw); + HRESULT CreateSample([in] IDirectDrawSurface *pSurface, [in] const RECT *pRect, [in] DWORD dwFlags, [out]IDirectDrawStreamSample **ppSample); + HRESULT GetTimePerFrame([out] STREAM_TIME *pFrameTime); +}; + + Propchange: trunk/reactos/include/dxsdk/ddstream.idl ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/dxsdk/dxsdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dxsdk.rbuild… ============================================================================== --- trunk/reactos/include/dxsdk/dxsdk.rbuild (original) +++ trunk/reactos/include/dxsdk/dxsdk.rbuild Sat May 26 15:51:45 2007 @@ -1,3 +1,5 @@ <module name="dxsdk" type="idlheader"> + <file>austream.idl</file> + <file>ddstream.idl</file> <file>mmstream.idl</file> </module> Removed: trunk/reactos/include/psdk/austream.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/austream.h?re… ============================================================================== --- trunk/reactos/include/psdk/austream.h (original) +++ trunk/reactos/include/psdk/austream.h (removed) @@ -1,485 +1,0 @@ -/*** Autogenerated by WIDL 0.3.0 from include\psdk\austream.idl - Do not edit ***/ -#include <rpc.h> -#include <rpcndr.h> - -#ifndef __WIDL_INCLUDE_PSDK_AUSTREAM_H -#define __WIDL_INCLUDE_PSDK_AUSTREAM_H -#ifdef __cplusplus -extern "C" { -#endif -#include <unknwn.h> -#include <mmstream.h> -#if 0 -typedef struct tWAVEFORMATEX WAVEFORMATEX; -#endif -#ifndef __IAudioMediaStream_FWD_DEFINED__ -#define __IAudioMediaStream_FWD_DEFINED__ -typedef interface IAudioMediaStream IAudioMediaStream; -#endif - -#ifndef __IAudioStreamSample_FWD_DEFINED__ -#define __IAudioStreamSample_FWD_DEFINED__ -typedef interface IAudioStreamSample IAudioStreamSample; -#endif - -#ifndef __IMemoryData_FWD_DEFINED__ -#define __IMemoryData_FWD_DEFINED__ -typedef interface IMemoryData IMemoryData; -#endif - -#ifndef __IAudioData_FWD_DEFINED__ -#define __IAudioData_FWD_DEFINED__ -typedef interface IAudioData IAudioData; -#endif - -/***************************************************************************** - * IAudioMediaStream interface - */ -#ifndef __IAudioMediaStream_INTERFACE_DEFINED__ -#define __IAudioMediaStream_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_IAudioMediaStream, 0xf7537560, 0xa3be, 0x11d0, 0x82,0x12, 0x00,0xc0,0x4f,0xc3,0x2c,0x45); -#if defined(__cplusplus) && !defined(CINTERFACE) -interface IAudioMediaStream : public IMediaStream -{ - virtual HRESULT STDMETHODCALLTYPE GetFormat( - WAVEFORMATEX* pWaveFormatCurrent) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetFormat( - const WAVEFORMATEX* lpWaveFormat) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateSample( - IAudioData* pAudioData, - DWORD dwFlags, - IAudioStreamSample** ppSample) = 0; - -}; -#else -typedef struct IAudioMediaStreamVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAudioMediaStream* This, - REFIID riid, - void** ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IAudioMediaStream* This); - - ULONG (STDMETHODCALLTYPE *Release)( - IAudioMediaStream* This); - - /*** IMediaStream methods ***/ - HRESULT (STDMETHODCALLTYPE *GetMultiMediaStream)( - IAudioMediaStream* This, - IMultiMediaStream** ppMultiMediaStream); - - HRESULT (STDMETHODCALLTYPE *GetInformation)( - IAudioMediaStream* This, - MSPID* pPurposeId, - STREAM_TYPE* pType); - - HRESULT (STDMETHODCALLTYPE *SetSameFormat)( - IAudioMediaStream* This, - IMediaStream* pStreamThatHasDesiredFormat, - DWORD dwFlags); - - HRESULT (STDMETHODCALLTYPE *AllocateSample)( - IAudioMediaStream* This, - DWORD dwFlags, - IStreamSample** ppSample); - - HRESULT (STDMETHODCALLTYPE *CreateSharedSample)( - IAudioMediaStream* This, - IStreamSample* pExistingSample, - DWORD dwFlags, - IStreamSample** ppNewSample); - - HRESULT (STDMETHODCALLTYPE *SendEndOfStream)( - IAudioMediaStream* This, - DWORD dwFlags); - - /*** IAudioMediaStream methods ***/ - HRESULT (STDMETHODCALLTYPE *GetFormat)( - IAudioMediaStream* This, - WAVEFORMATEX* pWaveFormatCurrent); - - HRESULT (STDMETHODCALLTYPE *SetFormat)( - IAudioMediaStream* This, - const WAVEFORMATEX* lpWaveFormat); - - HRESULT (STDMETHODCALLTYPE *CreateSample)( - IAudioMediaStream* This, - IAudioData* pAudioData, - DWORD dwFlags, - IAudioStreamSample** ppSample); - - END_INTERFACE -} IAudioMediaStreamVtbl; -interface IAudioMediaStream { - const IAudioMediaStreamVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -/*** IUnknown methods ***/ -#define IAudioMediaStream_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IAudioMediaStream_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IAudioMediaStream_Release(p) (p)->lpVtbl->Release(p) -/*** IMediaStream methods ***/ -#define IAudioMediaStream_GetMultiMediaStream(p,a) (p)->lpVtbl->GetMultiMediaStream(p,a) -#define IAudioMediaStream_GetInformation(p,a,b) (p)->lpVtbl->GetInformation(p,a,b) -#define IAudioMediaStream_SetSameFormat(p,a,b) (p)->lpVtbl->SetSameFormat(p,a,b) -#define IAudioMediaStream_AllocateSample(p,a,b) (p)->lpVtbl->AllocateSample(p,a,b) -#define IAudioMediaStream_CreateSharedSample(p,a,b,c) (p)->lpVtbl->CreateSharedSample(p,a,b,c) -#define IAudioMediaStream_SendEndOfStream(p,a) (p)->lpVtbl->SendEndOfStream(p,a) -/*** IAudioMediaStream methods ***/ -#define IAudioMediaStream_GetFormat(p,a) (p)->lpVtbl->GetFormat(p,a) -#define IAudioMediaStream_SetFormat(p,a) (p)->lpVtbl->SetFormat(p,a) -#define IAudioMediaStream_CreateSample(p,a,b,c) (p)->lpVtbl->CreateSample(p,a,b,c) -#endif - -#endif - -HRESULT CALLBACK IAudioMediaStream_GetFormat_Proxy( - IAudioMediaStream* This, - WAVEFORMATEX* pWaveFormatCurrent); -void __RPC_STUB IAudioMediaStream_GetFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAudioMediaStream_SetFormat_Proxy( - IAudioMediaStream* This, - const WAVEFORMATEX* lpWaveFormat); -void __RPC_STUB IAudioMediaStream_SetFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAudioMediaStream_CreateSample_Proxy( - IAudioMediaStream* This, - IAudioData* pAudioData, - DWORD dwFlags, - IAudioStreamSample** ppSample); -void __RPC_STUB IAudioMediaStream_CreateSample_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); - -#endif /* __IAudioMediaStream_INTERFACE_DEFINED__ */ - -/***************************************************************************** - * IAudioStreamSample interface - */ -#ifndef __IAudioStreamSample_INTERFACE_DEFINED__ -#define __IAudioStreamSample_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_IAudioStreamSample, 0x345fee00, 0xaba5, 0x11d0, 0x82,0x12, 0x00,0xc0,0x4f,0xc3,0x2c,0x45); -#if defined(__cplusplus) && !defined(CINTERFACE) -interface IAudioStreamSample : public IStreamSample -{ - virtual HRESULT STDMETHODCALLTYPE GetAudioData( - IAudioData** ppAudio) = 0; - -}; -#else -typedef struct IAudioStreamSampleVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAudioStreamSample* This, - REFIID riid, - void** ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IAudioStreamSample* This); - - ULONG (STDMETHODCALLTYPE *Release)( - IAudioStreamSample* This); - - /*** IStreamSample methods ***/ - HRESULT (STDMETHODCALLTYPE *GetMediaStream)( - IAudioStreamSample* This, - IMediaStream** ppMediaStream); - - HRESULT (STDMETHODCALLTYPE *GetSampleTimes)( - IAudioStreamSample* This, - STREAM_TIME* pStartTime, - STREAM_TIME* pEndTime, - STREAM_TIME* pCurrentTime); - - HRESULT (STDMETHODCALLTYPE *SetSampleTimes)( - IAudioStreamSample* This, - const STREAM_TIME* pStartTime, - const STREAM_TIME* pEndTime); - - HRESULT (STDMETHODCALLTYPE *Update)( - IAudioStreamSample* This, - DWORD dwFlags, - HANDLE hEvent, - PAPCFUNC pfnAPC, - DWORD dwAPCData); - - HRESULT (STDMETHODCALLTYPE *CompletionStatus)( - IAudioStreamSample* This, - DWORD dwFlags, - DWORD dwMilliseconds); - - /*** IAudioStreamSample methods ***/ - HRESULT (STDMETHODCALLTYPE *GetAudioData)( - IAudioStreamSample* This, - IAudioData** ppAudio); - - END_INTERFACE -} IAudioStreamSampleVtbl; -interface IAudioStreamSample { - const IAudioStreamSampleVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -/*** IUnknown methods ***/ -#define IAudioStreamSample_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IAudioStreamSample_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IAudioStreamSample_Release(p) (p)->lpVtbl->Release(p) -/*** IStreamSample methods ***/ -#define IAudioStreamSample_GetMediaStream(p,a) (p)->lpVtbl->GetMediaStream(p,a) -#define IAudioStreamSample_GetSampleTimes(p,a,b,c) (p)->lpVtbl->GetSampleTimes(p,a,b,c) -#define IAudioStreamSample_SetSampleTimes(p,a,b) (p)->lpVtbl->SetSampleTimes(p,a,b) -#define IAudioStreamSample_Update(p,a,b,c,d) (p)->lpVtbl->Update(p,a,b,c,d) -#define IAudioStreamSample_CompletionStatus(p,a,b) (p)->lpVtbl->CompletionStatus(p,a,b) -/*** IAudioStreamSample methods ***/ -#define IAudioStreamSample_GetAudioData(p,a) (p)->lpVtbl->GetAudioData(p,a) -#endif - -#endif - -HRESULT CALLBACK IAudioStreamSample_GetAudioData_Proxy( - IAudioStreamSample* This, - IAudioData** ppAudio); -void __RPC_STUB IAudioStreamSample_GetAudioData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); - -#endif /* __IAudioStreamSample_INTERFACE_DEFINED__ */ - -/***************************************************************************** - * IMemoryData interface - */ -#ifndef __IMemoryData_INTERFACE_DEFINED__ -#define __IMemoryData_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_IMemoryData, 0x327fc560, 0xaf60, 0x11d0, 0x82,0x12, 0x00,0xc0,0x4f,0xc3,0x2c,0x45); -#if defined(__cplusplus) && !defined(CINTERFACE) -interface IMemoryData : public IUnknown -{ - virtual HRESULT STDMETHODCALLTYPE SetBuffer( - DWORD cbSize, - BYTE* pbData, - DWORD dwFlags) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetInfo( - DWORD* pdwLength, - BYTE** ppbData, - DWORD* pcbActualData) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetActual( - DWORD cbDataValid) = 0; - -}; -#else -typedef struct IMemoryDataVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMemoryData* This, - REFIID riid, - void** ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IMemoryData* This); - - ULONG (STDMETHODCALLTYPE *Release)( - IMemoryData* This); - - /*** IMemoryData methods ***/ - HRESULT (STDMETHODCALLTYPE *SetBuffer)( - IMemoryData* This, - DWORD cbSize, - BYTE* pbData, - DWORD dwFlags); - - HRESULT (STDMETHODCALLTYPE *GetInfo)( - IMemoryData* This, - DWORD* pdwLength, - BYTE** ppbData, - DWORD* pcbActualData); - - HRESULT (STDMETHODCALLTYPE *SetActual)( - IMemoryData* This, - DWORD cbDataValid); - - END_INTERFACE -} IMemoryDataVtbl; -interface IMemoryData { - const IMemoryDataVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -/*** IUnknown methods ***/ -#define IMemoryData_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IMemoryData_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IMemoryData_Release(p) (p)->lpVtbl->Release(p) -/*** IMemoryData methods ***/ -#define IMemoryData_SetBuffer(p,a,b,c) (p)->lpVtbl->SetBuffer(p,a,b,c) -#define IMemoryData_GetInfo(p,a,b,c) (p)->lpVtbl->GetInfo(p,a,b,c) -#define IMemoryData_SetActual(p,a) (p)->lpVtbl->SetActual(p,a) -#endif - -#endif - -HRESULT CALLBACK IMemoryData_SetBuffer_Proxy( - IMemoryData* This, - DWORD cbSize, - BYTE* pbData, - DWORD dwFlags); -void __RPC_STUB IMemoryData_SetBuffer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IMemoryData_GetInfo_Proxy( - IMemoryData* This, - DWORD* pdwLength, - BYTE** ppbData, - DWORD* pcbActualData); -void __RPC_STUB IMemoryData_GetInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IMemoryData_SetActual_Proxy( - IMemoryData* This, - DWORD cbDataValid); -void __RPC_STUB IMemoryData_SetActual_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); - -#endif /* __IMemoryData_INTERFACE_DEFINED__ */ - -/***************************************************************************** - * IAudioData interface - */ -#ifndef __IAudioData_INTERFACE_DEFINED__ -#define __IAudioData_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_IAudioData, 0x54c719c0, 0xaf60, 0x11d0, 0x82,0x12, 0x00,0xc0,0x4f,0xc3,0x2c,0x45); -#if defined(__cplusplus) && !defined(CINTERFACE) -interface IAudioData : public IMemoryData -{ - virtual HRESULT STDMETHODCALLTYPE GetFormat( - WAVEFORMATEX* pWaveFormatCurrent) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetFormat( - const WAVEFORMATEX* lpWaveFormat) = 0; - -}; -#else -typedef struct IAudioDataVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAudioData* This, - REFIID riid, - void** ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IAudioData* This); - - ULONG (STDMETHODCALLTYPE *Release)( - IAudioData* This); - - /*** IMemoryData methods ***/ - HRESULT (STDMETHODCALLTYPE *SetBuffer)( - IAudioData* This, - DWORD cbSize, - BYTE* pbData, - DWORD dwFlags); - - HRESULT (STDMETHODCALLTYPE *GetInfo)( - IAudioData* This, - DWORD* pdwLength, - BYTE** ppbData, - DWORD* pcbActualData); - - HRESULT (STDMETHODCALLTYPE *SetActual)( - IAudioData* This, - DWORD cbDataValid); - - /*** IAudioData methods ***/ - HRESULT (STDMETHODCALLTYPE *GetFormat)( - IAudioData* This, - WAVEFORMATEX* pWaveFormatCurrent); - - HRESULT (STDMETHODCALLTYPE *SetFormat)( - IAudioData* This, - const WAVEFORMATEX* lpWaveFormat); - - END_INTERFACE -} IAudioDataVtbl; -interface IAudioData { - const IAudioDataVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -/*** IUnknown methods ***/ -#define IAudioData_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IAudioData_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IAudioData_Release(p) (p)->lpVtbl->Release(p) -/*** IMemoryData methods ***/ -#define IAudioData_SetBuffer(p,a,b,c) (p)->lpVtbl->SetBuffer(p,a,b,c) -#define IAudioData_GetInfo(p,a,b,c) (p)->lpVtbl->GetInfo(p,a,b,c) -#define IAudioData_SetActual(p,a) (p)->lpVtbl->SetActual(p,a) -/*** IAudioData methods ***/ -#define IAudioData_GetFormat(p,a) (p)->lpVtbl->GetFormat(p,a) -#define IAudioData_SetFormat(p,a) (p)->lpVtbl->SetFormat(p,a) -#endif - -#endif - -HRESULT CALLBACK IAudioData_GetFormat_Proxy( - IAudioData* This, - WAVEFORMATEX* pWaveFormatCurrent); -void __RPC_STUB IAudioData_GetFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAudioData_SetFormat_Proxy( - IAudioData* This, - const WAVEFORMATEX* lpWaveFormat); -void __RPC_STUB IAudioData_SetFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); - -#endif /* __IAudioData_INTERFACE_DEFINED__ */ - -/* Begin additional prototypes for all interfaces */ - - -/* End additional prototypes */ - -#ifdef __cplusplus -} -#endif -#endif /* __WIDL_INCLUDE_PSDK_AUSTREAM_H */ Removed: trunk/reactos/include/psdk/austream.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/austream.idl?… ============================================================================== --- trunk/reactos/include/psdk/austream.idl (original) +++ trunk/reactos/include/psdk/austream.idl (removed) @@ -1,108 +1,0 @@ -/* - * Copyright 2004 Christian Costa - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -import "unknwn.idl"; -import "mmstream.idl"; - -cpp_quote("#if 0") -typedef struct tWAVEFORMATEX WAVEFORMATEX; -cpp_quote ("#endif") - -interface IAudioMediaStream; -interface IAudioStreamSample; -interface IMemoryData; -interface IAudioData; - -[ -object, -local, -uuid(f7537560-a3be-11d0-8212-00c04fc32c45), -pointer_default(unique) -] -interface IAudioMediaStream : IMediaStream -{ - HRESULT GetFormat( - [out] /*[optional]*/ WAVEFORMATEX *pWaveFormatCurrent - ); - - HRESULT SetFormat( - [in] const WAVEFORMATEX *lpWaveFormat); - - HRESULT CreateSample( - [in] IAudioData *pAudioData, - [in] DWORD dwFlags, - [out] IAudioStreamSample **ppSample - ); -} - - -[ -object, -local, -uuid(345fee00-aba5-11d0-8212-00c04fc32c45), -pointer_default(unique) -] -interface IAudioStreamSample : IStreamSample -{ - HRESULT GetAudioData( - [out] IAudioData **ppAudio - ); -} - - -[ -object, -local, -uuid(327fc560-af60-11d0-8212-00c04fc32c45), -pointer_default(unique) -] -interface IMemoryData : IUnknown -{ - HRESULT SetBuffer( - [in] DWORD cbSize, - [in] BYTE *pbData, - [in] DWORD dwFlags - ); - - HRESULT GetInfo( - [out] DWORD *pdwLength, - [out] BYTE **ppbData, - [out] DWORD *pcbActualData - ); - HRESULT SetActual( - [in] DWORD cbDataValid - ); -} - - -[ -object, -local, -uuid(54c719c0-af60-11d0-8212-00c04fc32c45), -pointer_default(unique) -] -interface IAudioData : IMemoryData -{ - HRESULT GetFormat( - [out] /*[optional]*/ WAVEFORMATEX *pWaveFormatCurrent - ); - - HRESULT SetFormat( - [in] const WAVEFORMATEX *lpWaveFormat - ); -} Removed: trunk/reactos/include/psdk/ddstream.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ddstream.h?re… ============================================================================== --- trunk/reactos/include/psdk/ddstream.h (original) +++ trunk/reactos/include/psdk/ddstream.h (removed) @@ -1,371 +1,0 @@ -/*** Autogenerated by WIDL 0.3.0 from include\psdk\ddstream.idl - Do not edit ***/ -#include <rpc.h> -#include <rpcndr.h> - -#ifndef __WIDL_INCLUDE_PSDK_DDSTREAM_H -#define __WIDL_INCLUDE_PSDK_DDSTREAM_H -#ifdef __cplusplus -extern "C" { -#endif -#include <unknwn.h> -#include <mmstream.h> -#ifndef __WINE_DDRAW_H -typedef void *LPDDSURFACEDESC; -typedef struct tDDSURFACEDESC DDSURFACEDESC; -#ifndef __IDirectDraw_FWD_DEFINED__ -#define __IDirectDraw_FWD_DEFINED__ -typedef interface IDirectDraw IDirectDraw; -#endif - -#ifndef __IDirectDrawSurface_FWD_DEFINED__ -#define __IDirectDrawSurface_FWD_DEFINED__ -typedef interface IDirectDrawSurface IDirectDrawSurface; -#endif - -#ifndef __IDirectDrawPalette_FWD_DEFINED__ -#define __IDirectDrawPalette_FWD_DEFINED__ -typedef interface IDirectDrawPalette IDirectDrawPalette; -#endif - -#endif -#include <ddraw.h> -enum { - DDSFF_PROGRESSIVERENDER = 0x1 -}; - -#ifndef __IDirectDrawMediaStream_FWD_DEFINED__ -#define __IDirectDrawMediaStream_FWD_DEFINED__ -typedef interface IDirectDrawMediaStream IDirectDrawMediaStream; -#endif - -#ifndef __IDirectDrawStreamSample_FWD_DEFINED__ -#define __IDirectDrawStreamSample_FWD_DEFINED__ -typedef interface IDirectDrawStreamSample IDirectDrawStreamSample; -#endif - -/***************************************************************************** - * IDirectDrawMediaStream interface - */ -#ifndef __IDirectDrawMediaStream_INTERFACE_DEFINED__ -#define __IDirectDrawMediaStream_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_IDirectDrawMediaStream, 0xf4104fce, 0x9a70, 0x11d0, 0x8f,0xde, 0x00,0xc0,0x4f,0xd9,0x18,0x9d); -#if defined(__cplusplus) && !defined(CINTERFACE) -interface IDirectDrawMediaStream : public IMediaStream -{ - virtual HRESULT STDMETHODCALLTYPE GetFormat( - DDSURFACEDESC* pDDSDCurrent, - IDirectDrawPalette** ppDirectDrawPalette, - DDSURFACEDESC* pDDSDDesired, - DWORD* pdwFlags) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetFormat( - const DDSURFACEDESC* pDDSurfaceDesc, - IDirectDrawPalette* pDirectDrawPalette) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetDirectDraw( - IDirectDraw** ppDirectDraw) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetDirectDraw( - IDirectDraw* pDirectDraw) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateSample( - IDirectDrawSurface* pSurface, - const RECT* pRect, - DWORD dwFlags, - IDirectDrawStreamSample** ppSample) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetTimePerFrame( - STREAM_TIME* pFrameTime) = 0; - -}; -#else -typedef struct IDirectDrawMediaStreamVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDirectDrawMediaStream* This, - REFIID riid, - void** ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IDirectDrawMediaStream* This); - - ULONG (STDMETHODCALLTYPE *Release)( - IDirectDrawMediaStream* This); - - /*** IMediaStream methods ***/ - HRESULT (STDMETHODCALLTYPE *GetMultiMediaStream)( - IDirectDrawMediaStream* This, - IMultiMediaStream** ppMultiMediaStream); - - HRESULT (STDMETHODCALLTYPE *GetInformation)( - IDirectDrawMediaStream* This, - MSPID* pPurposeId, - STREAM_TYPE* pType); - - HRESULT (STDMETHODCALLTYPE *SetSameFormat)( - IDirectDrawMediaStream* This, - IMediaStream* pStreamThatHasDesiredFormat, - DWORD dwFlags); - - HRESULT (STDMETHODCALLTYPE *AllocateSample)( - IDirectDrawMediaStream* This, - DWORD dwFlags, - IStreamSample** ppSample); - - HRESULT (STDMETHODCALLTYPE *CreateSharedSample)( - IDirectDrawMediaStream* This, - IStreamSample* pExistingSample, - DWORD dwFlags, - IStreamSample** ppNewSample); - - HRESULT (STDMETHODCALLTYPE *SendEndOfStream)( - IDirectDrawMediaStream* This, - DWORD dwFlags); - - /*** IDirectDrawMediaStream methods ***/ - HRESULT (STDMETHODCALLTYPE *GetFormat)( - IDirectDrawMediaStream* This, - DDSURFACEDESC* pDDSDCurrent, - IDirectDrawPalette** ppDirectDrawPalette, - DDSURFACEDESC* pDDSDDesired, - DWORD* pdwFlags); - - HRESULT (STDMETHODCALLTYPE *SetFormat)( - IDirectDrawMediaStream* This, - const DDSURFACEDESC* pDDSurfaceDesc, - IDirectDrawPalette* pDirectDrawPalette); - - HRESULT (STDMETHODCALLTYPE *GetDirectDraw)( - IDirectDrawMediaStream* This, - IDirectDraw** ppDirectDraw); - - HRESULT (STDMETHODCALLTYPE *SetDirectDraw)( - IDirectDrawMediaStream* This, - IDirectDraw* pDirectDraw); - - HRESULT (STDMETHODCALLTYPE *CreateSample)( - IDirectDrawMediaStream* This, - IDirectDrawSurface* pSurface, - const RECT* pRect, - DWORD dwFlags, - IDirectDrawStreamSample** ppSample); - - HRESULT (STDMETHODCALLTYPE *GetTimePerFrame)( - IDirectDrawMediaStream* This, - STREAM_TIME* pFrameTime); - - END_INTERFACE -} IDirectDrawMediaStreamVtbl; -interface IDirectDrawMediaStream { - const IDirectDrawMediaStreamVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -/*** IUnknown methods ***/ -#define IDirectDrawMediaStream_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IDirectDrawMediaStream_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IDirectDrawMediaStream_Release(p) (p)->lpVtbl->Release(p) -/*** IMediaStream methods ***/ -#define IDirectDrawMediaStream_GetMultiMediaStream(p,a) (p)->lpVtbl->GetMultiMediaStream(p,a) -#define IDirectDrawMediaStream_GetInformation(p,a,b) (p)->lpVtbl->GetInformation(p,a,b) -#define IDirectDrawMediaStream_SetSameFormat(p,a,b) (p)->lpVtbl->SetSameFormat(p,a,b) -#define IDirectDrawMediaStream_AllocateSample(p,a,b) (p)->lpVtbl->AllocateSample(p,a,b) -#define IDirectDrawMediaStream_CreateSharedSample(p,a,b,c) (p)->lpVtbl->CreateSharedSample(p,a,b,c) -#define IDirectDrawMediaStream_SendEndOfStream(p,a) (p)->lpVtbl->SendEndOfStream(p,a) -/*** IDirectDrawMediaStream methods ***/ -#define IDirectDrawMediaStream_GetFormat(p,a,b,c,d) (p)->lpVtbl->GetFormat(p,a,b,c,d) -#define IDirectDrawMediaStream_SetFormat(p,a,b) (p)->lpVtbl->SetFormat(p,a,b) -#define IDirectDrawMediaStream_GetDirectDraw(p,a) (p)->lpVtbl->GetDirectDraw(p,a) -#define IDirectDrawMediaStream_SetDirectDraw(p,a) (p)->lpVtbl->SetDirectDraw(p,a) -#define IDirectDrawMediaStream_CreateSample(p,a,b,c,d) (p)->lpVtbl->CreateSample(p,a,b,c,d) -#define IDirectDrawMediaStream_GetTimePerFrame(p,a) (p)->lpVtbl->GetTimePerFrame(p,a) -#endif - -#endif - -HRESULT CALLBACK IDirectDrawMediaStream_GetFormat_Proxy( - IDirectDrawMediaStream* This, - DDSURFACEDESC* pDDSDCurrent, - IDirectDrawPalette** ppDirectDrawPalette, - DDSURFACEDESC* pDDSDDesired, - DWORD* pdwFlags); -void __RPC_STUB IDirectDrawMediaStream_GetFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IDirectDrawMediaStream_SetFormat_Proxy( - IDirectDrawMediaStream* This, - const DDSURFACEDESC* pDDSurfaceDesc, - IDirectDrawPalette* pDirectDrawPalette); -void __RPC_STUB IDirectDrawMediaStream_SetFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IDirectDrawMediaStream_GetDirectDraw_Proxy( - IDirectDrawMediaStream* This, - IDirectDraw** ppDirectDraw); -void __RPC_STUB IDirectDrawMediaStream_GetDirectDraw_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IDirectDrawMediaStream_SetDirectDraw_Proxy( - IDirectDrawMediaStream* This, - IDirectDraw* pDirectDraw); -void __RPC_STUB IDirectDrawMediaStream_SetDirectDraw_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IDirectDrawMediaStream_CreateSample_Proxy( - IDirectDrawMediaStream* This, - IDirectDrawSurface* pSurface, - const RECT* pRect, - DWORD dwFlags, - IDirectDrawStreamSample** ppSample); -void __RPC_STUB IDirectDrawMediaStream_CreateSample_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IDirectDrawMediaStream_GetTimePerFrame_Proxy( - IDirectDrawMediaStream* This, - STREAM_TIME* pFrameTime); -void __RPC_STUB IDirectDrawMediaStream_GetTimePerFrame_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); - -#endif /* __IDirectDrawMediaStream_INTERFACE_DEFINED__ */ - -/***************************************************************************** - * IDirectDrawStreamSample interface - */ -#ifndef __IDirectDrawStreamSample_INTERFACE_DEFINED__ -#define __IDirectDrawStreamSample_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_IDirectDrawStreamSample, 0xf4104fcf, 0x9a70, 0x11d0, 0x8f,0xde, 0x00,0xc0,0x4f,0xd9,0x18,0x9d); -#if defined(__cplusplus) && !defined(CINTERFACE) -interface IDirectDrawStreamSample : public IStreamSample -{ - virtual HRESULT STDMETHODCALLTYPE GetSurface( - IDirectDrawSurface** ppDirectDrawSurface, - RECT* pRect) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetRect( - const RECT* pRect) = 0; - -}; -#else -typedef struct IDirectDrawStreamSampleVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDirectDrawStreamSample* This, - REFIID riid, - void** ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IDirectDrawStreamSample* This); - - ULONG (STDMETHODCALLTYPE *Release)( - IDirectDrawStreamSample* This); - - /*** IStreamSample methods ***/ - HRESULT (STDMETHODCALLTYPE *GetMediaStream)( - IDirectDrawStreamSample* This, - IMediaStream** ppMediaStream); - - HRESULT (STDMETHODCALLTYPE *GetSampleTimes)( - IDirectDrawStreamSample* This, - STREAM_TIME* pStartTime, - STREAM_TIME* pEndTime, - STREAM_TIME* pCurrentTime); - - HRESULT (STDMETHODCALLTYPE *SetSampleTimes)( - IDirectDrawStreamSample* This, - const STREAM_TIME* pStartTime, - const STREAM_TIME* pEndTime); - - HRESULT (STDMETHODCALLTYPE *Update)( - IDirectDrawStreamSample* This, - DWORD dwFlags, - HANDLE hEvent, - PAPCFUNC pfnAPC, - DWORD dwAPCData); - - HRESULT (STDMETHODCALLTYPE *CompletionStatus)( - IDirectDrawStreamSample* This, - DWORD dwFlags, - DWORD dwMilliseconds); - - /*** IDirectDrawStreamSample methods ***/ - HRESULT (STDMETHODCALLTYPE *GetSurface)( - IDirectDrawStreamSample* This, - IDirectDrawSurface** ppDirectDrawSurface, - RECT* pRect); - - HRESULT (STDMETHODCALLTYPE *SetRect)( - IDirectDrawStreamSample* This, - const RECT* pRect); - - END_INTERFACE -} IDirectDrawStreamSampleVtbl; -interface IDirectDrawStreamSample { - const IDirectDrawStreamSampleVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -/*** IUnknown methods ***/ -#define IDirectDrawStreamSample_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IDirectDrawStreamSample_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IDirectDrawStreamSample_Release(p) (p)->lpVtbl->Release(p) -/*** IStreamSample methods ***/ -#define IDirectDrawStreamSample_GetMediaStream(p,a) (p)->lpVtbl->GetMediaStream(p,a) -#define IDirectDrawStreamSample_GetSampleTimes(p,a,b,c) (p)->lpVtbl->GetSampleTimes(p,a,b,c) -#define IDirectDrawStreamSample_SetSampleTimes(p,a,b) (p)->lpVtbl->SetSampleTimes(p,a,b) -#define IDirectDrawStreamSample_Update(p,a,b,c,d) (p)->lpVtbl->Update(p,a,b,c,d) -#define IDirectDrawStreamSample_CompletionStatus(p,a,b) (p)->lpVtbl->CompletionStatus(p,a,b) -/*** IDirectDrawStreamSample methods ***/ -#define IDirectDrawStreamSample_GetSurface(p,a,b) (p)->lpVtbl->GetSurface(p,a,b) -#define IDirectDrawStreamSample_SetRect(p,a) (p)->lpVtbl->SetRect(p,a) -#endif - -#endif - -HRESULT CALLBACK IDirectDrawStreamSample_GetSurface_Proxy( - IDirectDrawStreamSample* This, - IDirectDrawSurface** ppDirectDrawSurface, - RECT* pRect); -void __RPC_STUB IDirectDrawStreamSample_GetSurface_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IDirectDrawStreamSample_SetRect_Proxy( - IDirectDrawStreamSample* This, - const RECT* pRect); -void __RPC_STUB IDirectDrawStreamSample_SetRect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); - -#endif /* __IDirectDrawStreamSample_INTERFACE_DEFINED__ */ - -/* Begin additional prototypes for all interfaces */ - - -/* End additional prototypes */ - -#ifdef __cplusplus -} -#endif -#endif /* __WIDL_INCLUDE_PSDK_DDSTREAM_H */ Removed: trunk/reactos/include/psdk/ddstream.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ddstream.idl?… ============================================================================== --- trunk/reactos/include/psdk/ddstream.idl (original) +++ trunk/reactos/include/psdk/ddstream.idl (removed) @@ -1,88 +1,0 @@ -/* - * Copyright 2004 Christian Costa - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -import "unknwn.idl"; -import "mmstream.idl"; - -cpp_quote("#ifndef __WINE_DDRAW_H") -typedef void * LPDDSURFACEDESC; -typedef struct tDDSURFACEDESC DDSURFACEDESC; -interface IDirectDraw; -interface IDirectDrawSurface; -interface IDirectDrawPalette; -cpp_quote("#endif") -cpp_quote("#include <ddraw.h>") - -enum { - DDSFF_PROGRESSIVERENDER = 0x00000001 -}; - -interface IDirectDrawMediaStream; -interface IDirectDrawStreamSample; - -[ -object, -local, -uuid(F4104FCE-9A70-11d0-8FDE-00C04FD9189D), -pointer_default(unique) -] -interface IDirectDrawMediaStream : IMediaStream -{ - HRESULT GetFormat( - [out, optional] DDSURFACEDESC *pDDSDCurrent, - [out, optional] IDirectDrawPalette **ppDirectDrawPalette, - [out, optional] DDSURFACEDESC *pDDSDDesired, - [out, optional] DWORD *pdwFlags); - - HRESULT SetFormat( - [in] const DDSURFACEDESC *pDDSurfaceDesc, - [in, optional] IDirectDrawPalette *pDirectDrawPalette); - - HRESULT GetDirectDraw( - [out] IDirectDraw **ppDirectDraw); - - HRESULT SetDirectDraw( - [in] IDirectDraw *pDirectDraw); - - HRESULT CreateSample( - [in, optional] IDirectDrawSurface *pSurface, - [in, optional] const RECT *pRect, - [in] DWORD dwFlags, - [out] IDirectDrawStreamSample **ppSample); - - HRESULT GetTimePerFrame( - [out] STREAM_TIME *pFrameTime); -} - - -[ -object, -local, -uuid(F4104FCF-9A70-11d0-8FDE-00C04FD9189D), -pointer_default(unique) -] -interface IDirectDrawStreamSample : IStreamSample -{ - HRESULT GetSurface( - [out, optional] IDirectDrawSurface ** ppDirectDrawSurface, - [out, optional] RECT * pRect); - - HRESULT SetRect( - [in] const RECT * pRect); - -}

1 0

[greatlrd] 26902: forget adding a header hack, for widl
by greatlrd＠svn.reactos.org 26 May '07

26 May '07

Author: greatlrd Date: Sat May 26 15:26:23 2007 New Revision: 26902 URL: http://svn.reactos.org/svn/reactos?rev=26902&view=rev Log: forget adding a header hack, for widl Modified: trunk/reactos/include/dxsdk/mmstream.idl Modified: trunk/reactos/include/dxsdk/mmstream.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/mmstream.idl… ============================================================================== --- trunk/reactos/include/dxsdk/mmstream.idl (original) +++ trunk/reactos/include/dxsdk/mmstream.idl Sat May 26 15:26:23 2007 @@ -24,13 +24,11 @@ // FIXME HACK remove the // for two cpp_quote - -#ifndef DX_IDL_HACK +cpp_quote("#if 0"); typedef LPVOID PAPCFUNC; -#endif +cpp_quote("#endif"); cpp_quote("#if(_WIN32_WINNT < 0x0400)") -cpp_quote("#define DX_IDL_HACK") cpp_quote("typedef void (__stdcall * PAPCFUNC)(DWORD_PTR dwParam);") cpp_quote("#endif")

1 0

[greatlrd] 26901: adding correct mmstream.idl
by greatlrd＠svn.reactos.org 26 May '07

26 May '07

Author: greatlrd Date: Sat May 26 15:22:58 2007 New Revision: 26901 URL: http://svn.reactos.org/svn/reactos?rev=26901&view=rev Log: adding correct mmstream.idl Added: trunk/reactos/include/dxsdk/dxsdk.rbuild (with props) trunk/reactos/include/dxsdk/mmstream.idl (with props) Removed: trunk/reactos/include/psdk/mmstream.h trunk/reactos/include/psdk/mmstream.idl Modified: trunk/reactos/include/directory.rbuild trunk/reactos/include/dxsdk/ (props changed) Modified: trunk/reactos/include/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/directory.rbuild?r… ============================================================================== --- trunk/reactos/include/directory.rbuild (original) +++ trunk/reactos/include/directory.rbuild Sat May 26 15:22:58 2007 @@ -1,5 +1,8 @@ <directory name="reactos"> <xi:include href="reactos/reactos.rbuild" /> +</directory> +<directory name="dxsdk"> + <xi:include href="dxsdk/dxsdk.rbuild" /> </directory> <directory name="psdk"> <xi:include href="psdk/psdk.rbuild" /> Propchange: trunk/reactos/include/dxsdk/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat May 26 15:22:58 2007 @@ -1,0 +1,1 @@ +mmstream.h Added: trunk/reactos/include/dxsdk/dxsdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dxsdk.rbuild… ============================================================================== --- trunk/reactos/include/dxsdk/dxsdk.rbuild (added) +++ trunk/reactos/include/dxsdk/dxsdk.rbuild Sat May 26 15:22:58 2007 @@ -1,0 +1,3 @@ +<module name="dxsdk" type="idlheader"> + <file>mmstream.idl</file> +</module> Propchange: trunk/reactos/include/dxsdk/dxsdk.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/mmstream.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/mmstream.idl… ============================================================================== --- trunk/reactos/include/dxsdk/mmstream.idl (added) +++ trunk/reactos/include/dxsdk/mmstream.idl Sat May 26 15:22:58 2007 @@ -1,0 +1,130 @@ + + +import "unknwn.idl"; + +cpp_quote("DEFINE_GUID(MSPID_PrimaryVideo, 0xA35FF56A, 0x9FDA, 0x11D0, 0x8F, 0xDF, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0x9D);") +cpp_quote("DEFINE_GUID(MSPID_PrimaryAudio, 0xA35FF56B, 0x9FDA, 0x11D0, 0x8F, 0xDF, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0x9D);") + +cpp_quote("#define MS_ERROR_CODE(x) MAKE_HRESULT(1, FACILITY_ITF, (x) + 0x400)") +cpp_quote("#define MS_SUCCESS_CODE(x) MAKE_HRESULT(0, FACILITY_ITF, x)") +cpp_quote("#define MS_S_PENDING MS_SUCCESS_CODE(1)") +cpp_quote("#define MS_S_NOUPDATE MS_SUCCESS_CODE(2)") +cpp_quote("#define MS_S_ENDOFSTREAM MS_SUCCESS_CODE(3)") +cpp_quote("#define MS_E_SAMPLEALLOC MS_ERROR_CODE(1)") +cpp_quote("#define MS_E_PURPOSEID MS_ERROR_CODE(2)") +cpp_quote("#define MS_E_NOSTREAM MS_ERROR_CODE(3)") +cpp_quote("#define MS_E_NOSEEKING MS_ERROR_CODE(4)") +cpp_quote("#define MS_E_INCOMPATIBLE MS_ERROR_CODE(5)") +cpp_quote("#define MS_E_BUSY MS_ERROR_CODE(6)") +cpp_quote("#define MS_E_NOTINIT MS_ERROR_CODE(7)") +cpp_quote("#define MS_E_SOURCEALREADYDEFINED MS_ERROR_CODE(8)") +cpp_quote("#define MS_E_INVALIDSTREAMTYPE MS_ERROR_CODE(9)") +cpp_quote("#define MS_E_NOTRUNNING MS_ERROR_CODE(10)") + + + +// FIXME HACK remove the // for two cpp_quote + +#ifndef DX_IDL_HACK + typedef LPVOID PAPCFUNC; +#endif + +cpp_quote("#if(_WIN32_WINNT < 0x0400)") +cpp_quote("#define DX_IDL_HACK") +cpp_quote("typedef void (__stdcall * PAPCFUNC)(DWORD_PTR dwParam);") +cpp_quote("#endif") + +typedef LONGLONG STREAM_TIME; + +typedef GUID MSPID; +typedef REFGUID REFMSPID; + +enum +{ + MMSSF_HASCLOCK = 0x00000001, + MMSSF_SUPPORTSEEK = 0x00000002, + MMSSF_ASYNCHRONOUS = 0x00000004 +}; + +typedef enum +{ + STREAMTYPE_READ = 0, + STREAMTYPE_WRITE = 1, + STREAMTYPE_TRANSFORM= 2 +} STREAM_TYPE; + +enum +{ + SSUPDATE_ASYNC = 0x00000001, + SSUPDATE_CONTINUOUS = 0x00000002 +}; + +typedef enum +{ + COMPSTAT_NOUPDATEOK = 0x00000001, + COMPSTAT_WAIT = 0x00000002, + COMPSTAT_ABORT = 0x00000004 +} COMPLETION_STATUS_FLAGS; + + +typedef enum +{ + STREAMSTATE_STOP = 0, + STREAMSTATE_RUN = 1 +} STREAM_STATE; + +interface IMultiMediaStream; +interface IMediaStream; +interface IStreamSample; + +[ +object, +local, +uuid(B502D1BC-9A57-11d0-8FDE-00C04FD9189D), +pointer_default(unique) +] +interface IMultiMediaStream : IUnknown +{ + HRESULT GetInformation([out] DWORD *pdwFlags, [out] STREAM_TYPE *pStreamType); + HRESULT GetMediaStream([in] REFMSPID idPurpose, [out] IMediaStream **ppMediaStream); + HRESULT EnumMediaStreams([in] long Index, [out] IMediaStream **ppMediaStream); + HRESULT GetState([out] STREAM_STATE *pCurrentState); + HRESULT SetState([in] STREAM_STATE NewState); + HRESULT GetTime([out] STREAM_TIME *pCurrentTime); + HRESULT GetDuration([out] STREAM_TIME *pDuration); + HRESULT Seek([in] STREAM_TIME SeekTime); + HRESULT GetEndOfStreamEventHandle([out] HANDLE *phEOS); +}; + + +[ +object, +uuid(B502D1BD-9A57-11d0-8FDE-00C04FD9189D), +pointer_default(unique) +] +interface IMediaStream : IUnknown +{ + HRESULT GetMultiMediaStream([out] IMultiMediaStream **ppMultiMediaStream); + HRESULT GetInformation([out] MSPID *pPurposeId, [out] STREAM_TYPE *pType); + HRESULT SetSameFormat([in] IMediaStream *pStreamThatHasDesiredFormat, [in] DWORD dwFlags); + HRESULT AllocateSample([in] DWORD dwFlags, [out] IStreamSample **ppSample); + HRESULT CreateSharedSample([in] IStreamSample *pExistingSample, [in] DWORD dwFlags, [out] IStreamSample **ppNewSample); + HRESULT SendEndOfStream(DWORD dwFlags); +}; + +[ +object, +local, +uuid(B502D1BE-9A57-11d0-8FDE-00C04FD9189D), +pointer_default(unique) +] + +interface IStreamSample : IUnknown +{ + HRESULT GetMediaStream([in] IMediaStream **ppMediaStream); + HRESULT GetSampleTimes([out] STREAM_TIME * pStartTime, [out] STREAM_TIME * pEndTime, [out] STREAM_TIME * pCurrentTime); + HRESULT SetSampleTimes([in] const STREAM_TIME *pStartTime, [in] const STREAM_TIME *pEndTime); + HRESULT Update([in] DWORD dwFlags, [in] HANDLE hEvent, [in] PAPCFUNC pfnAPC, [in] DWORD_PTR dwAPCData); + HRESULT CompletionStatus( [in] DWORD dwFlags, [in] DWORD dwMilliseconds); +}; + Propchange: trunk/reactos/include/dxsdk/mmstream.idl ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/include/psdk/mmstream.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmstream.h?re… ============================================================================== --- trunk/reactos/include/psdk/mmstream.h (original) +++ trunk/reactos/include/psdk/mmstream.h (removed) @@ -1,588 +1,0 @@ -/*** Autogenerated by WIDL 0.3.0 from include\psdk\mmstream.idl - Do not edit ***/ -#include <rpc.h> -#include <rpcndr.h> - -#ifndef __WIDL_INCLUDE_PSDK_MMSTREAM_H -#define __WIDL_INCLUDE_PSDK_MMSTREAM_H -#ifdef __cplusplus -extern "C" { -#endif -#include <unknwn.h> -#define MS_ERROR_CODE(x) MAKE_HRESULT(1, FACILITY_ITF, (x) + 0x400) -#define MS_SUCCESS_CODE(x) MAKE_HRESULT(0, FACILITY_ITF, x) -#define MS_S_PENDING MS_SUCCESS_CODE(1) -#define MS_S_NOUPDATE MS_SUCCESS_CODE(2) -#define MS_S_ENDOFSTREAM MS_SUCCESS_CODE(3) -#define MS_E_SAMPLEALLOC MS_ERROR_CODE(1) -#define MS_E_PURPOSEID MS_ERROR_CODE(2) -#define MS_E_NOSTREAM MS_ERROR_CODE(3) -#define MS_E_NOSEEKING MS_ERROR_CODE(4) -#define MS_E_INCOMPATIBLE MS_ERROR_CODE(5) -#define MS_E_BUSY MS_ERROR_CODE(6) -#define MS_E_NOTINIT MS_ERROR_CODE(7) -#define MS_E_SOURCEALREADYDEFINED MS_ERROR_CODE(8) -#define MS_E_INVALIDSTREAMTYPE MS_ERROR_CODE(9) -#define MS_E_NOTRUNNING MS_ERROR_CODE(10) -DEFINE_GUID(MSPID_PrimaryVideo, 0xa35ff56a, 0x9fda, 0x11d0, 0x8f, 0xdf, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0x9d); -DEFINE_GUID(MSPID_PrimaryAudio, 0xa35ff56b, 0x9fda, 0x11d0, 0x8f, 0xdf, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0x9d); -#if 0 -typedef void *PAPCFUNC; -#endif -typedef LONGLONG STREAM_TIME; -typedef GUID MSPID; -typedef REFGUID REFMSPID; -typedef enum { - STREAMTYPE_READ = 0, - STREAMTYPE_WRITE = 1, - STREAMTYPE_TRANSFORM = 2 -} STREAM_TYPE; -typedef enum { - STREAMSTATE_STOP = 0, - STREAMSTATE_RUN = 1 -} STREAM_STATE; -typedef enum { - COMPSTAT_NOUPDATEOK = 0x1, - COMPSTAT_WAIT = 0x2, - COMPSTAT_ABORT = 0x4 -} COMPLETION_STATUS_FLAGS; -enum { - MMSSF_HASCLOCK = 0x1, - MMSSF_SUPPORTSEEK = 0x2, - MMSSF_ASYNCHRONOUS = 0x4 -}; - -enum { - SSUPDATE_ASYNC = 0x1, - SSUPDATE_CONTINUOUS = 0x2 -}; - -#ifndef __IMultiMediaStream_FWD_DEFINED__ -#define __IMultiMediaStream_FWD_DEFINED__ -typedef interface IMultiMediaStream IMultiMediaStream; -#endif - -#ifndef __IMediaStream_FWD_DEFINED__ -#define __IMediaStream_FWD_DEFINED__ -typedef interface IMediaStream IMediaStream; -#endif - -#ifndef __IStreamSample_FWD_DEFINED__ -#define __IStreamSample_FWD_DEFINED__ -typedef interface IStreamSample IStreamSample; -#endif - -/***************************************************************************** - * IMultiMediaStream interface - */ -#ifndef __IMultiMediaStream_INTERFACE_DEFINED__ -#define __IMultiMediaStream_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_IMultiMediaStream, 0xb502d1bc, 0x9a57, 0x11d0, 0x8f,0xde, 0x00,0xc0,0x4f,0xd9,0x18,0x9d); -#if defined(__cplusplus) && !defined(CINTERFACE) -interface IMultiMediaStream : public IUnknown -{ - virtual HRESULT STDMETHODCALLTYPE GetInformation( - DWORD* pdwFlags, - STREAM_TYPE* pStreamType) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetMediaStream( - REFMSPID idPurpose, - IMediaStream** ppMediaStream) = 0; - - virtual HRESULT STDMETHODCALLTYPE EnumMediaStreams( - long Index, - IMediaStream** ppMediaStream) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetState( - STREAM_STATE* pCurrentState) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetState( - STREAM_STATE NewState) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetTime( - STREAM_TIME* pCurrentTime) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetDuration( - STREAM_TIME* pDuration) = 0; - - virtual HRESULT STDMETHODCALLTYPE Seek( - STREAM_TIME SeekTime) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetEndOfStreamEventHandle( - HANDLE* phEOS) = 0; - -}; -#else -typedef struct IMultiMediaStreamVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMultiMediaStream* This, - REFIID riid, - void** ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IMultiMediaStream* This); - - ULONG (STDMETHODCALLTYPE *Release)( - IMultiMediaStream* This); - - /*** IMultiMediaStream methods ***/ - HRESULT (STDMETHODCALLTYPE *GetInformation)( - IMultiMediaStream* This, - DWORD* pdwFlags, - STREAM_TYPE* pStreamType); - - HRESULT (STDMETHODCALLTYPE *GetMediaStream)( - IMultiMediaStream* This, - REFMSPID idPurpose, - IMediaStream** ppMediaStream); - - HRESULT (STDMETHODCALLTYPE *EnumMediaStreams)( - IMultiMediaStream* This, - long Index, - IMediaStream** ppMediaStream); - - HRESULT (STDMETHODCALLTYPE *GetState)( - IMultiMediaStream* This, - STREAM_STATE* pCurrentState); - - HRESULT (STDMETHODCALLTYPE *SetState)( - IMultiMediaStream* This, - STREAM_STATE NewState); - - HRESULT (STDMETHODCALLTYPE *GetTime)( - IMultiMediaStream* This, - STREAM_TIME* pCurrentTime); - - HRESULT (STDMETHODCALLTYPE *GetDuration)( - IMultiMediaStream* This, - STREAM_TIME* pDuration); - - HRESULT (STDMETHODCALLTYPE *Seek)( - IMultiMediaStream* This, - STREAM_TIME SeekTime); - - HRESULT (STDMETHODCALLTYPE *GetEndOfStreamEventHandle)( - IMultiMediaStream* This, - HANDLE* phEOS); - - END_INTERFACE -} IMultiMediaStreamVtbl; -interface IMultiMediaStream { - const IMultiMediaStreamVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -/*** IUnknown methods ***/ -#define IMultiMediaStream_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IMultiMediaStream_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IMultiMediaStream_Release(p) (p)->lpVtbl->Release(p) -/*** IMultiMediaStream methods ***/ -#define IMultiMediaStream_GetInformation(p,a,b) (p)->lpVtbl->GetInformation(p,a,b) -#define IMultiMediaStream_GetMediaStream(p,a,b) (p)->lpVtbl->GetMediaStream(p,a,b) -#define IMultiMediaStream_EnumMediaStreams(p,a,b) (p)->lpVtbl->EnumMediaStreams(p,a,b) -#define IMultiMediaStream_GetState(p,a) (p)->lpVtbl->GetState(p,a) -#define IMultiMediaStream_SetState(p,a) (p)->lpVtbl->SetState(p,a) -#define IMultiMediaStream_GetTime(p,a) (p)->lpVtbl->GetTime(p,a) -#define IMultiMediaStream_GetDuration(p,a) (p)->lpVtbl->GetDuration(p,a) -#define IMultiMediaStream_Seek(p,a) (p)->lpVtbl->Seek(p,a) -#define IMultiMediaStream_GetEndOfStreamEventHandle(p,a) (p)->lpVtbl->GetEndOfStreamEventHandle(p,a) -#endif - -#endif - -HRESULT CALLBACK IMultiMediaStream_GetInformation_Proxy( - IMultiMediaStream* This, - DWORD* pdwFlags, - STREAM_TYPE* pStreamType); -void __RPC_STUB IMultiMediaStream_GetInformation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IMultiMediaStream_GetMediaStream_Proxy( - IMultiMediaStream* This, - REFMSPID idPurpose, - IMediaStream** ppMediaStream); -void __RPC_STUB IMultiMediaStream_GetMediaStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IMultiMediaStream_EnumMediaStreams_Proxy( - IMultiMediaStream* This, - long Index, - IMediaStream** ppMediaStream); -void __RPC_STUB IMultiMediaStream_EnumMediaStreams_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IMultiMediaStream_GetState_Proxy( - IMultiMediaStream* This, - STREAM_STATE* pCurrentState); -void __RPC_STUB IMultiMediaStream_GetState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IMultiMediaStream_SetState_Proxy( - IMultiMediaStream* This, - STREAM_STATE NewState); -void __RPC_STUB IMultiMediaStream_SetState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IMultiMediaStream_GetTime_Proxy( - IMultiMediaStream* This, - STREAM_TIME* pCurrentTime); -void __RPC_STUB IMultiMediaStream_GetTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IMultiMediaStream_GetDuration_Proxy( - IMultiMediaStream* This, - STREAM_TIME* pDuration); -void __RPC_STUB IMultiMediaStream_GetDuration_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IMultiMediaStream_Seek_Proxy( - IMultiMediaStream* This, - STREAM_TIME SeekTime); -void __RPC_STUB IMultiMediaStream_Seek_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IMultiMediaStream_GetEndOfStreamEventHandle_Proxy( - IMultiMediaStream* This, - HANDLE* phEOS); -void __RPC_STUB IMultiMediaStream_GetEndOfStreamEventHandle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); - -#endif /* __IMultiMediaStream_INTERFACE_DEFINED__ */ - -/***************************************************************************** - * IMediaStream interface - */ -#ifndef __IMediaStream_INTERFACE_DEFINED__ -#define __IMediaStream_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_IMediaStream, 0xb502d1bd, 0x9a57, 0x11d0, 0x8f,0xde, 0x00,0xc0,0x4f,0xd9,0x18,0x9d); -#if defined(__cplusplus) && !defined(CINTERFACE) -interface IMediaStream : public IUnknown -{ - virtual HRESULT STDMETHODCALLTYPE GetMultiMediaStream( - IMultiMediaStream** ppMultiMediaStream) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetInformation( - MSPID* pPurposeId, - STREAM_TYPE* pType) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetSameFormat( - IMediaStream* pStreamThatHasDesiredFormat, - DWORD dwFlags) = 0; - - virtual HRESULT STDMETHODCALLTYPE AllocateSample( - DWORD dwFlags, - IStreamSample** ppSample) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateSharedSample( - IStreamSample* pExistingSample, - DWORD dwFlags, - IStreamSample** ppNewSample) = 0; - - virtual HRESULT STDMETHODCALLTYPE SendEndOfStream( - DWORD dwFlags) = 0; - -}; -#else -typedef struct IMediaStreamVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMediaStream* This, - REFIID riid, - void** ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IMediaStream* This); - - ULONG (STDMETHODCALLTYPE *Release)( - IMediaStream* This); - - /*** IMediaStream methods ***/ - HRESULT (STDMETHODCALLTYPE *GetMultiMediaStream)( - IMediaStream* This, - IMultiMediaStream** ppMultiMediaStream); - - HRESULT (STDMETHODCALLTYPE *GetInformation)( - IMediaStream* This, - MSPID* pPurposeId, - STREAM_TYPE* pType); - - HRESULT (STDMETHODCALLTYPE *SetSameFormat)( - IMediaStream* This, - IMediaStream* pStreamThatHasDesiredFormat, - DWORD dwFlags); - - HRESULT (STDMETHODCALLTYPE *AllocateSample)( - IMediaStream* This, - DWORD dwFlags, - IStreamSample** ppSample); - - HRESULT (STDMETHODCALLTYPE *CreateSharedSample)( - IMediaStream* This, - IStreamSample* pExistingSample, - DWORD dwFlags, - IStreamSample** ppNewSample); - - HRESULT (STDMETHODCALLTYPE *SendEndOfStream)( - IMediaStream* This, - DWORD dwFlags); - - END_INTERFACE -} IMediaStreamVtbl; -interface IMediaStream { - const IMediaStreamVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -/*** IUnknown methods ***/ -#define IMediaStream_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IMediaStream_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IMediaStream_Release(p) (p)->lpVtbl->Release(p) -/*** IMediaStream methods ***/ -#define IMediaStream_GetMultiMediaStream(p,a) (p)->lpVtbl->GetMultiMediaStream(p,a) -#define IMediaStream_GetInformation(p,a,b) (p)->lpVtbl->GetInformation(p,a,b) -#define IMediaStream_SetSameFormat(p,a,b) (p)->lpVtbl->SetSameFormat(p,a,b) -#define IMediaStream_AllocateSample(p,a,b) (p)->lpVtbl->AllocateSample(p,a,b) -#define IMediaStream_CreateSharedSample(p,a,b,c) (p)->lpVtbl->CreateSharedSample(p,a,b,c) -#define IMediaStream_SendEndOfStream(p,a) (p)->lpVtbl->SendEndOfStream(p,a) -#endif - -#endif - -HRESULT CALLBACK IMediaStream_GetMultiMediaStream_Proxy( - IMediaStream* This, - IMultiMediaStream** ppMultiMediaStream); -void __RPC_STUB IMediaStream_GetMultiMediaStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IMediaStream_GetInformation_Proxy( - IMediaStream* This, - MSPID* pPurposeId, - STREAM_TYPE* pType); -void __RPC_STUB IMediaStream_GetInformation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IMediaStream_SetSameFormat_Proxy( - IMediaStream* This, - IMediaStream* pStreamThatHasDesiredFormat, - DWORD dwFlags); -void __RPC_STUB IMediaStream_SetSameFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IMediaStream_AllocateSample_Proxy( - IMediaStream* This, - DWORD dwFlags, - IStreamSample** ppSample); -void __RPC_STUB IMediaStream_AllocateSample_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IMediaStream_CreateSharedSample_Proxy( - IMediaStream* This, - IStreamSample* pExistingSample, - DWORD dwFlags, - IStreamSample** ppNewSample); -void __RPC_STUB IMediaStream_CreateSharedSample_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IMediaStream_SendEndOfStream_Proxy( - IMediaStream* This, - DWORD dwFlags); -void __RPC_STUB IMediaStream_SendEndOfStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); - -#endif /* __IMediaStream_INTERFACE_DEFINED__ */ - -/***************************************************************************** - * IStreamSample interface - */ -#ifndef __IStreamSample_INTERFACE_DEFINED__ -#define __IStreamSample_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_IStreamSample, 0xb502d1be, 0x9a57, 0x11d0, 0x8f,0xde, 0x00,0xc0,0x4f,0xd9,0x18,0x9d); -#if defined(__cplusplus) && !defined(CINTERFACE) -interface IStreamSample : public IUnknown -{ - virtual HRESULT STDMETHODCALLTYPE GetMediaStream( - IMediaStream** ppMediaStream) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetSampleTimes( - STREAM_TIME* pStartTime, - STREAM_TIME* pEndTime, - STREAM_TIME* pCurrentTime) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetSampleTimes( - const STREAM_TIME* pStartTime, - const STREAM_TIME* pEndTime) = 0; - - virtual HRESULT STDMETHODCALLTYPE Update( - DWORD dwFlags, - HANDLE hEvent, - PAPCFUNC pfnAPC, - DWORD dwAPCData) = 0; - - virtual HRESULT STDMETHODCALLTYPE CompletionStatus( - DWORD dwFlags, - DWORD dwMilliseconds) = 0; - -}; -#else -typedef struct IStreamSampleVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IStreamSample* This, - REFIID riid, - void** ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IStreamSample* This); - - ULONG (STDMETHODCALLTYPE *Release)( - IStreamSample* This); - - /*** IStreamSample methods ***/ - HRESULT (STDMETHODCALLTYPE *GetMediaStream)( - IStreamSample* This, - IMediaStream** ppMediaStream); - - HRESULT (STDMETHODCALLTYPE *GetSampleTimes)( - IStreamSample* This, - STREAM_TIME* pStartTime, - STREAM_TIME* pEndTime, - STREAM_TIME* pCurrentTime); - - HRESULT (STDMETHODCALLTYPE *SetSampleTimes)( - IStreamSample* This, - const STREAM_TIME* pStartTime, - const STREAM_TIME* pEndTime); - - HRESULT (STDMETHODCALLTYPE *Update)( - IStreamSample* This, - DWORD dwFlags, - HANDLE hEvent, - PAPCFUNC pfnAPC, - DWORD dwAPCData); - - HRESULT (STDMETHODCALLTYPE *CompletionStatus)( - IStreamSample* This, - DWORD dwFlags, - DWORD dwMilliseconds); - - END_INTERFACE -} IStreamSampleVtbl; -interface IStreamSample { - const IStreamSampleVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -/*** IUnknown methods ***/ -#define IStreamSample_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IStreamSample_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IStreamSample_Release(p) (p)->lpVtbl->Release(p) -/*** IStreamSample methods ***/ -#define IStreamSample_GetMediaStream(p,a) (p)->lpVtbl->GetMediaStream(p,a) -#define IStreamSample_GetSampleTimes(p,a,b,c) (p)->lpVtbl->GetSampleTimes(p,a,b,c) -#define IStreamSample_SetSampleTimes(p,a,b) (p)->lpVtbl->SetSampleTimes(p,a,b) -#define IStreamSample_Update(p,a,b,c,d) (p)->lpVtbl->Update(p,a,b,c,d) -#define IStreamSample_CompletionStatus(p,a,b) (p)->lpVtbl->CompletionStatus(p,a,b) -#endif - -#endif - -HRESULT CALLBACK IStreamSample_GetMediaStream_Proxy( - IStreamSample* This, - IMediaStream** ppMediaStream); -void __RPC_STUB IStreamSample_GetMediaStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IStreamSample_GetSampleTimes_Proxy( - IStreamSample* This, - STREAM_TIME* pStartTime, - STREAM_TIME* pEndTime, - STREAM_TIME* pCurrentTime); -void __RPC_STUB IStreamSample_GetSampleTimes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IStreamSample_SetSampleTimes_Proxy( - IStreamSample* This, - const STREAM_TIME* pStartTime, - const STREAM_TIME* pEndTime); -void __RPC_STUB IStreamSample_SetSampleTimes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IStreamSample_Update_Proxy( - IStreamSample* This, - DWORD dwFlags, - HANDLE hEvent, - PAPCFUNC pfnAPC, - DWORD dwAPCData); -void __RPC_STUB IStreamSample_Update_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IStreamSample_CompletionStatus_Proxy( - IStreamSample* This, - DWORD dwFlags, - DWORD dwMilliseconds); -void __RPC_STUB IStreamSample_CompletionStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); - -#endif /* __IStreamSample_INTERFACE_DEFINED__ */ - -/* Begin additional prototypes for all interfaces */ - - -/* End additional prototypes */ - -#ifdef __cplusplus -} -#endif -#endif /* __WIDL_INCLUDE_PSDK_MMSTREAM_H */ Removed: trunk/reactos/include/psdk/mmstream.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmstream.idl?… ============================================================================== --- trunk/reactos/include/psdk/mmstream.idl (original) +++ trunk/reactos/include/psdk/mmstream.idl (removed) @@ -1,184 +1,0 @@ -/* - * Copyright 2004 Christian Costa - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -import "unknwn.idl"; - -cpp_quote("#define MS_ERROR_CODE(x) MAKE_HRESULT(1, FACILITY_ITF, (x) + 0x400)") -cpp_quote("#define MS_SUCCESS_CODE(x) MAKE_HRESULT(0, FACILITY_ITF, x)") -cpp_quote("#define MS_S_PENDING MS_SUCCESS_CODE(1)") -cpp_quote("#define MS_S_NOUPDATE MS_SUCCESS_CODE(2)") -cpp_quote("#define MS_S_ENDOFSTREAM MS_SUCCESS_CODE(3)") - -cpp_quote("#define MS_E_SAMPLEALLOC MS_ERROR_CODE(1)") -cpp_quote("#define MS_E_PURPOSEID MS_ERROR_CODE(2)") -cpp_quote("#define MS_E_NOSTREAM MS_ERROR_CODE(3)") -cpp_quote("#define MS_E_NOSEEKING MS_ERROR_CODE(4)") -cpp_quote("#define MS_E_INCOMPATIBLE MS_ERROR_CODE(5)") -cpp_quote("#define MS_E_BUSY MS_ERROR_CODE(6)") -cpp_quote("#define MS_E_NOTINIT MS_ERROR_CODE(7)") -cpp_quote("#define MS_E_SOURCEALREADYDEFINED MS_ERROR_CODE(8)") -cpp_quote("#define MS_E_INVALIDSTREAMTYPE MS_ERROR_CODE(9)") -cpp_quote("#define MS_E_NOTRUNNING MS_ERROR_CODE(10)") - -cpp_quote("DEFINE_GUID(MSPID_PrimaryVideo, 0xa35ff56a, 0x9fda, 0x11d0, 0x8f, 0xdf, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0x9d);") -cpp_quote("DEFINE_GUID(MSPID_PrimaryAudio, 0xa35ff56b, 0x9fda, 0x11d0, 0x8f, 0xdf, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0x9d);") - -cpp_quote("#if 0") -typedef void* PAPCFUNC; -cpp_quote("#endif") - -typedef LONGLONG STREAM_TIME; - -typedef GUID MSPID; -typedef REFGUID REFMSPID; - -typedef enum { - STREAMTYPE_READ = 0, - STREAMTYPE_WRITE = 1, - STREAMTYPE_TRANSFORM = 2 -} STREAM_TYPE; - -typedef enum { - STREAMSTATE_STOP = 0, - STREAMSTATE_RUN = 1 -} STREAM_STATE; - - -typedef enum { - COMPSTAT_NOUPDATEOK = 0x00000001, - COMPSTAT_WAIT = 0x00000002, - COMPSTAT_ABORT = 0x00000004 -} COMPLETION_STATUS_FLAGS; - -enum { - MMSSF_HASCLOCK = 0x00000001, - MMSSF_SUPPORTSEEK = 0x00000002, - MMSSF_ASYNCHRONOUS = 0x00000004 -}; - -enum { - SSUPDATE_ASYNC = 0x00000001, - SSUPDATE_CONTINUOUS = 0x00000002 -}; - -interface IMultiMediaStream; -interface IMediaStream; -interface IStreamSample; - - -[ -object, -local, -uuid(B502D1BC-9A57-11d0-8FDE-00C04FD9189D), -pointer_default(unique) -] -interface IMultiMediaStream : IUnknown { - - HRESULT GetInformation( - [out, optional] DWORD *pdwFlags, - [out, optional] STREAM_TYPE *pStreamType); - - HRESULT GetMediaStream( - [in] REFMSPID idPurpose, - [out] IMediaStream **ppMediaStream); - - HRESULT EnumMediaStreams( - [in] long Index, - [out] IMediaStream **ppMediaStream); - - HRESULT GetState( - [out] STREAM_STATE *pCurrentState); - - HRESULT SetState( - [in] STREAM_STATE NewState); - - HRESULT GetTime( - [out] STREAM_TIME *pCurrentTime); - - HRESULT GetDuration( - [out] STREAM_TIME *pDuration); - - HRESULT Seek( - [in] STREAM_TIME SeekTime); - - HRESULT GetEndOfStreamEventHandle( - [out] HANDLE *phEOS); -} - - -[ -object, -uuid(B502D1BD-9A57-11d0-8FDE-00C04FD9189D), -pointer_default(unique) -] -interface IMediaStream : IUnknown { - - HRESULT GetMultiMediaStream( - [out] IMultiMediaStream **ppMultiMediaStream); - - HRESULT GetInformation( - [out, optional] MSPID *pPurposeId, - [out, optional] STREAM_TYPE *pType); - - HRESULT SetSameFormat( - [in] IMediaStream *pStreamThatHasDesiredFormat, - [in] DWORD dwFlags); - - HRESULT AllocateSample( - [in] DWORD dwFlags, - [out] IStreamSample **ppSample); - - HRESULT CreateSharedSample( - [in] IStreamSample *pExistingSample, - [in] DWORD dwFlags, - [out] IStreamSample **ppNewSample); - - HRESULT SendEndOfStream(DWORD dwFlags); -} - - -[ -object, -local, -uuid(B502D1BE-9A57-11d0-8FDE-00C04FD9189D), -pointer_default(unique) -] -interface IStreamSample : IUnknown { - - HRESULT GetMediaStream( - [in] IMediaStream **ppMediaStream); - - HRESULT GetSampleTimes( - [out, optional] STREAM_TIME * pStartTime, - [out, optional] STREAM_TIME * pEndTime, - [out, optional] STREAM_TIME * pCurrentTime); - - HRESULT SetSampleTimes( - [in, optional] const STREAM_TIME *pStartTime, - [in, optional] const STREAM_TIME *pEndTime); - - HRESULT Update( - [in] DWORD dwFlags, - [in, optional] HANDLE hEvent, - [in, optional] PAPCFUNC pfnAPC, - [in, optional] DWORD dwAPCData); - - HRESULT CompletionStatus( - [in] DWORD dwFlags, - [in, optional] DWORD dwMilliseconds); -}

1 0

[greatlrd] 26900: adding dshowasf.idl did miss this file is a idl compatible wih ms dxsdk 2004 dec
by greatlrd＠svn.reactos.org 26 May '07

26 May '07

Author: greatlrd Date: Sat May 26 13:48:35 2007 New Revision: 26900 URL: http://svn.reactos.org/svn/reactos?rev=26900&view=rev Log: adding dshowasf.idl did miss this file is a idl compatible wih ms dxsdk 2004 dec Added: trunk/reactos/include/dxsdk/dshowasf.idl (with props) Removed: trunk/reactos/include/dxsdk/dshowasf.h Removed: trunk/reactos/include/dxsdk/dshowasf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dshowasf.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/dshowasf.h (original) +++ trunk/reactos/include/dxsdk/dshowasf.h (removed) @@ -1,134 +1,0 @@ - -#pragma warning( disable: 4049 ) - -#ifndef __REQUIRED_RPCNDR_H_VERSION__ -#define __REQUIRED_RPCNDR_H_VERSION__ 475 -#endif - -#include "rpc.h" -#include "rpcndr.h" - -#ifndef __RPCNDR_H_VERSION__ -#error this stub requires an updated version of <rpcndr.h> -#endif // __RPCNDR_H_VERSION__ - -#ifndef COM_NO_WINDOWS_H -#include "windows.h" -#include "ole2.h" -#endif - -#ifndef __dshowasf_h__ -#define __dshowasf_h__ - -#if defined(_MSC_VER) && (_MSC_VER >= 1020) -#pragma once -#endif - - -#ifndef __IConfigAsfWriter_FWD_DEFINED__ - #define __IConfigAsfWriter_FWD_DEFINED__ - typedef interface IConfigAsfWriter IConfigAsfWriter; -#endif - -#include "unknwn.h" -#include "objidl.h" -#include "strmif.h" -#include "wmsdkidl.h" - -#ifdef __cplusplus -extern "C"{ -#endif - -void * __RPC_USER MIDL_user_allocate(size_t); -void __RPC_USER MIDL_user_free( void * ); - -EXTERN_GUID( IID_IConfigAsfWriter,0x45086030,0xF7E4,0x486A,0xB5,0x04,0x82,0x6B,0xB5,0x79,0x2A,0x3B ); - -extern RPC_IF_HANDLE __MIDL_itf_dshowasf_0000_v0_0_c_ifspec; -extern RPC_IF_HANDLE __MIDL_itf_dshowasf_0000_v0_0_s_ifspec; - -#ifndef __IConfigAsfWriter_INTERFACE_DEFINED__ -#define __IConfigAsfWriter_INTERFACE_DEFINED__ - - EXTERN_C const IID IID_IConfigAsfWriter; - - #if defined(__cplusplus) && !defined(CINTERFACE) - - MIDL_INTERFACE("45086030-F7E4-486a-B504-826BB5792A3B") - IConfigAsfWriter : public IUnknown - { - public: - virtual HRESULT STDMETHODCALLTYPE ConfigureFilterUsingProfileId(DWORD dwProfileId) = 0; - virtual HRESULT STDMETHODCALLTYPE GetCurrentProfileId(DWORD *pdwProfileId) = 0; - virtual HRESULT STDMETHODCALLTYPE ConfigureFilterUsingProfileGuid(REFGUID guidProfile) = 0; - virtual HRESULT STDMETHODCALLTYPE GetCurrentProfileGuid(GUID *pProfileGuid) = 0; - virtual HRESULT STDMETHODCALLTYPE ConfigureFilterUsingProfile(IWMProfile *pProfile) = 0; - virtual HRESULT STDMETHODCALLTYPE GetCurrentProfile(IWMProfile **ppProfile) = 0; - virtual HRESULT STDMETHODCALLTYPE SetIndexMode(BOOL bIndexFile) = 0; - virtual HRESULT STDMETHODCALLTYPE GetIndexMode(BOOL *pbIndexFile) = 0; - }; - - #else - typedef struct IConfigAsfWriterVtbl - { - BEGIN_INTERFACE - HRESULT ( STDMETHODCALLTYPE *QueryInterface )(IConfigAsfWriter * This, REFIID riid, void **ppvObject); - ULONG ( STDMETHODCALLTYPE *AddRef )(IConfigAsfWriter * This); - ULONG ( STDMETHODCALLTYPE *Release )(IConfigAsfWriter * This); - HRESULT ( STDMETHODCALLTYPE *ConfigureFilterUsingProfileId )(IConfigAsfWriter * This, DWORD dwProfileId); - HRESULT ( STDMETHODCALLTYPE *GetCurrentProfileId )(IConfigAsfWriter * This, DWORD *pdwProfileId); - HRESULT ( STDMETHODCALLTYPE *ConfigureFilterUsingProfileGuid )(IConfigAsfWriter * This, REFGUID guidProfile); - HRESULT ( STDMETHODCALLTYPE *GetCurrentProfileGuid )(IConfigAsfWriter * This, GUID *pProfileGuid); - HRESULT ( STDMETHODCALLTYPE *ConfigureFilterUsingProfile )(IConfigAsfWriter * This, IWMProfile *pProfile); - HRESULT ( STDMETHODCALLTYPE *GetCurrentProfile )(IConfigAsfWriter * This, IWMProfile **ppProfile); - HRESULT ( STDMETHODCALLTYPE *SetIndexMode )(IConfigAsfWriter * This, BOOL bIndexFile); - HRESULT ( STDMETHODCALLTYPE *GetIndexMode )(IConfigAsfWriter * This, BOOL *pbIndexFile); - END_INTERFACE - } IConfigAsfWriterVtbl; - - interface IConfigAsfWriter - { - CONST_VTBL struct IConfigAsfWriterVtbl *lpVtbl; - }; - - #ifdef COBJMACROS - #define IConfigAsfWriter_QueryInterface(This,riid,ppvObject) (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) - #define IConfigAsfWriter_AddRef(This) (This)->lpVtbl -> AddRef(This) - #define IConfigAsfWriter_Release(This) (This)->lpVtbl -> Release(This) - #define IConfigAsfWriter_ConfigureFilterUsingProfileId(This,dwProfileId) (This)->lpVtbl -> ConfigureFilterUsingProfileId(This,dwProfileId) - #define IConfigAsfWriter_GetCurrentProfileId(This,pdwProfileId) (This)->lpVtbl -> GetCurrentProfileId(This,pdwProfileId) - #define IConfigAsfWriter_ConfigureFilterUsingProfileGuid(This,guidProfile) (This)->lpVtbl -> ConfigureFilterUsingProfileGuid(This,guidProfile) - #define IConfigAsfWriter_GetCurrentProfileGuid(This,pProfileGuid) (This)->lpVtbl -> GetCurrentProfileGuid(This,pProfileGuid) - #define IConfigAsfWriter_ConfigureFilterUsingProfile(This,pProfile) (This)->lpVtbl -> ConfigureFilterUsingProfile(This,pProfile) - #define IConfigAsfWriter_GetCurrentProfile(This,ppProfile) (This)->lpVtbl -> GetCurrentProfile(This,ppProfile) - #define IConfigAsfWriter_SetIndexMode(This,bIndexFile) (This)->lpVtbl -> SetIndexMode(This,bIndexFile) - #define IConfigAsfWriter_GetIndexMode(This,pbIndexFile) (This)->lpVtbl -> GetIndexMode(This,pbIndexFile) - #endif -#endif - -HRESULT STDMETHODCALLTYPE IConfigAsfWriter_ConfigureFilterUsingProfileId_Proxy(IConfigAsfWriter * This, DWORD dwProfileId); -void __RPC_STUB IConfigAsfWriter_ConfigureFilterUsingProfileId_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase); -HRESULT STDMETHODCALLTYPE IConfigAsfWriter_GetCurrentProfileId_Proxy(IConfigAsfWriter * This, DWORD *pdwProfileId); -void __RPC_STUB IConfigAsfWriter_GetCurrentProfileId_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase); -HRESULT STDMETHODCALLTYPE IConfigAsfWriter_ConfigureFilterUsingProfileGuid_Proxy(IConfigAsfWriter * This, REFGUID guidProfile); -void __RPC_STUB IConfigAsfWriter_ConfigureFilterUsingProfileGuid_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase); -HRESULT STDMETHODCALLTYPE IConfigAsfWriter_GetCurrentProfileGuid_Proxy(IConfigAsfWriter * This, GUID *pProfileGuid); -void __RPC_STUB IConfigAsfWriter_GetCurrentProfileGuid_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase); -HRESULT STDMETHODCALLTYPE IConfigAsfWriter_ConfigureFilterUsingProfile_Proxy(IConfigAsfWriter * This, IWMProfile *pProfile); -void __RPC_STUB IConfigAsfWriter_ConfigureFilterUsingProfile_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase); -HRESULT STDMETHODCALLTYPE IConfigAsfWriter_GetCurrentProfile_Proxy(IConfigAsfWriter * This, IWMProfile **ppProfile); -void __RPC_STUB IConfigAsfWriter_GetCurrentProfile_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase); -HRESULT STDMETHODCALLTYPE IConfigAsfWriter_SetIndexMode_Proxy(IConfigAsfWriter * This, BOOL bIndexFile); -void __RPC_STUB IConfigAsfWriter_SetIndexMode_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase); -HRESULT STDMETHODCALLTYPE IConfigAsfWriter_GetIndexMode_Proxy(IConfigAsfWriter * This, BOOL *pbIndexFile); -void __RPC_STUB IConfigAsfWriter_GetIndexMode_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase); - - - -#endif - -#ifdef __cplusplus -} -#endif - -#endif Added: trunk/reactos/include/dxsdk/dshowasf.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dshowasf.idl… ============================================================================== --- trunk/reactos/include/dxsdk/dshowasf.idl (added) +++ trunk/reactos/include/dxsdk/dshowasf.idl Sat May 26 13:48:35 2007 @@ -1,0 +1,28 @@ +import "unknwn.idl"; +import "objidl.idl"; +import "strmif.idl"; +import "wmsdkidl.idl"; + +cpp_quote( "EXTERN_GUID( IID_IConfigAsfWriter,0x45086030,0xF7E4,0x486a,0xB5,0x04,0x82,0x6B,0xB5,0x79,0x2A,0x3B );" ) + +interface IConfigAsfWriter; +interface IWMProfile; + +[ +object, +uuid(45086030-F7E4-486a-B504-826BB5792A3B), +pointer_default(unique) +] + +interface IConfigAsfWriter : IUnknown +{ + HRESULT ConfigureFilterUsingProfileId([in] DWORD dwProfileId); + HRESULT GetCurrentProfileId([out] DWORD *pdwProfileId); + HRESULT ConfigureFilterUsingProfileGuid([in] REFGUID guidProfile); + HRESULT GetCurrentProfileGuid([out] GUID *pProfileGuid); + HRESULT ConfigureFilterUsingProfile([in] IWMProfile * pProfile); + HRESULT GetCurrentProfile([out] IWMProfile **ppProfile); + HRESULT SetIndexMode( [in] BOOL bIndexFile ); + HRESULT GetIndexMode( [out] BOOL *pbIndexFile ); +} + Propchange: trunk/reactos/include/dxsdk/dshowasf.idl ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 26899: adding two idl file 100% compatible with ms dxsdk 2004 dec This two idl can not yet be auto genrated in reactos for varius reason.
by greatlrd＠svn.reactos.org 26 May '07

26 May '07

Author: greatlrd Date: Sat May 26 13:28:26 2007 New Revision: 26899 URL: http://svn.reactos.org/svn/reactos?rev=26899&view=rev Log: adding two idl file 100% compatible with ms dxsdk 2004 dec This two idl can not yet be auto genrated in reactos for varius reason. Added: trunk/reactos/include/dxsdk/devenum.idl (with props) trunk/reactos/include/dxsdk/strmif.idl (with props) Added: trunk/reactos/include/dxsdk/devenum.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/devenum.idl?… ============================================================================== --- trunk/reactos/include/dxsdk/devenum.idl (added) +++ trunk/reactos/include/dxsdk/devenum.idl Sat May 26 13:28:26 2007 @@ -1,0 +1,19 @@ + +cpp_quote("#define CDEF_CLASS_DEFAULT 0x0001") +cpp_quote("#define CDEF_BYPASS_CLASS_MANAGER 0x0002") +cpp_quote("#define CDEF_CLASS_LEGACY 0x0004") +cpp_quote("#define CDEF_MERIT_ABOVE_DO_NOT_USE 0x0008") + +[ + object, + uuid(29840822-5B84-11D0-BD3B-00A0C911CE86), + pointer_default(unique) +] +interface ICreateDevEnum : IUnknown +{ + import "oaidl.idl"; + + HRESULT CreateClassEnumerator( [in] REFCLSID clsidDeviceClass, + [out] IEnumMoniker ** ppEnumMoniker, + [in] DWORD dwFlags); +} Propchange: trunk/reactos/include/dxsdk/devenum.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/strmif.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/strmif.idl?r… ============================================================================== --- trunk/reactos/include/dxsdk/strmif.idl (added) +++ trunk/reactos/include/dxsdk/strmif.idl Sat May 26 13:28:26 2007 @@ -1,0 +1,9 @@ + +import "unknwn.idl"; +import "objidl.idl"; +#include <devenum.idl> +#include <axcore.idl> +#include <axextend.idl> +#include <dvdif.idl> +#include <dyngraph.idl> +#include "VMRender.idl" Propchange: trunk/reactos/include/dxsdk/strmif.idl ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 26898: Created folder remotely This folder will contain dxsdk idl files
by greatlrd＠svn.reactos.org 26 May '07

26 May '07

Author: greatlrd Date: Sat May 26 12:36:56 2007 New Revision: 26898 URL: http://svn.reactos.org/svn/reactos?rev=26898&view=rev Log: Created folder remotely This folder will contain dxsdk idl files Added: trunk/reactos/include/dxsdk/DShowIDL/

1 0

[greatlrd] 26897: Wrote two new header this morning compatible with dxsdk 2004 dec release.
by greatlrd＠svn.reactos.org 26 May '07

26 May '07

Author: greatlrd Date: Sat May 26 11:03:52 2007 New Revision: 26897 URL: http://svn.reactos.org/svn/reactos?rev=26897&view=rev Log: Wrote two new header this morning compatible with dxsdk 2004 dec release. Added: trunk/reactos/include/dxsdk/dmusics.h (with props) trunk/reactos/include/dxsdk/dshowasf.h (with props) Added: trunk/reactos/include/dxsdk/dmusics.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dmusics.h?re… ============================================================================== --- trunk/reactos/include/dxsdk/dmusics.h (added) +++ trunk/reactos/include/dxsdk/dmusics.h Sat May 26 11:03:52 2007 @@ -1,0 +1,112 @@ + +#ifndef _DMUSICS_ +#define _DMUSICS_ + +#include "dmusicc.h" + +#define REGSTR_PATH_SOFTWARESYNTHS "Software\\Microsoft\\DirectMusic\\SoftwareSynths" + +interface IDirectMusicSynth; +interface IDirectMusicSynthSink; + +#ifndef __cplusplus + typedef interface IDirectMusicSynth IDirectMusicSynth; + typedef interface IDirectMusicSynthSink IDirectMusicSynthSink; +#endif + +#ifndef _DMUS_VOICE_STATE_DEFINED +#define _DMUS_VOICE_STATE_DEFINED + + +DEFINE_GUID(IID_IDirectMusicSynth, 0x9823661, 0x5C85, 0x11D2, 0xAF, 0xA6, 0x00, 0xAA, 0x00, 0x24, 0xD8, 0xB6); +DEFINE_GUID(IID_IDirectMusicSynth8, 0x53CAB625, 0x2711, 0x4C9F, 0x9D, 0xE7, 0x1B, 0x7F, 0x92, 0x5F, 0x6F, 0xC8); +DEFINE_GUID(IID_IDirectMusicSynthSink, 0x09823663, 0x5C85, 0x11D2, 0xAF, 0xA6, 0x00, 0xAA, 0x00, 0x24, 0xD8, 0xB6); +DEFINE_GUID(GUID_DMUS_PROP_SetSynthSink, 0x0A3A5BA5, 0x37B6, 0x11D2, 0xB9, 0xF9, 0x00, 0x00, 0xF8, 0x75, 0xAC, 0x12); +DEFINE_GUID(GUID_DMUS_PROP_SinkUsesDSound, 0xBE208857, 0x8952, 0x11D2, 0xBA, 0x1C, 0x00, 0x00, 0xF8, 0x75, 0xAC, 0x12); + +#define REFRESH_F_LASTBUFFER 0x00000001 + +typedef struct _DMUS_VOICE_STATE +{ + BOOL bExists; + SAMPLE_POSITION spPosition; +} DMUS_VOICE_STATE; + +#endif + +#undef INTERFACE +#define INTERFACE IDirectMusicSynth +DECLARE_INTERFACE_(IDirectMusicSynth, IUnknown) +{ + STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID FAR *) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD(Open) (THIS_ LPDMUS_PORTPARAMS pPortParams) PURE; + STDMETHOD(Close) (THIS) PURE; + STDMETHOD(SetNumChannelGroups) (THIS_ DWORD dwGroups) PURE; + STDMETHOD(Download) (THIS_ LPHANDLE phDownload, LPVOID pvData, LPBOOL pbFree ) PURE; + STDMETHOD(Unload) (THIS_ HANDLE hDownload, HRESULT ( CALLBACK *lpFreeHandle)(HANDLE,HANDLE), HANDLE hUserData ) PURE; + STDMETHOD(PlayBuffer) (THIS_ REFERENCE_TIME rt,LPBYTE pbBuffer, DWORD cbBuffer) PURE; + STDMETHOD(GetRunningStats) (THIS_ LPDMUS_SYNTHSTATS pStats) PURE; + STDMETHOD(GetPortCaps) (THIS_ LPDMUS_PORTCAPS pCaps) PURE; + STDMETHOD(SetMasterClock) (THIS_ IReferenceClock *pClock) PURE; + STDMETHOD(GetLatencyClock) (THIS_ IReferenceClock **ppClock) PURE; + STDMETHOD(Activate) (THIS_ BOOL fEnable) PURE; + STDMETHOD(SetSynthSink) (THIS_ IDirectMusicSynthSink *pSynthSink) PURE; + STDMETHOD(Render) (THIS_ short *pBuffer, DWORD dwLength, LONGLONG llPosition) PURE; + STDMETHOD(SetChannelPriority) (THIS_ DWORD dwChannelGroup, DWORD dwChannel, DWORD dwPriority) PURE; + STDMETHOD(GetChannelPriority) (THIS_ DWORD dwChannelGroup, DWORD dwChannel, LPDWORD pdwPriority) PURE; + STDMETHOD(GetFormat) (THIS_ LPWAVEFORMATEX pWaveFormatEx, LPDWORD pdwWaveFormatExSize) PURE; + STDMETHOD(GetAppend) (THIS_ DWORD* pdwAppend) PURE; +}; + +#undef INTERFACE + +#define INTERFACE IDirectMusicSynth8 +DECLARE_INTERFACE_(IDirectMusicSynth8, IDirectMusicSynth) +{ + STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID FAR *) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD(Open) (THIS_ LPDMUS_PORTPARAMS pPortParams) PURE; + STDMETHOD(Close) (THIS) PURE; + STDMETHOD(SetNumChannelGroups) (THIS_ DWORD dwGroups) PURE; + STDMETHOD(Download) (THIS_ LPHANDLE phDownload, LPVOID pvData, LPBOOL pbFree ) PURE; + STDMETHOD(Unload) (THIS_ HANDLE hDownload, HRESULT ( CALLBACK *lpFreeHandle)(HANDLE,HANDLE), HANDLE hUserData ) PURE; + STDMETHOD(PlayBuffer) (THIS_ REFERENCE_TIME rt, LPBYTE pbBuffer, DWORD cbBuffer) PURE; + STDMETHOD(GetRunningStats) (THIS_ LPDMUS_SYNTHSTATS pStats) PURE; + STDMETHOD(GetPortCaps) (THIS_ LPDMUS_PORTCAPS pCaps) PURE; + STDMETHOD(SetMasterClock) (THIS_ IReferenceClock *pClock) PURE; + STDMETHOD(GetLatencyClock) (THIS_ IReferenceClock **ppClock) PURE; + STDMETHOD(Activate) (THIS_ BOOL fEnable) PURE; + STDMETHOD(SetSynthSink) (THIS_ IDirectMusicSynthSink *pSynthSink) PURE; + STDMETHOD(Render) (THIS_ short *pBuffer, DWORD dwLength, LONGLONG llPosition) PURE; + STDMETHOD(SetChannelPriority) (THIS_ DWORD dwChannelGroup, DWORD dwChannel, DWORD dwPriority) PURE; + STDMETHOD(GetChannelPriority) (THIS_ DWORD dwChannelGroup, DWORD dwChannel, LPDWORD pdwPriority) PURE; + STDMETHOD(GetFormat) (THIS_ LPWAVEFORMATEX pWaveFormatEx, LPDWORD pdwWaveFormatExSize) PURE; + STDMETHOD(GetAppend) (THIS_ DWORD* pdwAppend) PURE; + STDMETHOD(PlayVoice) (THIS_ REFERENCE_TIME rt, DWORD dwVoiceId, DWORD dwChannelGroup, DWORD dwChannel, DWORD dwDLId, long prPitch, long vrVolume, SAMPLE_TIME stVoiceStart, SAMPLE_TIME stLoopStart, SAMPLE_TIME stLoopEnd) PURE; + STDMETHOD(StopVoice) (THIS_ REFERENCE_TIME rt, DWORD dwVoiceId ) PURE; + STDMETHOD(GetVoiceState) (THIS_ DWORD dwVoice[], DWORD cbVoice, DMUS_VOICE_STATE dwVoiceState[] ) PURE; + STDMETHOD(Refresh) (THIS_ DWORD dwDownloadID, DWORD dwFlags) PURE; + STDMETHOD(AssignChannelToBuses) (THIS_ DWORD dwChannelGroup, DWORD dwChannel, LPDWORD pdwBuses, DWORD cBuses) PURE; +}; + +#undef INTERFACE +#define INTERFACE IDirectMusicSynthSink +DECLARE_INTERFACE_(IDirectMusicSynthSink, IUnknown) +{ + STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID FAR *) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD(Init) (THIS_ IDirectMusicSynth *pSynth) PURE; + STDMETHOD(SetMasterClock) (THIS_ IReferenceClock *pClock) PURE; + STDMETHOD(GetLatencyClock) (THIS_ IReferenceClock **ppClock) PURE; + STDMETHOD(Activate) (THIS_ BOOL fEnable) PURE; + STDMETHOD(SampleToRefTime) (THIS_ LONGLONG llSampleTime, REFERENCE_TIME *prfTime) PURE; + STDMETHOD(RefTimeToSample) (THIS_ REFERENCE_TIME rfTime, LONGLONG *pllSampleTime) PURE; + STDMETHOD(SetDirectSound) (THIS_ LPDIRECTSOUND pDirectSound, LPDIRECTSOUNDBUFFER pDirectSoundBuffer) PURE; + STDMETHOD(GetDesiredBufferSize) (THIS_ LPDWORD pdwBufferSizeInSamples) PURE; +}; + +#endif Propchange: trunk/reactos/include/dxsdk/dmusics.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/dshowasf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dshowasf.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/dshowasf.h (added) +++ trunk/reactos/include/dxsdk/dshowasf.h Sat May 26 11:03:52 2007 @@ -1,0 +1,134 @@ + +#pragma warning( disable: 4049 ) + +#ifndef __REQUIRED_RPCNDR_H_VERSION__ +#define __REQUIRED_RPCNDR_H_VERSION__ 475 +#endif + +#include "rpc.h" +#include "rpcndr.h" + +#ifndef __RPCNDR_H_VERSION__ +#error this stub requires an updated version of <rpcndr.h> +#endif // __RPCNDR_H_VERSION__ + +#ifndef COM_NO_WINDOWS_H +#include "windows.h" +#include "ole2.h" +#endif + +#ifndef __dshowasf_h__ +#define __dshowasf_h__ + +#if defined(_MSC_VER) && (_MSC_VER >= 1020) +#pragma once +#endif + + +#ifndef __IConfigAsfWriter_FWD_DEFINED__ + #define __IConfigAsfWriter_FWD_DEFINED__ + typedef interface IConfigAsfWriter IConfigAsfWriter; +#endif + +#include "unknwn.h" +#include "objidl.h" +#include "strmif.h" +#include "wmsdkidl.h" + +#ifdef __cplusplus +extern "C"{ +#endif + +void * __RPC_USER MIDL_user_allocate(size_t); +void __RPC_USER MIDL_user_free( void * ); + +EXTERN_GUID( IID_IConfigAsfWriter,0x45086030,0xF7E4,0x486A,0xB5,0x04,0x82,0x6B,0xB5,0x79,0x2A,0x3B ); + +extern RPC_IF_HANDLE __MIDL_itf_dshowasf_0000_v0_0_c_ifspec; +extern RPC_IF_HANDLE __MIDL_itf_dshowasf_0000_v0_0_s_ifspec; + +#ifndef __IConfigAsfWriter_INTERFACE_DEFINED__ +#define __IConfigAsfWriter_INTERFACE_DEFINED__ + + EXTERN_C const IID IID_IConfigAsfWriter; + + #if defined(__cplusplus) && !defined(CINTERFACE) + + MIDL_INTERFACE("45086030-F7E4-486a-B504-826BB5792A3B") + IConfigAsfWriter : public IUnknown + { + public: + virtual HRESULT STDMETHODCALLTYPE ConfigureFilterUsingProfileId(DWORD dwProfileId) = 0; + virtual HRESULT STDMETHODCALLTYPE GetCurrentProfileId(DWORD *pdwProfileId) = 0; + virtual HRESULT STDMETHODCALLTYPE ConfigureFilterUsingProfileGuid(REFGUID guidProfile) = 0; + virtual HRESULT STDMETHODCALLTYPE GetCurrentProfileGuid(GUID *pProfileGuid) = 0; + virtual HRESULT STDMETHODCALLTYPE ConfigureFilterUsingProfile(IWMProfile *pProfile) = 0; + virtual HRESULT STDMETHODCALLTYPE GetCurrentProfile(IWMProfile **ppProfile) = 0; + virtual HRESULT STDMETHODCALLTYPE SetIndexMode(BOOL bIndexFile) = 0; + virtual HRESULT STDMETHODCALLTYPE GetIndexMode(BOOL *pbIndexFile) = 0; + }; + + #else + typedef struct IConfigAsfWriterVtbl + { + BEGIN_INTERFACE + HRESULT ( STDMETHODCALLTYPE *QueryInterface )(IConfigAsfWriter * This, REFIID riid, void **ppvObject); + ULONG ( STDMETHODCALLTYPE *AddRef )(IConfigAsfWriter * This); + ULONG ( STDMETHODCALLTYPE *Release )(IConfigAsfWriter * This); + HRESULT ( STDMETHODCALLTYPE *ConfigureFilterUsingProfileId )(IConfigAsfWriter * This, DWORD dwProfileId); + HRESULT ( STDMETHODCALLTYPE *GetCurrentProfileId )(IConfigAsfWriter * This, DWORD *pdwProfileId); + HRESULT ( STDMETHODCALLTYPE *ConfigureFilterUsingProfileGuid )(IConfigAsfWriter * This, REFGUID guidProfile); + HRESULT ( STDMETHODCALLTYPE *GetCurrentProfileGuid )(IConfigAsfWriter * This, GUID *pProfileGuid); + HRESULT ( STDMETHODCALLTYPE *ConfigureFilterUsingProfile )(IConfigAsfWriter * This, IWMProfile *pProfile); + HRESULT ( STDMETHODCALLTYPE *GetCurrentProfile )(IConfigAsfWriter * This, IWMProfile **ppProfile); + HRESULT ( STDMETHODCALLTYPE *SetIndexMode )(IConfigAsfWriter * This, BOOL bIndexFile); + HRESULT ( STDMETHODCALLTYPE *GetIndexMode )(IConfigAsfWriter * This, BOOL *pbIndexFile); + END_INTERFACE + } IConfigAsfWriterVtbl; + + interface IConfigAsfWriter + { + CONST_VTBL struct IConfigAsfWriterVtbl *lpVtbl; + }; + + #ifdef COBJMACROS + #define IConfigAsfWriter_QueryInterface(This,riid,ppvObject) (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) + #define IConfigAsfWriter_AddRef(This) (This)->lpVtbl -> AddRef(This) + #define IConfigAsfWriter_Release(This) (This)->lpVtbl -> Release(This) + #define IConfigAsfWriter_ConfigureFilterUsingProfileId(This,dwProfileId) (This)->lpVtbl -> ConfigureFilterUsingProfileId(This,dwProfileId) + #define IConfigAsfWriter_GetCurrentProfileId(This,pdwProfileId) (This)->lpVtbl -> GetCurrentProfileId(This,pdwProfileId) + #define IConfigAsfWriter_ConfigureFilterUsingProfileGuid(This,guidProfile) (This)->lpVtbl -> ConfigureFilterUsingProfileGuid(This,guidProfile) + #define IConfigAsfWriter_GetCurrentProfileGuid(This,pProfileGuid) (This)->lpVtbl -> GetCurrentProfileGuid(This,pProfileGuid) + #define IConfigAsfWriter_ConfigureFilterUsingProfile(This,pProfile) (This)->lpVtbl -> ConfigureFilterUsingProfile(This,pProfile) + #define IConfigAsfWriter_GetCurrentProfile(This,ppProfile) (This)->lpVtbl -> GetCurrentProfile(This,ppProfile) + #define IConfigAsfWriter_SetIndexMode(This,bIndexFile) (This)->lpVtbl -> SetIndexMode(This,bIndexFile) + #define IConfigAsfWriter_GetIndexMode(This,pbIndexFile) (This)->lpVtbl -> GetIndexMode(This,pbIndexFile) + #endif +#endif + +HRESULT STDMETHODCALLTYPE IConfigAsfWriter_ConfigureFilterUsingProfileId_Proxy(IConfigAsfWriter * This, DWORD dwProfileId); +void __RPC_STUB IConfigAsfWriter_ConfigureFilterUsingProfileId_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase); +HRESULT STDMETHODCALLTYPE IConfigAsfWriter_GetCurrentProfileId_Proxy(IConfigAsfWriter * This, DWORD *pdwProfileId); +void __RPC_STUB IConfigAsfWriter_GetCurrentProfileId_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase); +HRESULT STDMETHODCALLTYPE IConfigAsfWriter_ConfigureFilterUsingProfileGuid_Proxy(IConfigAsfWriter * This, REFGUID guidProfile); +void __RPC_STUB IConfigAsfWriter_ConfigureFilterUsingProfileGuid_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase); +HRESULT STDMETHODCALLTYPE IConfigAsfWriter_GetCurrentProfileGuid_Proxy(IConfigAsfWriter * This, GUID *pProfileGuid); +void __RPC_STUB IConfigAsfWriter_GetCurrentProfileGuid_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase); +HRESULT STDMETHODCALLTYPE IConfigAsfWriter_ConfigureFilterUsingProfile_Proxy(IConfigAsfWriter * This, IWMProfile *pProfile); +void __RPC_STUB IConfigAsfWriter_ConfigureFilterUsingProfile_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase); +HRESULT STDMETHODCALLTYPE IConfigAsfWriter_GetCurrentProfile_Proxy(IConfigAsfWriter * This, IWMProfile **ppProfile); +void __RPC_STUB IConfigAsfWriter_GetCurrentProfile_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase); +HRESULT STDMETHODCALLTYPE IConfigAsfWriter_SetIndexMode_Proxy(IConfigAsfWriter * This, BOOL bIndexFile); +void __RPC_STUB IConfigAsfWriter_SetIndexMode_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase); +HRESULT STDMETHODCALLTYPE IConfigAsfWriter_GetIndexMode_Proxy(IConfigAsfWriter * This, BOOL *pbIndexFile); +void __RPC_STUB IConfigAsfWriter_GetIndexMode_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase); + + + +#endif + +#ifdef __cplusplus +} +#endif + +#endif Propchange: trunk/reactos/include/dxsdk/dshowasf.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 26896: Wrote one new header this night compatible with dxsdk 2004 dec release.
by greatlrd＠svn.reactos.org 25 May '07

25 May '07

Author: greatlrd Date: Sat May 26 01:51:35 2007 New Revision: 26896 URL: http://svn.reactos.org/svn/reactos?rev=26896&view=rev Log: Wrote one new header this night compatible with dxsdk 2004 dec release. Added: trunk/reactos/include/dxsdk/dsconf.h (with props) Removed: trunk/reactos/include/psdk/dsconf.h Modified: trunk/reactos/include/psdk/dsound.h Added: trunk/reactos/include/dxsdk/dsconf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dsconf.h?rev… ============================================================================== --- trunk/reactos/include/dxsdk/dsconf.h (added) +++ trunk/reactos/include/dxsdk/dsconf.h Sat May 26 01:51:35 2007 @@ -1,0 +1,168 @@ +#ifndef __DSCONF_INCLUDED__ +#define __DSCONF_INCLUDED__ + +#ifndef __DSOUND_INCLUDED__ +#error dsound.h not included +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +DEFINE_GUID(CLSID_DirectSoundPrivate, 0x11AB3EC0, 0x25EC, 0x11D1, 0xA4, 0xD8, 0x0, 0xC0, 0x4F, 0xC2, 0x8A, 0xCA); +DEFINE_GUID(DSPROPSETID_DirectSoundDevice, 0x84624F82, 0x25EC, 0x11D1, 0xA4, 0xD8, 0x0, 0xC0, 0x4F, 0xC2, 0x8A, 0xCA); + +typedef enum +{ + DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A = 1, + DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1 = 2, + DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1 = 3, + DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W = 4, + DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A = 5, + DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W = 6, + DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A = 7, + DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W = 8, +} DSPROPERTY_DIRECTSOUNDDEVICE; + +typedef enum +{ + DIRECTSOUNDDEVICE_TYPE_EMULATED, + DIRECTSOUNDDEVICE_TYPE_VXD, + DIRECTSOUNDDEVICE_TYPE_WDM +} DIRECTSOUNDDEVICE_TYPE; + +typedef enum +{ + DIRECTSOUNDDEVICE_DATAFLOW_RENDER, + DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE +} DIRECTSOUNDDEVICE_DATAFLOW; + +typedef struct _DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A_DATA +{ + LPSTR DeviceName; + DIRECTSOUNDDEVICE_DATAFLOW DataFlow; + GUID DeviceId; +} DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A_DATA, *PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A_DATA; + +typedef struct _DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W_DATA +{ + LPWSTR DeviceName; + DIRECTSOUNDDEVICE_DATAFLOW DataFlow; + GUID DeviceId; +} DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W_DATA, *PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W_DATA; + +typedef struct _DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA +{ + GUID DeviceId; + CHAR DescriptionA[0x100]; + WCHAR DescriptionW[0x100]; + CHAR ModuleA[MAX_PATH]; + WCHAR ModuleW[MAX_PATH]; + DIRECTSOUNDDEVICE_TYPE Type; + DIRECTSOUNDDEVICE_DATAFLOW DataFlow; + ULONG WaveDeviceId; + ULONG Devnode; +} DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA, *PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA; + +typedef struct _DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA +{ + DIRECTSOUNDDEVICE_TYPE Type; + DIRECTSOUNDDEVICE_DATAFLOW DataFlow; + GUID DeviceId; + LPSTR Description; + LPSTR Module; + LPSTR Interface; + ULONG WaveDeviceId; +} DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA, *PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA; + +typedef struct _DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA +{ + DIRECTSOUNDDEVICE_TYPE Type; + DIRECTSOUNDDEVICE_DATAFLOW DataFlow; + GUID DeviceId; + LPWSTR Description; + LPWSTR Module; + LPWSTR Interface; + ULONG WaveDeviceId; +} DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA, *PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA; + +#if DIRECTSOUND_VERSION >= 0x0700 + #ifdef UNICODE + #define DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W + #define DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W + #define DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W + #define DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_DATA DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA + #define PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_DATA PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA + #else + #define DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A + #define DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A + #define DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A + #define DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_DATA DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA + #define PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_DATA PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA + #endif +#else + #define DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A + #define DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1 + #define DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1 + #define DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_DATA DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA +#define PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_DATA PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA +#endif + +#ifdef UNICODE + #define DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_DATA DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W_DATA + #define PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_DATA PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W_DATA +#else + #define DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_DATA DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A_DATA + #define PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_DATA PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A_DATA +#endif + +typedef BOOL (CALLBACK *LPFNDIRECTSOUNDDEVICEENUMERATECALLBACK1)(PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA, LPVOID); +typedef BOOL (CALLBACK *LPFNDIRECTSOUNDDEVICEENUMERATECALLBACKA)(PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA, LPVOID); +typedef BOOL (CALLBACK *LPFNDIRECTSOUNDDEVICEENUMERATECALLBACKW)(PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA, LPVOID); + +#if DIRECTSOUND_VERSION >= 0x0700 + #ifdef UNICODE + #define LPFNDIRECTSOUNDDEVICEENUMERATECALLBACK LPFNDIRECTSOUNDDEVICEENUMERATECALLBACKW + #else + #define LPFNDIRECTSOUNDDEVICEENUMERATECALLBACK LPFNDIRECTSOUNDDEVICEENUMERATECALLBACKA + #endif +#else + #define LPFNDIRECTSOUNDDEVICEENUMERATECALLBACK LPFNDIRECTSOUNDDEVICEENUMERATECALLBACK1 +#endif + +typedef struct _DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1_DATA +{ + LPFNDIRECTSOUNDDEVICEENUMERATECALLBACK1 Callback; + LPVOID Context; +} DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1_DATA, *PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1_DATA; + +typedef struct _DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA +{ + LPFNDIRECTSOUNDDEVICEENUMERATECALLBACKA Callback; + LPVOID Context; +} DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA, *PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA; + +typedef struct _DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA +{ + LPFNDIRECTSOUNDDEVICEENUMERATECALLBACKW Callback; + LPVOID Context; +} DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA, *PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA; + +#if DIRECTSOUND_VERSION >= 0x0700 + #ifdef UNICODE + #define DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_DATA DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA + #define PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_DATA PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA + #else + #define DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_DATA DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA + #define PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_DATA PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA + #endif +#else + #define DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_DATA DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1_DATA + #define PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_DATA PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1_DATA +#endif + +#ifdef __cplusplus +} +#endif + +#endif Propchange: trunk/reactos/include/dxsdk/dsconf.h ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/include/psdk/dsconf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dsconf.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/dsconf.h (original) +++ trunk/reactos/include/psdk/dsconf.h (removed) @@ -1,167 +1,0 @@ -/* - * Copyright (C) 2003 Robert Reif - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef __WINE_DSCONF_H -#define __WINE_DSCONF_H - -#ifdef __cplusplus -extern "C" { -#endif /* defined(__cplusplus) */ - -/***************************************************************************** - * Predeclare the interfaces - */ -DEFINE_GUID(CLSID_DirectSoundPrivate, 0x11ab3ec0,0x25ec,0x11d1,0xa4,0xd8,0x00,0xc0,0x4f,0xc2,0x8a,0xca); - -DEFINE_GUID(DSPROPSETID_DirectSoundDevice, 0x84624f82,0x25ec,0x11d1,0xa4,0xd8,0x00,0xc0,0x4f,0xc2,0x8a,0xca); - -typedef enum -{ - DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A = 1, - DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1 = 2, - DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1 = 3, - DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W = 4, - DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A = 5, - DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W = 6, - DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A = 7, - DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W = 8, -} DSPROPERTY_DIRECTSOUNDDEVICE; - -#ifdef UNICODE -#define DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W -#define DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W -#define DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W -#else -#define DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A -#define DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A -#define DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A -#endif - -typedef enum -{ - DIRECTSOUNDDEVICE_TYPE_EMULATED, - DIRECTSOUNDDEVICE_TYPE_VXD, - DIRECTSOUNDDEVICE_TYPE_WDM -} DIRECTSOUNDDEVICE_TYPE; - -typedef enum -{ - DIRECTSOUNDDEVICE_DATAFLOW_RENDER, - DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE -} DIRECTSOUNDDEVICE_DATAFLOW; - -typedef struct _DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A_DATA -{ - LPSTR DeviceName; - DIRECTSOUNDDEVICE_DATAFLOW DataFlow; - GUID DeviceId; -} DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A_DATA, *PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A_DATA; - -typedef struct _DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W_DATA -{ - LPWSTR DeviceName; - DIRECTSOUNDDEVICE_DATAFLOW DataFlow; - GUID DeviceId; -} DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W_DATA, *PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W_DATA; - -#ifdef UNICODE -#define DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_DATA DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W_DATA -#define PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_DATA PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W_DATA -#else -#define DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_DATA DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A_DATA -#define PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_DATA PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A_DATA -#endif - -typedef struct _DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA -{ - GUID DeviceId; - CHAR DescriptionA[0x100]; - WCHAR DescriptionW[0x100]; - CHAR ModuleA[MAX_PATH]; - WCHAR ModuleW[MAX_PATH]; - DIRECTSOUNDDEVICE_TYPE Type; - DIRECTSOUNDDEVICE_DATAFLOW DataFlow; - ULONG WaveDeviceId; - ULONG Devnode; -} DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA, *PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA; - -typedef struct _DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA -{ - DIRECTSOUNDDEVICE_TYPE Type; - DIRECTSOUNDDEVICE_DATAFLOW DataFlow; - GUID DeviceId; - LPSTR Description; - LPSTR Module; - LPSTR Interface; - ULONG WaveDeviceId; -} DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA, *PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA; - -typedef struct _DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA -{ - DIRECTSOUNDDEVICE_TYPE Type; - DIRECTSOUNDDEVICE_DATAFLOW DataFlow; - GUID DeviceId; - LPWSTR Description; - LPWSTR Module; - LPWSTR Interface; - ULONG WaveDeviceId; -} DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA, *PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA; - -#ifdef UNICODE -#define DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_DATA DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA -#define PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_DATA PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA -#else -#define DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_DATA DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA -#define PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_DATA PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA -#endif - -typedef BOOL (CALLBACK *LPFNDIRECTSOUNDDEVICEENUMERATECALLBACK1)(PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA, LPVOID); -typedef BOOL (CALLBACK *LPFNDIRECTSOUNDDEVICEENUMERATECALLBACKA)(PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA, LPVOID); -typedef BOOL (CALLBACK *LPFNDIRECTSOUNDDEVICEENUMERATECALLBACKW)(PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA, LPVOID); - -typedef struct _DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1_DATA -{ - LPFNDIRECTSOUNDDEVICEENUMERATECALLBACK1 Callback; - LPVOID Context; -} DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1_DATA, *PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1_DATA; - -typedef struct _DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA -{ - LPFNDIRECTSOUNDDEVICEENUMERATECALLBACKA Callback; - LPVOID Context; -} DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA, *PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA; - -typedef struct _DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA -{ - LPFNDIRECTSOUNDDEVICEENUMERATECALLBACKW Callback; - LPVOID Context; -} DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA, *PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA; - -#ifdef UNICODE -#define DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_DATA DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA -#define PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_DATA PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA -#else -#define DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_DATA DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA -#define PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_DATA PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA -#endif - -#ifdef __cplusplus -} /* extern "C" */ -#endif /* defined(__cplusplus) */ - -#endif /* __WINE_DSCONF_H */ Modified: trunk/reactos/include/psdk/dsound.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dsound.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/dsound.h (original) +++ trunk/reactos/include/psdk/dsound.h Sat May 26 01:51:35 2007 @@ -16,8 +16,14 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + + #ifndef __WINE_DSOUND_H #define __WINE_DSOUND_H + +// hack +#define __DSOUND_INCLUDED__ + #if __GNUC__ >= 3 #pragma GCC system_header

1 0

[dgorbachev] 26895: Uncomment Japanese, as it is supported already.
by dgorbachev＠svn.reactos.org 25 May '07

25 May '07

Author: dgorbachev Date: Fri May 25 22:25:06 2007 New Revision: 26895 URL: http://svn.reactos.org/svn/reactos?rev=26895&view=rev Log: Uncomment Japanese, as it is supported already. Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Fri May 25 22:25:06 2007 @@ -312,7 +312,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040f",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000410",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000810",0x00000000,"1" -;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000411",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000411",0x00000000,"" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000412",0x00000000,"" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000413",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000813",0x00000000,"1"

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs