Zebediah Figura : quartz/filtergraph: Use the type info cache for IBasicAudio.
Alexandre Julliard
julliard at winehq.org
Tue Jun 11 16:54:07 CDT 2019
Module: wine
Branch: master
Commit: 014012ddf3298ce117c9a54f681c7ee7e58c2230
URL: https://source.winehq.org/git/wine.git/?a=commit;h=014012ddf3298ce117c9a54f681c7ee7e58c2230
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Tue Jun 11 10:42:13 2019 -0400
quartz/filtergraph: Use the type info cache for IBasicAudio.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/quartz/filtergraph.c | 95 ++++++++++++-----------------------------
dlls/quartz/tests/filtergraph.c | 5 +++
2 files changed, 33 insertions(+), 67 deletions(-)
diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c
index 9606a49..45da4f2 100644
--- a/dlls/quartz/filtergraph.c
+++ b/dlls/quartz/filtergraph.c
@@ -3058,90 +3058,51 @@ static ULONG WINAPI BasicAudio_Release(IBasicAudio *iface)
return IUnknown_Release(This->outer_unk);
}
-/*** IDispatch methods ***/
-static HRESULT WINAPI BasicAudio_GetTypeInfoCount(IBasicAudio *iface, UINT *pctinfo)
+static HRESULT WINAPI BasicAudio_GetTypeInfoCount(IBasicAudio *iface, UINT *count)
{
- IFilterGraphImpl *This = impl_from_IBasicAudio(iface);
- IBasicAudio* pBasicAudio;
- HRESULT hr;
-
- TRACE("(%p/%p)->(%p)\n", This, iface, pctinfo);
-
- EnterCriticalSection(&This->cs);
-
- hr = GetTargetInterface(This, &IID_IBasicAudio, (LPVOID*)&pBasicAudio);
-
- if (hr == S_OK)
- hr = IBasicAudio_GetTypeInfoCount(pBasicAudio, pctinfo);
-
- LeaveCriticalSection(&This->cs);
-
- return hr;
+ TRACE("iface %p, count %p.\n", iface, count);
+ *count = 1;
+ return S_OK;
}
-static HRESULT WINAPI BasicAudio_GetTypeInfo(IBasicAudio *iface, UINT iTInfo, LCID lcid,
- ITypeInfo **ppTInfo)
+static HRESULT WINAPI BasicAudio_GetTypeInfo(IBasicAudio *iface, UINT index,
+ LCID lcid, ITypeInfo **typeinfo)
{
- IFilterGraphImpl *This = impl_from_IBasicAudio(iface);
- IBasicAudio* pBasicAudio;
- HRESULT hr;
-
- TRACE("(%p/%p)->(%d, %d, %p)\n", This, iface, iTInfo, lcid, ppTInfo);
-
- EnterCriticalSection(&This->cs);
-
- hr = GetTargetInterface(This, &IID_IBasicAudio, (LPVOID*)&pBasicAudio);
-
- if (hr == S_OK)
- hr = IBasicAudio_GetTypeInfo(pBasicAudio, iTInfo, lcid, ppTInfo);
-
- LeaveCriticalSection(&This->cs);
-
- return hr;
+ TRACE("iface %p, index %u, lcid %#x, typeinfo %p.\n", iface, index, lcid, typeinfo);
+ return strmbase_get_typeinfo(IBasicAudio_tid, typeinfo);
}
-static HRESULT WINAPI BasicAudio_GetIDsOfNames(IBasicAudio *iface, REFIID riid, LPOLESTR *rgszNames,
- UINT cNames, LCID lcid, DISPID *rgDispId)
+static HRESULT WINAPI BasicAudio_GetIDsOfNames(IBasicAudio *iface, REFIID iid,
+ LPOLESTR *names, UINT count, LCID lcid, DISPID *ids)
{
- IFilterGraphImpl *This = impl_from_IBasicAudio(iface);
- IBasicAudio* pBasicAudio;
+ ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p/%p)->(%s, %p, %d, %d, %p)\n", This, iface, debugstr_guid(riid), rgszNames, cNames,
- lcid, rgDispId);
-
- EnterCriticalSection(&This->cs);
-
- hr = GetTargetInterface(This, &IID_IBasicAudio, (LPVOID*)&pBasicAudio);
-
- if (hr == S_OK)
- hr = IBasicAudio_GetIDsOfNames(pBasicAudio, riid, rgszNames, cNames, lcid, rgDispId);
-
- LeaveCriticalSection(&This->cs);
+ TRACE("iface %p, iid %s, names %p, count %u, lcid %#x, ids %p.\n",
+ iface, debugstr_guid(iid), names, count, lcid, ids);
+ if (SUCCEEDED(hr = strmbase_get_typeinfo(IBasicAudio_tid, &typeinfo)))
+ {
+ hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, ids);
+ ITypeInfo_Release(typeinfo);
+ }
return hr;
}
-static HRESULT WINAPI BasicAudio_Invoke(IBasicAudio *iface, DISPID dispIdMember, REFIID riid,
- LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo,
- UINT *puArgErr)
+static HRESULT WINAPI BasicAudio_Invoke(IBasicAudio *iface, DISPID id, REFIID iid, LCID lcid,
+ WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *error_arg)
{
- IFilterGraphImpl *This = impl_from_IBasicAudio(iface);
- IBasicAudio* pBasicAudio;
+ ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p/%p)->(%d, %s, %d, %04x, %p, %p, %p, %p)\n", This, iface, dispIdMember,
- debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr);
-
- EnterCriticalSection(&This->cs);
-
- hr = GetTargetInterface(This, &IID_IBasicAudio, (LPVOID*)&pBasicAudio);
-
- if (hr == S_OK)
- hr = IBasicAudio_Invoke(pBasicAudio, dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr);
-
- LeaveCriticalSection(&This->cs);
+ TRACE("iface %p, id %d, iid %s, lcid %#x, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
+ iface, id, debugstr_guid(iid), lcid, flags, params, result, excepinfo, error_arg);
+ if (SUCCEEDED(hr = strmbase_get_typeinfo(IBasicAudio_tid, &typeinfo)))
+ {
+ hr = ITypeInfo_Invoke(typeinfo, iface, id, flags, params, result, excepinfo, error_arg);
+ ITypeInfo_Release(typeinfo);
+ }
return hr;
}
diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c
index e6f2afa..adad45a 100644
--- a/dlls/quartz/tests/filtergraph.c
+++ b/dlls/quartz/tests/filtergraph.c
@@ -2495,6 +2495,7 @@ static void test_control_delegation(void)
IBaseFilter *renderer;
IVideoWindow *window;
IBasicVideo *video;
+ ULONG count;
HRESULT hr;
LONG val;
@@ -2503,6 +2504,10 @@ static void test_control_delegation(void)
hr = IFilterGraph2_QueryInterface(graph, &IID_IBasicAudio, (void **)&audio);
ok(hr == S_OK, "got %#x\n", hr);
+ hr = IBasicAudio_GetTypeInfoCount(audio, &count);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(count == 1, "Got count %u.\n", count);
+
hr = IBasicAudio_put_Volume(audio, -10);
ok(hr == E_NOTIMPL, "got %#x\n", hr);
hr = IBasicAudio_get_Volume(audio, &val);
More information about the wine-cvs
mailing list