strmbase: Use the type info cache for IMediaPosition.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
fad521f525
commit
5c494e1226
|
@ -32,7 +32,6 @@ typedef struct PassThruImpl {
|
||||||
ISeekingPassThru ISeekingPassThru_iface;
|
ISeekingPassThru ISeekingPassThru_iface;
|
||||||
IMediaSeeking IMediaSeeking_iface;
|
IMediaSeeking IMediaSeeking_iface;
|
||||||
IMediaPosition IMediaPosition_iface;
|
IMediaPosition IMediaPosition_iface;
|
||||||
BaseDispatch baseDispatch;
|
|
||||||
|
|
||||||
LONG ref;
|
LONG ref;
|
||||||
IUnknown * outer_unk;
|
IUnknown * outer_unk;
|
||||||
|
@ -114,7 +113,6 @@ static ULONG WINAPI SeekInner_Release(IUnknown * iface) {
|
||||||
|
|
||||||
if (ref == 0)
|
if (ref == 0)
|
||||||
{
|
{
|
||||||
BaseDispatch_Destroy(&This->baseDispatch);
|
|
||||||
This->time_cs.DebugInfo->Spare[0] = 0;
|
This->time_cs.DebugInfo->Spare[0] = 0;
|
||||||
DeleteCriticalSection(&This->time_cs);
|
DeleteCriticalSection(&This->time_cs);
|
||||||
CoTaskMemFree(This);
|
CoTaskMemFree(This);
|
||||||
|
@ -260,7 +258,6 @@ HRESULT WINAPI PosPassThru_Construct(IUnknown *pUnkOuter, LPVOID *ppPassThru)
|
||||||
fimpl->timevalid = FALSE;
|
fimpl->timevalid = FALSE;
|
||||||
InitializeCriticalSection(&fimpl->time_cs);
|
InitializeCriticalSection(&fimpl->time_cs);
|
||||||
fimpl->time_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PassThruImpl.time_cs");
|
fimpl->time_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PassThruImpl.time_cs");
|
||||||
BaseDispatch_Init(&fimpl->baseDispatch, &IID_IMediaPosition);
|
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -674,40 +671,51 @@ static ULONG WINAPI MediaPositionPassThru_Release(IMediaPosition *iface)
|
||||||
return SeekOuter_Release(This);
|
return SeekOuter_Release(This);
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI MediaPositionPassThru_GetTypeInfoCount(IMediaPosition *iface, UINT*pctinfo)
|
static HRESULT WINAPI MediaPositionPassThru_GetTypeInfoCount(IMediaPosition *iface, UINT *count)
|
||||||
{
|
{
|
||||||
PassThruImpl *This = impl_from_IMediaPosition(iface);
|
TRACE("iface %p, count %p.\n", iface, count);
|
||||||
|
*count = 1;
|
||||||
return BaseDispatchImpl_GetTypeInfoCount(&This->baseDispatch, pctinfo);
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI MediaPositionPassThru_GetTypeInfo(IMediaPosition *iface, UINT iTInfo, LCID lcid, ITypeInfo**ppTInfo)
|
static HRESULT WINAPI MediaPositionPassThru_GetTypeInfo(IMediaPosition *iface, UINT index,
|
||||||
|
LCID lcid, ITypeInfo **typeinfo)
|
||||||
{
|
{
|
||||||
PassThruImpl *This = impl_from_IMediaPosition(iface);
|
TRACE("iface %p, index %u, lcid %#x, typeinfo %p.\n", iface, index, lcid, typeinfo);
|
||||||
|
return strmbase_get_typeinfo(IMediaPosition_tid, typeinfo);
|
||||||
return BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, &IID_NULL, iTInfo, lcid, ppTInfo);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI MediaPositionPassThru_GetIDsOfNames(IMediaPosition *iface, REFIID riid, LPOLESTR*rgszNames, UINT cNames, LCID lcid, DISPID*rgDispId)
|
static HRESULT WINAPI MediaPositionPassThru_GetIDsOfNames(IMediaPosition *iface, REFIID iid,
|
||||||
|
LPOLESTR *names, UINT count, LCID lcid, DISPID *ids)
|
||||||
{
|
{
|
||||||
PassThruImpl *This = impl_from_IMediaPosition(iface);
|
ITypeInfo *typeinfo;
|
||||||
|
HRESULT hr;
|
||||||
|
|
||||||
return BaseDispatchImpl_GetIDsOfNames(&This->baseDispatch, riid, rgszNames, cNames, lcid, rgDispId);
|
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(IMediaPosition_tid, &typeinfo)))
|
||||||
|
{
|
||||||
|
hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, ids);
|
||||||
|
ITypeInfo_Release(typeinfo);
|
||||||
|
}
|
||||||
|
return hr;
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI MediaPositionPassThru_Invoke(IMediaPosition *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS*pDispParams, VARIANT*pVarResult, EXCEPINFO*pExepInfo, UINT*puArgErr)
|
static HRESULT WINAPI MediaPositionPassThru_Invoke(IMediaPosition *iface, DISPID id, REFIID iid, LCID lcid,
|
||||||
|
WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *error_arg)
|
||||||
{
|
{
|
||||||
PassThruImpl *This = impl_from_IMediaPosition(iface);
|
ITypeInfo *typeinfo;
|
||||||
HRESULT hr = S_OK;
|
HRESULT hr;
|
||||||
ITypeInfo *pTypeInfo;
|
|
||||||
|
|
||||||
hr = BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, riid, 1, lcid, &pTypeInfo);
|
TRACE("iface %p, id %d, iid %s, lcid %#x, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
|
||||||
if (SUCCEEDED(hr))
|
iface, id, debugstr_guid(iid), lcid, flags, params, result, excepinfo, error_arg);
|
||||||
|
|
||||||
|
if (SUCCEEDED(hr = strmbase_get_typeinfo(IMediaPosition_tid, &typeinfo)))
|
||||||
{
|
{
|
||||||
hr = ITypeInfo_Invoke(pTypeInfo, &This->IMediaPosition_iface, dispIdMember, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr);
|
hr = ITypeInfo_Invoke(typeinfo, iface, id, flags, params, result, excepinfo, error_arg);
|
||||||
ITypeInfo_Release(pTypeInfo);
|
ITypeInfo_Release(typeinfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
return hr;
|
return hr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue