system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 22:28:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

strmbase: Reimplement BaseFilterImpl_QueryInterface() using a callback.

Browse source 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2019-05-29 20:52:56 -05:00 committed by Alexandre Julliard
parent 5e1ed74c9f
commit 4b839bdd6a
2 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
dlls/strmbase/filter.c
View file

@ -27,20 +27,32 @@ static inline BaseFilter *impl_from_IBaseFilter(IBaseFilter *iface)
return CONTAINING_RECORD(iface, BaseFilter, IBaseFilter_iface);
}
HRESULT WINAPI BaseFilterImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv)
HRESULT WINAPI BaseFilterImpl_QueryInterface(IBaseFilter *iface, REFIID iid, void **out)
{
TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv);
BaseFilter *filter = impl_from_IBaseFilter(iface);
HRESULT hr;
*ppv = NULL;
TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out);
if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IPersist) ||
IsEqualIID(riid, &IID_IMediaFilter) || IsEqualIID(riid, &IID_IBaseFilter))
*out = NULL;
if (filter->pFuncsTable->filter_query_interface
&& SUCCEEDED(hr = filter->pFuncsTable->filter_query_interface(filter, iid, out)))
{
*ppv = iface;
return hr;
}
if (IsEqualIID(iid, &IID_IUnknown)
|| IsEqualIID(iid, &IID_IPersist)
|| IsEqualIID(iid, &IID_IMediaFilter)
|| IsEqualIID(iid, &IID_IBaseFilter))
{
*out = iface;
IBaseFilter_AddRef(iface);
return S_OK;
}
WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid));
return E_NOINTERFACE;
}

1
include/wine/strmbase.h
View file

@ -172,6 +172,7 @@ typedef struct BaseFilterFuncTable
{
IPin *(*filter_get_pin)(BaseFilter *iface, unsigned int index);
void (*filter_destroy)(BaseFilter *iface);
HRESULT (*filter_query_interface)(BaseFilter *iface, REFIID iid, void **out);
} BaseFilterFuncTable;
HRESULT WINAPI BaseFilterImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv);