marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

amstream: Basic COM cleanup for the IDirectDrawMediaStream iface.

oldstable
Michael Stefaniuc 2011-08-16 10:11:54 +02:00 committed by Alexandre Julliard
parent ea47c12ebe
commit aba87e0fe5
1 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
dlls/amstream/mediastream.c
View File

@ -44,7 +44,7 @@ typedef struct {
} IMediaStreamImpl; } IMediaStreamImpl;
typedef struct { typedef struct {
const IDirectDrawMediaStreamVtbl *lpVtbl; IDirectDrawMediaStream IDirectDrawMediaStream_iface;
LONG ref; LONG ref;
IMultiMediaStream* Parent; IMultiMediaStream* Parent;
MSPID PurposeId; MSPID PurposeId;
@ -207,77 +207,89 @@ HRESULT DirectDrawMediaStream_create(IMultiMediaStream* Parent, const MSPID* pPu
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
object->lpVtbl = &DirectDrawMediaStream_Vtbl; object->IDirectDrawMediaStream_iface.lpVtbl = &DirectDrawMediaStream_Vtbl;
object->ref = 1; object->ref = 1;
object->Parent = Parent; object->Parent = Parent;
object->PurposeId = *pPurposeId; object->PurposeId = *pPurposeId;
object->StreamType = StreamType; object->StreamType = StreamType;
*ppMediaStream = (IMediaStream*)object; *ppMediaStream = (IMediaStream*)&object->IDirectDrawMediaStream_iface;
return S_OK; return S_OK;
} }
static HRESULT WINAPI IDirectDrawMediaStreamImpl_QueryInterface(IDirectDrawMediaStream* iface, REFIID riid, void** ppvObject) static inline IDirectDrawMediaStreamImpl *impl_from_IDirectDrawMediaStream(IDirectDrawMediaStream *iface)
{ {
IMediaStreamImpl *This = (IMediaStreamImpl *)iface; return CONTAINING_RECORD(iface, IDirectDrawMediaStreamImpl, IDirectDrawMediaStream_iface);
}
TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppvObject); static HRESULT WINAPI IDirectDrawMediaStreamImpl_QueryInterface(IDirectDrawMediaStream *iface,
REFIID riid, void **ppv)
{
IDirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface);
TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppv);
if (IsEqualGUID(riid, &IID_IUnknown) || if (IsEqualGUID(riid, &IID_IUnknown) ||
IsEqualGUID(riid, &IID_IMediaStream) || IsEqualGUID(riid, &IID_IMediaStream) ||
IsEqualGUID(riid, &IID_IDirectDrawMediaStream)) IsEqualGUID(riid, &IID_IDirectDrawMediaStream))
{ {
IUnknown_AddRef(iface); IUnknown_AddRef(iface);
*ppvObject = This; *ppv = This;
return S_OK; return S_OK;
} }
ERR("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppvObject); ERR("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppv);
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static HRESULT WINAPI IDirectDrawMediaStreamImpl_GetFormat(IDirectDrawMediaStream* iface, DDSURFACEDESC *pDDSDCurrent, static HRESULT WINAPI IDirectDrawMediaStreamImpl_GetFormat(IDirectDrawMediaStream *iface,
IDirectDrawPalette **ppDirectDrawPalette, DDSURFACEDESC *pDDSDDesired, DWORD *pdwFlags) DDSURFACEDESC *pDDSDCurrent, IDirectDrawPalette **ppDirectDrawPalette,
DDSURFACEDESC *pDDSDDesired, DWORD *pdwFlags)
{ {
FIXME("(%p)->(%p,%p,%p,%p) stub!\n", iface, pDDSDCurrent, ppDirectDrawPalette, pDDSDDesired, pdwFlags); FIXME("(%p)->(%p,%p,%p,%p) stub!\n", iface, pDDSDCurrent, ppDirectDrawPalette, pDDSDDesired,
pdwFlags);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IDirectDrawMediaStreamImpl_SetFormat(IDirectDrawMediaStream* iface, const DDSURFACEDESC *pDDSurfaceDesc, static HRESULT WINAPI IDirectDrawMediaStreamImpl_SetFormat(IDirectDrawMediaStream *iface,
IDirectDrawPalette *pDirectDrawPalette) const DDSURFACEDESC *pDDSurfaceDesc, IDirectDrawPalette *pDirectDrawPalette)
{ {
FIXME("(%p)->(%p,%p) stub!\n", iface, pDDSurfaceDesc, pDirectDrawPalette); FIXME("(%p)->(%p,%p) stub!\n", iface, pDDSurfaceDesc, pDirectDrawPalette);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IDirectDrawMediaStreamImpl_GetDirectDraw(IDirectDrawMediaStream* iface, IDirectDraw **ppDirectDraw) static HRESULT WINAPI IDirectDrawMediaStreamImpl_GetDirectDraw(IDirectDrawMediaStream *iface,
IDirectDraw **ppDirectDraw)
{ {
FIXME("(%p)->(%p) stub!\n", iface, ppDirectDraw); FIXME("(%p)->(%p) stub!\n", iface, ppDirectDraw);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IDirectDrawMediaStreamImpl_SetDirectDraw(IDirectDrawMediaStream* iface, IDirectDraw *pDirectDraw) static HRESULT WINAPI IDirectDrawMediaStreamImpl_SetDirectDraw(IDirectDrawMediaStream *iface,
IDirectDraw *pDirectDraw)
{ {
FIXME("(%p)->(%p) stub!\n", iface, pDirectDraw); FIXME("(%p)->(%p) stub!\n", iface, pDirectDraw);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IDirectDrawMediaStreamImpl_CreateSample(IDirectDrawMediaStream* iface, IDirectDrawSurface *pSurface, const RECT *pRect, static HRESULT WINAPI IDirectDrawMediaStreamImpl_CreateSample(IDirectDrawMediaStream *iface,
DWORD dwFlags, IDirectDrawStreamSample **ppSample) IDirectDrawSurface *pSurface, const RECT *pRect, DWORD dwFlags,
IDirectDrawStreamSample **ppSample)
{ {
FIXME("(%p)->(%p,%p,%x,%p) stub!\n", iface, pSurface, pRect, dwFlags, ppSample); FIXME("(%p)->(%p,%p,%x,%p) stub!\n", iface, pSurface, pRect, dwFlags, ppSample);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IDirectDrawMediaStreamImpl_GetTimePerFrame(IDirectDrawMediaStream* iface, STREAM_TIME *pFrameTime) static HRESULT WINAPI IDirectDrawMediaStreamImpl_GetTimePerFrame(IDirectDrawMediaStream *iface,
STREAM_TIME *pFrameTime)
{ {
FIXME("(%p)->(%p) stub!\n", iface, pFrameTime); FIXME("(%p)->(%p) stub!\n", iface, pFrameTime);