WINE_DEFAULT_DEBUG_CHANNEL(amstream);
typedef struct {
- IAMMultiMediaStream lpVtbl;
+ const IAMMultiMediaStreamVtbl *lpVtbl;
LONG ref;
IGraphBuilder* pFilterGraph;
IPin* ipin;
return E_OUTOFMEMORY;
}
- object->lpVtbl.lpVtbl = &AM_Vtbl;
+ object->lpVtbl = &AM_Vtbl;
object->ref = 1;
*ppObj = object;
MSPID PurposeId;
unsigned int i;
- TRACE("(%p/%p)->(%p,%p)\n", This, iface, idPurpose, ppMediaStream);
+ TRACE("(%p/%p)->(%s,%p)\n", This, iface, debugstr_guid(idPurpose), ppMediaStream);
for (i = 0; i < This->nbStreams; i++)
{
IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface;
HRESULT hr = S_OK;
- FIXME("(%p/%p)->(%x,%x,%p) partial stub!\n", This, iface, (DWORD)StreamType, dwFlags, pFilterGraph);
+ TRACE("(%p/%p)->(%x,%x,%p)\n", This, iface, (DWORD)StreamType, dwFlags, pFilterGraph);
if (pFilterGraph)
{
{
IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface;
- FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppGraphBuilder);
+ TRACE("(%p/%p)->(%p)\n", This, iface, ppGraphBuilder);
- return E_NOTIMPL;
+ if (!ppGraphBuilder)
+ return E_POINTER;
+
+ if (This->pFilterGraph)
+ return IFilterGraph_QueryInterface(This->pFilterGraph, &IID_IGraphBuilder, (void**)ppGraphBuilder);
+ else
+ *ppGraphBuilder = NULL;
+
+ return S_OK;
}
static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilter(IAMMultiMediaStream* iface, IMediaStreamFilter** ppFilter)
IMediaStream* pStream;
IMediaStream** pNewStreams;
- FIXME("(%p/%p)->(%p,%p,%x,%p) partial stub!\n", This, iface, pStreamObject, PurposeId, dwFlags, ppNewStream);
+ FIXME("(%p/%p)->(%p,%s,%x,%p) partial stub!\n", This, iface, pStreamObject, debugstr_guid(PurposeId), dwFlags, ppNewStream);
if (IsEqualGUID(PurposeId, &MSPID_PrimaryVideo))
hr = DirectDrawMediaStream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream);
goto end;
}
+ /* If Initialize was not called before, we do it here */
+ if (!This->pFilterGraph)
+ {
+ ret = IAMMultiMediaStream_Initialize(iface, STREAMTYPE_READ, 0, NULL);
+ if (FAILED(ret))
+ goto end;
+ }
+
ret = IFilterGraph_QueryInterface(This->pFilterGraph, &IID_IGraphBuilder, (void**)&This->GraphBuilder);
if(ret != S_OK)
{
#include "wingdi.h"
#include "amstream_private.h"
-#include "ddstream.h"
#include "amstream.h"
+#include "ddstream.h"
+
WINE_DEFAULT_DEBUG_CHANNEL(amstream);
typedef struct {
- IMediaStream lpVtbl;
+ const IMediaStreamVtbl *lpVtbl;
LONG ref;
IMultiMediaStream* Parent;
MSPID PurposeId;
} IMediaStreamImpl;
typedef struct {
- IDirectDrawMediaStream lpVtbl;
+ const IDirectDrawMediaStreamVtbl *lpVtbl;
LONG ref;
IMultiMediaStream* Parent;
MSPID PurposeId;
{
IMediaStreamImpl* object;
- TRACE("(%p,%p,%p)\n", Parent, pPurposeId, ppMediaStream);
+ TRACE("(%p,%s,%p)\n", Parent, debugstr_guid(pPurposeId), ppMediaStream);
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IMediaStreamImpl));
if (!object)
return E_OUTOFMEMORY;
}
- object->lpVtbl.lpVtbl = &MediaStream_Vtbl;
+ object->lpVtbl = &MediaStream_Vtbl;
object->ref = 1;
object->Parent = Parent;
{
IDirectDrawMediaStreamImpl* object;
- TRACE("(%p,%p,%p)\n", Parent, pPurposeId, ppMediaStream);
+ TRACE("(%p,%s,%p)\n", Parent, debugstr_guid(pPurposeId), ppMediaStream);
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IMediaStreamImpl));
if (!object)
return E_OUTOFMEMORY;
}
- object->lpVtbl.lpVtbl = &DirectDrawMediaStream_Vtbl;
+ object->lpVtbl = &DirectDrawMediaStream_Vtbl;
object->ref = 1;
object->Parent = Parent;