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

quartz: COM cleanup for the IMediaEventEx iface.

This commit is contained in:
Michael Stefaniuc 2011-06-30 00:47:38 +02:00 committed by Alexandre Julliard
parent 6d929c71b6
commit eca149bb4b
1 changed files with 63 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
dlls/quartz/filtergraph.c
View File

@ -158,7 +158,7 @@ typedef struct _IFilterGraphImpl {
IBasicAudio IBasicAudio_iface; IBasicAudio IBasicAudio_iface;
IBasicVideo2 IBasicVideo2_iface; IBasicVideo2 IBasicVideo2_iface;
IVideoWindow IVideoWindow_iface; IVideoWindow IVideoWindow_iface;
const IMediaEventExVtbl *IMediaEventEx_vtbl; IMediaEventEx IMediaEventEx_iface;
const IMediaFilterVtbl *IMediaFilter_vtbl; const IMediaFilterVtbl *IMediaFilter_vtbl;
const IMediaEventSinkVtbl *IMediaEventSink_vtbl; const IMediaEventSinkVtbl *IMediaEventSink_vtbl;
const IGraphConfigVtbl *IGraphConfig_vtbl; const IGraphConfigVtbl *IGraphConfig_vtbl;
@ -249,7 +249,7 @@ static HRESULT WINAPI FilterGraphInner_QueryInterface(IUnknown * iface,
TRACE(" returning IVideoWindow interface (%p)\n", *ppvObj); TRACE(" returning IVideoWindow interface (%p)\n", *ppvObj);
} else if (IsEqualGUID(&IID_IMediaEvent, riid) || } else if (IsEqualGUID(&IID_IMediaEvent, riid) ||
IsEqualGUID(&IID_IMediaEventEx, riid)) { IsEqualGUID(&IID_IMediaEventEx, riid)) {
*ppvObj = &(This->IMediaEventEx_vtbl); *ppvObj = &This->IMediaEventEx_iface;
TRACE(" returning IMediaEvent(Ex) interface (%p)\n", *ppvObj); TRACE(" returning IMediaEvent(Ex) interface (%p)\n", *ppvObj);
} else if (IsEqualGUID(&IID_IMediaFilter, riid) || } else if (IsEqualGUID(&IID_IMediaFilter, riid) ||
IsEqualGUID(&IID_IPersist, riid)) { IsEqualGUID(&IID_IPersist, riid)) {
@ -4767,28 +4767,32 @@ static const IVideoWindowVtbl IVideoWindow_VTable =
VideoWindow_IsCursorHidden VideoWindow_IsCursorHidden
}; };
static inline IFilterGraphImpl *impl_from_IMediaEventEx(IMediaEventEx *iface)
{
return CONTAINING_RECORD(iface, IFilterGraphImpl, IMediaEventEx_iface);
}
/*** IUnknown methods ***/ static HRESULT WINAPI MediaEvent_QueryInterface(IMediaEventEx *iface, REFIID riid, void **ppvObj)
static HRESULT WINAPI MediaEvent_QueryInterface(IMediaEventEx *iface, {
REFIID riid, IFilterGraphImpl *This = impl_from_IMediaEventEx(iface);
LPVOID*ppvObj) {
ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface);
TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid), riid, ppvObj); TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid), riid, ppvObj);
return Filtergraph_QueryInterface(This, riid, ppvObj); return Filtergraph_QueryInterface(This, riid, ppvObj);
} }
static ULONG WINAPI MediaEvent_AddRef(IMediaEventEx *iface) { static ULONG WINAPI MediaEvent_AddRef(IMediaEventEx *iface)
ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface); {
IFilterGraphImpl *This = impl_from_IMediaEventEx(iface);
TRACE("(%p/%p)->()\n", This, iface); TRACE("(%p/%p)->()\n", This, iface);
return Filtergraph_AddRef(This); return Filtergraph_AddRef(This);
} }
static ULONG WINAPI MediaEvent_Release(IMediaEventEx *iface) { static ULONG WINAPI MediaEvent_Release(IMediaEventEx *iface)
ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface); {
IFilterGraphImpl *This = impl_from_IMediaEventEx(iface);
TRACE("(%p/%p)->()\n", This, iface); TRACE("(%p/%p)->()\n", This, iface);
@ -4796,49 +4800,40 @@ static ULONG WINAPI MediaEvent_Release(IMediaEventEx *iface) {
} }
/*** IDispatch methods ***/ /*** IDispatch methods ***/
static HRESULT WINAPI MediaEvent_GetTypeInfoCount(IMediaEventEx *iface, static HRESULT WINAPI MediaEvent_GetTypeInfoCount(IMediaEventEx *iface, UINT *pctinfo)
UINT*pctinfo) { {
ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface); IFilterGraphImpl *This = impl_from_IMediaEventEx(iface);
TRACE("(%p/%p)->(%p): stub !!!\n", This, iface, pctinfo); TRACE("(%p/%p)->(%p): stub !!!\n", This, iface, pctinfo);
return S_OK; return S_OK;
} }
static HRESULT WINAPI MediaEvent_GetTypeInfo(IMediaEventEx *iface, static HRESULT WINAPI MediaEvent_GetTypeInfo(IMediaEventEx *iface, UINT iTInfo, LCID lcid,
UINT iTInfo, ITypeInfo **ppTInfo)
LCID lcid, {
ITypeInfo**ppTInfo) { IFilterGraphImpl *This = impl_from_IMediaEventEx(iface);
ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface);
TRACE("(%p/%p)->(%d, %d, %p): stub !!!\n", This, iface, iTInfo, lcid, ppTInfo); TRACE("(%p/%p)->(%d, %d, %p): stub !!!\n", This, iface, iTInfo, lcid, ppTInfo);
return S_OK; return S_OK;
} }
static HRESULT WINAPI MediaEvent_GetIDsOfNames(IMediaEventEx *iface, static HRESULT WINAPI MediaEvent_GetIDsOfNames(IMediaEventEx *iface, REFIID riid,
REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId)
LPOLESTR*rgszNames, {
UINT cNames, IFilterGraphImpl *This = impl_from_IMediaEventEx(iface);
LCID lcid,
DISPID*rgDispId) {
ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface);
TRACE("(%p/%p)->(%s (%p), %p, %d, %d, %p): stub !!!\n", This, iface, debugstr_guid(riid), riid, rgszNames, cNames, lcid, rgDispId); TRACE("(%p/%p)->(%s (%p), %p, %d, %d, %p): stub !!!\n", This, iface, debugstr_guid(riid), riid, rgszNames, cNames, lcid, rgDispId);
return S_OK; return S_OK;
} }
static HRESULT WINAPI MediaEvent_Invoke(IMediaEventEx *iface, static HRESULT WINAPI MediaEvent_Invoke(IMediaEventEx *iface, DISPID dispIdMember, REFIID riid,
DISPID dispIdMember, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo,
REFIID riid, UINT *puArgErr)
LCID lcid, {
WORD wFlags, IFilterGraphImpl *This = impl_from_IMediaEventEx(iface);
DISPPARAMS*pDispParams,
VARIANT*pVarResult,
EXCEPINFO*pExepInfo,
UINT*puArgErr) {
ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface);
TRACE("(%p/%p)->(%d, %s (%p), %d, %04x, %p, %p, %p, %p): stub !!!\n", This, iface, dispIdMember, debugstr_guid(riid), riid, lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); TRACE("(%p/%p)->(%d, %s (%p), %d, %04x, %p, %p, %p, %p): stub !!!\n", This, iface, dispIdMember, debugstr_guid(riid), riid, lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr);
@ -4846,9 +4841,9 @@ static HRESULT WINAPI MediaEvent_Invoke(IMediaEventEx *iface,
} }
/*** IMediaEvent methods ***/ /*** IMediaEvent methods ***/
static HRESULT WINAPI MediaEvent_GetEventHandle(IMediaEventEx *iface, static HRESULT WINAPI MediaEvent_GetEventHandle(IMediaEventEx *iface, OAEVENT *hEvent)
OAEVENT *hEvent) { {
ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface); IFilterGraphImpl *This = impl_from_IMediaEventEx(iface);
TRACE("(%p/%p)->(%p)\n", This, iface, hEvent); TRACE("(%p/%p)->(%p)\n", This, iface, hEvent);
@ -4857,12 +4852,10 @@ static HRESULT WINAPI MediaEvent_GetEventHandle(IMediaEventEx *iface,
return S_OK; return S_OK;
} }
static HRESULT WINAPI MediaEvent_GetEvent(IMediaEventEx *iface, static HRESULT WINAPI MediaEvent_GetEvent(IMediaEventEx *iface, LONG *lEventCode, LONG_PTR *lParam1,
LONG *lEventCode, LONG_PTR *lParam2, LONG msTimeout)
LONG_PTR *lParam1, {
LONG_PTR *lParam2, IFilterGraphImpl *This = impl_from_IMediaEventEx(iface);
LONG msTimeout) {
ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface);
Event evt; Event evt;
TRACE("(%p/%p)->(%p, %p, %p, %d)\n", This, iface, lEventCode, lParam1, lParam2, msTimeout); TRACE("(%p/%p)->(%p, %p, %p, %d)\n", This, iface, lEventCode, lParam1, lParam2, msTimeout);
@ -4879,10 +4872,10 @@ static HRESULT WINAPI MediaEvent_GetEvent(IMediaEventEx *iface,
return E_ABORT; return E_ABORT;
} }
static HRESULT WINAPI MediaEvent_WaitForCompletion(IMediaEventEx *iface, static HRESULT WINAPI MediaEvent_WaitForCompletion(IMediaEventEx *iface, LONG msTimeout,
LONG msTimeout, LONG *pEvCode)
LONG *pEvCode) { {
ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface); IFilterGraphImpl *This = impl_from_IMediaEventEx(iface);
TRACE("(%p/%p)->(%d, %p)\n", This, iface, msTimeout, pEvCode); TRACE("(%p/%p)->(%d, %p)\n", This, iface, msTimeout, pEvCode);
@ -4899,9 +4892,9 @@ static HRESULT WINAPI MediaEvent_WaitForCompletion(IMediaEventEx *iface,
return E_ABORT; return E_ABORT;
} }
static HRESULT WINAPI MediaEvent_CancelDefaultHandling(IMediaEventEx *iface, static HRESULT WINAPI MediaEvent_CancelDefaultHandling(IMediaEventEx *iface, LONG lEvCode)
LONG lEvCode) { {
ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface); IFilterGraphImpl *This = impl_from_IMediaEventEx(iface);
TRACE("(%p/%p)->(%d)\n", This, iface, lEvCode); TRACE("(%p/%p)->(%d)\n", This, iface, lEvCode);
@ -4917,9 +4910,9 @@ static HRESULT WINAPI MediaEvent_CancelDefaultHandling(IMediaEventEx *iface,
return S_OK; return S_OK;
} }
static HRESULT WINAPI MediaEvent_RestoreDefaultHandling(IMediaEventEx *iface, static HRESULT WINAPI MediaEvent_RestoreDefaultHandling(IMediaEventEx *iface, LONG lEvCode)
LONG lEvCode) { {
ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface); IFilterGraphImpl *This = impl_from_IMediaEventEx(iface);
TRACE("(%p/%p)->(%d)\n", This, iface, lEvCode); TRACE("(%p/%p)->(%d)\n", This, iface, lEvCode);
@ -4935,11 +4928,10 @@ static HRESULT WINAPI MediaEvent_RestoreDefaultHandling(IMediaEventEx *iface,
return S_OK; return S_OK;
} }
static HRESULT WINAPI MediaEvent_FreeEventParams(IMediaEventEx *iface, static HRESULT WINAPI MediaEvent_FreeEventParams(IMediaEventEx *iface, LONG lEvCode,
LONG lEvCode, LONG_PTR lParam1, LONG_PTR lParam2)
LONG_PTR lParam1, {
LONG_PTR lParam2) { IFilterGraphImpl *This = impl_from_IMediaEventEx(iface);
ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface);
TRACE("(%p/%p)->(%d, %08lx, %08lx): stub !!!\n", This, iface, lEvCode, lParam1, lParam2); TRACE("(%p/%p)->(%d, %08lx, %08lx): stub !!!\n", This, iface, lEvCode, lParam1, lParam2);
@ -4947,11 +4939,10 @@ static HRESULT WINAPI MediaEvent_FreeEventParams(IMediaEventEx *iface,
} }
/*** IMediaEventEx methods ***/ /*** IMediaEventEx methods ***/
static HRESULT WINAPI MediaEvent_SetNotifyWindow(IMediaEventEx *iface, static HRESULT WINAPI MediaEvent_SetNotifyWindow(IMediaEventEx *iface, OAHWND hwnd, LONG lMsg,
OAHWND hwnd, LONG_PTR lInstanceData)
LONG lMsg, {
LONG_PTR lInstanceData) { IFilterGraphImpl *This = impl_from_IMediaEventEx(iface);
ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface);
TRACE("(%p/%p)->(%08lx, %d, %08lx)\n", This, iface, hwnd, lMsg, lInstanceData); TRACE("(%p/%p)->(%08lx, %d, %08lx)\n", This, iface, hwnd, lMsg, lInstanceData);
@ -4962,9 +4953,9 @@ static HRESULT WINAPI MediaEvent_SetNotifyWindow(IMediaEventEx *iface,
return S_OK; return S_OK;
} }
static HRESULT WINAPI MediaEvent_SetNotifyFlags(IMediaEventEx *iface, static HRESULT WINAPI MediaEvent_SetNotifyFlags(IMediaEventEx *iface, LONG lNoNotifyFlags)
LONG lNoNotifyFlags) { {
ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface); IFilterGraphImpl *This = impl_from_IMediaEventEx(iface);
TRACE("(%p/%p)->(%d)\n", This, iface, lNoNotifyFlags); TRACE("(%p/%p)->(%d)\n", This, iface, lNoNotifyFlags);
@ -4976,9 +4967,9 @@ static HRESULT WINAPI MediaEvent_SetNotifyFlags(IMediaEventEx *iface,
return S_OK; return S_OK;
} }
static HRESULT WINAPI MediaEvent_GetNotifyFlags(IMediaEventEx *iface, static HRESULT WINAPI MediaEvent_GetNotifyFlags(IMediaEventEx *iface, LONG *lplNoNotifyFlags)
LONG *lplNoNotifyFlags) { {
ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface); IFilterGraphImpl *This = impl_from_IMediaEventEx(iface);
TRACE("(%p/%p)->(%p)\n", This, iface, lplNoNotifyFlags); TRACE("(%p/%p)->(%p)\n", This, iface, lplNoNotifyFlags);
@ -5458,7 +5449,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj)
fimpl->IBasicAudio_iface.lpVtbl = &IBasicAudio_VTable; fimpl->IBasicAudio_iface.lpVtbl = &IBasicAudio_VTable;
fimpl->IBasicVideo2_iface.lpVtbl = &IBasicVideo_VTable; fimpl->IBasicVideo2_iface.lpVtbl = &IBasicVideo_VTable;
fimpl->IVideoWindow_iface.lpVtbl = &IVideoWindow_VTable; fimpl->IVideoWindow_iface.lpVtbl = &IVideoWindow_VTable;
fimpl->IMediaEventEx_vtbl = &IMediaEventEx_VTable; fimpl->IMediaEventEx_iface.lpVtbl = &IMediaEventEx_VTable;
fimpl->IMediaFilter_vtbl = &IMediaFilter_VTable; fimpl->IMediaFilter_vtbl = &IMediaFilter_VTable;
fimpl->IMediaEventSink_vtbl = &IMediaEventSink_VTable; fimpl->IMediaEventSink_vtbl = &IMediaEventSink_VTable;
fimpl->IGraphConfig_vtbl = &IGraphConfig_VTable; fimpl->IGraphConfig_vtbl = &IGraphConfig_VTable;