Ros-diffs May 2007

ros-diffs@reactos.org

17 participants
322 discussions

[greatlrd] 26908: add correct mediaoobj.idl compatible with ms dxsdk 2004 dec add medoaram.idl compatible with ms dxsdk 2004 dec
by greatlrd＠svn.reactos.org 27 May '07

27 May '07

Author: greatlrd Date: Sun May 27 13:34:59 2007 New Revision: 26908 URL: http://svn.reactos.org/svn/reactos?rev=26908&view=rev Log: add correct mediaoobj.idl compatible with ms dxsdk 2004 dec add medoaram.idl compatible with ms dxsdk 2004 dec Added: trunk/reactos/include/dxsdk/mediaobj.idl (with props) trunk/reactos/include/dxsdk/medparam.idl (with props) Removed: trunk/reactos/include/psdk/mediaobj.h trunk/reactos/include/psdk/mediaobj.idl Modified: trunk/reactos/include/dxsdk/ (props changed) trunk/reactos/include/dxsdk/dxsdk.rbuild Propchange: trunk/reactos/include/dxsdk/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun May 27 13:34:59 2007 @@ -5,3 +5,5 @@ mixerocx.h vidcap.h Videoacc.h +mediaobj.h +medparam.h 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 Sun May 27 13:34:59 2007 @@ -3,6 +3,8 @@ <file>amstream.idl</file> <file>ddstream.idl</file> <file>mixerocx.idl</file> + <file>mediaobj.idl</file> + <file>medparam.idl</file> <file>mmstream.idl</file> <file>vidcap.idl</file> <file>Videoacc.idl</file> Added: trunk/reactos/include/dxsdk/mediaobj.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/mediaobj.idl… ============================================================================== --- trunk/reactos/include/dxsdk/mediaobj.idl (added) +++ trunk/reactos/include/dxsdk/mediaobj.idl Sun May 27 13:34:59 2007 @@ -1,0 +1,189 @@ + +import "unknwn.idl"; +import "objidl.idl"; + + +cpp_quote("#ifdef __strmif_h__") +cpp_quote("typedef AM_MEDIA_TYPE DMO_MEDIA_TYPE;") +cpp_quote("#else") +typedef struct _DMOMediaType +{ + GUID majortype; + GUID subtype; + BOOL bFixedSizeSamples; + BOOL bTemporalCompression; + ULONG lSampleSize; + GUID formattype; + IUnknown *pUnk; + ULONG cbFormat; + [size_is(cbFormat)] BYTE * pbFormat; +} DMO_MEDIA_TYPE; +typedef LONGLONG REFERENCE_TIME; +cpp_quote("#endif") + + + +enum _DMO_INPUT_DATA_BUFFER_FLAGS +{ + DMO_INPUT_DATA_BUFFERF_SYNCPOINT = 0x00000001, + DMO_INPUT_DATA_BUFFERF_TIME = 0x00000002, + DMO_INPUT_DATA_BUFFERF_TIMELENGTH = 0x00000004 +}; + +enum _DMO_OUTPUT_DATA_BUFFER_FLAGS +{ + DMO_OUTPUT_DATA_BUFFERF_SYNCPOINT = 0x00000001, + DMO_OUTPUT_DATA_BUFFERF_TIME = 0x00000002, + DMO_OUTPUT_DATA_BUFFERF_TIMELENGTH = 0x00000004, + DMO_OUTPUT_DATA_BUFFERF_INCOMPLETE = 0x01000000 +}; + +enum _DMO_INPUT_STATUS_FLAGS +{ + DMO_INPUT_STATUSF_ACCEPT_DATA = 0x00000001 +}; + +enum _DMO_INPUT_STREAM_INFO_FLAGS +{ + DMO_INPUT_STREAMF_WHOLE_SAMPLES = 0x00000001, + DMO_INPUT_STREAMF_SINGLE_SAMPLE_PER_BUFFER = 0x00000002, + DMO_INPUT_STREAMF_FIXED_SAMPLE_SIZE = 0x00000004, + DMO_INPUT_STREAMF_HOLDS_BUFFERS = 0x00000008 +}; + +enum _DMO_OUTPUT_STREAM_INFO_FLAGS +{ + DMO_OUTPUT_STREAMF_WHOLE_SAMPLES = 0x00000001, + DMO_OUTPUT_STREAMF_SINGLE_SAMPLE_PER_BUFFER = 0x00000002, + DMO_OUTPUT_STREAMF_FIXED_SAMPLE_SIZE = 0x00000004, + DMO_OUTPUT_STREAMF_DISCARDABLE = 0x00000008, + DMO_OUTPUT_STREAMF_OPTIONAL = 0x00000010 +}; + +enum _DMO_SET_TYPE_FLAGS +{ + DMO_SET_TYPEF_TEST_ONLY = 0x00000001, + DMO_SET_TYPEF_CLEAR = 0x00000002 +}; + +enum _DMO_PROCESS_OUTPUT_FLAGS +{ + DMO_PROCESS_OUTPUT_DISCARD_WHEN_NO_BUFFER = 0x00000001 +}; + +enum _DMO_INPLACE_PROCESS_FLAGS +{ + DMO_INPLACE_NORMAL = 0x00000000, + DMO_INPLACE_ZERO = 0x00000001 +}; + +enum _DMO_QUALITY_STATUS_FLAGS +{ + DMO_QUALITY_STATUS_ENABLED = 0x00000001 +}; + +enum _DMO_VIDEO_OUTPUT_STREAM_FLAGS +{ + DMO_VOSF_NEEDS_PREVIOUS_SAMPLE = 0x00000001 +}; + + +[ + object, + uuid(59eff8b9-938c-4a26-82f2-95cb84cdc837) +] +interface IMediaBuffer : IUnknown +{ + HRESULT SetLength(DWORD cbLength); + HRESULT GetMaxLength([out] DWORD *pcbMaxLength); + HRESULT GetBufferAndLength([out] BYTE **ppBuffer, [out] DWORD *pcbLength); +} + + +typedef struct _DMO_OUTPUT_DATA_BUFFER +{ + IMediaBuffer *pBuffer; + DWORD dwStatus; + REFERENCE_TIME rtTimestamp; + REFERENCE_TIME rtTimelength; +} DMO_OUTPUT_DATA_BUFFER, *PDMO_OUTPUT_DATA_BUFFER; + + +[ + object, + uuid(d8ad0f58-5494-4102-97c5-ec798e59bcf4) +] +interface IMediaObject : IUnknown +{ + HRESULT GetStreamCount([out] DWORD *pcInputStreams, [out] DWORD *pcOutputStreams); + HRESULT GetInputStreamInfo(DWORD dwInputStreamIndex, [out] DWORD *pdwFlags); + HRESULT GetOutputStreamInfo(DWORD dwOutputStreamIndex, [out] DWORD *pdwFlags); + HRESULT GetInputType(DWORD dwInputStreamIndex, DWORD dwTypeIndex, [out] DMO_MEDIA_TYPE *pmt); + HRESULT GetOutputType(DWORD dwOutputStreamIndex, DWORD dwTypeIndex, [out] DMO_MEDIA_TYPE *pmt); + HRESULT SetInputType(DWORD dwInputStreamIndex, [in] const DMO_MEDIA_TYPE *pmt, DWORD dwFlags); + HRESULT SetOutputType(DWORD dwOutputStreamIndex, [in] const DMO_MEDIA_TYPE *pmt, DWORD dwFlags); + HRESULT GetInputCurrentType(DWORD dwInputStreamIndex, [out] DMO_MEDIA_TYPE *pmt); + HRESULT GetOutputCurrentType(DWORD dwOutputStreamIndex, [out] DMO_MEDIA_TYPE *pmt); + HRESULT GetInputSizeInfo(DWORD dwInputStreamIndex, [out] DWORD *pcbSize, [out] DWORD *pcbMaxLookahead, [out] DWORD *pcbAlignment); + HRESULT GetOutputSizeInfo(DWORD dwOutputStreamIndex, [out] DWORD *pcbSize, [out] DWORD *pcbAlignment); + HRESULT GetInputMaxLatency(DWORD dwInputStreamIndex, [out] REFERENCE_TIME *prtMaxLatency); + HRESULT SetInputMaxLatency(DWORD dwInputStreamIndex, REFERENCE_TIME rtMaxLatency); + HRESULT Flush(); + HRESULT Discontinuity(DWORD dwInputStreamIndex); + HRESULT AllocateStreamingResources(); + HRESULT FreeStreamingResources(); + HRESULT GetInputStatus(DWORD dwInputStreamIndex, [out] DWORD *dwFlags); + HRESULT ProcessInput(DWORD dwInputStreamIndex, IMediaBuffer *pBuffer, DWORD dwFlags, REFERENCE_TIME rtTimestamp, REFERENCE_TIME rtTimelength); + HRESULT ProcessOutput(DWORD dwFlags,DWORD cOutputBufferCount, [in,out,size_is(cOutputBufferCount)] + DMO_OUTPUT_DATA_BUFFER *pOutputBuffers, [out] DWORD *pdwStatus); + HRESULT Lock(LONG bLock); +}; + + +[ +object, +uuid(2c3cd98a-2bfa-4a53-9c27-5249ba64ba0f) +] +interface IEnumDMO : IUnknown +{ + HRESULT Next(DWORD cItemsToFetch, [out, size_is(cItemsToFetch), length_is(*pcItemsFetched)] CLSID *pCLSID, [out, size_is(cItemsToFetch), length_is(*pcItemsFetched), string] WCHAR **Names, [out] DWORD *pcItemsFetched); + HRESULT Skip(DWORD cItemsToSkip); + HRESULT Reset(void); + HRESULT Clone([out] IEnumDMO **ppEnum); +} + +[ +object, +uuid(651b9ad0-0fc7-4aa9-9538-d89931010741) +] +interface IMediaObjectInPlace : IUnknown +{ + HRESULT Process([in] ULONG ulSize, [in,out,size_is(ulSize)] BYTE* pData, [in] REFERENCE_TIME refTimeStart, [in] DWORD dwFlags); + HRESULT Clone([out] IMediaObjectInPlace **ppMediaObject); + HRESULT GetLatency([out] REFERENCE_TIME *pLatencyTime); +} + +[ +object, +uuid(65abea96-cf36-453f-af8a-705e98f16260) +] +interface IDMOQualityControl : IUnknown +{ + HRESULT SetNow([in] REFERENCE_TIME rtNow); + HRESULT SetStatus([in] DWORD dwFlags); + HRESULT GetStatus([out] DWORD *pdwFlags); +} + +[ +object, +uuid(be8f4f4e-5b16-4d29-b350-7f6b5d9298ac) +] +interface IDMOVideoOutputOptimizations : IUnknown +{ + HRESULT QueryOperationModePreferences (ULONG ulOutputStreamIndex, DWORD *pdwRequestedCapabilities); + HRESULT SetOperationMode (ULONG ulOutputStreamIndex, DWORD dwEnabledFeatures); + HRESULT GetCurrentOperationMode (ULONG ulOutputStreamIndex, DWORD *pdwEnabledFeatures); + HRESULT GetCurrentSampleRequirements (ULONG ulOutputStreamIndex, DWORD *pdwRequestedFeatures + ); +} + Propchange: trunk/reactos/include/dxsdk/mediaobj.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/medparam.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/medparam.idl… ============================================================================== --- trunk/reactos/include/dxsdk/medparam.idl (added) +++ trunk/reactos/include/dxsdk/medparam.idl Sun May 27 13:34:59 2007 @@ -1,0 +1,107 @@ + + +import "oaidl.idl"; +import "ocidl.idl"; +import "strmif.idl"; + + +typedef float MP_DATA; + +typedef enum _MP_Type +{ + MPT_INT, + MPT_FLOAT, + MPT_BOOL, + MPT_ENUM, + MPT_MAX, +} MP_TYPE; + +cpp_quote("const MP_DATA MPBOOL_TRUE = 1.0;") +cpp_quote("const MP_DATA MPBOOL_FALSE = 0.0;") + + +typedef enum _MP_CURVE_TYPE +{ + MP_CURVE_JUMP = 0x0001, + MP_CURVE_LINEAR = 0x0002, + MP_CURVE_SQUARE = 0x0004, + MP_CURVE_INVSQUARE = 0x0008, + MP_CURVE_SINE = 0x0010, +} MP_CURVE_TYPE; + + +typedef DWORD MP_CAPS; +const MP_CAPS MP_CAPS_CURVE_JUMP = MP_CURVE_JUMP; +const MP_CAPS MP_CAPS_CURVE_LINEAR = MP_CURVE_LINEAR; +const MP_CAPS MP_CAPS_CURVE_SQUARE = MP_CURVE_SQUARE; +const MP_CAPS MP_CAPS_CURVE_INVSQUARE = MP_CURVE_INVSQUARE; +const MP_CAPS MP_CAPS_CURVE_SINE = MP_CURVE_SINE; + +typedef struct _MP_PARAMINFO +{ + MP_TYPE mpType; + MP_CAPS mopCaps; + MP_DATA mpdMinValue; + MP_DATA mpdMaxValue; + MP_DATA mpdNeutralValue; + WCHAR szUnitText[32]; + WCHAR szLabel[32]; +} MP_PARAMINFO; + +typedef DWORD DWORD; +const DWORD DWORD_ALLPARAMS = -1; +typedef DWORD MP_TIMEDATA; + +cpp_quote("DEFINE_GUID(GUID_TIME_REFERENCE, 0x93ad712b, 0xdaa0, 0x4ffe, 0xbc, 0x81, 0xb0, 0xce, 0x50, 0x0f, 0xcd, 0xd9);") +cpp_quote("DEFINE_GUID(GUID_TIME_MUSIC, 0x0574c49d, 0x5b04, 0x4b15, 0xa5, 0x42, 0xae, 0x28, 0x20, 0x30, 0x11, 0x7b);") +cpp_quote("DEFINE_GUID(GUID_TIME_SAMPLES, 0xa8593d05, 0x0c43, 0x4984, 0x9a, 0x63, 0x97, 0xaf, 0x9e, 0x02, 0xc4, 0xc0);") + +typedef DWORD MP_FLAGS; +const MP_FLAGS MPF_ENVLP_STANDARD = 0x0000; +const MP_FLAGS MPF_ENVLP_BEGIN_CURRENTVAL = 0x0001; +const MP_FLAGS MPF_ENVLP_BEGIN_NEUTRALVAL = 0x0002; + +typedef struct _MP_ENVELOPE_SEGMENT +{ + REFERENCE_TIME rtStart; + REFERENCE_TIME rtEnd; + MP_DATA valStart; + MP_DATA valEnd; + MP_CURVE_TYPE iCurve; + MP_FLAGS flags; +} MP_ENVELOPE_SEGMENT; + + +const MP_FLAGS MPF_PUNCHIN_REFTIME = 0; +const MP_FLAGS MPF_PUNCHIN_NOW = 0x0001; +const MP_FLAGS MPF_PUNCHIN_STOPPED = 0x0002; + +[ +object, +uuid(6d6cbb60-a223-44aa-842f-a2f06750be6d), +version(1.0) +] +interface IMediaParamInfo : IUnknown +{ + HRESULT GetParamCount ([out] DWORD * pdwParams); + HRESULT GetParamInfo ([in] DWORD dwParamIndex, [out] MP_PARAMINFO * pInfo); + HRESULT GetParamText ([in] DWORD dwParamIndex, [out] WCHAR **ppwchText); + HRESULT GetNumTimeFormats ([out] DWORD * pdwNumTimeFormats); + HRESULT GetSupportedTimeFormat([in] DWORD dwFormatIndex, [out] GUID *pguidTimeFormat); + HRESULT GetCurrentTimeFormat ([out] GUID *pguidTimeFormat, [out] MP_TIMEDATA *pTimeData); +} + +[ +object, +uuid(6d6cbb61-a223-44aa-842f-a2f06750be6e), +version(1.0) +] +interface IMediaParams : IUnknown +{ + HRESULT GetParam ([in] DWORD dwParamIndex, [out] MP_DATA *pValue); + HRESULT SetParam ([in] DWORD dwParamIndex, [in] MP_DATA value); + HRESULT AddEnvelope ([in] DWORD dwParamIndex, [in] DWORD cSegments, [in] MP_ENVELOPE_SEGMENT * pEnvelopeSegments); + HRESULT FlushEnvelope ([in] DWORD dwParamIndex, [in] REFERENCE_TIME refTimeStart, [in] REFERENCE_TIME refTimeEnd); + HRESULT SetTimeFormat ([in] GUID guidTimeFormat, [in] MP_TIMEDATA mpTimeData); +} + Propchange: trunk/reactos/include/dxsdk/medparam.idl ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/include/psdk/mediaobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mediaobj.h?re… ============================================================================== --- trunk/reactos/include/psdk/mediaobj.h (original) +++ trunk/reactos/include/psdk/mediaobj.h (removed) @@ -1,172 +1,0 @@ -/*** Autogenerated by WIDL 0.3.0 from include\psdk\mediaobj.idl - Do not edit ***/ -#include <rpc.h> -#include <rpcndr.h> - -#ifndef __WIDL_INCLUDE_PSDK_MEDIAOBJ_H -#define __WIDL_INCLUDE_PSDK_MEDIAOBJ_H -#ifdef __cplusplus -extern "C" { -#endif -#if !defined(COM_NO_WINDOWS_H) && !defined(__WINESRC__) -#include <windows.h> -#include <ole2.h> -#endif -#include <unknwn.h> -#include <objidl.h> -#ifndef __IDMOQualityControl_FWD_DEFINED__ -#define __IDMOQualityControl_FWD_DEFINED__ -typedef interface IDMOQualityControl IDMOQualityControl; -#endif - -#ifndef __IDMOVideoOutputOptimizations_FWD_DEFINED__ -#define __IDMOVideoOutputOptimizations_FWD_DEFINED__ -typedef interface IDMOVideoOutputOptimizations IDMOVideoOutputOptimizations; -#endif - -#ifndef __IMediaBuffer_FWD_DEFINED__ -#define __IMediaBuffer_FWD_DEFINED__ -typedef interface IMediaBuffer IMediaBuffer; -#endif - -#ifndef __IMediaObject_FWD_DEFINED__ -#define __IMediaObject_FWD_DEFINED__ -typedef interface IMediaObject IMediaObject; -#endif - -#ifndef __IMediaObjectInPlace_FWD_DEFINED__ -#define __IMediaObjectInPlace_FWD_DEFINED__ -typedef interface IMediaObjectInPlace IMediaObjectInPlace; -#endif - -typedef struct _DMOMediaType { - GUID majortype; - GUID subtype; - BOOL bFixedSizeSamples; - BOOL bTemporalCompression; - ULONG lSampleSize; - GUID formattype; - IUnknown *pUnk; - ULONG cbFormat; - BYTE *pbFormat; -} DMO_MEDIA_TYPE; -#ifndef __IEnumDMO_FWD_DEFINED__ -#define __IEnumDMO_FWD_DEFINED__ -typedef interface IEnumDMO IEnumDMO; -#endif - -/***************************************************************************** - * IEnumDMO interface - */ -#ifndef __IEnumDMO_INTERFACE_DEFINED__ -#define __IEnumDMO_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_IEnumDMO, 0x2c3cd98a, 0x2bfa, 0x4a53, 0x9c,0x27, 0x52,0x49,0xba,0x64,0xba,0x0f); -#if defined(__cplusplus) && !defined(CINTERFACE) -interface IEnumDMO : public IUnknown -{ - virtual HRESULT STDMETHODCALLTYPE Next( - DWORD cItemsToFetch, - CLSID* pCLSID, - WCHAR** Names, - DWORD* pcItemsFetched) = 0; - - virtual HRESULT STDMETHODCALLTYPE Skip( - DWORD cItemsToSkip) = 0; - - virtual HRESULT STDMETHODCALLTYPE Reset( - ) = 0; - - virtual HRESULT STDMETHODCALLTYPE Clone( - IEnumDMO** ppEnum) = 0; - -}; -#else -typedef struct IEnumDMOVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumDMO* This, - REFIID riid, - void** ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumDMO* This); - - ULONG (STDMETHODCALLTYPE *Release)( - IEnumDMO* This); - - /*** IEnumDMO methods ***/ - HRESULT (STDMETHODCALLTYPE *Next)( - IEnumDMO* This, - DWORD cItemsToFetch, - CLSID* pCLSID, - WCHAR** Names, - DWORD* pcItemsFetched); - - HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumDMO* This, - DWORD cItemsToSkip); - - HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumDMO* This); - - HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumDMO* This, - IEnumDMO** ppEnum); - - END_INTERFACE -} IEnumDMOVtbl; -interface IEnumDMO { - const IEnumDMOVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -/*** IUnknown methods ***/ -#define IEnumDMO_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IEnumDMO_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IEnumDMO_Release(p) (p)->lpVtbl->Release(p) -/*** IEnumDMO methods ***/ -#define IEnumDMO_Next(p,a,b,c,d) (p)->lpVtbl->Next(p,a,b,c,d) -#define IEnumDMO_Skip(p,a) (p)->lpVtbl->Skip(p,a) -#define IEnumDMO_Reset(p) (p)->lpVtbl->Reset(p) -#define IEnumDMO_Clone(p,a) (p)->lpVtbl->Clone(p,a) -#endif - -#endif - -HRESULT CALLBACK IEnumDMO_Skip_Proxy( - IEnumDMO* This, - DWORD cItemsToSkip); -void __RPC_STUB IEnumDMO_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IEnumDMO_Reset_Proxy( - IEnumDMO* This); -void __RPC_STUB IEnumDMO_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IEnumDMO_Clone_Proxy( - IEnumDMO* This, - IEnumDMO** ppEnum); -void __RPC_STUB IEnumDMO_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); - -#endif /* __IEnumDMO_INTERFACE_DEFINED__ */ - -/* Begin additional prototypes for all interfaces */ - - -/* End additional prototypes */ - -#ifdef __cplusplus -} -#endif -#endif /* __WIDL_INCLUDE_PSDK_MEDIAOBJ_H */ Removed: trunk/reactos/include/psdk/mediaobj.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mediaobj.idl?… ============================================================================== --- trunk/reactos/include/psdk/mediaobj.idl (original) +++ trunk/reactos/include/psdk/mediaobj.idl (removed) @@ -1,74 +1,0 @@ -/* - * Copyright (C) 2002 Alexandre Julliard - * Copyright (C) 2004 Vincent Béron - * - * 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 - */ - -cpp_quote("#if !defined(COM_NO_WINDOWS_H) && !defined(__WINESRC__)") -cpp_quote("#include <windows.h>") -cpp_quote("#include <ole2.h>") -cpp_quote("#endif") - -import "unknwn.idl"; -import "objidl.idl"; - -interface IDMOQualityControl; -interface IDMOVideoOutputOptimizations; -interface IMediaBuffer; -interface IMediaObject; -interface IMediaObjectInPlace; - -typedef struct _DMOMediaType -{ - GUID majortype; - GUID subtype; - BOOL bFixedSizeSamples; - BOOL bTemporalCompression; - ULONG lSampleSize; - GUID formattype; - IUnknown *pUnk; - ULONG cbFormat; - BYTE *pbFormat; -} DMO_MEDIA_TYPE; - -/***************************************************************************** - * IEnumDMO interface - */ -[ - object, - uuid(2C3CD98A-2BFA-4A53-9C27-5249BA64BA0F), - pointer_default(unique) -] -interface IEnumDMO : IUnknown -{ - [local] - HRESULT Next( - [in] DWORD cItemsToFetch, - [out] CLSID *pCLSID, - [out] WCHAR **Names, - [out] DWORD *pcItemsFetched - ); - - HRESULT Skip( - [in] DWORD cItemsToSkip - ); - - HRESULT Reset(); - - HRESULT Clone( - [out] IEnumDMO **ppEnum - ); -}

