Christian Costa : amstream: Cleanup MediaStreamFilterImpl_QueryInterface.
Alexandre Julliard
julliard at winehq.org
Mon Oct 15 14:29:05 CDT 2012
Module: wine
Branch: master
Commit: 5d5da39ddc1094e563e7bb81070f821cdb722cca
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d5da39ddc1094e563e7bb81070f821cdb722cca
Author: Christian Costa <titan.costa at gmail.com>
Date: Fri Oct 12 23:07:15 2012 +0200
amstream: Cleanup MediaStreamFilterImpl_QueryInterface.
---
dlls/amstream/mediastreamfilter.c | 29 +++++++++++------------------
1 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c
index 194914e..8423cfa 100644
--- a/dlls/amstream/mediastreamfilter.c
+++ b/dlls/amstream/mediastreamfilter.c
@@ -102,29 +102,22 @@ static const BaseInputPinFuncTable input_BaseInputFuncTable = {
/*** IUnknown methods ***/
-static HRESULT WINAPI MediaStreamFilterImpl_QueryInterface(IMediaStreamFilter *iface, REFIID riid,
- void **ppv)
+static HRESULT WINAPI MediaStreamFilterImpl_QueryInterface(IMediaStreamFilter *iface, REFIID riid, void **ret_iface)
{
- IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface);
-
- TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv);
+ TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ret_iface);
- *ppv = NULL;
+ *ret_iface = NULL;
- if (IsEqualIID(riid, &IID_IUnknown))
- *ppv = This;
- else if (IsEqualIID(riid, &IID_IPersist))
- *ppv = This;
- else if (IsEqualIID(riid, &IID_IMediaFilter))
- *ppv = This;
- else if (IsEqualIID(riid, &IID_IBaseFilter))
- *ppv = This;
- else if (IsEqualIID(riid, &IID_IMediaStreamFilter))
- *ppv = This;
+ if (IsEqualIID(riid, &IID_IUnknown) ||
+ IsEqualIID(riid, &IID_IPersist) ||
+ IsEqualIID(riid, &IID_IMediaFilter) ||
+ IsEqualIID(riid, &IID_IBaseFilter) ||
+ IsEqualIID(riid, &IID_IMediaStreamFilter))
+ *ret_iface = iface;
- if (*ppv)
+ if (*ret_iface)
{
- IUnknown_AddRef((IUnknown *)(*ppv));
+ IMediaStreamFilter_AddRef(*ret_iface);
return S_OK;
}
More information about the wine-cvs
mailing list