adding correct mmstream.idl
authorMagnus Olsen <magnus@greatlord.com>
Sat, 26 May 2007 11:22:58 +0000 (11:22 +0000)
committerMagnus Olsen <magnus@greatlord.com>
Sat, 26 May 2007 11:22:58 +0000 (11:22 +0000)
svn path=/trunk/; revision=26901

reactos/include/directory.rbuild
reactos/include/dxsdk/dxsdk.rbuild [new file with mode: 0644]
reactos/include/dxsdk/mmstream.idl [new file with mode: 0644]
reactos/include/psdk/mmstream.h [deleted file]
reactos/include/psdk/mmstream.idl [deleted file]

index fdde2e5..f88a35f 100644 (file)
@@ -1,6 +1,9 @@
 <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" />
 </directory>
diff --git a/reactos/include/dxsdk/dxsdk.rbuild b/reactos/include/dxsdk/dxsdk.rbuild
new file mode 100644 (file)
index 0000000..67fe64d
--- /dev/null
@@ -0,0 +1,3 @@
+<module name="dxsdk" type="idlheader">
+       <file>mmstream.idl</file>       
+</module>
\ No newline at end of file
diff --git a/reactos/include/dxsdk/mmstream.idl b/reactos/include/dxsdk/mmstream.idl
new file mode 100644 (file)
index 0000000..d130506
--- /dev/null
@@ -0,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);
+};
+
diff --git a/reactos/include/psdk/mmstream.h b/reactos/include/psdk/mmstream.h
deleted file mode 100644 (file)
index 1b21f14..0000000
+++ /dev/null
@@ -1,588 +0,0 @@
-/*** Autogenerated by WIDL 0.3.0 from include\psdk\mmstream.idl - Do not edit ***/\r
-#include <rpc.h>\r
-#include <rpcndr.h>\r
-\r
-#ifndef __WIDL_INCLUDE_PSDK_MMSTREAM_H\r
-#define __WIDL_INCLUDE_PSDK_MMSTREAM_H\r
-#ifdef __cplusplus\r
-extern "C" {\r
-#endif\r
-#include <unknwn.h>\r
-#define MS_ERROR_CODE(x)                  MAKE_HRESULT(1, FACILITY_ITF, (x) + 0x400)\r
-#define MS_SUCCESS_CODE(x)                MAKE_HRESULT(0, FACILITY_ITF, x)\r
-#define MS_S_PENDING                      MS_SUCCESS_CODE(1)\r
-#define MS_S_NOUPDATE                     MS_SUCCESS_CODE(2)\r
-#define MS_S_ENDOFSTREAM                  MS_SUCCESS_CODE(3)\r
-#define MS_E_SAMPLEALLOC                  MS_ERROR_CODE(1)\r
-#define MS_E_PURPOSEID                    MS_ERROR_CODE(2)\r
-#define MS_E_NOSTREAM                     MS_ERROR_CODE(3)\r
-#define MS_E_NOSEEKING                    MS_ERROR_CODE(4)\r
-#define MS_E_INCOMPATIBLE                 MS_ERROR_CODE(5)\r
-#define MS_E_BUSY                         MS_ERROR_CODE(6)\r
-#define MS_E_NOTINIT                      MS_ERROR_CODE(7)\r
-#define MS_E_SOURCEALREADYDEFINED         MS_ERROR_CODE(8)\r
-#define MS_E_INVALIDSTREAMTYPE            MS_ERROR_CODE(9)\r
-#define MS_E_NOTRUNNING                   MS_ERROR_CODE(10)\r
-DEFINE_GUID(MSPID_PrimaryVideo,  0xa35ff56a, 0x9fda, 0x11d0, 0x8f, 0xdf, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0x9d);\r
-DEFINE_GUID(MSPID_PrimaryAudio,  0xa35ff56b, 0x9fda, 0x11d0, 0x8f, 0xdf, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0x9d);\r
-#if 0\r
-typedef void *PAPCFUNC;\r
-#endif\r
-typedef LONGLONG STREAM_TIME;\r
-typedef GUID MSPID;\r
-typedef REFGUID REFMSPID;\r
-typedef enum {\r
-    STREAMTYPE_READ = 0,\r
-    STREAMTYPE_WRITE = 1,\r
-    STREAMTYPE_TRANSFORM = 2\r
-} STREAM_TYPE;\r
-typedef enum {\r
-    STREAMSTATE_STOP = 0,\r
-    STREAMSTATE_RUN = 1\r
-} STREAM_STATE;\r
-typedef enum {\r
-    COMPSTAT_NOUPDATEOK = 0x1,\r
-    COMPSTAT_WAIT = 0x2,\r
-    COMPSTAT_ABORT = 0x4\r
-} COMPLETION_STATUS_FLAGS;\r
-enum {\r
-    MMSSF_HASCLOCK = 0x1,\r
-    MMSSF_SUPPORTSEEK = 0x2,\r
-    MMSSF_ASYNCHRONOUS = 0x4\r
-};\r
-\r
-enum {\r
-    SSUPDATE_ASYNC = 0x1,\r
-    SSUPDATE_CONTINUOUS = 0x2\r
-};\r
-\r
-#ifndef __IMultiMediaStream_FWD_DEFINED__\r
-#define __IMultiMediaStream_FWD_DEFINED__\r
-typedef interface IMultiMediaStream IMultiMediaStream;\r
-#endif\r
-\r
-#ifndef __IMediaStream_FWD_DEFINED__\r
-#define __IMediaStream_FWD_DEFINED__\r
-typedef interface IMediaStream IMediaStream;\r
-#endif\r
-\r
-#ifndef __IStreamSample_FWD_DEFINED__\r
-#define __IStreamSample_FWD_DEFINED__\r
-typedef interface IStreamSample IStreamSample;\r
-#endif\r
-\r
-/*****************************************************************************\r
- * IMultiMediaStream interface\r
- */\r
-#ifndef __IMultiMediaStream_INTERFACE_DEFINED__\r
-#define __IMultiMediaStream_INTERFACE_DEFINED__\r
-\r
-DEFINE_GUID(IID_IMultiMediaStream, 0xb502d1bc, 0x9a57, 0x11d0, 0x8f,0xde, 0x00,0xc0,0x4f,0xd9,0x18,0x9d);\r
-#if defined(__cplusplus) && !defined(CINTERFACE)\r
-interface IMultiMediaStream : public IUnknown\r
-{\r
-    virtual HRESULT STDMETHODCALLTYPE GetInformation(\r
-        DWORD* pdwFlags,\r
-        STREAM_TYPE* pStreamType) = 0;\r
-\r
-    virtual HRESULT STDMETHODCALLTYPE GetMediaStream(\r
-        REFMSPID idPurpose,\r
-        IMediaStream** ppMediaStream) = 0;\r
-\r
-    virtual HRESULT STDMETHODCALLTYPE EnumMediaStreams(\r
-        long Index,\r
-        IMediaStream** ppMediaStream) = 0;\r
-\r
-    virtual HRESULT STDMETHODCALLTYPE GetState(\r
-        STREAM_STATE* pCurrentState) = 0;\r
-\r
-    virtual HRESULT STDMETHODCALLTYPE SetState(\r
-        STREAM_STATE NewState) = 0;\r
-\r
-    virtual HRESULT STDMETHODCALLTYPE GetTime(\r
-        STREAM_TIME* pCurrentTime) = 0;\r
-\r
-    virtual HRESULT STDMETHODCALLTYPE GetDuration(\r
-        STREAM_TIME* pDuration) = 0;\r
-\r
-    virtual HRESULT STDMETHODCALLTYPE Seek(\r
-        STREAM_TIME SeekTime) = 0;\r
-\r
-    virtual HRESULT STDMETHODCALLTYPE GetEndOfStreamEventHandle(\r
-        HANDLE* phEOS) = 0;\r
-\r
-};\r
-#else\r
-typedef struct IMultiMediaStreamVtbl {\r
-    BEGIN_INTERFACE\r
-\r
-    /*** IUnknown methods ***/\r
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(\r
-        IMultiMediaStream* This,\r
-        REFIID riid,\r
-        void** ppvObject);\r
-\r
-    ULONG (STDMETHODCALLTYPE *AddRef)(\r
-        IMultiMediaStream* This);\r
-\r
-    ULONG (STDMETHODCALLTYPE *Release)(\r
-        IMultiMediaStream* This);\r
-\r
-    /*** IMultiMediaStream methods ***/\r
-    HRESULT (STDMETHODCALLTYPE *GetInformation)(\r
-        IMultiMediaStream* This,\r
-        DWORD* pdwFlags,\r
-        STREAM_TYPE* pStreamType);\r
-\r
-    HRESULT (STDMETHODCALLTYPE *GetMediaStream)(\r
-        IMultiMediaStream* This,\r
-        REFMSPID idPurpose,\r
-        IMediaStream** ppMediaStream);\r
-\r
-    HRESULT (STDMETHODCALLTYPE *EnumMediaStreams)(\r
-        IMultiMediaStream* This,\r
-        long Index,\r
-        IMediaStream** ppMediaStream);\r
-\r
-    HRESULT (STDMETHODCALLTYPE *GetState)(\r
-        IMultiMediaStream* This,\r
-        STREAM_STATE* pCurrentState);\r
-\r
-    HRESULT (STDMETHODCALLTYPE *SetState)(\r
-        IMultiMediaStream* This,\r
-        STREAM_STATE NewState);\r
-\r
-    HRESULT (STDMETHODCALLTYPE *GetTime)(\r
-        IMultiMediaStream* This,\r
-        STREAM_TIME* pCurrentTime);\r
-\r
-    HRESULT (STDMETHODCALLTYPE *GetDuration)(\r
-        IMultiMediaStream* This,\r
-        STREAM_TIME* pDuration);\r
-\r
-    HRESULT (STDMETHODCALLTYPE *Seek)(\r
-        IMultiMediaStream* This,\r
-        STREAM_TIME SeekTime);\r
-\r
-    HRESULT (STDMETHODCALLTYPE *GetEndOfStreamEventHandle)(\r
-        IMultiMediaStream* This,\r
-        HANDLE* phEOS);\r
-\r
-    END_INTERFACE\r
-} IMultiMediaStreamVtbl;\r
-interface IMultiMediaStream {\r
-    const IMultiMediaStreamVtbl* lpVtbl;\r
-};\r
-\r
-#ifdef COBJMACROS\r
-/*** IUnknown methods ***/\r
-#define IMultiMediaStream_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)\r
-#define IMultiMediaStream_AddRef(p) (p)->lpVtbl->AddRef(p)\r
-#define IMultiMediaStream_Release(p) (p)->lpVtbl->Release(p)\r
-/*** IMultiMediaStream methods ***/\r
-#define IMultiMediaStream_GetInformation(p,a,b) (p)->lpVtbl->GetInformation(p,a,b)\r
-#define IMultiMediaStream_GetMediaStream(p,a,b) (p)->lpVtbl->GetMediaStream(p,a,b)\r
-#define IMultiMediaStream_EnumMediaStreams(p,a,b) (p)->lpVtbl->EnumMediaStreams(p,a,b)\r
-#define IMultiMediaStream_GetState(p,a) (p)->lpVtbl->GetState(p,a)\r
-#define IMultiMediaStream_SetState(p,a) (p)->lpVtbl->SetState(p,a)\r
-#define IMultiMediaStream_GetTime(p,a) (p)->lpVtbl->GetTime(p,a)\r
-#define IMultiMediaStream_GetDuration(p,a) (p)->lpVtbl->GetDuration(p,a)\r
-#define IMultiMediaStream_Seek(p,a) (p)->lpVtbl->Seek(p,a)\r
-#define IMultiMediaStream_GetEndOfStreamEventHandle(p,a) (p)->lpVtbl->GetEndOfStreamEventHandle(p,a)\r
-#endif\r
-\r
-#endif\r
-\r
-HRESULT CALLBACK IMultiMediaStream_GetInformation_Proxy(\r
-    IMultiMediaStream* This,\r
-    DWORD* pdwFlags,\r
-    STREAM_TYPE* pStreamType);\r
-void __RPC_STUB IMultiMediaStream_GetInformation_Stub(\r
-    IRpcStubBuffer* This,\r
-    IRpcChannelBuffer* pRpcChannelBuffer,\r
-    PRPC_MESSAGE pRpcMessage,\r
-    DWORD* pdwStubPhase);\r
-HRESULT CALLBACK IMultiMediaStream_GetMediaStream_Proxy(\r
-    IMultiMediaStream* This,\r
-    REFMSPID idPurpose,\r
-    IMediaStream** ppMediaStream);\r
-void __RPC_STUB IMultiMediaStream_GetMediaStream_Stub(\r
-    IRpcStubBuffer* This,\r
-    IRpcChannelBuffer* pRpcChannelBuffer,\r
-    PRPC_MESSAGE pRpcMessage,\r
-    DWORD* pdwStubPhase);\r
-HRESULT CALLBACK IMultiMediaStream_EnumMediaStreams_Proxy(\r
-    IMultiMediaStream* This,\r
-    long Index,\r
-    IMediaStream** ppMediaStream);\r
-void __RPC_STUB IMultiMediaStream_EnumMediaStreams_Stub(\r
-    IRpcStubBuffer* This,\r
-    IRpcChannelBuffer* pRpcChannelBuffer,\r
-    PRPC_MESSAGE pRpcMessage,\r
-    DWORD* pdwStubPhase);\r
-HRESULT CALLBACK IMultiMediaStream_GetState_Proxy(\r
-    IMultiMediaStream* This,\r
-    STREAM_STATE* pCurrentState);\r
-void __RPC_STUB IMultiMediaStream_GetState_Stub(\r
-    IRpcStubBuffer* This,\r
-    IRpcChannelBuffer* pRpcChannelBuffer,\r
-    PRPC_MESSAGE pRpcMessage,\r
-    DWORD* pdwStubPhase);\r
-HRESULT CALLBACK IMultiMediaStream_SetState_Proxy(\r
-    IMultiMediaStream* This,\r
-    STREAM_STATE NewState);\r
-void __RPC_STUB IMultiMediaStream_SetState_Stub(\r
-    IRpcStubBuffer* This,\r
-    IRpcChannelBuffer* pRpcChannelBuffer,\r
-    PRPC_MESSAGE pRpcMessage,\r
-    DWORD* pdwStubPhase);\r
-HRESULT CALLBACK IMultiMediaStream_GetTime_Proxy(\r
-    IMultiMediaStream* This,\r
-    STREAM_TIME* pCurrentTime);\r
-void __RPC_STUB IMultiMediaStream_GetTime_Stub(\r
-    IRpcStubBuffer* This,\r
-    IRpcChannelBuffer* pRpcChannelBuffer,\r
-    PRPC_MESSAGE pRpcMessage,\r
-    DWORD* pdwStubPhase);\r
-HRESULT CALLBACK IMultiMediaStream_GetDuration_Proxy(\r
-    IMultiMediaStream* This,\r
-    STREAM_TIME* pDuration);\r
-void __RPC_STUB IMultiMediaStream_GetDuration_Stub(\r
-    IRpcStubBuffer* This,\r
-    IRpcChannelBuffer* pRpcChannelBuffer,\r
-    PRPC_MESSAGE pRpcMessage,\r
-    DWORD* pdwStubPhase);\r
-HRESULT CALLBACK IMultiMediaStream_Seek_Proxy(\r
-    IMultiMediaStream* This,\r
-    STREAM_TIME SeekTime);\r
-void __RPC_STUB IMultiMediaStream_Seek_Stub(\r
-    IRpcStubBuffer* This,\r
-    IRpcChannelBuffer* pRpcChannelBuffer,\r
-    PRPC_MESSAGE pRpcMessage,\r
-    DWORD* pdwStubPhase);\r
-HRESULT CALLBACK IMultiMediaStream_GetEndOfStreamEventHandle_Proxy(\r
-    IMultiMediaStream* This,\r
-    HANDLE* phEOS);\r
-void __RPC_STUB IMultiMediaStream_GetEndOfStreamEventHandle_Stub(\r
-    IRpcStubBuffer* This,\r
-    IRpcChannelBuffer* pRpcChannelBuffer,\r
-    PRPC_MESSAGE pRpcMessage,\r
-    DWORD* pdwStubPhase);\r
-\r
-#endif  /* __IMultiMediaStream_INTERFACE_DEFINED__ */\r
-\r
-/*****************************************************************************\r
- * IMediaStream interface\r
- */\r
-#ifndef __IMediaStream_INTERFACE_DEFINED__\r
-#define __IMediaStream_INTERFACE_DEFINED__\r
-\r
-DEFINE_GUID(IID_IMediaStream, 0xb502d1bd, 0x9a57, 0x11d0, 0x8f,0xde, 0x00,0xc0,0x4f,0xd9,0x18,0x9d);\r
-#if defined(__cplusplus) && !defined(CINTERFACE)\r
-interface IMediaStream : public IUnknown\r
-{\r
-    virtual HRESULT STDMETHODCALLTYPE GetMultiMediaStream(\r
-        IMultiMediaStream** ppMultiMediaStream) = 0;\r
-\r
-    virtual HRESULT STDMETHODCALLTYPE GetInformation(\r
-        MSPID* pPurposeId,\r
-        STREAM_TYPE* pType) = 0;\r
-\r
-    virtual HRESULT STDMETHODCALLTYPE SetSameFormat(\r
-        IMediaStream* pStreamThatHasDesiredFormat,\r
-        DWORD dwFlags) = 0;\r
-\r
-    virtual HRESULT STDMETHODCALLTYPE AllocateSample(\r
-        DWORD dwFlags,\r
-        IStreamSample** ppSample) = 0;\r
-\r
-    virtual HRESULT STDMETHODCALLTYPE CreateSharedSample(\r
-        IStreamSample* pExistingSample,\r
-        DWORD dwFlags,\r
-        IStreamSample** ppNewSample) = 0;\r
-\r
-    virtual HRESULT STDMETHODCALLTYPE SendEndOfStream(\r
-        DWORD dwFlags) = 0;\r
-\r
-};\r
-#else\r
-typedef struct IMediaStreamVtbl {\r
-    BEGIN_INTERFACE\r
-\r
-    /*** IUnknown methods ***/\r
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(\r
-        IMediaStream* This,\r
-        REFIID riid,\r
-        void** ppvObject);\r
-\r
-    ULONG (STDMETHODCALLTYPE *AddRef)(\r
-        IMediaStream* This);\r
-\r
-    ULONG (STDMETHODCALLTYPE *Release)(\r
-        IMediaStream* This);\r
-\r
-    /*** IMediaStream methods ***/\r
-    HRESULT (STDMETHODCALLTYPE *GetMultiMediaStream)(\r
-        IMediaStream* This,\r
-        IMultiMediaStream** ppMultiMediaStream);\r
-\r
-    HRESULT (STDMETHODCALLTYPE *GetInformation)(\r
-        IMediaStream* This,\r
-        MSPID* pPurposeId,\r
-        STREAM_TYPE* pType);\r
-\r
-    HRESULT (STDMETHODCALLTYPE *SetSameFormat)(\r
-        IMediaStream* This,\r
-        IMediaStream* pStreamThatHasDesiredFormat,\r
-        DWORD dwFlags);\r
-\r
-    HRESULT (STDMETHODCALLTYPE *AllocateSample)(\r
-        IMediaStream* This,\r
-        DWORD dwFlags,\r
-        IStreamSample** ppSample);\r
-\r
-    HRESULT (STDMETHODCALLTYPE *CreateSharedSample)(\r
-        IMediaStream* This,\r
-        IStreamSample* pExistingSample,\r
-        DWORD dwFlags,\r
-        IStreamSample** ppNewSample);\r
-\r
-    HRESULT (STDMETHODCALLTYPE *SendEndOfStream)(\r
-        IMediaStream* This,\r
-        DWORD dwFlags);\r
-\r
-    END_INTERFACE\r
-} IMediaStreamVtbl;\r
-interface IMediaStream {\r
-    const IMediaStreamVtbl* lpVtbl;\r
-};\r
-\r
-#ifdef COBJMACROS\r
-/*** IUnknown methods ***/\r
-#define IMediaStream_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)\r
-#define IMediaStream_AddRef(p) (p)->lpVtbl->AddRef(p)\r
-#define IMediaStream_Release(p) (p)->lpVtbl->Release(p)\r
-/*** IMediaStream methods ***/\r
-#define IMediaStream_GetMultiMediaStream(p,a) (p)->lpVtbl->GetMultiMediaStream(p,a)\r
-#define IMediaStream_GetInformation(p,a,b) (p)->lpVtbl->GetInformation(p,a,b)\r
-#define IMediaStream_SetSameFormat(p,a,b) (p)->lpVtbl->SetSameFormat(p,a,b)\r
-#define IMediaStream_AllocateSample(p,a,b) (p)->lpVtbl->AllocateSample(p,a,b)\r
-#define IMediaStream_CreateSharedSample(p,a,b,c) (p)->lpVtbl->CreateSharedSample(p,a,b,c)\r
-#define IMediaStream_SendEndOfStream(p,a) (p)->lpVtbl->SendEndOfStream(p,a)\r
-#endif\r
-\r
-#endif\r
-\r
-HRESULT CALLBACK IMediaStream_GetMultiMediaStream_Proxy(\r
-    IMediaStream* This,\r
-    IMultiMediaStream** ppMultiMediaStream);\r
-void __RPC_STUB IMediaStream_GetMultiMediaStream_Stub(\r
-    IRpcStubBuffer* This,\r
-    IRpcChannelBuffer* pRpcChannelBuffer,\r
-    PRPC_MESSAGE pRpcMessage,\r
-    DWORD* pdwStubPhase);\r
-HRESULT CALLBACK IMediaStream_GetInformation_Proxy(\r
-    IMediaStream* This,\r
-    MSPID* pPurposeId,\r
-    STREAM_TYPE* pType);\r
-void __RPC_STUB IMediaStream_GetInformation_Stub(\r
-    IRpcStubBuffer* This,\r
-    IRpcChannelBuffer* pRpcChannelBuffer,\r
-    PRPC_MESSAGE pRpcMessage,\r
-    DWORD* pdwStubPhase);\r
-HRESULT CALLBACK IMediaStream_SetSameFormat_Proxy(\r
-    IMediaStream* This,\r
-    IMediaStream* pStreamThatHasDesiredFormat,\r
-    DWORD dwFlags);\r
-void __RPC_STUB IMediaStream_SetSameFormat_Stub(\r
-    IRpcStubBuffer* This,\r
-    IRpcChannelBuffer* pRpcChannelBuffer,\r
-    PRPC_MESSAGE pRpcMessage,\r
-    DWORD* pdwStubPhase);\r
-HRESULT CALLBACK IMediaStream_AllocateSample_Proxy(\r
-    IMediaStream* This,\r
-    DWORD dwFlags,\r
-    IStreamSample** ppSample);\r
-void __RPC_STUB IMediaStream_AllocateSample_Stub(\r
-    IRpcStubBuffer* This,\r
-    IRpcChannelBuffer* pRpcChannelBuffer,\r
-    PRPC_MESSAGE pRpcMessage,\r
-    DWORD* pdwStubPhase);\r
-HRESULT CALLBACK IMediaStream_CreateSharedSample_Proxy(\r
-    IMediaStream* This,\r
-    IStreamSample* pExistingSample,\r
-    DWORD dwFlags,\r
-    IStreamSample** ppNewSample);\r
-void __RPC_STUB IMediaStream_CreateSharedSample_Stub(\r
-    IRpcStubBuffer* This,\r
-    IRpcChannelBuffer* pRpcChannelBuffer,\r
-    PRPC_MESSAGE pRpcMessage,\r
-    DWORD* pdwStubPhase);\r
-HRESULT CALLBACK IMediaStream_SendEndOfStream_Proxy(\r
-    IMediaStream* This,\r
-    DWORD dwFlags);\r
-void __RPC_STUB IMediaStream_SendEndOfStream_Stub(\r
-    IRpcStubBuffer* This,\r
-    IRpcChannelBuffer* pRpcChannelBuffer,\r
-    PRPC_MESSAGE pRpcMessage,\r
-    DWORD* pdwStubPhase);\r
-\r
-#endif  /* __IMediaStream_INTERFACE_DEFINED__ */\r
-\r
-/*****************************************************************************\r
- * IStreamSample interface\r
- */\r
-#ifndef __IStreamSample_INTERFACE_DEFINED__\r
-#define __IStreamSample_INTERFACE_DEFINED__\r
-\r
-DEFINE_GUID(IID_IStreamSample, 0xb502d1be, 0x9a57, 0x11d0, 0x8f,0xde, 0x00,0xc0,0x4f,0xd9,0x18,0x9d);\r
-#if defined(__cplusplus) && !defined(CINTERFACE)\r
-interface IStreamSample : public IUnknown\r
-{\r
-    virtual HRESULT STDMETHODCALLTYPE GetMediaStream(\r
-        IMediaStream** ppMediaStream) = 0;\r
-\r
-    virtual HRESULT STDMETHODCALLTYPE GetSampleTimes(\r
-        STREAM_TIME* pStartTime,\r
-        STREAM_TIME* pEndTime,\r
-        STREAM_TIME* pCurrentTime) = 0;\r
-\r
-    virtual HRESULT STDMETHODCALLTYPE SetSampleTimes(\r
-        const STREAM_TIME* pStartTime,\r
-        const STREAM_TIME* pEndTime) = 0;\r
-\r
-    virtual HRESULT STDMETHODCALLTYPE Update(\r
-        DWORD dwFlags,\r
-        HANDLE hEvent,\r
-        PAPCFUNC pfnAPC,\r
-        DWORD dwAPCData) = 0;\r
-\r
-    virtual HRESULT STDMETHODCALLTYPE CompletionStatus(\r
-        DWORD dwFlags,\r
-        DWORD dwMilliseconds) = 0;\r
-\r
-};\r
-#else\r
-typedef struct IStreamSampleVtbl {\r
-    BEGIN_INTERFACE\r
-\r
-    /*** IUnknown methods ***/\r
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(\r
-        IStreamSample* This,\r
-        REFIID riid,\r
-        void** ppvObject);\r
-\r
-    ULONG (STDMETHODCALLTYPE *AddRef)(\r
-        IStreamSample* This);\r
-\r
-    ULONG (STDMETHODCALLTYPE *Release)(\r
-        IStreamSample* This);\r
-\r
-    /*** IStreamSample methods ***/\r
-    HRESULT (STDMETHODCALLTYPE *GetMediaStream)(\r
-        IStreamSample* This,\r
-        IMediaStream** ppMediaStream);\r
-\r
-    HRESULT (STDMETHODCALLTYPE *GetSampleTimes)(\r
-        IStreamSample* This,\r
-        STREAM_TIME* pStartTime,\r
-        STREAM_TIME* pEndTime,\r
-        STREAM_TIME* pCurrentTime);\r
-\r
-    HRESULT (STDMETHODCALLTYPE *SetSampleTimes)(\r
-        IStreamSample* This,\r
-        const STREAM_TIME* pStartTime,\r
-        const STREAM_TIME* pEndTime);\r
-\r
-    HRESULT (STDMETHODCALLTYPE *Update)(\r
-        IStreamSample* This,\r
-        DWORD dwFlags,\r
-        HANDLE hEvent,\r
-        PAPCFUNC pfnAPC,\r
-        DWORD dwAPCData);\r
-\r
-    HRESULT (STDMETHODCALLTYPE *CompletionStatus)(\r
-        IStreamSample* This,\r
-        DWORD dwFlags,\r
-        DWORD dwMilliseconds);\r
-\r
-    END_INTERFACE\r
-} IStreamSampleVtbl;\r
-interface IStreamSample {\r
-    const IStreamSampleVtbl* lpVtbl;\r
-};\r
-\r
-#ifdef COBJMACROS\r
-/*** IUnknown methods ***/\r
-#define IStreamSample_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)\r
-#define IStreamSample_AddRef(p) (p)->lpVtbl->AddRef(p)\r
-#define IStreamSample_Release(p) (p)->lpVtbl->Release(p)\r
-/*** IStreamSample methods ***/\r
-#define IStreamSample_GetMediaStream(p,a) (p)->lpVtbl->GetMediaStream(p,a)\r
-#define IStreamSample_GetSampleTimes(p,a,b,c) (p)->lpVtbl->GetSampleTimes(p,a,b,c)\r
-#define IStreamSample_SetSampleTimes(p,a,b) (p)->lpVtbl->SetSampleTimes(p,a,b)\r
-#define IStreamSample_Update(p,a,b,c,d) (p)->lpVtbl->Update(p,a,b,c,d)\r
-#define IStreamSample_CompletionStatus(p,a,b) (p)->lpVtbl->CompletionStatus(p,a,b)\r
-#endif\r
-\r
-#endif\r
-\r
-HRESULT CALLBACK IStreamSample_GetMediaStream_Proxy(\r
-    IStreamSample* This,\r
-    IMediaStream** ppMediaStream);\r
-void __RPC_STUB IStreamSample_GetMediaStream_Stub(\r
-    IRpcStubBuffer* This,\r
-    IRpcChannelBuffer* pRpcChannelBuffer,\r
-    PRPC_MESSAGE pRpcMessage,\r
-    DWORD* pdwStubPhase);\r
-HRESULT CALLBACK IStreamSample_GetSampleTimes_Proxy(\r
-    IStreamSample* This,\r
-    STREAM_TIME* pStartTime,\r
-    STREAM_TIME* pEndTime,\r
-    STREAM_TIME* pCurrentTime);\r
-void __RPC_STUB IStreamSample_GetSampleTimes_Stub(\r
-    IRpcStubBuffer* This,\r
-    IRpcChannelBuffer* pRpcChannelBuffer,\r
-    PRPC_MESSAGE pRpcMessage,\r
-    DWORD* pdwStubPhase);\r
-HRESULT CALLBACK IStreamSample_SetSampleTimes_Proxy(\r
-    IStreamSample* This,\r
-    const STREAM_TIME* pStartTime,\r
-    const STREAM_TIME* pEndTime);\r
-void __RPC_STUB IStreamSample_SetSampleTimes_Stub(\r
-    IRpcStubBuffer* This,\r
-    IRpcChannelBuffer* pRpcChannelBuffer,\r
-    PRPC_MESSAGE pRpcMessage,\r
-    DWORD* pdwStubPhase);\r
-HRESULT CALLBACK IStreamSample_Update_Proxy(\r
-    IStreamSample* This,\r
-    DWORD dwFlags,\r
-    HANDLE hEvent,\r
-    PAPCFUNC pfnAPC,\r
-    DWORD dwAPCData);\r
-void __RPC_STUB IStreamSample_Update_Stub(\r
-    IRpcStubBuffer* This,\r
-    IRpcChannelBuffer* pRpcChannelBuffer,\r
-    PRPC_MESSAGE pRpcMessage,\r
-    DWORD* pdwStubPhase);\r
-HRESULT CALLBACK IStreamSample_CompletionStatus_Proxy(\r
-    IStreamSample* This,\r
-    DWORD dwFlags,\r
-    DWORD dwMilliseconds);\r
-void __RPC_STUB IStreamSample_CompletionStatus_Stub(\r
-    IRpcStubBuffer* This,\r
-    IRpcChannelBuffer* pRpcChannelBuffer,\r
-    PRPC_MESSAGE pRpcMessage,\r
-    DWORD* pdwStubPhase);\r
-\r
-#endif  /* __IStreamSample_INTERFACE_DEFINED__ */\r
-\r
-/* Begin additional prototypes for all interfaces */\r
-\r
-\r
-/* End additional prototypes */\r
-\r
-#ifdef __cplusplus\r
-}\r
-#endif\r
-#endif /* __WIDL_INCLUDE_PSDK_MMSTREAM_H */\r
diff --git a/reactos/include/psdk/mmstream.idl b/reactos/include/psdk/mmstream.idl
deleted file mode 100644 (file)
index 9730ee2..0000000
+++ /dev/null
@@ -1,184 +0,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);
-}