1 0

[ekohl] 26907: Calculate L2 cache size for AMD CPUs.
by ekohl＠svn.reactos.org 26 May '07

26 May '07

Author: ekohl Date: Sat May 26 20:37:11 2007 New Revision: 26907 URL: http://svn.reactos.org/svn/reactos?rev=26907&view=rev Log: Calculate L2 cache size for AMD CPUs. Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c Sat May 26 20:37:11 2007 @@ -510,13 +510,21 @@ } } while (--CacheRequests); } - break; - - case CPU_AMD: - - /* FIXME */ - DPRINT1("Not handling AMD caches yet\n"); - break; + break; + + case CPU_AMD: + + /* Check if we support CPUID 0x80000006 */ + CPUID(Data, 0x80000000); + if (Data[0] >= 6) + { + /* Get 2nd level cache and tlb size */ + CPUID(Data, 0x80000006); + + /* Set the L2 Cache Size */ + Pcr->SecondLevelCacheSize = (Data[2] & 0xFFFF0000) >> 6; + } + break; } }

1 0

[greatlrd] 26906: adding mixerocx.idl, vidcap.idl, videoacc.idl compatible with ms dxsdk 2004 dec
by greatlrd＠svn.reactos.org 26 May '07

26 May '07

Author: greatlrd Date: Sat May 26 20:16:01 2007 New Revision: 26906 URL: http://svn.reactos.org/svn/reactos?rev=26906&view=rev Log: adding mixerocx.idl, vidcap.idl, videoacc.idl compatible with ms dxsdk 2004 dec Added: trunk/reactos/include/dxsdk/Videoacc.idl (with props) trunk/reactos/include/dxsdk/mixerocx.idl (with props) trunk/reactos/include/dxsdk/vidcap.idl (with props) 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 20:16:01 2007 @@ -2,3 +2,6 @@ mmstream.h ddstream.h amstream.h +mixerocx.h +vidcap.h +Videoacc.h Added: trunk/reactos/include/dxsdk/Videoacc.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/Videoacc.idl… ============================================================================== --- trunk/reactos/include/dxsdk/Videoacc.idl (added) +++ trunk/reactos/include/dxsdk/Videoacc.idl Sat May 26 20:16:01 2007 @@ -1,0 +1,58 @@ +import "unknwn.idl"; + +cpp_quote("#if 0") + +typedef void* LPVOID; +typedef void* LPGUID; +typedef void* LPDIRECTDRAWSURFACE; +typedef void* LPDDPIXELFORMAT; +typedef void* LPAMVAInternalMemInfo; +typedef void AMVAUncompDataInfo; +typedef void* LPAMVACompBufferInfo; +typedef void AMVABUFFERINFO; +typedef void AMVAEndFrameInfo; +typedef void* LPAMVAUncompBufferInfo; +typedef void AMVABeginFrameInfo; +typedef IUnknown* IMediaSample; +cpp_quote("#endif") + +cpp_quote("#include <ddraw.h>") +cpp_quote("#include <amva.h>") + + +[ + local, + object, + uuid(256A6A22-FBAD-11d1-82BF-00A0C9696C8F), + pointer_default(unique) +] + +interface IAMVideoAccelerator : IUnknown +{ + HRESULT GetVideoAcceleratorGUIDs([in] [out] LPDWORD pdwNumGuidsSupported, [in] [out] LPGUID pGuidsSupported); + HRESULT GetUncompFormatsSupported( [in] const GUID *pGuid, [in] [out] LPDWORD pdwNumFormatsSupported, [in] [out] LPDDPIXELFORMAT pFormatsSupported); + HRESULT GetInternalMemInfo([in] const GUID *pGuid, [in] const AMVAUncompDataInfo *pamvaUncompDataInfo, [in] [out] LPAMVAInternalMemInfo pamvaInternalMemInfo); + HRESULT GetCompBufferInfo([in] const GUID *pGuid, [in] const AMVAUncompDataInfo *pamvaUncompDataInfo, [in] [out] LPDWORD pdwNumTypesCompBuffers, [out] LPAMVACompBufferInfo pamvaCompBufferInfo); + HRESULT GetInternalCompBufferInfo([in] [out] LPDWORD pdwNumTypesCompBuffers, [out] LPAMVACompBufferInfo pamvaCompBufferInfo); + HRESULT BeginFrame([in] const AMVABeginFrameInfo *amvaBeginFrameInfo); + HRESULT EndFrame([in] const AMVAEndFrameInfo *pEndFrameInfo); + HRESULT GetBuffer([in] DWORD dwTypeIndex, [in] DWORD dwBufferIndex, [in] BOOL bReadOnly, [out] LPVOID *ppBuffer, [out] LONG *lpStride); + HRESULT ReleaseBuffer([in] DWORD dwTypeIndex, [in] DWORD dwBufferIndex); + HRESULT Execute([in] DWORD dwFunction, [in] LPVOID lpPrivateInputData, [in] DWORD cbPrivateInputData, [in] LPVOID lpPrivateOutputDat, [in] DWORD cbPrivateOutputData, [in] DWORD dwNumBuffers, [in] const AMVABUFFERINFO *pamvaBufferInfo); + HRESULT QueryRenderStatus([in] DWORD dwTypeIndex, [in] DWORD dwBufferIndex, [in] DWORD dwFlags); + HRESULT DisplayFrame([in] DWORD dwFlipToIndex, [in] IMediaSample *pMediaSample); +}; + +[ + local, + object, + uuid(256A6A21-FBAD-11d1-82BF-00A0C9696C8F), + pointer_default(unique) +] + +interface IAMVideoAcceleratorNotify : IUnknown +{ + HRESULT GetUncompSurfacesInfo([in] const GUID *pGuid, [in] [out] LPAMVAUncompBufferInfo pUncompBufferInfo); + HRESULT SetUncompSurfacesInfo([in] DWORD dwActualUncompSurfacesAllocated); + HRESULT GetCreateVideoAcceleratorData([in] const GUID *pGuid, [out] LPDWORD pdwSizeMiscData, [out] LPVOID *ppMiscData); +}; Propchange: trunk/reactos/include/dxsdk/Videoacc.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 20:16:01 2007 @@ -1,6 +1,9 @@ <module name="dxsdk" type="idlheader"> <file>austream.idl</file> <file>amstream.idl</file> - <file>ddstream.idl</file> - <file>mmstream.idl</file> + <file>ddstream.idl</file> + <file>mixerocx.idl</file> + <file>mmstream.idl</file> + <file>vidcap.idl</file> + <file>Videoacc.idl</file> </module> Added: trunk/reactos/include/dxsdk/mixerocx.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/mixerocx.idl… ============================================================================== --- trunk/reactos/include/dxsdk/mixerocx.idl (added) +++ trunk/reactos/include/dxsdk/mixerocx.idl Sat May 26 20:16:01 2007 @@ -1,0 +1,42 @@ +import "unknwn.idl"; + +#define MIXER_DATA_ASPECT_RATIO 0x00000001 +#define MIXER_DATA_NATIVE_SIZE 0x00000002 +#define MIXER_DATA_PALETTE 0x00000004 +#define MIXER_STATE_MASK 0x00000003 +#define MIXER_STATE_UNCONNECTED 0x00000000 +#define MIXER_STATE_CONNECTED_STOPPED 0x00000001 +#define MIXER_STATE_CONNECTED_PAUSED 0x00000002 +#define MIXER_STATE_CONNECTED_PLAYING 0x00000003 + +interface IMixerOCXNotify; +interface IMixerOCX; + +[ + object, + uuid(81A3BD31-DEE1-11d1-8508-00A0C91F9CA0), + pointer_default(unique) +] +interface IMixerOCXNotify : IUnknown +{ + HRESULT OnInvalidateRect([in] LPCRECT lpcRect); + HRESULT OnStatusChange([in] ULONG ulStatusFlags); + HRESULT OnDataChange([in] ULONG ulDataFlags); +}; + +[ + object, + uuid(81A3BD32-DEE1-11d1-8508-00A0C91F9CA0), + pointer_default(unique) +] +interface IMixerOCX : IUnknown +{ + HRESULT OnDisplayChange([in] ULONG ulBitsPerPixel, [in] ULONG ulScreenWidth, [in] ULONG ulScreenHeight); + HRESULT GetAspectRatio([out] LPDWORD pdwPictAspectRatioX, [out] LPDWORD pdwPictAspectRatioY); + HRESULT GetVideoSize([out] LPDWORD pdwVideoWidth, [out] LPDWORD pdwVideoHeight); + HRESULT GetStatus([out] LPDWORD *pdwStatus); + HRESULT OnDraw([in] HDC hdcDraw, [in] LPCRECT prcDraw); + HRESULT SetDrawRegion([in] LPPOINT lpptTopLeftSC, [in] LPCRECT prcDrawCC, [in] LPCRECT lprcClip); + HRESULT Advise([in] IMixerOCXNotify *pmdns); + HRESULT UnAdvise(); +}; Propchange: trunk/reactos/include/dxsdk/mixerocx.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/vidcap.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/vidcap.idl?r… ============================================================================== --- trunk/reactos/include/dxsdk/vidcap.idl (added) +++ trunk/reactos/include/dxsdk/vidcap.idl Sat May 26 20:16:01 2007 @@ -1,0 +1,60 @@ + +import "unknwn.idl"; +import "strmif.idl"; + +cpp_quote("#include \"ks.h\"") +cpp_quote("#ifndef _KS_") +typedef struct { + ULONG FromNode; + ULONG FromNodePin; + ULONG ToNode; + ULONG ToNodePin; +} KSTOPOLOGY_CONNECTION, *PKSTOPOLOGY_CONNECTION; +cpp_quote("#endif") + + +[ + object, + local, + uuid(720D4AC0-7533-11D0-A5D6-28DB04C10000), + pointer_default(unique) +] +interface IKsTopologyInfo : IUnknown +{ + HRESULT get_NumCategories([out] DWORD *pdwNumCategories); + HRESULT get_Category([in] DWORD dwIndex, [out] GUID *pCategory); + HRESULT get_NumConnections([out] DWORD *pdwNumConnections); + HRESULT get_ConnectionInfo([in] DWORD dwIndex, [out] KSTOPOLOGY_CONNECTION *pConnectionInfo); + HRESULT get_NodeName([in] DWORD dwNodeId, [out] WCHAR *pwchNodeName, [in] DWORD dwBufSize, [out] DWORD *pdwNameLen); + HRESULT get_NumNodes([out] DWORD *pdwNumNodes); + HRESULT get_NodeType([in] DWORD dwNodeId, [out] GUID *pNodeType); + HRESULT CreateNodeInstance([in] DWORD dwNodeId, [in] REFIID iid, [out] void **ppvObject); +} + +[ + object, + local, + uuid(11737C14-24A7-4bb5-81A0-0D003813B0C4), + pointer_default(unique) +] +interface IKsNodeControl :IUnknown +{ + HRESULT put_NodeId([in] DWORD dwNodeId); + HRESULT put_KsControl([in] PVOID pKsControl); +} + +[ + object, + local, + uuid(1ABDAECA-68B6-4F83-9371-B413907C7B9F), + pointer_default(unique) +] +interface ISelector : IUnknown +{ + HRESULT get_NumSources([out] DWORD *pdwNumSources); + HRESULT get_SourceNodeId([out] DWORD *pdwPinId); + HRESULT put_SourceNodeId([in] DWORD dwPinId); +} + + + Propchange: trunk/reactos/include/dxsdk/vidcap.idl ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 26905: adding correct amstream.idl , compatible with ms dxsdk 2004 dec remove amvideo.idl this idl does not exists as idl in ms dxsdk only as amvideo.h
by greatlrd＠svn.reactos.org 26 May '07

