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

quartz/videorenderer: Don't expose IAMFilterMiscFlags. 

This reverts 822c3fe9ea.

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:04 -05:00 committed by Alexandre Julliard
parent 8e302b83ad
commit 75af3556a8
2 changed files with 1 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/quartz/tests/videorenderer.c
View File

@ -74,7 +74,7 @@ static void test_interfaces(void)
check_interface(filter, &IID_IUnknown, TRUE); check_interface(filter, &IID_IUnknown, TRUE);
check_interface(filter, &IID_IVideoWindow, TRUE); check_interface(filter, &IID_IVideoWindow, 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_IDispatch, FALSE); check_interface(filter, &IID_IDispatch, FALSE);
check_interface(filter, &IID_IOverlay, FALSE); check_interface(filter, &IID_IOverlay, FALSE);

40
dlls/quartz/videorenderer.c
View File

@ -47,7 +47,6 @@ typedef struct VideoRendererImpl
BaseControlVideo baseControlVideo; BaseControlVideo baseControlVideo;
IUnknown IUnknown_inner; IUnknown IUnknown_inner;
IAMFilterMiscFlags IAMFilterMiscFlags_iface;
IUnknown *outer_unk; IUnknown *outer_unk;
BOOL init; BOOL init;
@ -659,8 +658,6 @@ static HRESULT WINAPI VideoRendererInner_QueryInterface(IUnknown *iface, REFIID
*ppv = &This->baseControlVideo.IBasicVideo_iface; *ppv = &This->baseControlVideo.IBasicVideo_iface;
else if (IsEqualIID(riid, &IID_IVideoWindow)) else if (IsEqualIID(riid, &IID_IVideoWindow))
*ppv = &This->baseControlWindow.IVideoWindow_iface; *ppv = &This->baseControlWindow.IVideoWindow_iface;
else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags))
*ppv = &This->IAMFilterMiscFlags_iface;
else else
{ {
HRESULT hr; HRESULT hr;
@ -980,42 +977,6 @@ static const IVideoWindowVtbl IVideoWindow_VTable =
BaseControlWindowImpl_IsCursorHidden BaseControlWindowImpl_IsCursorHidden
}; };
static VideoRendererImpl *impl_from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface)
{
return CONTAINING_RECORD(iface, VideoRendererImpl, IAMFilterMiscFlags_iface);
}
static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, REFIID riid,
void **ppv)
{
VideoRendererImpl *This = impl_from_IAMFilterMiscFlags(iface);
return IUnknown_QueryInterface(This->outer_unk, riid, ppv);
}
static ULONG WINAPI AMFilterMiscFlags_AddRef(IAMFilterMiscFlags *iface)
{
VideoRendererImpl *This = impl_from_IAMFilterMiscFlags(iface);
return IUnknown_AddRef(This->outer_unk);
}
static ULONG WINAPI AMFilterMiscFlags_Release(IAMFilterMiscFlags *iface)
{
VideoRendererImpl *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 VideoRenderer_create(IUnknown *pUnkOuter, void **ppv) HRESULT VideoRenderer_create(IUnknown *pUnkOuter, void **ppv)
{ {
static const WCHAR sink_name[] = {'I','n',0}; static const WCHAR sink_name[] = {'I','n',0};
@ -1028,7 +989,6 @@ HRESULT VideoRenderer_create(IUnknown *pUnkOuter, void **ppv)
pVideoRenderer = CoTaskMemAlloc(sizeof(VideoRendererImpl)); pVideoRenderer = CoTaskMemAlloc(sizeof(VideoRendererImpl));
pVideoRenderer->IUnknown_inner.lpVtbl = &IInner_VTable; pVideoRenderer->IUnknown_inner.lpVtbl = &IInner_VTable;
pVideoRenderer->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl;
pVideoRenderer->init = FALSE; pVideoRenderer->init = FALSE;
ZeroMemory(&pVideoRenderer->SourceRect, sizeof(RECT)); ZeroMemory(&pVideoRenderer->SourceRect, sizeof(RECT));