ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qedit/nullrenderer: Don't expose IAMFilterMiscFlags. 

This reverts 443e24fe88.

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-20 17:44:06 -05:00 committed by Alexandre Julliard
parent 19b5b68cde
commit c483201993
2 changed files with 1 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
dlls/qedit/nullrenderer.c
View File

@ -30,7 +30,6 @@ typedef struct NullRendererImpl
{ {
BaseRenderer renderer; BaseRenderer renderer;
IUnknown IUnknown_inner; IUnknown IUnknown_inner;
IAMFilterMiscFlags IAMFilterMiscFlags_iface;
IUnknown *outer_unk; IUnknown *outer_unk;
} NullRendererImpl; } NullRendererImpl;
@ -82,8 +81,6 @@ static HRESULT WINAPI NullRendererInner_QueryInterface(IUnknown *iface, REFIID r
if (IsEqualIID(riid, &IID_IUnknown)) if (IsEqualIID(riid, &IID_IUnknown))
*ppv = &This->IUnknown_inner; *ppv = &This->IUnknown_inner;
else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags))
*ppv = &This->IAMFilterMiscFlags_iface;
else else
{ {
HRESULT hr; HRESULT hr;
@ -174,42 +171,6 @@ static const IBaseFilterVtbl NullRenderer_Vtbl =
BaseFilterImpl_QueryVendorInfo BaseFilterImpl_QueryVendorInfo
}; };
static NullRendererImpl *impl_from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface)
{
return CONTAINING_RECORD(iface, NullRendererImpl, IAMFilterMiscFlags_iface);
}
static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, REFIID riid,
void **ppv)
{
NullRendererImpl *This = impl_from_IAMFilterMiscFlags(iface);
return IUnknown_QueryInterface(This->outer_unk, riid, ppv);
}
static ULONG WINAPI AMFilterMiscFlags_AddRef(IAMFilterMiscFlags *iface)
{
NullRendererImpl *This = impl_from_IAMFilterMiscFlags(iface);
return IUnknown_AddRef(This->outer_unk);
}
static ULONG WINAPI AMFilterMiscFlags_Release(IAMFilterMiscFlags *iface)
{
NullRendererImpl *This = impl_from_IAMFilterMiscFlags(iface);
return IUnknown_Release(This->outer_unk);
}
static ULONG WINAPI AMFilterMiscFlags_GetMiscFlags(IAMFilterMiscFlags *iface)
{
return AM_FILTER_MISC_FLAGS_IS_RENDERER;
}
static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl = {
AMFilterMiscFlags_QueryInterface,
AMFilterMiscFlags_AddRef,
AMFilterMiscFlags_Release,
AMFilterMiscFlags_GetMiscFlags
};
HRESULT NullRenderer_create(IUnknown *pUnkOuter, void **ppv) HRESULT NullRenderer_create(IUnknown *pUnkOuter, void **ppv)
{ {
static const WCHAR sink_name[] = {'I','n',0}; static const WCHAR sink_name[] = {'I','n',0};
@ -223,7 +184,6 @@ HRESULT NullRenderer_create(IUnknown *pUnkOuter, void **ppv)
pNullRenderer = CoTaskMemAlloc(sizeof(NullRendererImpl)); pNullRenderer = CoTaskMemAlloc(sizeof(NullRendererImpl));
pNullRenderer->IUnknown_inner.lpVtbl = &IInner_VTable; pNullRenderer->IUnknown_inner.lpVtbl = &IInner_VTable;
pNullRenderer->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl;
if (pUnkOuter) if (pUnkOuter)
pNullRenderer->outer_unk = pUnkOuter; pNullRenderer->outer_unk = pUnkOuter;

2
dlls/qedit/tests/nullrenderer.c
View File

@ -68,7 +68,7 @@ static void test_interfaces(void)
check_interface(filter, &IID_IPersist, TRUE); check_interface(filter, &IID_IPersist, TRUE);
check_interface(filter, &IID_IUnknown, TRUE); check_interface(filter, &IID_IUnknown, TRUE);
todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, FALSE); check_interface(filter, &IID_IAMFilterMiscFlags, FALSE);
check_interface(filter, &IID_IBasicAudio, FALSE); check_interface(filter, &IID_IBasicAudio, FALSE);
check_interface(filter, &IID_IBasicVideo, FALSE); check_interface(filter, &IID_IBasicVideo, FALSE);
check_interface(filter, &IID_IKsPropertySet, FALSE); check_interface(filter, &IID_IKsPropertySet, FALSE);