26 May '07

Author: greatlrd Date: Sat May 26 19:41:51 2007 New Revision: 26905 URL: http://svn.reactos.org/svn/reactos?rev=26905&view=rev Log: adding correct amstream.idl , compatible with ms dxsdk 2004 dec remove amvideo.idl this idl does not exists as idl in ms dxsdk only as amvideo.h Added: trunk/reactos/include/dxsdk/amstream.idl (with props) Removed: trunk/reactos/include/psdk/amstream.h trunk/reactos/include/psdk/amstream.idl trunk/reactos/include/psdk/amvideo.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 19:41:51 2007 @@ -1,3 +1,4 @@ austream.h mmstream.h ddstream.h +amstream.h Added: trunk/reactos/include/dxsdk/amstream.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/amstream.idl… ============================================================================== --- trunk/reactos/include/dxsdk/amstream.idl (added) +++ trunk/reactos/include/dxsdk/amstream.idl Sat May 26 19:41:51 2007 @@ -1,0 +1,212 @@ + +import "unknwn.idl"; +import "mmstream.idl"; +import "strmif.idl"; + +cpp_quote("#include <ddraw.h>") +cpp_quote("#include <mmsystem.h>") +cpp_quote("#include <mmstream.h>") +cpp_quote("#include <ddstream.h>") +cpp_quote("#include <austream.h>") + +interface IAMMultiMediaStream; +interface IAMMediaStream; +interface IMediaStreamFilter; +interface IDirectDraw; +interface IDirectDrawSurface; +interface IAMMediaTypeStream; +interface IAMMediaTypeSample; + +enum +{ + AMMSF_NOGRAPHTHREAD = 0x00000001 +}; + +enum +{ + AMMSF_ADDDEFAULTRENDERER = 0x00000001, + AMMSF_CREATEPEER = 0x00000002, + AMMSF_STOPIFNOSAMPLES = 0x00000004, + AMMSF_NOSTALL = 0x00000008 +}; + +enum +{ + AMMSF_RENDERTYPEMASK = 0x00000003, + AMMSF_RENDERTOEXISTING = 0x00000000, + AMMSF_RENDERALLSTREAMS = 0x00000001, + AMMSF_NORENDER = 0x00000002, + + AMMSF_NOCLOCK = 0x00000004, + AMMSF_RUN = 0x00000008 +}; + +typedef [v1_enum] enum +{ + Disabled = 0, + ReadData = 1, + RenderData = 2 +} OUTPUT_STATE; + + +[ +object, +uuid(7DB01C96-C0C3-11d0-8FF1-00C04FD9189D), +dual, +pointer_default(unique) +] +interface IDirectShowStream : IDispatch +{ + [propget, id(1)] HRESULT FileName([out, retval] BSTR *pVal); + [propput, id(1)] HRESULT FileName([in] BSTR newVal); + [propget, id(2)] HRESULT Video([out, retval] OUTPUT_STATE *pVal); + [propput, id(2)] HRESULT Video([in] OUTPUT_STATE newVal); + [propget, id(3)] HRESULT Audio([out, retval] OUTPUT_STATE *pVal); + [propput, id(3)] HRESULT Audio([in] OUTPUT_STATE newVal); +}; + +[ +object, +uuid(BEBE595C-9A6F-11d0-8FDE-00C04FD9189D), +pointer_default(unique) +] +interface IAMMultiMediaStream : IMultiMediaStream +{ + HRESULT Initialize([in] STREAM_TYPE StreamType, [in] DWORD dwFlags, [in] IGraphBuilder *pFilterGraph); + HRESULT GetFilterGraph([out] IGraphBuilder **ppGraphBuilder); + HRESULT GetFilter([out] IMediaStreamFilter **ppFilter); + HRESULT AddMediaStream([in] IUnknown *pStreamObject, [in] const MSPID *PurposeId, [in] DWORD dwFlags, [out] IMediaStream **ppNewStream); + HRESULT OpenFile([in] LPCWSTR pszFileName, [in] DWORD dwFlags); + HRESULT OpenMoniker([in] IBindCtx *pCtx, [in] IMoniker *pMoniker, [in] DWORD dwFlags); + HRESULT Render([in] DWORD dwFlags); +} + +[ +object, +uuid(BEBE595D-9A6F-11d0-8FDE-00C04FD9189D), +pointer_default(unique) +] +interface IAMMediaStream : IMediaStream +{ + HRESULT Initialize([in] IUnknown *pSourceObject, [in] DWORD dwFlags, [in] REFMSPID PurposeId, [in] const STREAM_TYPE StreamType); + HRESULT SetState([in] FILTER_STATE State); + HRESULT JoinAMMultiMediaStream([in] IAMMultiMediaStream *pAMMultiMediaStream); + HRESULT JoinFilter([in] IMediaStreamFilter *pMediaStreamFilter); + HRESULT JoinFilterGraph([in] IFilterGraph *pFilterGraph); +}; + +[ +object, +local, +uuid(BEBE595E-9A6F-11d0-8FDE-00C04FD9189D), +pointer_default(unique) +] +interface IMediaStreamFilter : IBaseFilter +{ + HRESULT AddMediaStream([in] IAMMediaStream *pAMMediaStream); + HRESULT GetMediaStream([in] REFMSPID idPurpose, [out] IMediaStream **ppMediaStream); + HRESULT EnumMediaStreams([in] long Index, [out] IMediaStream **ppMediaStream); + HRESULT SupportSeeking([in] BOOL bRenderer); + HRESULT ReferenceTimeToStreamTime([in] [out] REFERENCE_TIME *pTime); + HRESULT GetCurrentStreamTime([out] REFERENCE_TIME *pCurrentStreamTime); + HRESULT WaitUntil([in] REFERENCE_TIME WaitStreamTime); + HRESULT Flush([in] BOOL bCancelEOS); + HRESULT EndOfStream(); +}; + +[ +object, +local, +uuid(AB6B4AFC-F6E4-11d0-900D-00C04FD9189D), +pointer_default(unique) +] +interface IDirectDrawMediaSampleAllocator : IUnknown +{ + HRESULT GetDirectDraw(IDirectDraw **ppDirectDraw); +}; + +[ +object, +local, +uuid(AB6B4AFE-F6E4-11d0-900D-00C04FD9189D), +pointer_default(unique) +] +interface IDirectDrawMediaSample : IUnknown +{ + HRESULT GetSurfaceAndReleaseLock([out] IDirectDrawSurface **ppDirectDrawSurface, [out] RECT * pRect); + HRESULT LockMediaSamplePointer(void); +}; + +[ +object, +local, +uuid(AB6B4AFA-F6E4-11d0-900D-00C04FD9189D), +pointer_default(unique) +] + +interface IAMMediaTypeStream : IMediaStream +{ + HRESULT GetFormat([out] AM_MEDIA_TYPE * pMediaType, [in] DWORD dwFlags); + HRESULT SetFormat([in] AM_MEDIA_TYPE * pMediaType, [in] DWORD dwFlags); + HRESULT CreateSample([in] long lSampleSize, [in] BYTE * pbBuffer, [in] DWORD dwFlags, [in] IUnknown *pUnkOuter, [out] IAMMediaTypeSample ** ppAMMediaTypeSample); + HRESULT GetStreamAllocatorRequirements([out] ALLOCATOR_PROPERTIES *pProps); + HRESULT SetStreamAllocatorRequirements([in] ALLOCATOR_PROPERTIES *pProps); +}; + + + + + + + [ +object, +local, +uuid(AB6B4AFB-F6E4-11d0-900D-00C04FD9189D), +pointer_default(unique) +] +interface IAMMediaTypeSample : IStreamSample +{ + HRESULT SetPointer([in] BYTE *pBuffer, [in] long lSize); + HRESULT GetPointer([out] BYTE ** ppBuffer); + long GetSize(void); + HRESULT GetTime([out] REFERENCE_TIME * pTimeStart, [out] REFERENCE_TIME * pTimeEnd); + HRESULT SetTime([in] REFERENCE_TIME * pTimeStart, [in] REFERENCE_TIME * pTimeEnd); + HRESULT IsSyncPoint(void); + HRESULT SetSyncPoint(BOOL bIsSyncPoint); + HRESULT IsPreroll(void); + HRESULT SetPreroll(BOOL bIsPreroll); + long GetActualDataLength(void); + HRESULT SetActualDataLength(long Len); + HRESULT GetMediaType(AM_MEDIA_TYPE **ppMediaType); + HRESULT SetMediaType(AM_MEDIA_TYPE *pMediaType); + HRESULT IsDiscontinuity(void); + HRESULT SetDiscontinuity(BOOL bDiscontinuity); + HRESULT GetMediaTime([out] LONGLONG * pTimeStart, [out] LONGLONG * pTimeEnd); + HRESULT SetMediaTime([in] LONGLONG * pTimeStart, [in] LONGLONG * pTimeEnd); +}; + +[ + uuid(4E6CDE29-C0C4-11d0-8FF1-00C04FD9189D) +] + +library DirectShowStreamLib +{ + importlib("stdole2.tlb"); + [ + uuid(49c47ce5-9ba4-11d0-8212-00c04fc32c45) + ] + coclass AMMultiMediaStream + { + [default] dispinterface IDirectShowStream; + }; +}; + +cpp_quote("#ifndef __cplusplus") +cpp_quote("EXTERN_C const CLSID CLSID_AMMultiMediaStream;") +cpp_quote("#endif") + +cpp_quote("DEFINE_GUID(CLSID_AMDirectDrawStream, 0x49c47ce4, 0x9ba4, 0x11d0, 0x82, 0x12, 0x00, 0xc0, 0x4f, 0xc3, 0x2c, 0x45);") +cpp_quote("DEFINE_GUID(CLSID_AMAudioStream, 0x8496e040, 0xaf4c, 0x11d0, 0x82, 0x12, 0x00, 0xc0, 0x4f, 0xc3, 0x2c, 0x45);") +cpp_quote("DEFINE_GUID(CLSID_AMAudioData, 0xf2468580, 0xaf8a, 0x11d0, 0x82, 0x12, 0x00, 0xc0, 0x4f, 0xc3, 0x2c, 0x45);") +cpp_quote("DEFINE_GUID(CLSID_AMMediaTypeStream, 0xcf0f2f7c, 0xf7bf, 0x11d0, 0x90, 0xd, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0x9d);") + Propchange: trunk/reactos/include/dxsdk/amstream.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 19:41:51 2007 @@ -1,5 +1,6 @@ <module name="dxsdk" type="idlheader"> <file>austream.idl</file> + <file>amstream.idl</file> <file>ddstream.idl</file> <file>mmstream.idl</file> </module> Removed: trunk/reactos/include/psdk/amstream.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/amstream.h?re… ============================================================================== --- trunk/reactos/include/psdk/amstream.h (original) +++ trunk/reactos/include/psdk/amstream.h (removed) @@ -1,1464 +1,0 @@ -/*** Autogenerated by WIDL 0.3.0 from include\psdk\amstream.idl - Do not edit ***/ -#include <rpc.h> -#include <rpcndr.h> - -#ifndef __WIDL_INCLUDE_PSDK_AMSTREAM_H -#define __WIDL_INCLUDE_PSDK_AMSTREAM_H -#ifdef __cplusplus -extern "C" { -#endif -#include <unknwn.h> -#include <mmstream.h> -#include <strmif.h> -#include <ddraw.h> -#include <mmsystem.h> -#include <mmstream.h> -#include <ddstream.h> -#include <austream.h> -#if 0 -#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 - -#endif -#ifndef __IAMMultiMediaStream_FWD_DEFINED__ -#define __IAMMultiMediaStream_FWD_DEFINED__ -typedef interface IAMMultiMediaStream IAMMultiMediaStream; -#endif - -#ifndef __IAMMediaStream_FWD_DEFINED__ -#define __IAMMediaStream_FWD_DEFINED__ -typedef interface IAMMediaStream IAMMediaStream; -#endif - -#ifndef __IMediaStreamFilter_FWD_DEFINED__ -#define __IMediaStreamFilter_FWD_DEFINED__ -typedef interface IMediaStreamFilter IMediaStreamFilter; -#endif - -#ifndef __IAMMediaTypeStream_FWD_DEFINED__ -#define __IAMMediaTypeStream_FWD_DEFINED__ -typedef interface IAMMediaTypeStream IAMMediaTypeStream; -#endif - -#ifndef __IAMMediaTypeSample_FWD_DEFINED__ -#define __IAMMediaTypeSample_FWD_DEFINED__ -typedef interface IAMMediaTypeSample IAMMediaTypeSample; -#endif - -enum { - AMMSF_NOGRAPHTHREAD = 0x1 -}; - -enum { - AMMSF_ADDDEFAULTRENDERER = 0x1, - AMMSF_CREATEPEER = 0x2, - AMMSF_STOPIFNOSAMPLES = 0x4, - AMMSF_NOSTALL = 0x8 -}; - -enum { - AMMSF_RENDERTYPEMASK = 0x3, - AMMSF_RENDERTOEXISTING = 0x0, - AMMSF_RENDERALLSTREAMS = 0x1, - AMMSF_NORENDER = 0x2, - AMMSF_NOCLOCK = 0x4, - AMMSF_RUN = 0x8 -}; - -typedef enum { - Disabled = 0, - ReadData = 1, - RenderData = 2 -} OUTPUT_STATE; -/***************************************************************************** - * IAMMultiMediaStream interface - */ -#ifndef __IAMMultiMediaStream_INTERFACE_DEFINED__ -#define __IAMMultiMediaStream_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_IAMMultiMediaStream, 0xbebe595c, 0x9a6f, 0x11d0, 0x8f,0xde, 0x00,0xc0,0x4f,0xd9,0x18,0x9d); -#if defined(__cplusplus) && !defined(CINTERFACE) -interface IAMMultiMediaStream : public IMultiMediaStream -{ - virtual HRESULT STDMETHODCALLTYPE Initialize( - STREAM_TYPE StreamType, - DWORD dwFlags, - IGraphBuilder* pFilterGraph) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetFilterGraph( - IGraphBuilder** ppGraphBuilder) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetFilter( - IMediaStreamFilter** ppFilter) = 0; - - virtual HRESULT STDMETHODCALLTYPE AddMediaStream( - IUnknown* pStreamObject, - const MSPID* PurposeId, - DWORD dwFlags, - IMediaStream** ppNewStream) = 0; - - virtual HRESULT STDMETHODCALLTYPE OpenFile( - LPCWSTR pszFileName, - DWORD dwFlags) = 0; - - virtual HRESULT STDMETHODCALLTYPE OpenMoniker( - IBindCtx* pCtx, - IMoniker* pMoniker, - DWORD dwFlags) = 0; - - virtual HRESULT STDMETHODCALLTYPE Render( - DWORD dwFlags) = 0; - -}; -#else -typedef struct IAMMultiMediaStreamVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAMMultiMediaStream* This, - REFIID riid, - void** ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IAMMultiMediaStream* This); - - ULONG (STDMETHODCALLTYPE *Release)( - IAMMultiMediaStream* This); - - /*** IMultiMediaStream methods ***/ - HRESULT (STDMETHODCALLTYPE *GetInformation)( - IAMMultiMediaStream* This, - DWORD* pdwFlags, - STREAM_TYPE* pStreamType); - - HRESULT (STDMETHODCALLTYPE *GetMediaStream)( - IAMMultiMediaStream* This, - REFMSPID idPurpose, - IMediaStream** ppMediaStream); - - HRESULT (STDMETHODCALLTYPE *EnumMediaStreams)( - IAMMultiMediaStream* This, - long Index, - IMediaStream** ppMediaStream); - - HRESULT (STDMETHODCALLTYPE *GetState)( - IAMMultiMediaStream* This, - STREAM_STATE* pCurrentState); - - HRESULT (STDMETHODCALLTYPE *SetState)( - IAMMultiMediaStream* This, - STREAM_STATE NewState); - - HRESULT (STDMETHODCALLTYPE *GetTime)( - IAMMultiMediaStream* This, - STREAM_TIME* pCurrentTime); - - HRESULT (STDMETHODCALLTYPE *GetDuration)( - IAMMultiMediaStream* This, - STREAM_TIME* pDuration); - - HRESULT (STDMETHODCALLTYPE *Seek)( - IAMMultiMediaStream* This, - STREAM_TIME SeekTime); - - HRESULT (STDMETHODCALLTYPE *GetEndOfStreamEventHandle)( - IAMMultiMediaStream* This, - HANDLE* phEOS); - - /*** IAMMultiMediaStream methods ***/ - HRESULT (STDMETHODCALLTYPE *Initialize)( - IAMMultiMediaStream* This, - STREAM_TYPE StreamType, - DWORD dwFlags, - IGraphBuilder* pFilterGraph); - - HRESULT (STDMETHODCALLTYPE *GetFilterGraph)( - IAMMultiMediaStream* This, - IGraphBuilder** ppGraphBuilder); - - HRESULT (STDMETHODCALLTYPE *GetFilter)( - IAMMultiMediaStream* This, - IMediaStreamFilter** ppFilter); - - HRESULT (STDMETHODCALLTYPE *AddMediaStream)( - IAMMultiMediaStream* This, - IUnknown* pStreamObject, - const MSPID* PurposeId, - DWORD dwFlags, - IMediaStream** ppNewStream); - - HRESULT (STDMETHODCALLTYPE *OpenFile)( - IAMMultiMediaStream* This, - LPCWSTR pszFileName, - DWORD dwFlags); - - HRESULT (STDMETHODCALLTYPE *OpenMoniker)( - IAMMultiMediaStream* This, - IBindCtx* pCtx, - IMoniker* pMoniker, - DWORD dwFlags); - - HRESULT (STDMETHODCALLTYPE *Render)( - IAMMultiMediaStream* This, - DWORD dwFlags); - - END_INTERFACE -} IAMMultiMediaStreamVtbl; -interface IAMMultiMediaStream { - const IAMMultiMediaStreamVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -/*** IUnknown methods ***/ -#define IAMMultiMediaStream_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IAMMultiMediaStream_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IAMMultiMediaStream_Release(p) (p)->lpVtbl->Release(p) -/*** IMultiMediaStream methods ***/ -#define IAMMultiMediaStream_GetInformation(p,a,b) (p)->lpVtbl->GetInformation(p,a,b) -#define IAMMultiMediaStream_GetMediaStream(p,a,b) (p)->lpVtbl->GetMediaStream(p,a,b) -#define IAMMultiMediaStream_EnumMediaStreams(p,a,b) (p)->lpVtbl->EnumMediaStreams(p,a,b) -#define IAMMultiMediaStream_GetState(p,a) (p)->lpVtbl->GetState(p,a) -#define IAMMultiMediaStream_SetState(p,a) (p)->lpVtbl->SetState(p,a) -#define IAMMultiMediaStream_GetTime(p,a) (p)->lpVtbl->GetTime(p,a) -#define IAMMultiMediaStream_GetDuration(p,a) (p)->lpVtbl->GetDuration(p,a) -#define IAMMultiMediaStream_Seek(p,a) (p)->lpVtbl->Seek(p,a) -#define IAMMultiMediaStream_GetEndOfStreamEventHandle(p,a) (p)->lpVtbl->GetEndOfStreamEventHandle(p,a) -/*** IAMMultiMediaStream methods ***/ -#define IAMMultiMediaStream_Initialize(p,a,b,c) (p)->lpVtbl->Initialize(p,a,b,c) -#define IAMMultiMediaStream_GetFilterGraph(p,a) (p)->lpVtbl->GetFilterGraph(p,a) -#define IAMMultiMediaStream_GetFilter(p,a) (p)->lpVtbl->GetFilter(p,a) -#define IAMMultiMediaStream_AddMediaStream(p,a,b,c,d) (p)->lpVtbl->AddMediaStream(p,a,b,c,d) -#define IAMMultiMediaStream_OpenFile(p,a,b) (p)->lpVtbl->OpenFile(p,a,b) -#define IAMMultiMediaStream_OpenMoniker(p,a,b,c) (p)->lpVtbl->OpenMoniker(p,a,b,c) -#define IAMMultiMediaStream_Render(p,a) (p)->lpVtbl->Render(p,a) -#endif - -#endif - -HRESULT CALLBACK IAMMultiMediaStream_Initialize_Proxy( - IAMMultiMediaStream* This, - STREAM_TYPE StreamType, - DWORD dwFlags, - IGraphBuilder* pFilterGraph); -void __RPC_STUB IAMMultiMediaStream_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMultiMediaStream_GetFilterGraph_Proxy( - IAMMultiMediaStream* This, - IGraphBuilder** ppGraphBuilder); -void __RPC_STUB IAMMultiMediaStream_GetFilterGraph_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMultiMediaStream_GetFilter_Proxy( - IAMMultiMediaStream* This, - IMediaStreamFilter** ppFilter); -void __RPC_STUB IAMMultiMediaStream_GetFilter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMultiMediaStream_AddMediaStream_Proxy( - IAMMultiMediaStream* This, - IUnknown* pStreamObject, - const MSPID* PurposeId, - DWORD dwFlags, - IMediaStream** ppNewStream); -void __RPC_STUB IAMMultiMediaStream_AddMediaStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMultiMediaStream_OpenFile_Proxy( - IAMMultiMediaStream* This, - LPCWSTR pszFileName, - DWORD dwFlags); -void __RPC_STUB IAMMultiMediaStream_OpenFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMultiMediaStream_OpenMoniker_Proxy( - IAMMultiMediaStream* This, - IBindCtx* pCtx, - IMoniker* pMoniker, - DWORD dwFlags); -void __RPC_STUB IAMMultiMediaStream_OpenMoniker_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMultiMediaStream_Render_Proxy( - IAMMultiMediaStream* This, - DWORD dwFlags); -void __RPC_STUB IAMMultiMediaStream_Render_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); - -#endif /* __IAMMultiMediaStream_INTERFACE_DEFINED__ */ - -/***************************************************************************** - * IAMMediaStream interface - */ -#ifndef __IAMMediaStream_INTERFACE_DEFINED__ -#define __IAMMediaStream_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_IAMMediaStream, 0xbebe595d, 0x9a6f, 0x11d0, 0x8f,0xde, 0x00,0xc0,0x4f,0xd9,0x18,0x9d); -#if defined(__cplusplus) && !defined(CINTERFACE) -interface IAMMediaStream : public IMediaStream -{ - virtual HRESULT STDMETHODCALLTYPE Initialize( - IUnknown* pSourceObject, - DWORD dwFlags, - REFMSPID PurposeId, - const STREAM_TYPE StreamType) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetState( - FILTER_STATE State) = 0; - - virtual HRESULT STDMETHODCALLTYPE JoinAMMultiMediaStream( - IAMMultiMediaStream* pAMMultiMediaStream) = 0; - - virtual HRESULT STDMETHODCALLTYPE JoinFilter( - IMediaStreamFilter* pMediaStreamFilter) = 0; - - virtual HRESULT STDMETHODCALLTYPE JoinFilterGraph( - IFilterGraph* pFilterGraph) = 0; - -}; -#else -typedef struct IAMMediaStreamVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAMMediaStream* This, - REFIID riid, - void** ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IAMMediaStream* This); - - ULONG (STDMETHODCALLTYPE *Release)( - IAMMediaStream* This); - - /*** IMediaStream methods ***/ - HRESULT (STDMETHODCALLTYPE *GetMultiMediaStream)( - IAMMediaStream* This, - IMultiMediaStream** ppMultiMediaStream); - - HRESULT (STDMETHODCALLTYPE *GetInformation)( - IAMMediaStream* This, - MSPID* pPurposeId, - STREAM_TYPE* pType); - - HRESULT (STDMETHODCALLTYPE *SetSameFormat)( - IAMMediaStream* This, - IMediaStream* pStreamThatHasDesiredFormat, - DWORD dwFlags); - - HRESULT (STDMETHODCALLTYPE *AllocateSample)( - IAMMediaStream* This, - DWORD dwFlags, - IStreamSample** ppSample); - - HRESULT (STDMETHODCALLTYPE *CreateSharedSample)( - IAMMediaStream* This, - IStreamSample* pExistingSample, - DWORD dwFlags, - IStreamSample** ppNewSample); - - HRESULT (STDMETHODCALLTYPE *SendEndOfStream)( - IAMMediaStream* This, - DWORD dwFlags); - - /*** IAMMediaStream methods ***/ - HRESULT (STDMETHODCALLTYPE *Initialize)( - IAMMediaStream* This, - IUnknown* pSourceObject, - DWORD dwFlags, - REFMSPID PurposeId, - const STREAM_TYPE StreamType); - - HRESULT (STDMETHODCALLTYPE *SetState)( - IAMMediaStream* This, - FILTER_STATE State); - - HRESULT (STDMETHODCALLTYPE *JoinAMMultiMediaStream)( - IAMMediaStream* This, - IAMMultiMediaStream* pAMMultiMediaStream); - - HRESULT (STDMETHODCALLTYPE *JoinFilter)( - IAMMediaStream* This, - IMediaStreamFilter* pMediaStreamFilter); - - HRESULT (STDMETHODCALLTYPE *JoinFilterGraph)( - IAMMediaStream* This, - IFilterGraph* pFilterGraph); - - END_INTERFACE -} IAMMediaStreamVtbl; -interface IAMMediaStream { - const IAMMediaStreamVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -/*** IUnknown methods ***/ -#define IAMMediaStream_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IAMMediaStream_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IAMMediaStream_Release(p) (p)->lpVtbl->Release(p) -/*** IMediaStream methods ***/ -#define IAMMediaStream_GetMultiMediaStream(p,a) (p)->lpVtbl->GetMultiMediaStream(p,a) -#define IAMMediaStream_GetInformation(p,a,b) (p)->lpVtbl->GetInformation(p,a,b) -#define IAMMediaStream_SetSameFormat(p,a,b) (p)->lpVtbl->SetSameFormat(p,a,b) -#define IAMMediaStream_AllocateSample(p,a,b) (p)->lpVtbl->AllocateSample(p,a,b) -#define IAMMediaStream_CreateSharedSample(p,a,b,c) (p)->lpVtbl->CreateSharedSample(p,a,b,c) -#define IAMMediaStream_SendEndOfStream(p,a) (p)->lpVtbl->SendEndOfStream(p,a) -/*** IAMMediaStream methods ***/ -#define IAMMediaStream_Initialize(p,a,b,c,d) (p)->lpVtbl->Initialize(p,a,b,c,d) -#define IAMMediaStream_SetState(p,a) (p)->lpVtbl->SetState(p,a) -#define IAMMediaStream_JoinAMMultiMediaStream(p,a) (p)->lpVtbl->JoinAMMultiMediaStream(p,a) -#define IAMMediaStream_JoinFilter(p,a) (p)->lpVtbl->JoinFilter(p,a) -#define IAMMediaStream_JoinFilterGraph(p,a) (p)->lpVtbl->JoinFilterGraph(p,a) -#endif - -#endif - -HRESULT CALLBACK IAMMediaStream_Initialize_Proxy( - IAMMediaStream* This, - IUnknown* pSourceObject, - DWORD dwFlags, - REFMSPID PurposeId, - const STREAM_TYPE StreamType); -void __RPC_STUB IAMMediaStream_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaStream_SetState_Proxy( - IAMMediaStream* This, - FILTER_STATE State); -void __RPC_STUB IAMMediaStream_SetState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaStream_JoinAMMultiMediaStream_Proxy( - IAMMediaStream* This, - IAMMultiMediaStream* pAMMultiMediaStream); -void __RPC_STUB IAMMediaStream_JoinAMMultiMediaStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaStream_JoinFilter_Proxy( - IAMMediaStream* This, - IMediaStreamFilter* pMediaStreamFilter); -void __RPC_STUB IAMMediaStream_JoinFilter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaStream_JoinFilterGraph_Proxy( - IAMMediaStream* This, - IFilterGraph* pFilterGraph); -void __RPC_STUB IAMMediaStream_JoinFilterGraph_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); - -#endif /* __IAMMediaStream_INTERFACE_DEFINED__ */ - -/***************************************************************************** - * IMediaStreamFilter interface - */ -#ifndef __IMediaStreamFilter_INTERFACE_DEFINED__ -#define __IMediaStreamFilter_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_IMediaStreamFilter, 0xbebe595e, 0x9a6f, 0x11d0, 0x8f,0xde, 0x00,0xc0,0x4f,0xd9,0x18,0x9d); -#if defined(__cplusplus) && !defined(CINTERFACE) -interface IMediaStreamFilter : public IBaseFilter -{ - virtual HRESULT STDMETHODCALLTYPE AddMediaStream( - IAMMediaStream* pAMMediaStream) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetMediaStream( - REFMSPID idPurpose, - IMediaStream** ppMediaStream) = 0; - - virtual HRESULT STDMETHODCALLTYPE EnumMediaStreams( - long Index, - IMediaStream** ppMediaStream) = 0; - - virtual HRESULT STDMETHODCALLTYPE SupportSeeking( - BOOL bRenderer) = 0; - - virtual HRESULT STDMETHODCALLTYPE ReferenceTimeToStreamTime( - REFERENCE_TIME* pTime) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetCurrentStreamTime( - REFERENCE_TIME* pCurrentStreamTime) = 0; - - virtual HRESULT STDMETHODCALLTYPE WaitUntil( - REFERENCE_TIME WaitStreamTime) = 0; - - virtual HRESULT STDMETHODCALLTYPE Flush( - BOOL bCancelEOS) = 0; - - virtual HRESULT STDMETHODCALLTYPE EndOfStream( - ) = 0; - -}; -#else -typedef struct IMediaStreamFilterVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMediaStreamFilter* This, - REFIID riid, - void** ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IMediaStreamFilter* This); - - ULONG (STDMETHODCALLTYPE *Release)( - IMediaStreamFilter* This); - - /*** IPersist methods ***/ - HRESULT (STDMETHODCALLTYPE *GetClassID)( - IMediaStreamFilter* This, - CLSID* pClassID); - - /*** IMediaFilter methods ***/ - HRESULT (STDMETHODCALLTYPE *Stop)( - IMediaStreamFilter* This); - - HRESULT (STDMETHODCALLTYPE *Pause)( - IMediaStreamFilter* This); - - HRESULT (STDMETHODCALLTYPE *Run)( - IMediaStreamFilter* This, - REFERENCE_TIME tStart); - - HRESULT (STDMETHODCALLTYPE *GetState)( - IMediaStreamFilter* This, - DWORD dwMilliSecsTimeout, - FILTER_STATE* State); - - HRESULT (STDMETHODCALLTYPE *SetSyncSource)( - IMediaStreamFilter* This, - IReferenceClock* pClock); - - HRESULT (STDMETHODCALLTYPE *GetSyncSource)( - IMediaStreamFilter* This, - IReferenceClock** pClock); - - /*** IBaseFilter methods ***/ - HRESULT (STDMETHODCALLTYPE *EnumPins)( - IMediaStreamFilter* This, - IEnumPins** ppEnum); - - HRESULT (STDMETHODCALLTYPE *FindPin)( - IMediaStreamFilter* This, - LPCWSTR Id, - IPin** ppPin); - - HRESULT (STDMETHODCALLTYPE *QueryFilterInfo)( - IMediaStreamFilter* This, - FILTER_INFO* pInfo); - - HRESULT (STDMETHODCALLTYPE *JoinFilterGraph)( - IMediaStreamFilter* This, - IFilterGraph* pGraph, - LPCWSTR pName); - - HRESULT (STDMETHODCALLTYPE *QueryVendorInfo)( - IMediaStreamFilter* This, - LPWSTR* pVendorInfo); - - /*** IMediaStreamFilter methods ***/ - HRESULT (STDMETHODCALLTYPE *AddMediaStream)( - IMediaStreamFilter* This, - IAMMediaStream* pAMMediaStream); - - HRESULT (STDMETHODCALLTYPE *GetMediaStream)( - IMediaStreamFilter* This, - REFMSPID idPurpose, - IMediaStream** ppMediaStream); - - HRESULT (STDMETHODCALLTYPE *EnumMediaStreams)( - IMediaStreamFilter* This, - long Index, - IMediaStream** ppMediaStream); - - HRESULT (STDMETHODCALLTYPE *SupportSeeking)( - IMediaStreamFilter* This, - BOOL bRenderer); - - HRESULT (STDMETHODCALLTYPE *ReferenceTimeToStreamTime)( - IMediaStreamFilter* This, - REFERENCE_TIME* pTime); - - HRESULT (STDMETHODCALLTYPE *GetCurrentStreamTime)( - IMediaStreamFilter* This, - REFERENCE_TIME* pCurrentStreamTime); - - HRESULT (STDMETHODCALLTYPE *WaitUntil)( - IMediaStreamFilter* This, - REFERENCE_TIME WaitStreamTime); - - HRESULT (STDMETHODCALLTYPE *Flush)( - IMediaStreamFilter* This, - BOOL bCancelEOS); - - HRESULT (STDMETHODCALLTYPE *EndOfStream)( - IMediaStreamFilter* This); - - END_INTERFACE -} IMediaStreamFilterVtbl; -interface IMediaStreamFilter { - const IMediaStreamFilterVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -/*** IUnknown methods ***/ -#define IMediaStreamFilter_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IMediaStreamFilter_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IMediaStreamFilter_Release(p) (p)->lpVtbl->Release(p) -/*** IPersist methods ***/ -#define IMediaStreamFilter_GetClassID(p,a) (p)->lpVtbl->GetClassID(p,a) -/*** IMediaFilter methods ***/ -#define IMediaStreamFilter_Stop(p) (p)->lpVtbl->Stop(p) -#define IMediaStreamFilter_Pause(p) (p)->lpVtbl->Pause(p) -#define IMediaStreamFilter_Run(p,a) (p)->lpVtbl->Run(p,a) -#define IMediaStreamFilter_GetState(p,a,b) (p)->lpVtbl->GetState(p,a,b) -#define IMediaStreamFilter_SetSyncSource(p,a) (p)->lpVtbl->SetSyncSource(p,a) -#define IMediaStreamFilter_GetSyncSource(p,a) (p)->lpVtbl->GetSyncSource(p,a) -/*** IBaseFilter methods ***/ -#define IMediaStreamFilter_EnumPins(p,a) (p)->lpVtbl->EnumPins(p,a) -#define IMediaStreamFilter_FindPin(p,a,b) (p)->lpVtbl->FindPin(p,a,b) -#define IMediaStreamFilter_QueryFilterInfo(p,a) (p)->lpVtbl->QueryFilterInfo(p,a) -#define IMediaStreamFilter_JoinFilterGraph(p,a,b) (p)->lpVtbl->JoinFilterGraph(p,a,b) -#define IMediaStreamFilter_QueryVendorInfo(p,a) (p)->lpVtbl->QueryVendorInfo(p,a) -/*** IMediaStreamFilter methods ***/ -#define IMediaStreamFilter_AddMediaStream(p,a) (p)->lpVtbl->AddMediaStream(p,a) -#define IMediaStreamFilter_GetMediaStream(p,a,b) (p)->lpVtbl->GetMediaStream(p,a,b) -#define IMediaStreamFilter_EnumMediaStreams(p,a,b) (p)->lpVtbl->EnumMediaStreams(p,a,b) -#define IMediaStreamFilter_SupportSeeking(p,a) (p)->lpVtbl->SupportSeeking(p,a) -#define IMediaStreamFilter_ReferenceTimeToStreamTime(p,a) (p)->lpVtbl->ReferenceTimeToStreamTime(p,a) -#define IMediaStreamFilter_GetCurrentStreamTime(p,a) (p)->lpVtbl->GetCurrentStreamTime(p,a) -#define IMediaStreamFilter_WaitUntil(p,a) (p)->lpVtbl->WaitUntil(p,a) -#define IMediaStreamFilter_Flush(p,a) (p)->lpVtbl->Flush(p,a) -#define IMediaStreamFilter_EndOfStream(p) (p)->lpVtbl->EndOfStream(p) -#endif - -#endif - -HRESULT CALLBACK IMediaStreamFilter_AddMediaStream_Proxy( - IMediaStreamFilter* This, - IAMMediaStream* pAMMediaStream); -void __RPC_STUB IMediaStreamFilter_AddMediaStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IMediaStreamFilter_GetMediaStream_Proxy( - IMediaStreamFilter* This, - REFMSPID idPurpose, - IMediaStream** ppMediaStream); -void __RPC_STUB IMediaStreamFilter_GetMediaStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IMediaStreamFilter_EnumMediaStreams_Proxy( - IMediaStreamFilter* This, - long Index, - IMediaStream** ppMediaStream); -void __RPC_STUB IMediaStreamFilter_EnumMediaStreams_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IMediaStreamFilter_SupportSeeking_Proxy( - IMediaStreamFilter* This, - BOOL bRenderer); -void __RPC_STUB IMediaStreamFilter_SupportSeeking_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IMediaStreamFilter_ReferenceTimeToStreamTime_Proxy( - IMediaStreamFilter* This, - REFERENCE_TIME* pTime); -void __RPC_STUB IMediaStreamFilter_ReferenceTimeToStreamTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IMediaStreamFilter_GetCurrentStreamTime_Proxy( - IMediaStreamFilter* This, - REFERENCE_TIME* pCurrentStreamTime); -void __RPC_STUB IMediaStreamFilter_GetCurrentStreamTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IMediaStreamFilter_WaitUntil_Proxy( - IMediaStreamFilter* This, - REFERENCE_TIME WaitStreamTime); -void __RPC_STUB IMediaStreamFilter_WaitUntil_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IMediaStreamFilter_Flush_Proxy( - IMediaStreamFilter* This, - BOOL bCancelEOS); -void __RPC_STUB IMediaStreamFilter_Flush_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IMediaStreamFilter_EndOfStream_Proxy( - IMediaStreamFilter* This); -void __RPC_STUB IMediaStreamFilter_EndOfStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); - -#endif /* __IMediaStreamFilter_INTERFACE_DEFINED__ */ - -#ifndef __IDirectDrawMediaSampleAllocator_FWD_DEFINED__ -#define __IDirectDrawMediaSampleAllocator_FWD_DEFINED__ -typedef interface IDirectDrawMediaSampleAllocator IDirectDrawMediaSampleAllocator; -#endif - -/***************************************************************************** - * IDirectDrawMediaSampleAllocator interface - */ -#ifndef __IDirectDrawMediaSampleAllocator_INTERFACE_DEFINED__ -#define __IDirectDrawMediaSampleAllocator_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_IDirectDrawMediaSampleAllocator, 0xab6b4afc, 0xf6e4, 0x11d0, 0x90,0x0d, 0x00,0xc0,0x4f,0xd9,0x18,0x9d); -#if defined(__cplusplus) && !defined(CINTERFACE) -interface IDirectDrawMediaSampleAllocator : public IUnknown -{ - virtual HRESULT STDMETHODCALLTYPE GetDirectDraw( - IDirectDraw** ppDirectDraw) = 0; - -}; -#else -typedef struct IDirectDrawMediaSampleAllocatorVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDirectDrawMediaSampleAllocator* This, - REFIID riid, - void** ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IDirectDrawMediaSampleAllocator* This); - - ULONG (STDMETHODCALLTYPE *Release)( - IDirectDrawMediaSampleAllocator* This); - - /*** IDirectDrawMediaSampleAllocator methods ***/ - HRESULT (STDMETHODCALLTYPE *GetDirectDraw)( - IDirectDrawMediaSampleAllocator* This, - IDirectDraw** ppDirectDraw); - - END_INTERFACE -} IDirectDrawMediaSampleAllocatorVtbl; -interface IDirectDrawMediaSampleAllocator { - const IDirectDrawMediaSampleAllocatorVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -/*** IUnknown methods ***/ -#define IDirectDrawMediaSampleAllocator_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IDirectDrawMediaSampleAllocator_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IDirectDrawMediaSampleAllocator_Release(p) (p)->lpVtbl->Release(p) -/*** IDirectDrawMediaSampleAllocator methods ***/ -#define IDirectDrawMediaSampleAllocator_GetDirectDraw(p,a) (p)->lpVtbl->GetDirectDraw(p,a) -#endif - -#endif - -HRESULT CALLBACK IDirectDrawMediaSampleAllocator_GetDirectDraw_Proxy( - IDirectDrawMediaSampleAllocator* This, - IDirectDraw** ppDirectDraw); -void __RPC_STUB IDirectDrawMediaSampleAllocator_GetDirectDraw_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); - -#endif /* __IDirectDrawMediaSampleAllocator_INTERFACE_DEFINED__ */ - -#ifndef __IDirectDrawMediaSample_FWD_DEFINED__ -#define __IDirectDrawMediaSample_FWD_DEFINED__ -typedef interface IDirectDrawMediaSample IDirectDrawMediaSample; -#endif - -/***************************************************************************** - * IDirectDrawMediaSample interface - */ -#ifndef __IDirectDrawMediaSample_INTERFACE_DEFINED__ -#define __IDirectDrawMediaSample_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_IDirectDrawMediaSample, 0xab6b4afe, 0xf6e4, 0x11d0, 0x90,0x0d, 0x00,0xc0,0x4f,0xd9,0x18,0x9d); -#if defined(__cplusplus) && !defined(CINTERFACE) -interface IDirectDrawMediaSample : public IUnknown -{ - virtual HRESULT STDMETHODCALLTYPE GetSurfaceAndReleaseLock( - IDirectDrawSurface** ppDirectDrawSurface, - RECT* pRect) = 0; - - virtual HRESULT STDMETHODCALLTYPE LockMediaSamplePointer( - ) = 0; - -}; -#else -typedef struct IDirectDrawMediaSampleVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDirectDrawMediaSample* This, - REFIID riid, - void** ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IDirectDrawMediaSample* This); - - ULONG (STDMETHODCALLTYPE *Release)( - IDirectDrawMediaSample* This); - - /*** IDirectDrawMediaSample methods ***/ - HRESULT (STDMETHODCALLTYPE *GetSurfaceAndReleaseLock)( - IDirectDrawMediaSample* This, - IDirectDrawSurface** ppDirectDrawSurface, - RECT* pRect); - - HRESULT (STDMETHODCALLTYPE *LockMediaSamplePointer)( - IDirectDrawMediaSample* This); - - END_INTERFACE -} IDirectDrawMediaSampleVtbl; -interface IDirectDrawMediaSample { - const IDirectDrawMediaSampleVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -/*** IUnknown methods ***/ -#define IDirectDrawMediaSample_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IDirectDrawMediaSample_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IDirectDrawMediaSample_Release(p) (p)->lpVtbl->Release(p) -/*** IDirectDrawMediaSample methods ***/ -#define IDirectDrawMediaSample_GetSurfaceAndReleaseLock(p,a,b) (p)->lpVtbl->GetSurfaceAndReleaseLock(p,a,b) -#define IDirectDrawMediaSample_LockMediaSamplePointer(p) (p)->lpVtbl->LockMediaSamplePointer(p) -#endif - -#endif - -HRESULT CALLBACK IDirectDrawMediaSample_GetSurfaceAndReleaseLock_Proxy( - IDirectDrawMediaSample* This, - IDirectDrawSurface** ppDirectDrawSurface, - RECT* pRect); -void __RPC_STUB IDirectDrawMediaSample_GetSurfaceAndReleaseLock_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IDirectDrawMediaSample_LockMediaSamplePointer_Proxy( - IDirectDrawMediaSample* This); -void __RPC_STUB IDirectDrawMediaSample_LockMediaSamplePointer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); - -#endif /* __IDirectDrawMediaSample_INTERFACE_DEFINED__ */ - -/***************************************************************************** - * IAMMediaTypeStream interface - */ -#ifndef __IAMMediaTypeStream_INTERFACE_DEFINED__ -#define __IAMMediaTypeStream_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_IAMMediaTypeStream, 0xab6b4afa, 0xf6e4, 0x11d0, 0x90,0x0d, 0x00,0xc0,0x4f,0xd9,0x18,0x9d); -#if defined(__cplusplus) && !defined(CINTERFACE) -interface IAMMediaTypeStream : public IMediaStream -{ - virtual HRESULT STDMETHODCALLTYPE GetFormat( - AM_MEDIA_TYPE* pMediaType, - DWORD dwFlags) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetFormat( - AM_MEDIA_TYPE* pMediaType, - DWORD dwFlags) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateSample( - long lSampleSize, - BYTE* pbBuffer, - DWORD dwFlags, - IUnknown* pUnkOuter, - IAMMediaTypeSample** ppAMMediaTypeSample) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetStreamAllocatorRequirements( - ALLOCATOR_PROPERTIES* pProps) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetStreamAllocatorRequirements( - ALLOCATOR_PROPERTIES* pProps) = 0; - -}; -#else -typedef struct IAMMediaTypeStreamVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAMMediaTypeStream* This, - REFIID riid, - void** ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IAMMediaTypeStream* This); - - ULONG (STDMETHODCALLTYPE *Release)( - IAMMediaTypeStream* This); - - /*** IMediaStream methods ***/ - HRESULT (STDMETHODCALLTYPE *GetMultiMediaStream)( - IAMMediaTypeStream* This, - IMultiMediaStream** ppMultiMediaStream); - - HRESULT (STDMETHODCALLTYPE *GetInformation)( - IAMMediaTypeStream* This, - MSPID* pPurposeId, - STREAM_TYPE* pType); - - HRESULT (STDMETHODCALLTYPE *SetSameFormat)( - IAMMediaTypeStream* This, - IMediaStream* pStreamThatHasDesiredFormat, - DWORD dwFlags); - - HRESULT (STDMETHODCALLTYPE *AllocateSample)( - IAMMediaTypeStream* This, - DWORD dwFlags, - IStreamSample** ppSample); - - HRESULT (STDMETHODCALLTYPE *CreateSharedSample)( - IAMMediaTypeStream* This, - IStreamSample* pExistingSample, - DWORD dwFlags, - IStreamSample** ppNewSample); - - HRESULT (STDMETHODCALLTYPE *SendEndOfStream)( - IAMMediaTypeStream* This, - DWORD dwFlags); - - /*** IAMMediaTypeStream methods ***/ - HRESULT (STDMETHODCALLTYPE *GetFormat)( - IAMMediaTypeStream* This, - AM_MEDIA_TYPE* pMediaType, - DWORD dwFlags); - - HRESULT (STDMETHODCALLTYPE *SetFormat)( - IAMMediaTypeStream* This, - AM_MEDIA_TYPE* pMediaType, - DWORD dwFlags); - - HRESULT (STDMETHODCALLTYPE *CreateSample)( - IAMMediaTypeStream* This, - long lSampleSize, - BYTE* pbBuffer, - DWORD dwFlags, - IUnknown* pUnkOuter, - IAMMediaTypeSample** ppAMMediaTypeSample); - - HRESULT (STDMETHODCALLTYPE *GetStreamAllocatorRequirements)( - IAMMediaTypeStream* This, - ALLOCATOR_PROPERTIES* pProps); - - HRESULT (STDMETHODCALLTYPE *SetStreamAllocatorRequirements)( - IAMMediaTypeStream* This, - ALLOCATOR_PROPERTIES* pProps); - - END_INTERFACE -} IAMMediaTypeStreamVtbl; -interface IAMMediaTypeStream { - const IAMMediaTypeStreamVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -/*** IUnknown methods ***/ -#define IAMMediaTypeStream_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IAMMediaTypeStream_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IAMMediaTypeStream_Release(p) (p)->lpVtbl->Release(p) -/*** IMediaStream methods ***/ -#define IAMMediaTypeStream_GetMultiMediaStream(p,a) (p)->lpVtbl->GetMultiMediaStream(p,a) -#define IAMMediaTypeStream_GetInformation(p,a,b) (p)->lpVtbl->GetInformation(p,a,b) -#define IAMMediaTypeStream_SetSameFormat(p,a,b) (p)->lpVtbl->SetSameFormat(p,a,b) -#define IAMMediaTypeStream_AllocateSample(p,a,b) (p)->lpVtbl->AllocateSample(p,a,b) -#define IAMMediaTypeStream_CreateSharedSample(p,a,b,c) (p)->lpVtbl->CreateSharedSample(p,a,b,c) -#define IAMMediaTypeStream_SendEndOfStream(p,a) (p)->lpVtbl->SendEndOfStream(p,a) -/*** IAMMediaTypeStream methods ***/ -#define IAMMediaTypeStream_GetFormat(p,a,b) (p)->lpVtbl->GetFormat(p,a,b) -#define IAMMediaTypeStream_SetFormat(p,a,b) (p)->lpVtbl->SetFormat(p,a,b) -#define IAMMediaTypeStream_CreateSample(p,a,b,c,d,e) (p)->lpVtbl->CreateSample(p,a,b,c,d,e) -#define IAMMediaTypeStream_GetStreamAllocatorRequirements(p,a) (p)->lpVtbl->GetStreamAllocatorRequirements(p,a) -#define IAMMediaTypeStream_SetStreamAllocatorRequirements(p,a) (p)->lpVtbl->SetStreamAllocatorRequirements(p,a) -#endif - -#endif - -HRESULT CALLBACK IAMMediaTypeStream_GetFormat_Proxy( - IAMMediaTypeStream* This, - AM_MEDIA_TYPE* pMediaType, - DWORD dwFlags); -void __RPC_STUB IAMMediaTypeStream_GetFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeStream_SetFormat_Proxy( - IAMMediaTypeStream* This, - AM_MEDIA_TYPE* pMediaType, - DWORD dwFlags); -void __RPC_STUB IAMMediaTypeStream_SetFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeStream_CreateSample_Proxy( - IAMMediaTypeStream* This, - long lSampleSize, - BYTE* pbBuffer, - DWORD dwFlags, - IUnknown* pUnkOuter, - IAMMediaTypeSample** ppAMMediaTypeSample); -void __RPC_STUB IAMMediaTypeStream_CreateSample_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeStream_GetStreamAllocatorRequirements_Proxy( - IAMMediaTypeStream* This, - ALLOCATOR_PROPERTIES* pProps); -void __RPC_STUB IAMMediaTypeStream_GetStreamAllocatorRequirements_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeStream_SetStreamAllocatorRequirements_Proxy( - IAMMediaTypeStream* This, - ALLOCATOR_PROPERTIES* pProps); -void __RPC_STUB IAMMediaTypeStream_SetStreamAllocatorRequirements_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); - -#endif /* __IAMMediaTypeStream_INTERFACE_DEFINED__ */ - -/***************************************************************************** - * IAMMediaTypeSample interface - */ -#ifndef __IAMMediaTypeSample_INTERFACE_DEFINED__ -#define __IAMMediaTypeSample_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_IAMMediaTypeSample, 0xab6b4afb, 0xf6e4, 0x11d0, 0x90,0x0d, 0x00,0xc0,0x4f,0xd9,0x18,0x9d); -#if defined(__cplusplus) && !defined(CINTERFACE) -interface IAMMediaTypeSample : public IStreamSample -{ - virtual HRESULT STDMETHODCALLTYPE SetPointer( - BYTE* pBuffer, - long lSize) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetPointer( - BYTE** ppBuffer) = 0; - - virtual long STDMETHODCALLTYPE GetSize( - ) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetTime( - REFERENCE_TIME* pTimeStart, - REFERENCE_TIME* pTimeEnd) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetTime( - REFERENCE_TIME* pTimeStart, - REFERENCE_TIME* pTimeEnd) = 0; - - virtual HRESULT STDMETHODCALLTYPE IsSyncPoint( - ) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetSyncPoint( - BOOL bIsSyncPoint) = 0; - - virtual HRESULT STDMETHODCALLTYPE IsPreroll( - ) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetPreroll( - BOOL bIsPreroll) = 0; - - virtual long STDMETHODCALLTYPE GetActualDataLength( - ) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetActualDataLength( - long Len) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetMediaType( - AM_MEDIA_TYPE** ppMediaType) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetMediaType( - AM_MEDIA_TYPE* pMediaType) = 0; - - virtual HRESULT STDMETHODCALLTYPE IsDiscontinuity( - ) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetDiscontinuity( - BOOL bDiscontinuity) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetMediaTime( - LONGLONG* pTimeStart, - LONGLONG* pTimeEnd) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetMediaTime( - LONGLONG* pTimeStart, - LONGLONG* pTimeEnd) = 0; - -}; -#else -typedef struct IAMMediaTypeSampleVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAMMediaTypeSample* This, - REFIID riid, - void** ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IAMMediaTypeSample* This); - - ULONG (STDMETHODCALLTYPE *Release)( - IAMMediaTypeSample* This); - - /*** IStreamSample methods ***/ - HRESULT (STDMETHODCALLTYPE *GetMediaStream)( - IAMMediaTypeSample* This, - IMediaStream** ppMediaStream); - - HRESULT (STDMETHODCALLTYPE *GetSampleTimes)( - IAMMediaTypeSample* This, - STREAM_TIME* pStartTime, - STREAM_TIME* pEndTime, - STREAM_TIME* pCurrentTime); - - HRESULT (STDMETHODCALLTYPE *SetSampleTimes)( - IAMMediaTypeSample* This, - const STREAM_TIME* pStartTime, - const STREAM_TIME* pEndTime); - - HRESULT (STDMETHODCALLTYPE *Update)( - IAMMediaTypeSample* This, - DWORD dwFlags, - HANDLE hEvent, - PAPCFUNC pfnAPC, - DWORD dwAPCData); - - HRESULT (STDMETHODCALLTYPE *CompletionStatus)( - IAMMediaTypeSample* This, - DWORD dwFlags, - DWORD dwMilliseconds); - - /*** IAMMediaTypeSample methods ***/ - HRESULT (STDMETHODCALLTYPE *SetPointer)( - IAMMediaTypeSample* This, - BYTE* pBuffer, - long lSize); - - HRESULT (STDMETHODCALLTYPE *GetPointer)( - IAMMediaTypeSample* This, - BYTE** ppBuffer); - - long (STDMETHODCALLTYPE *GetSize)( - IAMMediaTypeSample* This); - - HRESULT (STDMETHODCALLTYPE *GetTime)( - IAMMediaTypeSample* This, - REFERENCE_TIME* pTimeStart, - REFERENCE_TIME* pTimeEnd); - - HRESULT (STDMETHODCALLTYPE *SetTime)( - IAMMediaTypeSample* This, - REFERENCE_TIME* pTimeStart, - REFERENCE_TIME* pTimeEnd); - - HRESULT (STDMETHODCALLTYPE *IsSyncPoint)( - IAMMediaTypeSample* This); - - HRESULT (STDMETHODCALLTYPE *SetSyncPoint)( - IAMMediaTypeSample* This, - BOOL bIsSyncPoint); - - HRESULT (STDMETHODCALLTYPE *IsPreroll)( - IAMMediaTypeSample* This); - - HRESULT (STDMETHODCALLTYPE *SetPreroll)( - IAMMediaTypeSample* This, - BOOL bIsPreroll); - - long (STDMETHODCALLTYPE *GetActualDataLength)( - IAMMediaTypeSample* This); - - HRESULT (STDMETHODCALLTYPE *SetActualDataLength)( - IAMMediaTypeSample* This, - long Len); - - HRESULT (STDMETHODCALLTYPE *GetMediaType)( - IAMMediaTypeSample* This, - AM_MEDIA_TYPE** ppMediaType); - - HRESULT (STDMETHODCALLTYPE *SetMediaType)( - IAMMediaTypeSample* This, - AM_MEDIA_TYPE* pMediaType); - - HRESULT (STDMETHODCALLTYPE *IsDiscontinuity)( - IAMMediaTypeSample* This); - - HRESULT (STDMETHODCALLTYPE *SetDiscontinuity)( - IAMMediaTypeSample* This, - BOOL bDiscontinuity); - - HRESULT (STDMETHODCALLTYPE *GetMediaTime)( - IAMMediaTypeSample* This, - LONGLONG* pTimeStart, - LONGLONG* pTimeEnd); - - HRESULT (STDMETHODCALLTYPE *SetMediaTime)( - IAMMediaTypeSample* This, - LONGLONG* pTimeStart, - LONGLONG* pTimeEnd); - - END_INTERFACE -} IAMMediaTypeSampleVtbl; -interface IAMMediaTypeSample { - const IAMMediaTypeSampleVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -/*** IUnknown methods ***/ -#define IAMMediaTypeSample_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IAMMediaTypeSample_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IAMMediaTypeSample_Release(p) (p)->lpVtbl->Release(p) -/*** IStreamSample methods ***/ -#define IAMMediaTypeSample_GetMediaStream(p,a) (p)->lpVtbl->GetMediaStream(p,a) -#define IAMMediaTypeSample_GetSampleTimes(p,a,b,c) (p)->lpVtbl->GetSampleTimes(p,a,b,c) -#define IAMMediaTypeSample_SetSampleTimes(p,a,b) (p)->lpVtbl->SetSampleTimes(p,a,b) -#define IAMMediaTypeSample_Update(p,a,b,c,d) (p)->lpVtbl->Update(p,a,b,c,d) -#define IAMMediaTypeSample_CompletionStatus(p,a,b) (p)->lpVtbl->CompletionStatus(p,a,b) -/*** IAMMediaTypeSample methods ***/ -#define IAMMediaTypeSample_SetPointer(p,a,b) (p)->lpVtbl->SetPointer(p,a,b) -#define IAMMediaTypeSample_GetPointer(p,a) (p)->lpVtbl->GetPointer(p,a) -#define IAMMediaTypeSample_GetSize(p) (p)->lpVtbl->GetSize(p) -#define IAMMediaTypeSample_GetTime(p,a,b) (p)->lpVtbl->GetTime(p,a,b) -#define IAMMediaTypeSample_SetTime(p,a,b) (p)->lpVtbl->SetTime(p,a,b) -#define IAMMediaTypeSample_IsSyncPoint(p) (p)->lpVtbl->IsSyncPoint(p) -#define IAMMediaTypeSample_SetSyncPoint(p,a) (p)->lpVtbl->SetSyncPoint(p,a) -#define IAMMediaTypeSample_IsPreroll(p) (p)->lpVtbl->IsPreroll(p) -#define IAMMediaTypeSample_SetPreroll(p,a) (p)->lpVtbl->SetPreroll(p,a) -#define IAMMediaTypeSample_GetActualDataLength(p) (p)->lpVtbl->GetActualDataLength(p) -#define IAMMediaTypeSample_SetActualDataLength(p,a) (p)->lpVtbl->SetActualDataLength(p,a) -#define IAMMediaTypeSample_GetMediaType(p,a) (p)->lpVtbl->GetMediaType(p,a) -#define IAMMediaTypeSample_SetMediaType(p,a) (p)->lpVtbl->SetMediaType(p,a) -#define IAMMediaTypeSample_IsDiscontinuity(p) (p)->lpVtbl->IsDiscontinuity(p) -#define IAMMediaTypeSample_SetDiscontinuity(p,a) (p)->lpVtbl->SetDiscontinuity(p,a) -#define IAMMediaTypeSample_GetMediaTime(p,a,b) (p)->lpVtbl->GetMediaTime(p,a,b) -#define IAMMediaTypeSample_SetMediaTime(p,a,b) (p)->lpVtbl->SetMediaTime(p,a,b) -#endif - -#endif - -HRESULT CALLBACK IAMMediaTypeSample_SetPointer_Proxy( - IAMMediaTypeSample* This, - BYTE* pBuffer, - long lSize); -void __RPC_STUB IAMMediaTypeSample_SetPointer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeSample_GetPointer_Proxy( - IAMMediaTypeSample* This, - BYTE** ppBuffer); -void __RPC_STUB IAMMediaTypeSample_GetPointer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -long CALLBACK IAMMediaTypeSample_GetSize_Proxy( - IAMMediaTypeSample* This); -void __RPC_STUB IAMMediaTypeSample_GetSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeSample_GetTime_Proxy( - IAMMediaTypeSample* This, - REFERENCE_TIME* pTimeStart, - REFERENCE_TIME* pTimeEnd); -void __RPC_STUB IAMMediaTypeSample_GetTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeSample_SetTime_Proxy( - IAMMediaTypeSample* This, - REFERENCE_TIME* pTimeStart, - REFERENCE_TIME* pTimeEnd); -void __RPC_STUB IAMMediaTypeSample_SetTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeSample_IsSyncPoint_Proxy( - IAMMediaTypeSample* This); -void __RPC_STUB IAMMediaTypeSample_IsSyncPoint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeSample_SetSyncPoint_Proxy( - IAMMediaTypeSample* This, - BOOL bIsSyncPoint); -void __RPC_STUB IAMMediaTypeSample_SetSyncPoint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeSample_IsPreroll_Proxy( - IAMMediaTypeSample* This); -void __RPC_STUB IAMMediaTypeSample_IsPreroll_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeSample_SetPreroll_Proxy( - IAMMediaTypeSample* This, - BOOL bIsPreroll); -void __RPC_STUB IAMMediaTypeSample_SetPreroll_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -long CALLBACK IAMMediaTypeSample_GetActualDataLength_Proxy( - IAMMediaTypeSample* This); -void __RPC_STUB IAMMediaTypeSample_GetActualDataLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeSample_SetActualDataLength_Proxy( - IAMMediaTypeSample* This, - long Len); -void __RPC_STUB IAMMediaTypeSample_SetActualDataLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeSample_GetMediaType_Proxy( - IAMMediaTypeSample* This, - AM_MEDIA_TYPE** ppMediaType); -void __RPC_STUB IAMMediaTypeSample_GetMediaType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeSample_SetMediaType_Proxy( - IAMMediaTypeSample* This, - AM_MEDIA_TYPE* pMediaType); -void __RPC_STUB IAMMediaTypeSample_SetMediaType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeSample_IsDiscontinuity_Proxy( - IAMMediaTypeSample* This); -void __RPC_STUB IAMMediaTypeSample_IsDiscontinuity_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeSample_SetDiscontinuity_Proxy( - IAMMediaTypeSample* This, - BOOL bDiscontinuity); -void __RPC_STUB IAMMediaTypeSample_SetDiscontinuity_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeSample_GetMediaTime_Proxy( - IAMMediaTypeSample* This, - LONGLONG* pTimeStart, - LONGLONG* pTimeEnd); -void __RPC_STUB IAMMediaTypeSample_GetMediaTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeSample_SetMediaTime_Proxy( - IAMMediaTypeSample* This, - LONGLONG* pTimeStart, - LONGLONG* pTimeEnd); -void __RPC_STUB IAMMediaTypeSample_SetMediaTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); - -#endif /* __IAMMediaTypeSample_INTERFACE_DEFINED__ */ - -/***************************************************************************** - * AMMultiMediaStream coclass - */ - -DEFINE_GUID(CLSID_AMMultiMediaStream, 0x49c47ce5, 0x9ba4, 0x11d0, 0x82,0x12, 0x00,0xc0,0x4f,0xc3,0x2c,0x45); - -#ifndef __IDirectShowStream_FWD_DEFINED__ -#define __IDirectShowStream_FWD_DEFINED__ -typedef interface IDirectShowStream IDirectShowStream; -#endif - -DEFINE_GUID(CLSID_AMDirectDrawStream, 0x49c47ce4, 0x9ba4, 0x11d0, 0x82, 0x12, 0x00, 0xc0, 0x4f, 0xc3, 0x2c, 0x45); -DEFINE_GUID(CLSID_AMAudioStream, 0x8496e040, 0xaf4c, 0x11d0, 0x82, 0x12, 0x00, 0xc0, 0x4f, 0xc3, 0x2c, 0x45); -DEFINE_GUID(CLSID_AMAudioData, 0xf2468580, 0xaf8a, 0x11d0, 0x82, 0x12, 0x00, 0xc0, 0x4f, 0xc3, 0x2c, 0x45); -DEFINE_GUID(CLSID_AMMediaTypeStream, 0xcf0f2f7c, 0xf7bf, 0x11d0, 0x90, 0x0d, 0x00, 0xc0, 0x4f, 0xd9, 0x18, 0x9d); -/* Begin additional prototypes for all interfaces */ - - -/* End additional prototypes */ - -#ifdef __cplusplus -} -#endif -#endif /* __WIDL_INCLUDE_PSDK_AMSTREAM_H */ Removed: trunk/reactos/include/psdk/amstream.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/amstream.idl?… ============================================================================== --- trunk/reactos/include/psdk/amstream.idl (original) +++ trunk/reactos/include/psdk/amstream.idl (removed) @@ -1,319 +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"; -import "strmif.idl"; - -cpp_quote("#include <ddraw.h>") -cpp_quote("#include <mmsystem.h>") -cpp_quote("#include <mmstream.h>") -cpp_quote("#include <ddstream.h>") -cpp_quote("#include <austream.h>") - -cpp_quote("#if 0") -interface IDirectDraw; -interface IDirectDrawSurface; -cpp_quote("#endif") - -interface IAMMultiMediaStream; -interface IAMMediaStream; -interface IMediaStreamFilter; -interface IAMMediaTypeStream; -interface IAMMediaTypeSample; - -enum { - AMMSF_NOGRAPHTHREAD = 0x00000001 -}; - -enum { - AMMSF_ADDDEFAULTRENDERER = 0x00000001, - AMMSF_CREATEPEER = 0x00000002, - AMMSF_STOPIFNOSAMPLES = 0x00000004, - AMMSF_NOSTALL = 0x00000008 -}; - -enum { - AMMSF_RENDERTYPEMASK = 0x00000003, - AMMSF_RENDERTOEXISTING = 0x00000000, - AMMSF_RENDERALLSTREAMS = 0x00000001, - AMMSF_NORENDER = 0x00000002, - AMMSF_NOCLOCK = 0x00000004, - AMMSF_RUN = 0x00000008 -}; - - -typedef [v1_enum] enum { - Disabled = 0, - ReadData = 1, - RenderData = 2 -} OUTPUT_STATE; - -/* -[ -object, -uuid(7DB01C96-C0C3-11d0-8FF1-00C04FD9189D), -dual, -helpstring("IDirectShowStream Interface"), -pointer_default(unique) -] -interface IDirectShowStream : IDispatch -{ - [propget, id(1), helpstring("property FileName")] HRESULT FileName([out, retval] BSTR *pVal); - [propput, id(1), helpstring("property FileName")] HRESULT FileName([in] BSTR newVal); - [propget, id(2), helpstring("property Video")] HRESULT Video([out, retval] OUTPUT_STATE *pVal); - [propput, id(2), helpstring("propetry Video")] HRESULT Video([in] OUTPUT_STATE newVal); - [propget, id(3), helpstring("property Audio")] HRESULT Audio([out, retval] OUTPUT_STATE *pVal); - [propput, id(3), helpstring("propetry Audio")] HRESULT Audio([in] OUTPUT_STATE newVal); -}; -*/ - -[ -object, -uuid(BEBE595C-9A6F-11d0-8FDE-00C04FD9189D), -pointer_default(unique) -] -interface IAMMultiMediaStream : IMultiMediaStream -{ - HRESULT Initialize( - [in] STREAM_TYPE StreamType, - [in] DWORD dwFlags, - [in, optional] IGraphBuilder *pFilterGraph); - - HRESULT GetFilterGraph( - [out] IGraphBuilder **ppGraphBuilder); - - HRESULT GetFilter( - [out] IMediaStreamFilter **ppFilter); - - HRESULT AddMediaStream( - [in, optional] IUnknown *pStreamObject, - [in, optional] const MSPID *PurposeId, - [in] DWORD dwFlags, - [out, optional] IMediaStream **ppNewStream); - - HRESULT OpenFile( - [in] LPCWSTR pszFileName, - [in] DWORD dwFlags); - - HRESULT OpenMoniker( - [in] IBindCtx *pCtx, - [in] IMoniker *pMoniker, - [in] DWORD dwFlags); - - HRESULT Render( - [in] DWORD dwFlags); -} - - -[ -object, -uuid(BEBE595D-9A6F-11d0-8FDE-00C04FD9189D), -pointer_default(unique) -] -interface IAMMediaStream : IMediaStream -{ - HRESULT Initialize( - [in, optional] IUnknown *pSourceObject, - [in] DWORD dwFlags, - [in] REFMSPID PurposeId, - [in] const STREAM_TYPE StreamType); - - HRESULT SetState( - [in] FILTER_STATE State); - - HRESULT JoinAMMultiMediaStream( - [in] IAMMultiMediaStream *pAMMultiMediaStream); - - HRESULT JoinFilter( - [in] IMediaStreamFilter *pMediaStreamFilter); - - HRESULT JoinFilterGraph( - [in] IFilterGraph *pFilterGraph); -} - - -[ -object, -local, -uuid(BEBE595E-9A6F-11d0-8FDE-00C04FD9189D), -pointer_default(unique) -] -interface IMediaStreamFilter : IBaseFilter -{ - HRESULT AddMediaStream( - [in] IAMMediaStream *pAMMediaStream); - - HRESULT GetMediaStream( - [in] REFMSPID idPurpose, - [out] IMediaStream **ppMediaStream); - - HRESULT EnumMediaStreams( - [in] long Index, - [out] IMediaStream **ppMediaStream); - - HRESULT SupportSeeking( - [in] BOOL bRenderer); - - HRESULT ReferenceTimeToStreamTime( - [in] [out] REFERENCE_TIME *pTime); - - HRESULT GetCurrentStreamTime( - [out] REFERENCE_TIME *pCurrentStreamTime); - - HRESULT WaitUntil( - [in] REFERENCE_TIME WaitStreamTime); - - HRESULT Flush( - [in] BOOL bCancelEOS); - - HRESULT EndOfStream(); -} - - -[ -object, -local, -uuid(AB6B4AFC-F6E4-11d0-900D-00C04FD9189D), -pointer_default(unique) -] -interface IDirectDrawMediaSampleAllocator : IUnknown -{ - HRESULT GetDirectDraw(IDirectDraw **ppDirectDraw); -} - - -[ -object, -local, -uuid(AB6B4AFE-F6E4-11d0-900D-00C04FD9189D), -pointer_default(unique) -] -interface IDirectDrawMediaSample : IUnknown -{ - HRESULT GetSurfaceAndReleaseLock( - [out] IDirectDrawSurface **ppDirectDrawSurface, - [out] RECT * pRect); - - HRESULT LockMediaSamplePointer(void); -} - - -[ -object, -local, -uuid(AB6B4AFA-F6E4-11d0-900D-00C04FD9189D), -pointer_default(unique) -] - -interface IAMMediaTypeStream : IMediaStream -{ - HRESULT GetFormat( - [out] AM_MEDIA_TYPE * pMediaType, - [in] DWORD dwFlags); - - HRESULT SetFormat( - [in] AM_MEDIA_TYPE * pMediaType, - [in] DWORD dwFlags); - - HRESULT CreateSample( - [in] long lSampleSize, - [in, optional] BYTE * pbBuffer, - [in] DWORD dwFlags, - [in, optional] IUnknown *pUnkOuter, - [out] IAMMediaTypeSample ** ppAMMediaTypeSample); - - HRESULT GetStreamAllocatorRequirements( - [out] ALLOCATOR_PROPERTIES *pProps); - - HRESULT SetStreamAllocatorRequirements( - [in] ALLOCATOR_PROPERTIES *pProps); -} - - -[ -object, -local, -uuid(AB6B4AFB-F6E4-11d0-900D-00C04FD9189D), -pointer_default(unique) -] -interface IAMMediaTypeSample : IStreamSample -{ - HRESULT SetPointer( - [in] BYTE *pBuffer, - [in] long lSize); - - HRESULT GetPointer( - [out] BYTE ** ppBuffer); - - long GetSize(void); - - HRESULT GetTime( - [out] REFERENCE_TIME * pTimeStart, - [out] REFERENCE_TIME * pTimeEnd); - - HRESULT SetTime( - [in] REFERENCE_TIME * pTimeStart, - [in] REFERENCE_TIME * pTimeEnd); - - HRESULT IsSyncPoint(void); - - HRESULT SetSyncPoint( - BOOL bIsSyncPoint); - - HRESULT IsPreroll(void); - - HRESULT SetPreroll( - BOOL bIsPreroll); - - long GetActualDataLength(void); - - HRESULT SetActualDataLength(long Len); - - HRESULT GetMediaType( - AM_MEDIA_TYPE **ppMediaType); - - HRESULT SetMediaType( - AM_MEDIA_TYPE *pMediaType); - - HRESULT IsDiscontinuity(void); - - HRESULT SetDiscontinuity( - BOOL bDiscontinuity); - - HRESULT GetMediaTime( - [out] LONGLONG * pTimeStart, - [out] LONGLONG * pTimeEnd); - - HRESULT SetMediaTime( - [in] LONGLONG * pTimeStart, - [in] LONGLONG * pTimeEnd); -} - -[ - uuid(49C47CE5-9BA4-11d0-8212-00C04FC32C45) -] -coclass AMMultiMediaStream -{ - [default] dispinterface IDirectShowStream; -} - -cpp_quote("DEFINE_GUID(CLSID_AMDirectDrawStream, 0x49c47ce4, 0x9ba4, 0x11d0, 0x82, 0x12, 0x00, 0xc0, 0x4f, 0xc3, 0x2c, 0x45);") -cpp_quote("DEFINE_GUID(CLSID_AMAudioStream, 0x8496e040, 0xaf4c, 0x11d0, 0x82, 0x12, 0x00, 0xc0, 0x4f, 0xc3, 0x2c, 0x45);") -cpp_quote("DEFINE_GUID(CLSID_AMAudioData, 0xf2468580, 0xaf8a, 0x11d0, 0x82, 0x12, 0x00, 0xc0, 0x4f, 0xc3, 0x2c, 0x45);") -cpp_quote("DEFINE_GUID(CLSID_AMMediaTypeStream, 0xcf0f2f7c, 0xf7bf, 0x11d0, 0x90, 0x0d, 0x00, 0xc0, 0x4f, 0xd9, 0x18, 0x9d);") Removed: trunk/reactos/include/psdk/amvideo.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/amvideo.idl?r… ============================================================================== --- trunk/reactos/include/psdk/amvideo.idl (original) +++ trunk/reactos/include/psdk/amvideo.idl (removed) @@ -1,232 +1,0 @@ -/* - * Copyright (C) 2003 Robert Shearman - * - * 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 "objidl.idl"; - -/* trick widl into thinking that it knows the DirectDraw types - * as there is no IDL file for them (yet) */ -cpp_quote("#if 0") -typedef void * LPDIRECTDRAW; -typedef void DDSURFACEDESC,DDCAPS; -typedef DWORD RGBQUAD; -typedef LONGLONG REFERENCE_TIME; -typedef struct -{ - DWORD biSize; - LONG biWidth; - LONG biHeight; - WORD biPlanes; - WORD biBitCount; - DWORD biCompression; - DWORD biSizeImage; - LONG biXPelsPerMeter; - LONG biYPelsPerMeter; - DWORD biClrUsed; - DWORD biClrImportant; -} BITMAPINFOHEADER, *PBITMAPINFOHEADER, *LPBITMAPINFOHEADER; -cpp_quote("#endif") - -cpp_quote("#include <ddraw.h>") - -cpp_quote("#define AMDDS_NONE 0x00") -cpp_quote("#define AMDDS_DCIPS 0x01") -cpp_quote("#define AMDDS_PS 0x02") -cpp_quote("#define AMDDS_RGBOVR 0x04") -cpp_quote("#define AMDDS_YUVOVR 0x08") -cpp_quote("#define AMDDS_RGBOFF 0x10") -cpp_quote("#define AMDDS_YUVOFF 0x20") -cpp_quote("#define AMDDS_RGBFLP 0x40") -cpp_quote("#define AMDDS_YUVFLP 0x80") -cpp_quote("#define AMDDS_ALL 0xFF") -cpp_quote("#define AMDDS_DEFAULT AMDDS_ALL") - -cpp_quote("#define AMDDS_YUV (AMDDS_YUVOFF | AMDDS_YUVOVR | AMDDS_YUVFLP)") -cpp_quote("#define AMDDS_RGB (AMDDS_RGBOFF | AMDDS_RGBOVR | AMDDS_RGBFLP)") -cpp_quote("#define AMDSS_PRIMARY (AMDDS_DCIPS | AMDDS_PS)") - -[ - object, - pointer_default(unique) -] -interface IDirectDrawVideo : IUnknown -{ - HRESULT GetSwitches([out] DWORD * pSwitches); - HRESULT SetSwitches([in] DWORD Switches); - HRESULT GetCaps([out] DDCAPS * pCaps); - HRESULT GetEmulatedCaps([out] DDCAPS *pCaps); - HRESULT GetSurfaceDesc([out] DDSURFACEDESC * pSurfaceDesc); - HRESULT GetFourCCCodes([out] DWORD * pCount, [out] DWORD * pCodes); - HRESULT SetDirectDraw([in] LPDIRECTDRAW pDirectDraw); - HRESULT GetDirectDraw([out] LPDIRECTDRAW * ppDirectDraw); - HRESULT GetSurfaceType([out] DWORD * pSurfaceType); - HRESULT SetDefault(); - HRESULT UseScanLine([in] long UseScanLine); - HRESULT CanUseScanLine([out] long * UseScanLine); - HRESULT UseOverlayStretch([in] long UseOverlayStretch); - HRESULT CanUseOverlayStretch([out] long * UseOverlayStretch); - HRESULT UseWhenFullScreen([in] long UseWhenFullScreen); - HRESULT WillUseFullScreen([out] long * UseWhenFullScreen); -} - -[ - object, - pointer_default(unique) -] -interface IQualProp : IUnknown -{ - [propget] HRESULT FramesDroppedInRenderer([out] int * pcFrames); - [propget] HRESULT FramesDrawn([out] int * pcFramesDrawn); - [propget] HRESULT AvgFrameRate([out] int * piAvgFrameRate); - [propget] HRESULT Jitter([out] int * iJitter); - [propget] HRESULT AvgSyncOffset([out] int * piAvg); - [propget] HRESULT DevSyncOffset([out] int * piDev); -} - -[ - object, - pointer_default(unique) -] -interface IFullScreenVideo : IUnknown -{ - HRESULT CountModes([out] long * pModes); - HRESULT GetModeInfo([in] long Mode, [out] long * pWidth, [out] long * pHeight, [out] long * pDepth); - HRESULT GetCurrentMode([out] long * pMode); - HRESULT IsModeAvailable([in] long Mode); - HRESULT IsModeEnabled([in] long Mode); - HRESULT SetEnabled([in] long Mode, [in] long bEnabled); - HRESULT GetClipFactor([out] long * pClipFactor); - HRESULT SetClipFactor([in] long ClipFactor); - HRESULT SetMessageDrain([in] HWND hwnd); - HRESULT GetMessageDrain([out] HWND * hwnd); - HRESULT SetMonitor([in] long Monitor); - HRESULT GetMonitor([out] long * Monitor); - HRESULT HideOnDeactivate([in] long Hide); - HRESULT IsHideOnDeactivate(); - HRESULT SetCaption([in] BSTR strCaption); - HRESULT GetCaption([out] BSTR * pstrCaption); - HRESULT SetDefault(); -} - -[ - object, - pointer_default(unique) -] -interface IFullScreenVideoEx : IFullScreenVideo -{ - HRESULT SetAcceleratorTable([in] HWND hwnd, [in] HACCEL hAccel); - HRESULT GetAcceleratorTable([out] HWND * phwnd, [out] HACCEL * phAccel); - HRESULT KeepPixelAspectRatio([in] long KeepAspect); - /* FIXME: not sure is this next method is an [out] */ - HRESULT IsKeepPixelAspectRatio([out] long * pKeepAspect); -} - -[ - object, - pointer_default(unique) -] -interface IBaseVideoMixer : IUnknown -{ - HRESULT SetLeadPin([in] int iPin); - HRESULT GetLeadPin([out] int * piPin); - HRESULT GetInputPinCount([out] int * piPinCount); - HRESULT IsUsingClock([out] int * pbValue); - HRESULT SetUsingClock([in] int bValue); - HRESULT GetClockPeriod([out] int * pbValue); - HRESULT SetClockPeriod([in] int bValue); -} - -#define iPALETTE_COLORS 256 -#define iMASK_COLORS 3 - -cpp_quote("#define iPALETTE_COLORS 256") -cpp_quote("#define iEGA_COLORS 16") -cpp_quote("#define iMASK_COLORS 3") -cpp_quote("#define iTRUECOLOR 16") -cpp_quote("#define iRED 0") -cpp_quote("#define iGREEN 1") -cpp_quote("#define iBLUE 2") -cpp_quote("#define iPALETTE 8") -cpp_quote("#define iMAXBITS 8") - -typedef struct tag_TRUECOLORINFO -{ - DWORD dwBitMasks[iMASK_COLORS]; - RGBQUAD bmiColors[iPALETTE_COLORS]; -} TRUECOLORINFO; - -typedef struct tagVIDEOINFOHEADER -{ - RECT rcSource; - RECT rcTarget; - DWORD dwBitRate; - DWORD dwBitErrorRate; - REFERENCE_TIME AvgTimePerFrame; - - BITMAPINFOHEADER bmiHeader; -} VIDEOINFOHEADER; - -typedef struct tagVIDEOINFO -{ - RECT rcSource; - RECT rcTarget; - DWORD dwBitRate; - DWORD dwBitErrorRate; - REFERENCE_TIME AvgTimePerFrame; - - BITMAPINFOHEADER bmiHeader; - - union - { - RGBQUAD bmiColors[iPALETTE_COLORS]; - DWORD dwBitMasks[iMASK_COLORS]; - TRUECOLORINFO TrueColorInfo; - }; -} VIDEOINFO; - -typedef struct tagMPEG1VIDEOINFO -{ - VIDEOINFOHEADER hdr; - DWORD dwStartTimeCode; - DWORD cbSequenceHeader; - BYTE bSequenceHeader[1]; -} MPEG1VIDEOINFO; - -cpp_quote("#define MAX_SIZE_MPEG1_SEQUENCE_INFO 140") -cpp_quote("#define MPEG1_SEQUENCE_INFO(pv) ((const BYTE *)(pv)->bSequenceHeader)") - -typedef struct tagAnalogVideoInfo -{ - RECT rcSource; - RECT rcTarget; - DWORD dwActiveWidth; - DWORD dwActiveHeight; - REFERENCE_TIME AvgTimePerFrame; -} ANALOGVIDEOINFO; - -typedef enum -{ - AM_PROPERTY_FRAMESTEP_STEP = 0x01, - AM_PROPERTY_FRAMESTEP_CANCEL = 0x02, - AM_PROPERTY_FRAMESTEP_CANSTEP = 0x03, - AM_PROPERTY_FRAMESTEP_CANSTEPMULTIPLE = 0x04 -} AM_PROPERTY_FRAMESTEP; - -typedef struct _AM_FRAMESTEP_STEP -{ - DWORD dwFramesToStep; -} AM_FRAMESTEP_STEP;

1 0

[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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2007