Module: wine Branch: master Commit: ea0dfa7934dbc47436a14c33b7a14c81ae072d70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea0dfa7934dbc47436a14c33b...
Author: Zebediah Figura z.figura12@gmail.com Date: Thu Jun 6 19:49:25 2019 -0400
strmbase: Get rid of IBasicAudio implementation.
Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/strmbase/Makefile.in | 1 - dlls/strmbase/audio.c | 76 ----------------------------------------------- include/wine/strmbase.h | 16 ---------- 3 files changed, 93 deletions(-)
diff --git a/dlls/strmbase/Makefile.in b/dlls/strmbase/Makefile.in index a51691b..c58a359 100644 --- a/dlls/strmbase/Makefile.in +++ b/dlls/strmbase/Makefile.in @@ -1,7 +1,6 @@ MODULE = libstrmbase.a
C_SRCS = \ - audio.c \ dispatch.c \ dllfunc.c \ enumpins.c \ diff --git a/dlls/strmbase/audio.c b/dlls/strmbase/audio.c deleted file mode 100644 index 6ad6461..0000000 --- a/dlls/strmbase/audio.c +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Generic Implementation of strmbase audio classes - * - * Copyright 2012 Aric Stewart, CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "strmbase_private.h" - -static inline BasicAudio *impl_from_IBasicAudio(IBasicAudio *iface) -{ - return CONTAINING_RECORD(iface, BasicAudio, IBasicAudio_iface); -} - -HRESULT WINAPI BasicAudio_Init(BasicAudio *pBasicAudio, const IBasicAudioVtbl *lpVtbl) -{ - pBasicAudio->IBasicAudio_iface.lpVtbl = lpVtbl; - BaseDispatch_Init(&pBasicAudio->baseDispatch, &IID_IBasicAudio); - - return S_OK; -} - -HRESULT WINAPI BasicAudio_Destroy(BasicAudio *pBasicAudio) -{ - return BaseDispatch_Destroy(&pBasicAudio->baseDispatch); -} - -HRESULT WINAPI BasicAudioImpl_GetTypeInfoCount(IBasicAudio *iface, UINT *pctinfo) -{ - BasicAudio *This = impl_from_IBasicAudio(iface); - - return BaseDispatchImpl_GetTypeInfoCount(&This->baseDispatch, pctinfo); -} - -HRESULT WINAPI BasicAudioImpl_GetTypeInfo(IBasicAudio *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) -{ - BasicAudio *This = impl_from_IBasicAudio(iface); - - return BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, &IID_NULL, iTInfo, lcid, ppTInfo); -} - -HRESULT WINAPI BasicAudioImpl_GetIDsOfNames(IBasicAudio *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - BasicAudio *This = impl_from_IBasicAudio(iface); - - return BaseDispatchImpl_GetIDsOfNames(&This->baseDispatch, riid, rgszNames, cNames, lcid, rgDispId); -} - -HRESULT WINAPI BasicAudioImpl_Invoke(IBasicAudio *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo, UINT *puArgErr) -{ - BasicAudio *This = impl_from_IBasicAudio(iface); - ITypeInfo *pTypeInfo; - HRESULT hr; - - hr = BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, riid, 1, lcid, &pTypeInfo); - if (SUCCEEDED(hr)) - { - hr = ITypeInfo_Invoke(pTypeInfo, &This->IBasicAudio_iface, dispIdMember, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); - ITypeInfo_Release(pTypeInfo); - } - - return hr; -} diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index e762f44..62dcf74 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -638,22 +638,6 @@ HRESULT WINAPI strmbase_renderer_init(BaseRenderer *filter, const IBaseFilterVtb const BaseRendererFuncTable *func_table); void strmbase_renderer_cleanup(BaseRenderer *filter);
-#ifdef __IBasicAudio_FWD_DEFINED__ -typedef struct tagBasicAudio -{ - IBasicAudio IBasicAudio_iface; - BaseDispatch baseDispatch; -} BasicAudio; - -HRESULT WINAPI BasicAudio_Init(BasicAudio *This, const IBasicAudioVtbl *Vtbl); -HRESULT WINAPI BasicAudio_Destroy(BasicAudio *pBasicAudio); - -HRESULT WINAPI BasicAudioImpl_GetTypeInfoCount(IBasicAudio *iface, UINT*pctinfo); -HRESULT WINAPI BasicAudioImpl_GetTypeInfo(IBasicAudio *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); -HRESULT WINAPI BasicAudioImpl_GetIDsOfNames(IBasicAudio *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId); -HRESULT WINAPI BasicAudioImpl_Invoke(IBasicAudio *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo, UINT *puArgErr); -#endif - /* Dll Functions */ BOOL WINAPI STRMBASE_DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv); HRESULT WINAPI STRMBASE_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv);