Module: wine Branch: master Commit: 19b5b68cdebe571f35cb6a14629e5ca7e2d50b49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19b5b68cdebe571f35cb6a146...
Author: Zebediah Figura z.figura12@gmail.com Date: Mon May 20 17:44:05 2019 -0500
quartz/dsoundrender: Don't expose IAMFilterMiscFlags.
This reverts 0196da9b4d2a9689a0a5bc219bb393ac590ad088.
Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/quartz/dsoundrender.c | 36 ------------------------------------ dlls/quartz/tests/dsoundrender.c | 2 +- 2 files changed, 1 insertion(+), 37 deletions(-)
diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 31862d2..844085a 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -47,7 +47,6 @@ static const IBaseFilterVtbl DSoundRender_Vtbl; static const IBasicAudioVtbl IBasicAudio_Vtbl; static const IReferenceClockVtbl IReferenceClock_Vtbl; static const IAMDirectSoundVtbl IAMDirectSound_Vtbl; -static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl;
typedef struct DSoundRenderImpl { @@ -56,7 +55,6 @@ typedef struct DSoundRenderImpl
IReferenceClock IReferenceClock_iface; IAMDirectSound IAMDirectSound_iface; - IAMFilterMiscFlags IAMFilterMiscFlags_iface;
IDirectSound8 *dsound; LPDIRECTSOUNDBUFFER dsbuffer; @@ -100,11 +98,6 @@ static inline DSoundRenderImpl *impl_from_IAMDirectSound(IAMDirectSound *iface) return CONTAINING_RECORD(iface, DSoundRenderImpl, IAMDirectSound_iface); }
-static inline DSoundRenderImpl *impl_from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface) -{ - return CONTAINING_RECORD(iface, DSoundRenderImpl, IAMFilterMiscFlags_iface); -} - static REFERENCE_TIME time_from_pos(DSoundRenderImpl *This, DWORD pos) { WAVEFORMATEX *wfx = (WAVEFORMATEX*)This->renderer.pInputPin->pin.mtCurrent.pbFormat; REFERENCE_TIME ret = 10000000; @@ -642,7 +635,6 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) BasicAudio_Init(&pDSoundRender->basicAudio,&IBasicAudio_Vtbl); pDSoundRender->IReferenceClock_iface.lpVtbl = &IReferenceClock_Vtbl; pDSoundRender->IAMDirectSound_iface.lpVtbl = &IAMDirectSound_Vtbl; - pDSoundRender->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl;
if (SUCCEEDED(hr)) { @@ -700,8 +692,6 @@ static HRESULT WINAPI DSoundRender_QueryInterface(IBaseFilter * iface, REFIID ri *ppv = &This->IReferenceClock_iface; else if (IsEqualIID(riid, &IID_IAMDirectSound)) *ppv = &This->IAMDirectSound_iface; - else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags)) - *ppv = &This->IAMFilterMiscFlags_iface; else { HRESULT hr; @@ -1284,29 +1274,3 @@ static const IAMDirectSoundVtbl IAMDirectSound_Vtbl = AMDirectSound_SetFocusWindow, AMDirectSound_GetFocusWindow }; - -static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, REFIID riid, void **ppv) { - DSoundRenderImpl *This = impl_from_IAMFilterMiscFlags(iface); - return IBaseFilter_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppv); -} - -static ULONG WINAPI AMFilterMiscFlags_AddRef(IAMFilterMiscFlags *iface) { - DSoundRenderImpl *This = impl_from_IAMFilterMiscFlags(iface); - return IBaseFilter_AddRef(&This->renderer.filter.IBaseFilter_iface); -} - -static ULONG WINAPI AMFilterMiscFlags_Release(IAMFilterMiscFlags *iface) { - DSoundRenderImpl *This = impl_from_IAMFilterMiscFlags(iface); - return IBaseFilter_Release(&This->renderer.filter.IBaseFilter_iface); -} - -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 -}; diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index 09bd473..9e01aec 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -144,7 +144,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IReferenceClock, 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_IBasicVideo, FALSE); check_interface(filter, &IID_IDispatch, FALSE); check_interface(filter, &IID_IKsPropertySet, FALSE);