Skip to content

W
wine-cw
Commit 11af7a02 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard
Browse files
Options

quartz/filtergraph: Get rid of tracing for outer IUnknown methods.

Signed-off-by: 's avatarZebediah Figura <z.figura12@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 06674113
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 144 deletions
dlls/quartz/filtergraph.c
View file @ 11af7a02
...@@ -530,31 +530,22 @@ static inline IFilterGraphImpl *impl_from_IFilterGraph2(IFilterGraph2 *iface) ...@@ -530,31 +530,22 @@ static inline IFilterGraphImpl *impl_from_IFilterGraph2(IFilterGraph2 *iface)
return CONTAINING_RECORD(iface, IFilterGraphImpl, IFilterGraph2_iface); return CONTAINING_RECORD(iface, IFilterGraphImpl, IFilterGraph2_iface);
} }
static HRESULT WINAPI FilterGraph2_QueryInterface(IFilterGraph2 *iface, REFIID riid, void **ppvObj) static HRESULT WINAPI FilterGraph2_QueryInterface(IFilterGraph2 *iface, REFIID iid, void **out)
{ {
IFilterGraphImpl *This = impl_from_IFilterGraph2(iface); IFilterGraphImpl *graph = impl_from_IFilterGraph2(iface);
return IUnknown_QueryInterface(graph->outer_unk, iid, out);
TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj);
return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj);
} }
static ULONG WINAPI FilterGraph2_AddRef(IFilterGraph2 *iface) static ULONG WINAPI FilterGraph2_AddRef(IFilterGraph2 *iface)
{ {
IFilterGraphImpl *This = impl_from_IFilterGraph2(iface); IFilterGraphImpl *graph = impl_from_IFilterGraph2(iface);
return IUnknown_AddRef(graph->outer_unk);
TRACE("(%p/%p)->()\n", This, iface);
return IUnknown_AddRef(This->outer_unk);
} }
static ULONG WINAPI FilterGraph2_Release(IFilterGraph2 *iface) static ULONG WINAPI FilterGraph2_Release(IFilterGraph2 *iface)
{ {
IFilterGraphImpl *This = impl_from_IFilterGraph2(iface); IFilterGraphImpl *graph = impl_from_IFilterGraph2(iface);
return IUnknown_Release(graph->outer_unk);
TRACE("(%p/%p)->()\n", This, iface);
return IUnknown_Release(This->outer_unk);
} }
static IBaseFilter *find_filter_by_name(IFilterGraphImpl *graph, const WCHAR *name) static IBaseFilter *find_filter_by_name(IFilterGraphImpl *graph, const WCHAR *name)
...@@ -2012,31 +2003,22 @@ static inline IFilterGraphImpl *impl_from_IMediaControl(IMediaControl *iface) ...@@ -2012,31 +2003,22 @@ static inline IFilterGraphImpl *impl_from_IMediaControl(IMediaControl *iface)
return CONTAINING_RECORD(iface, IFilterGraphImpl, IMediaControl_iface); return CONTAINING_RECORD(iface, IFilterGraphImpl, IMediaControl_iface);
} }
static HRESULT WINAPI MediaControl_QueryInterface(IMediaControl *iface, REFIID riid, void **ppvObj) static HRESULT WINAPI MediaControl_QueryInterface(IMediaControl *iface, REFIID iid, void **out)
{ {
IFilterGraphImpl *This = impl_from_IMediaControl(iface); IFilterGraphImpl *graph = impl_from_IMediaControl(iface);
return IUnknown_QueryInterface(graph->outer_unk, iid, out);
TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj);
return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj);
} }
static ULONG WINAPI MediaControl_AddRef(IMediaControl *iface) static ULONG WINAPI MediaControl_AddRef(IMediaControl *iface)
{ {
IFilterGraphImpl *This = impl_from_IMediaControl(iface); IFilterGraphImpl *graph = impl_from_IMediaControl(iface);
return IUnknown_AddRef(graph->outer_unk);
TRACE("(%p/%p)->()\n", This, iface);
return IUnknown_AddRef(This->outer_unk);
} }
static ULONG WINAPI MediaControl_Release(IMediaControl *iface) static ULONG WINAPI MediaControl_Release(IMediaControl *iface)
{ {
IFilterGraphImpl *This = impl_from_IMediaControl(iface); IFilterGraphImpl *graph = impl_from_IMediaControl(iface);
return IUnknown_Release(graph->outer_unk);
TRACE("(%p/%p)->()\n", This, iface);
return IUnknown_Release(This->outer_unk);
} }
...@@ -2185,31 +2167,22 @@ static inline IFilterGraphImpl *impl_from_IMediaSeeking(IMediaSeeking *iface) ...@@ -2185,31 +2167,22 @@ static inline IFilterGraphImpl *impl_from_IMediaSeeking(IMediaSeeking *iface)
return CONTAINING_RECORD(iface, IFilterGraphImpl, IMediaSeeking_iface); return CONTAINING_RECORD(iface, IFilterGraphImpl, IMediaSeeking_iface);
} }
static HRESULT WINAPI MediaSeeking_QueryInterface(IMediaSeeking *iface, REFIID riid, void **ppvObj) static HRESULT WINAPI MediaSeeking_QueryInterface(IMediaSeeking *iface, REFIID iid, void **out)
{ {
IFilterGraphImpl *This = impl_from_IMediaSeeking(iface); IFilterGraphImpl *graph = impl_from_IMediaSeeking(iface);
return IUnknown_QueryInterface(graph->outer_unk, iid, out);
TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj);
return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj);
} }
static ULONG WINAPI MediaSeeking_AddRef(IMediaSeeking *iface) static ULONG WINAPI MediaSeeking_AddRef(IMediaSeeking *iface)
{ {
IFilterGraphImpl *This = impl_from_IMediaSeeking(iface); IFilterGraphImpl *graph = impl_from_IMediaSeeking(iface);
return IUnknown_AddRef(graph->outer_unk);
TRACE("(%p/%p)->()\n", This, iface);
return IUnknown_AddRef(This->outer_unk);
} }
static ULONG WINAPI MediaSeeking_Release(IMediaSeeking *iface) static ULONG WINAPI MediaSeeking_Release(IMediaSeeking *iface)
{ {
IFilterGraphImpl *This = impl_from_IMediaSeeking(iface); IFilterGraphImpl *graph = impl_from_IMediaSeeking(iface);
return IUnknown_Release(graph->outer_unk);
TRACE("(%p/%p)->()\n", This, iface);
return IUnknown_Release(This->outer_unk);
} }
typedef HRESULT (WINAPI *fnFoundSeek)(IFilterGraphImpl *This, IMediaSeeking*, DWORD_PTR arg); typedef HRESULT (WINAPI *fnFoundSeek)(IFilterGraphImpl *This, IMediaSeeking*, DWORD_PTR arg);
...@@ -2659,31 +2632,22 @@ static inline IFilterGraphImpl *impl_from_IMediaPosition(IMediaPosition *iface) ...@@ -2659,31 +2632,22 @@ static inline IFilterGraphImpl *impl_from_IMediaPosition(IMediaPosition *iface)
} }
/*** IUnknown methods ***/ /*** IUnknown methods ***/
static HRESULT WINAPI MediaPosition_QueryInterface(IMediaPosition* iface, REFIID riid, void** ppvObj) static HRESULT WINAPI MediaPosition_QueryInterface(IMediaPosition *iface, REFIID iid, void **out)
{ {
IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); IFilterGraphImpl *graph = impl_from_IMediaPosition(iface);
return IUnknown_QueryInterface(graph->outer_unk, iid, out);
TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj);
return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj);
} }
static ULONG WINAPI MediaPosition_AddRef(IMediaPosition *iface) static ULONG WINAPI MediaPosition_AddRef(IMediaPosition *iface)
{ {
IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); IFilterGraphImpl *graph = impl_from_IMediaPosition(iface);
return IUnknown_AddRef(graph->outer_unk);
TRACE("(%p/%p)->()\n", This, iface);
return IUnknown_AddRef(This->outer_unk);
} }
static ULONG WINAPI MediaPosition_Release(IMediaPosition *iface) static ULONG WINAPI MediaPosition_Release(IMediaPosition *iface)
{ {
IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); IFilterGraphImpl *graph = impl_from_IMediaPosition(iface);
return IUnknown_Release(graph->outer_unk);
TRACE("(%p/%p)->()\n", This, iface);
return IUnknown_Release(This->outer_unk);
} }
/*** IDispatch methods ***/ /*** IDispatch methods ***/
...@@ -2871,31 +2835,22 @@ static inline IFilterGraphImpl *impl_from_IObjectWithSite(IObjectWithSite *iface ...@@ -2871,31 +2835,22 @@ static inline IFilterGraphImpl *impl_from_IObjectWithSite(IObjectWithSite *iface
} }
/*** IUnknown methods ***/ /*** IUnknown methods ***/
static HRESULT WINAPI ObjectWithSite_QueryInterface(IObjectWithSite* iface, REFIID riid, void** ppvObj) static HRESULT WINAPI ObjectWithSite_QueryInterface(IObjectWithSite *iface, REFIID iid, void **out)
{ {
IFilterGraphImpl *This = impl_from_IObjectWithSite( iface ); IFilterGraphImpl *graph = impl_from_IObjectWithSite(iface);
return IUnknown_QueryInterface(graph->outer_unk, iid, out);
TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj);
return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj);
} }
static ULONG WINAPI ObjectWithSite_AddRef(IObjectWithSite *iface) static ULONG WINAPI ObjectWithSite_AddRef(IObjectWithSite *iface)
{ {
IFilterGraphImpl *This = impl_from_IObjectWithSite( iface ); IFilterGraphImpl *graph = impl_from_IObjectWithSite(iface);
return IUnknown_AddRef(graph->outer_unk);
TRACE("(%p/%p)->()\n", This, iface);
return IUnknown_AddRef(This->outer_unk);
} }
static ULONG WINAPI ObjectWithSite_Release(IObjectWithSite *iface) static ULONG WINAPI ObjectWithSite_Release(IObjectWithSite *iface)
{ {
IFilterGraphImpl *This = impl_from_IObjectWithSite( iface ); IFilterGraphImpl *graph = impl_from_IObjectWithSite(iface);
return IUnknown_Release(graph->outer_unk);
TRACE("(%p/%p)->()\n", This, iface);
return IUnknown_Release(This->outer_unk);
} }
/*** IObjectWithSite methods ***/ /*** IObjectWithSite methods ***/
...@@ -2983,31 +2938,22 @@ static inline IFilterGraphImpl *impl_from_IBasicAudio(IBasicAudio *iface) ...@@ -2983,31 +2938,22 @@ static inline IFilterGraphImpl *impl_from_IBasicAudio(IBasicAudio *iface)
return CONTAINING_RECORD(iface, IFilterGraphImpl, IBasicAudio_iface); return CONTAINING_RECORD(iface, IFilterGraphImpl, IBasicAudio_iface);
} }
static HRESULT WINAPI BasicAudio_QueryInterface(IBasicAudio *iface, REFIID riid, void **ppvObj) static HRESULT WINAPI BasicAudio_QueryInterface(IBasicAudio *iface, REFIID iid, void **out)
{ {
IFilterGraphImpl *This = impl_from_IBasicAudio(iface); IFilterGraphImpl *graph = impl_from_IBasicAudio(iface);
return IUnknown_QueryInterface(graph->outer_unk, iid, out);
TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj);
return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj);
} }
static ULONG WINAPI BasicAudio_AddRef(IBasicAudio *iface) static ULONG WINAPI BasicAudio_AddRef(IBasicAudio *iface)
{ {
IFilterGraphImpl *This = impl_from_IBasicAudio(iface); IFilterGraphImpl *graph = impl_from_IBasicAudio(iface);
return IUnknown_AddRef(graph->outer_unk);
TRACE("(%p/%p)->()\n", This, iface);
return IUnknown_AddRef(This->outer_unk);
} }
static ULONG WINAPI BasicAudio_Release(IBasicAudio *iface) static ULONG WINAPI BasicAudio_Release(IBasicAudio *iface)
{ {
IFilterGraphImpl *This = impl_from_IBasicAudio(iface); IFilterGraphImpl *graph = impl_from_IBasicAudio(iface);
return IUnknown_Release(graph->outer_unk);
TRACE("(%p/%p)->()\n", This, iface);
return IUnknown_Release(This->outer_unk);
} }
static HRESULT WINAPI BasicAudio_GetTypeInfoCount(IBasicAudio *iface, UINT *count) static HRESULT WINAPI BasicAudio_GetTypeInfoCount(IBasicAudio *iface, UINT *count)
...@@ -3159,31 +3105,22 @@ static inline IFilterGraphImpl *impl_from_IBasicVideo2(IBasicVideo2 *iface) ...@@ -3159,31 +3105,22 @@ static inline IFilterGraphImpl *impl_from_IBasicVideo2(IBasicVideo2 *iface)
return CONTAINING_RECORD(iface, IFilterGraphImpl, IBasicVideo2_iface); return CONTAINING_RECORD(iface, IFilterGraphImpl, IBasicVideo2_iface);
} }
static HRESULT WINAPI BasicVideo_QueryInterface(IBasicVideo2 *iface, REFIID riid, void **ppvObj) static HRESULT WINAPI BasicVideo_QueryInterface(IBasicVideo2 *iface, REFIID iid, void **out)
{ {
IFilterGraphImpl *This = impl_from_IBasicVideo2(iface); IFilterGraphImpl *graph = impl_from_IBasicVideo2(iface);
return IUnknown_QueryInterface(graph->outer_unk, iid, out);
TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj);
return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj);
} }
static ULONG WINAPI BasicVideo_AddRef(IBasicVideo2 *iface) static ULONG WINAPI BasicVideo_AddRef(IBasicVideo2 *iface)
{ {
IFilterGraphImpl *This = impl_from_IBasicVideo2(iface); IFilterGraphImpl *graph = impl_from_IBasicVideo2(iface);
return IUnknown_AddRef(graph->outer_unk);
TRACE("(%p/%p)->()\n", This, iface);
return IUnknown_AddRef(This->outer_unk);
} }
static ULONG WINAPI BasicVideo_Release(IBasicVideo2 *iface) static ULONG WINAPI BasicVideo_Release(IBasicVideo2 *iface)
{ {
IFilterGraphImpl *This = impl_from_IBasicVideo2(iface); IFilterGraphImpl *graph = impl_from_IBasicVideo2(iface);
return IUnknown_Release(graph->outer_unk);
TRACE("(%p/%p)->()\n", This, iface);
return IUnknown_Release(This->outer_unk);
} }
static HRESULT WINAPI BasicVideo_GetTypeInfoCount(IBasicVideo2 *iface, UINT *count) static HRESULT WINAPI BasicVideo_GetTypeInfoCount(IBasicVideo2 *iface, UINT *count)
...@@ -3952,31 +3889,22 @@ static inline IFilterGraphImpl *impl_from_IVideoWindow(IVideoWindow *iface) ...@@ -3952,31 +3889,22 @@ static inline IFilterGraphImpl *impl_from_IVideoWindow(IVideoWindow *iface)
return CONTAINING_RECORD(iface, IFilterGraphImpl, IVideoWindow_iface); return CONTAINING_RECORD(iface, IFilterGraphImpl, IVideoWindow_iface);
} }
static HRESULT WINAPI VideoWindow_QueryInterface(IVideoWindow *iface, REFIID riid, void **ppvObj) static HRESULT WINAPI VideoWindow_QueryInterface(IVideoWindow *iface, REFIID iid, void **out)
{ {
IFilterGraphImpl *This = impl_from_IVideoWindow(iface); IFilterGraphImpl *graph = impl_from_IVideoWindow(iface);
return IUnknown_QueryInterface(graph->outer_unk, iid, out);
TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj);
return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj);
} }
static ULONG WINAPI VideoWindow_AddRef(IVideoWindow *iface) static ULONG WINAPI VideoWindow_AddRef(IVideoWindow *iface)
{ {
IFilterGraphImpl *This = impl_from_IVideoWindow(iface); IFilterGraphImpl *graph = impl_from_IVideoWindow(iface);
return IUnknown_AddRef(graph->outer_unk);
TRACE("(%p/%p)->()\n", This, iface);
return IUnknown_AddRef(This->outer_unk);
} }
static ULONG WINAPI VideoWindow_Release(IVideoWindow *iface) static ULONG WINAPI VideoWindow_Release(IVideoWindow *iface)
{ {
IFilterGraphImpl *This = impl_from_IVideoWindow(iface); IFilterGraphImpl *graph = impl_from_IVideoWindow(iface);
return IUnknown_Release(graph->outer_unk);
TRACE("(%p/%p)->()\n", This, iface);
return IUnknown_Release(This->outer_unk);
} }
HRESULT WINAPI VideoWindow_GetTypeInfoCount(IVideoWindow *iface, UINT *count) HRESULT WINAPI VideoWindow_GetTypeInfoCount(IVideoWindow *iface, UINT *count)
...@@ -4871,31 +4799,22 @@ static inline IFilterGraphImpl *impl_from_IMediaEventEx(IMediaEventEx *iface) ...@@ -4871,31 +4799,22 @@ static inline IFilterGraphImpl *impl_from_IMediaEventEx(IMediaEventEx *iface)
return CONTAINING_RECORD(iface, IFilterGraphImpl, IMediaEventEx_iface); return CONTAINING_RECORD(iface, IFilterGraphImpl, IMediaEventEx_iface);
} }
static HRESULT WINAPI MediaEvent_QueryInterface(IMediaEventEx *iface, REFIID riid, void **ppvObj) static HRESULT WINAPI MediaEvent_QueryInterface(IMediaEventEx *iface, REFIID iid, void **out)
{ {
IFilterGraphImpl *This = impl_from_IMediaEventEx(iface); IFilterGraphImpl *graph = impl_from_IMediaEventEx(iface);
return IUnknown_QueryInterface(graph->outer_unk, iid, out);
TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj);
return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj);
} }
static ULONG WINAPI MediaEvent_AddRef(IMediaEventEx *iface) static ULONG WINAPI MediaEvent_AddRef(IMediaEventEx *iface)
{ {
IFilterGraphImpl *This = impl_from_IMediaEventEx(iface); IFilterGraphImpl *graph = impl_from_IMediaEventEx(iface);
return IUnknown_AddRef(graph->outer_unk);
TRACE("(%p/%p)->()\n", This, iface);
return IUnknown_AddRef(This->outer_unk);
} }
static ULONG WINAPI MediaEvent_Release(IMediaEventEx *iface) static ULONG WINAPI MediaEvent_Release(IMediaEventEx *iface)
{ {
IFilterGraphImpl *This = impl_from_IMediaEventEx(iface); IFilterGraphImpl *graph = impl_from_IMediaEventEx(iface);
return IUnknown_Release(graph->outer_unk);
TRACE("(%p/%p)->()\n", This, iface);
return IUnknown_Release(This->outer_unk);
} }
/*** IDispatch methods ***/ /*** IDispatch methods ***/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment