[PATCH 3/4] amstream: Get rid of the explicit implementation of IMediaStream.
Michael Stefaniuc
mstefani at redhat.de
Tue Aug 16 03:24:15 CDT 2011
IDirectDrawMediaStream inherits from IMediaStream.
---
dlls/amstream/amstream.c | 6 +-
dlls/amstream/amstream_private.h | 4 +-
dlls/amstream/mediastream.c | 156 +++++++++++---------------------------
3 files changed, 46 insertions(+), 120 deletions(-)
diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c
index fe21469..979c58e 100644
--- a/dlls/amstream/amstream.c
+++ b/dlls/amstream/amstream.c
@@ -276,11 +276,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream
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);
- else
- hr = MediaStream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream);
-
+ hr = mediastream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream);
if (SUCCEEDED(hr))
{
pNewStreams = CoTaskMemAlloc((This->nbStreams+1)*sizeof(IMediaStream*));
diff --git a/dlls/amstream/amstream_private.h b/dlls/amstream/amstream_private.h
index 3466f9e..62c8287 100644
--- a/dlls/amstream/amstream_private.h
+++ b/dlls/amstream/amstream_private.h
@@ -36,7 +36,7 @@
HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN;
HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN;
-HRESULT MediaStream_create(IMultiMediaStream* Parent, const MSPID* pPurposeId, STREAM_TYPE StreamType, IMediaStream** ppMediaStream) DECLSPEC_HIDDEN;
-HRESULT DirectDrawMediaStream_create(IMultiMediaStream* Parent, const MSPID* pPurposeId, STREAM_TYPE StreamType, IMediaStream** ppMediaStream) DECLSPEC_HIDDEN;
+HRESULT mediastream_create(IMultiMediaStream *Parent, const MSPID *pPurposeId,
+ STREAM_TYPE StreamType, IMediaStream **ppMediaStream) DECLSPEC_HIDDEN;
#endif /* __AMSTREAM_PRIVATE_INCLUDED__ */
diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c
index f41b944..886d26d 100644
--- a/dlls/amstream/mediastream.c
+++ b/dlls/amstream/mediastream.c
@@ -36,14 +36,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(amstream);
typedef struct {
- const IMediaStreamVtbl *lpVtbl;
- LONG ref;
- IMultiMediaStream* Parent;
- MSPID PurposeId;
- STREAM_TYPE StreamType;
-} IMediaStreamImpl;
-
-typedef struct {
IDirectDrawMediaStream IDirectDrawMediaStream_iface;
LONG ref;
IMultiMediaStream* Parent;
@@ -51,88 +43,68 @@ typedef struct {
STREAM_TYPE StreamType;
} IDirectDrawMediaStreamImpl;
-static const struct IMediaStreamVtbl MediaStream_Vtbl;
-
-HRESULT MediaStream_create(IMultiMediaStream* Parent, const MSPID* pPurposeId, STREAM_TYPE StreamType, IMediaStream** ppMediaStream)
+static inline IDirectDrawMediaStreamImpl *impl_from_IDirectDrawMediaStream(IDirectDrawMediaStream *iface)
{
- IMediaStreamImpl* object;
-
- TRACE("(%p,%s,%p)\n", Parent, debugstr_guid(pPurposeId), ppMediaStream);
-
- object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IMediaStreamImpl));
- if (!object)
- {
- ERR("Out of memory\n");
- return E_OUTOFMEMORY;
- }
-
- object->lpVtbl = &MediaStream_Vtbl;
- object->ref = 1;
-
- object->Parent = Parent;
- object->PurposeId = *pPurposeId;
- object->StreamType = StreamType;
-
- *ppMediaStream = (IMediaStream*)object;
-
- return S_OK;
+ return CONTAINING_RECORD(iface, IDirectDrawMediaStreamImpl, IDirectDrawMediaStream_iface);
}
-/*** IUnknown methods ***/
-static HRESULT WINAPI IMediaStreamImpl_QueryInterface(IMediaStream* iface, REFIID riid, void** ppvObject)
+static HRESULT WINAPI IDirectDrawMediaStreamImpl_QueryInterface(IDirectDrawMediaStream *iface,
+ REFIID riid, void **ppv)
{
- IMediaStreamImpl *This = (IMediaStreamImpl *)iface;
+ IDirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface);
- TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppvObject);
+ TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppv);
if (IsEqualGUID(riid, &IID_IUnknown) ||
- IsEqualGUID(riid, &IID_IMediaStream))
+ IsEqualGUID(riid, &IID_IMediaStream) ||
+ IsEqualGUID(riid, &IID_IDirectDrawMediaStream))
{
IUnknown_AddRef(iface);
- *ppvObject = This;
+ *ppv = This;
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;
}
-static ULONG WINAPI IMediaStreamImpl_AddRef(IMediaStream* iface)
+static ULONG WINAPI IDirectDrawMediaStreamImpl_AddRef(IDirectDrawMediaStream *iface)
{
- IMediaStreamImpl *This = (IMediaStreamImpl *)iface;
+ IDirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface);
TRACE("(%p/%p)\n", iface, This);
return InterlockedIncrement(&This->ref);
}
-static ULONG WINAPI IMediaStreamImpl_Release(IMediaStream* iface)
+static ULONG WINAPI IDirectDrawMediaStreamImpl_Release(IDirectDrawMediaStream *iface)
{
- IMediaStreamImpl *This = (IMediaStreamImpl *)iface;
+ IDirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface);
ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p/%p)\n", iface, This);
if (!ref)
- HeapFree(GetProcessHeap(), 0, This);
+ HeapFree(GetProcessHeap(), 0, This);
return ref;
}
/*** IMediaStream methods ***/
-static HRESULT WINAPI IMediaStreamImpl_GetMultiMediaStream(IMediaStream* iface, IMultiMediaStream** ppMultiMediaStream)
+static HRESULT WINAPI IDirectDrawMediaStreamImpl_GetMultiMediaStream(IDirectDrawMediaStream *iface,
+ IMultiMediaStream** ppMultiMediaStream)
{
- IMediaStreamImpl *This = (IMediaStreamImpl *)iface;
+ IDirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface);
FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppMultiMediaStream);
return S_FALSE;
}
-
-static HRESULT WINAPI IMediaStreamImpl_GetInformation(IMediaStream* iface, MSPID* pPurposeId, STREAM_TYPE* pType)
+static HRESULT WINAPI IDirectDrawMediaStreamImpl_GetInformation(IDirectDrawMediaStream *iface,
+ MSPID *pPurposeId, STREAM_TYPE *pType)
{
- IMediaStreamImpl *This = (IMediaStreamImpl *)iface;
+ IDirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface);
TRACE("(%p/%p)->(%p,%p)\n", This, iface, pPurposeId, pType);
@@ -144,80 +116,46 @@ static HRESULT WINAPI IMediaStreamImpl_GetInformation(IMediaStream* iface, MSPID
return S_OK;
}
-static HRESULT WINAPI IMediaStreamImpl_SetSameFormat(IMediaStream* iface, IMediaStream* pStreamThatHasDesiredFormat, DWORD dwFlags)
+static HRESULT WINAPI IDirectDrawMediaStreamImpl_SetSameFormat(IDirectDrawMediaStream *iface,
+ IMediaStream *pStreamThatHasDesiredFormat, DWORD dwFlags)
{
- IMediaStreamImpl *This = (IMediaStreamImpl *)iface;
+ IDirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface);
FIXME("(%p/%p)->(%p,%x) stub!\n", This, iface, pStreamThatHasDesiredFormat, dwFlags);
return S_FALSE;
}
-static HRESULT WINAPI IMediaStreamImpl_AllocateSample(IMediaStream* iface, DWORD dwFlags, IStreamSample** ppSample)
+static HRESULT WINAPI IDirectDrawMediaStreamImpl_AllocateSample(IDirectDrawMediaStream *iface,
+ DWORD dwFlags, IStreamSample **ppSample)
{
- IMediaStreamImpl *This = (IMediaStreamImpl *)iface;
+ IDirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface);
FIXME("(%p/%p)->(%x,%p) stub!\n", This, iface, dwFlags, ppSample);
return S_FALSE;
}
-static HRESULT WINAPI IMediaStreamImpl_CreateSharedSample(IMediaStream* iface, IStreamSample* pExistingSample, DWORD dwFlags, IStreamSample** ppSample)
+static HRESULT WINAPI IDirectDrawMediaStreamImpl_CreateSharedSample(IDirectDrawMediaStream *iface,
+ IStreamSample *pExistingSample, DWORD dwFlags, IStreamSample **ppSample)
{
- IMediaStreamImpl *This = (IMediaStreamImpl *)iface;
+ IDirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface);
FIXME("(%p/%p)->(%p,%x,%p) stub!\n", This, iface, pExistingSample, dwFlags, ppSample);
return S_FALSE;
}
-static HRESULT WINAPI IMediaStreamImpl_SendEndOfStream(IMediaStream* iface, DWORD dwFlags)
+static HRESULT WINAPI IDirectDrawMediaStreamImpl_SendEndOfStream(IDirectDrawMediaStream *iface,
+ DWORD dwFlags)
{
- IMediaStreamImpl *This = (IMediaStreamImpl *)iface;
+ IDirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface);
FIXME("(%p/%p)->(%x) stub!\n", This, iface, dwFlags);
return S_FALSE;
}
-static const struct IMediaStreamVtbl MediaStream_Vtbl =
-{
- IMediaStreamImpl_QueryInterface,
- IMediaStreamImpl_AddRef,
- IMediaStreamImpl_Release,
- IMediaStreamImpl_GetMultiMediaStream,
- IMediaStreamImpl_GetInformation,
- IMediaStreamImpl_SetSameFormat,
- IMediaStreamImpl_AllocateSample,
- IMediaStreamImpl_CreateSharedSample,
- IMediaStreamImpl_SendEndOfStream
-};
-
-static inline IDirectDrawMediaStreamImpl *impl_from_IDirectDrawMediaStream(IDirectDrawMediaStream *iface)
-{
- return CONTAINING_RECORD(iface, IDirectDrawMediaStreamImpl, IDirectDrawMediaStream_iface);
-}
-
-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) ||
- IsEqualGUID(riid, &IID_IMediaStream) ||
- IsEqualGUID(riid, &IID_IDirectDrawMediaStream))
- {
- IUnknown_AddRef(iface);
- *ppv = This;
- return S_OK;
- }
-
- ERR("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppv);
- return E_NOINTERFACE;
-}
-
static HRESULT WINAPI IDirectDrawMediaStreamImpl_GetFormat(IDirectDrawMediaStream *iface,
DDSURFACEDESC *pDDSDCurrent, IDirectDrawPalette **ppDirectDrawPalette,
DDSURFACEDESC *pDDSDDesired, DWORD *pdwFlags)
@@ -270,24 +208,17 @@ static HRESULT WINAPI IDirectDrawMediaStreamImpl_GetTimePerFrame(IDirectDrawMedi
return E_NOTIMPL;
}
-/* Note: Hack so we can reuse the old functions without compiler warnings */
-#if !defined(__STRICT_ANSI__) && defined(__GNUC__)
-# define XCAST(fun) (typeof(DirectDrawMediaStream_Vtbl.fun))
-#else
-# define XCAST(fun) (void*)
-#endif
-
static const struct IDirectDrawMediaStreamVtbl DirectDrawMediaStream_Vtbl =
{
IDirectDrawMediaStreamImpl_QueryInterface,
- XCAST(AddRef)IMediaStreamImpl_AddRef,
- XCAST(Release)IMediaStreamImpl_Release,
- XCAST(GetMultiMediaStream)IMediaStreamImpl_GetMultiMediaStream,
- XCAST(GetInformation)IMediaStreamImpl_GetInformation,
- XCAST(SetSameFormat)IMediaStreamImpl_SetSameFormat,
- XCAST(AllocateSample)IMediaStreamImpl_AllocateSample,
- XCAST(CreateSharedSample)IMediaStreamImpl_CreateSharedSample,
- XCAST(SendEndOfStream)IMediaStreamImpl_SendEndOfStream,
+ IDirectDrawMediaStreamImpl_AddRef,
+ IDirectDrawMediaStreamImpl_Release,
+ IDirectDrawMediaStreamImpl_GetMultiMediaStream,
+ IDirectDrawMediaStreamImpl_GetInformation,
+ IDirectDrawMediaStreamImpl_SetSameFormat,
+ IDirectDrawMediaStreamImpl_AllocateSample,
+ IDirectDrawMediaStreamImpl_CreateSharedSample,
+ IDirectDrawMediaStreamImpl_SendEndOfStream,
IDirectDrawMediaStreamImpl_GetFormat,
IDirectDrawMediaStreamImpl_SetFormat,
IDirectDrawMediaStreamImpl_GetDirectDraw,
@@ -295,16 +226,15 @@ static const struct IDirectDrawMediaStreamVtbl DirectDrawMediaStream_Vtbl =
IDirectDrawMediaStreamImpl_CreateSample,
IDirectDrawMediaStreamImpl_GetTimePerFrame
};
-#undef XCAST
-HRESULT DirectDrawMediaStream_create(IMultiMediaStream *Parent, const MSPID *pPurposeId,
+HRESULT mediastream_create(IMultiMediaStream *Parent, const MSPID *pPurposeId,
STREAM_TYPE StreamType, IMediaStream **ppMediaStream)
{
IDirectDrawMediaStreamImpl *object;
TRACE("(%p,%s,%p)\n", Parent, debugstr_guid(pPurposeId), ppMediaStream);
- object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IMediaStreamImpl));
+ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectDrawMediaStreamImpl));
if (!object)
{
ERR("Out of memory\n");
--
1.7.4.4
More information about the wine-patches
mailing list