Nikolay Sivov : amstream: Forward IUnknown methods to IAMMediaStream for streams.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Jun 23 09:17:14 CDT 2015
Module: wine
Branch: master
Commit: 147068453983bd1211e51251eaf885796fbc0e6d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=147068453983bd1211e51251eaf885796fbc0e6d
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Tue Jun 23 10:09:08 2015 +0300
amstream: Forward IUnknown methods to IAMMediaStream for streams.
---
dlls/amstream/mediastream.c | 72 +++++----------------------------------------
1 file changed, 8 insertions(+), 64 deletions(-)
diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c
index 1a31706..ca4f0ce 100644
--- a/dlls/amstream/mediastream.c
+++ b/dlls/amstream/mediastream.c
@@ -247,48 +247,22 @@ static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_QueryInte
REFIID riid, void **ret_iface)
{
DirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface);
-
TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ret_iface);
-
- if (IsEqualGUID(riid, &IID_IUnknown) ||
- IsEqualGUID(riid, &IID_IMediaStream) ||
- IsEqualGUID(riid, &IID_IDirectDrawMediaStream))
- {
- IDirectDrawMediaStream_AddRef(iface);
- *ret_iface = iface;
- return S_OK;
- }
- else if (IsEqualGUID(riid, &IID_IAMMediaStream))
- {
- IDirectDrawMediaStream_AddRef(iface);
- *ret_iface = &This->IAMMediaStream_iface;
- return S_OK;
- }
-
- ERR("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ret_iface);
- return E_NOINTERFACE;
+ return IAMMediaStream_QueryInterface(&This->IAMMediaStream_iface, riid, ret_iface);
}
static ULONG WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_AddRef(IDirectDrawMediaStream *iface)
{
DirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface);
-
TRACE("(%p/%p)\n", iface, This);
-
- return InterlockedIncrement(&This->ref);
+ return IAMMediaStream_AddRef(&This->IAMMediaStream_iface);
}
static ULONG WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_Release(IDirectDrawMediaStream *iface)
{
DirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface);
- ULONG ref = InterlockedDecrement(&This->ref);
-
TRACE("(%p/%p)\n", iface, This);
-
- if (!ref)
- HeapFree(GetProcessHeap(), 0, This);
-
- return ref;
+ return IAMMediaStream_Release(&This->IAMMediaStream_iface);
}
/*** IMediaStream methods ***/
@@ -673,52 +647,22 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_QueryInterface(IAud
REFIID riid, void **ret_iface)
{
AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface);
-
TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ret_iface);
-
- if (IsEqualGUID(riid, &IID_IUnknown) ||
- IsEqualGUID(riid, &IID_IMediaStream) ||
- IsEqualGUID(riid, &IID_IAudioMediaStream))
- {
- IAudioMediaStream_AddRef(iface);
- *ret_iface = iface;
- return S_OK;
- }
- else if (IsEqualGUID(riid, &IID_IAMMediaStream))
- {
- IAudioMediaStream_AddRef(iface);
- *ret_iface = &This->IAMMediaStream_iface;
- return S_OK;
- }
-
-
- *ret_iface = NULL;
-
- ERR("(%p/%p)->(%s,%p),not found\n", iface, This, debugstr_guid(riid), ret_iface);
- return E_NOINTERFACE;
+ return IAMMediaStream_QueryInterface(&This->IAMMediaStream_iface, riid, ret_iface);
}
static ULONG WINAPI AudioMediaStreamImpl_IAudioMediaStream_AddRef(IAudioMediaStream *iface)
{
AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface);
- ULONG ref = InterlockedIncrement(&This->ref);
-
- TRACE("(%p/%p): new ref = %u\n", iface, This, ref);
-
- return ref;
+ TRACE("(%p/%p)\n", iface, This);
+ return IAMMediaStream_AddRef(&This->IAMMediaStream_iface);
}
static ULONG WINAPI AudioMediaStreamImpl_IAudioMediaStream_Release(IAudioMediaStream *iface)
{
AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface);
- ULONG ref = InterlockedDecrement(&This->ref);
-
- TRACE("(%p/%p): new ref = %u\n", iface, This, ref);
-
- if (!ref)
- HeapFree(GetProcessHeap(), 0, This);
-
- return ref;
+ TRACE("(%p/%p)\n", iface, This);
+ return IAMMediaStream_Release(&This->IAMMediaStream_iface);
}
/*** IMediaStream methods ***/
More information about the wine-cvs
mailing list