wine-commits July 2011

wine-commits@winehq.org

2 participants
838 discussions

Michael Stefaniuc : quartz: COM cleanup for the IMediaFilter iface.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: e97b34b26e0f3d71f002b643665ef13e039d3e34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e97b34b26e0f3d71f002b6436… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 00:49:40 2011 +0200 quartz: COM cleanup for the IMediaFilter iface. --- dlls/quartz/filtergraph.c | 43 +++++++++++++++++++++++++++---------------- 1 files changed, 27 insertions(+), 16 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 9429495..e2ce0eb 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -159,7 +159,7 @@ typedef struct _IFilterGraphImpl { IBasicVideo2 IBasicVideo2_iface; IVideoWindow IVideoWindow_iface; IMediaEventEx IMediaEventEx_iface; - const IMediaFilterVtbl *IMediaFilter_vtbl; + IMediaFilter IMediaFilter_iface; const IMediaEventSinkVtbl *IMediaEventSink_vtbl; const IGraphConfigVtbl *IGraphConfig_vtbl; const IMediaPositionVtbl *IMediaPosition_vtbl; @@ -253,7 +253,7 @@ static HRESULT WINAPI FilterGraphInner_QueryInterface(IUnknown * iface, TRACE(" returning IMediaEvent(Ex) interface (%p)\n", *ppvObj); } else if (IsEqualGUID(&IID_IMediaFilter, riid) || IsEqualGUID(&IID_IPersist, riid)) { - *ppvObj = &(This->IMediaFilter_vtbl); + *ppvObj = &This->IMediaFilter_iface; TRACE(" returning IMediaFilter interface (%p)\n", *ppvObj); } else if (IsEqualGUID(&IID_IMediaEventSink, riid)) { *ppvObj = &(This->IMediaEventSink_vtbl); @@ -492,7 +492,7 @@ static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, IBaseFilte if (This->defaultclock && This->refClockProvider == pFilter) { - IMediaFilter_SetSyncSource((IMediaFilter*)&This->IMediaFilter_vtbl, NULL); + IMediaFilter_SetSyncSource(&This->IMediaFilter_iface, NULL); This->defaultclock = 1; } @@ -801,7 +801,7 @@ static HRESULT WINAPI FilterGraph2_SetDefaultSyncSource(IFilterGraph2 *iface) if (SUCCEEDED(hr)) { - hr = IMediaFilter_SetSyncSource((IMediaFilter*)&(This->IMediaFilter_vtbl), pClock); + hr = IMediaFilter_SetSyncSource(&This->IMediaFilter_iface, pClock); This->defaultclock = TRUE; IReferenceClock_Release(pClock); } @@ -5003,23 +5003,28 @@ static const IMediaEventExVtbl IMediaEventEx_VTable = }; -static HRESULT WINAPI MediaFilter_QueryInterface(IMediaFilter *iface, REFIID riid, LPVOID *ppv) +static inline IFilterGraphImpl *impl_from_IMediaFilter(IMediaFilter *iface) { - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaFilter_vtbl, iface); + return CONTAINING_RECORD(iface, IFilterGraphImpl, IMediaFilter_iface); +} + +static HRESULT WINAPI MediaFilter_QueryInterface(IMediaFilter *iface, REFIID riid, void **ppv) +{ + IFilterGraphImpl *This = impl_from_IMediaFilter(iface); return Filtergraph_QueryInterface(This, riid, ppv); } static ULONG WINAPI MediaFilter_AddRef(IMediaFilter *iface) { - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaFilter_vtbl, iface); + IFilterGraphImpl *This = impl_from_IMediaFilter(iface); return Filtergraph_AddRef(This); } static ULONG WINAPI MediaFilter_Release(IMediaFilter *iface) { - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaFilter_vtbl, iface); + IFilterGraphImpl *This = impl_from_IMediaFilter(iface); return Filtergraph_Release(This); } @@ -5033,34 +5038,40 @@ static HRESULT WINAPI MediaFilter_GetClassID(IMediaFilter *iface, CLSID * pClass static HRESULT WINAPI MediaFilter_Stop(IMediaFilter *iface) { - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaFilter_vtbl, iface); + IFilterGraphImpl *This = impl_from_IMediaFilter(iface); + return MediaControl_Stop(&This->IMediaControl_iface); } static HRESULT WINAPI MediaFilter_Pause(IMediaFilter *iface) { - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaFilter_vtbl, iface); + IFilterGraphImpl *This = impl_from_IMediaFilter(iface); + return MediaControl_Pause(&This->IMediaControl_iface); } static HRESULT WINAPI MediaFilter_Run(IMediaFilter *iface, REFERENCE_TIME tStart) { - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaFilter_vtbl, iface); + IFilterGraphImpl *This = impl_from_IMediaFilter(iface); + if (tStart) FIXME("Run called with non-null tStart: %x%08x\n", (int)(tStart>>32), (int)tStart); + return MediaControl_Run(&This->IMediaControl_iface); } -static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD dwMsTimeout, FILTER_STATE * pState) +static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD dwMsTimeout, + FILTER_STATE *pState) { - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaFilter_vtbl, iface); + IFilterGraphImpl *This = impl_from_IMediaFilter(iface); + return MediaControl_GetState(&This->IMediaControl_iface, dwMsTimeout, (OAFilterState*)pState); } static HRESULT WINAPI MediaFilter_SetSyncSource(IMediaFilter *iface, IReferenceClock *pClock) { - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaFilter_vtbl, iface); + IFilterGraphImpl *This = impl_from_IMediaFilter(iface); HRESULT hr = S_OK; int i; @@ -5110,7 +5121,7 @@ static HRESULT WINAPI MediaFilter_SetSyncSource(IMediaFilter *iface, IReferenceC static HRESULT WINAPI MediaFilter_GetSyncSource(IMediaFilter *iface, IReferenceClock **ppClock) { - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaFilter_vtbl, iface); + IFilterGraphImpl *This = impl_from_IMediaFilter(iface); TRACE("(%p/%p)->(%p)\n", iface, This, ppClock); @@ -5450,7 +5461,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) fimpl->IBasicVideo2_iface.lpVtbl = &IBasicVideo_VTable; fimpl->IVideoWindow_iface.lpVtbl = &IVideoWindow_VTable; fimpl->IMediaEventEx_iface.lpVtbl = &IMediaEventEx_VTable; - fimpl->IMediaFilter_vtbl = &IMediaFilter_VTable; + fimpl->IMediaFilter_iface.lpVtbl = &IMediaFilter_VTable; fimpl->IMediaEventSink_vtbl = &IMediaEventSink_VTable; fimpl->IGraphConfig_vtbl = &IGraphConfig_VTable; fimpl->IMediaPosition_vtbl = &IMediaPosition_VTable;

1 0

Michael Stefaniuc : quartz: COM cleanup for the IMediaEventEx iface.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: eca149bb4ba1e5eec89414260d303027e556b70d URL: http://source.winehq.org/git/wine.git/?a=commit;h=eca149bb4ba1e5eec89414260… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 00:47:38 2011 +0200 quartz: COM cleanup for the IMediaEventEx iface. --- dlls/quartz/filtergraph.c | 135 +++++++++++++++++++++------------------------ 1 files changed, 63 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eca149bb4ba1e5eec8941…

1 0

Michael Stefaniuc : quartz: COM cleanup for the IVideoWindow iface.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: 6d929c71b68c1f442a993ec30d17fc2358c87e3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d929c71b68c1f442a993ec30… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 00:45:48 2011 +0200 quartz: COM cleanup for the IVideoWindow iface. --- dlls/quartz/filtergraph.c | 408 ++++++++++++++++++++++----------------------- 1 files changed, 198 insertions(+), 210 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d929c71b68c1f442a993…

1 0

Michael Stefaniuc : quartz: COM cleanup for the IBasicVideo2 iface.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: a37208ba96855340fbfca0400127e36cc94725b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a37208ba96855340fbfca0400… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 00:44:08 2011 +0200 quartz: COM cleanup for the IBasicVideo2 iface. --- dlls/quartz/filtergraph.c | 358 ++++++++++++++++++++++----------------------- 1 files changed, 175 insertions(+), 183 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a37208ba96855340fbfca…

1 0

Michael Stefaniuc : quartz: COM cleanup for the IBasicAudio iface.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: 8d52dffc6d8306460a1cdd4930d0d8ecfdb78c06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d52dffc6d8306460a1cdd493… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 00:41:55 2011 +0200 quartz: COM cleanup for the IBasicAudio iface. --- dlls/quartz/filtergraph.c | 94 +++++++++++++++++++++----------------------- 1 files changed, 45 insertions(+), 49 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 39026e1..42cafa4 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -155,7 +155,7 @@ typedef struct _IFilterGraphImpl { IFilterGraph2 IFilterGraph2_iface; IMediaControl IMediaControl_iface; IMediaSeeking IMediaSeeking_iface; - const IBasicAudioVtbl *IBasicAudio_vtbl; + IBasicAudio IBasicAudio_iface; const IBasicVideo2Vtbl *IBasicVideo_vtbl; const IVideoWindowVtbl *IVideoWindow_vtbl; const IMediaEventExVtbl *IMediaEventEx_vtbl; @@ -238,7 +238,7 @@ static HRESULT WINAPI FilterGraphInner_QueryInterface(IUnknown * iface, *ppvObj = &This->IMediaSeeking_iface; TRACE(" returning IMediaSeeking interface (%p)\n", *ppvObj); } else if (IsEqualGUID(&IID_IBasicAudio, riid)) { - *ppvObj = &(This->IBasicAudio_vtbl); + *ppvObj = &This->IBasicAudio_iface; TRACE(" returning IBasicAudio interface (%p)\n", *ppvObj); } else if (IsEqualGUID(&IID_IBasicVideo, riid) || IsEqualGUID(&IID_IBasicVideo2, riid)) { @@ -2767,27 +2767,32 @@ static HRESULT GetTargetInterface(IFilterGraphImpl* pGraph, REFIID riid, LPVOID* return hr; } -/*** IUnknown methods ***/ -static HRESULT WINAPI BasicAudio_QueryInterface(IBasicAudio *iface, - REFIID riid, - LPVOID*ppvObj) { - ICOM_THIS_MULTI(IFilterGraphImpl, IBasicAudio_vtbl, iface); +static inline IFilterGraphImpl *impl_from_IBasicAudio(IBasicAudio *iface) +{ + return CONTAINING_RECORD(iface, IFilterGraphImpl, IBasicAudio_iface); +} + +static HRESULT WINAPI BasicAudio_QueryInterface(IBasicAudio *iface, REFIID riid, void **ppvObj) +{ + IFilterGraphImpl *This = impl_from_IBasicAudio(iface); TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid), riid, ppvObj); return Filtergraph_QueryInterface(This, riid, ppvObj); } -static ULONG WINAPI BasicAudio_AddRef(IBasicAudio *iface) { - ICOM_THIS_MULTI(IFilterGraphImpl, IBasicAudio_vtbl, iface); +static ULONG WINAPI BasicAudio_AddRef(IBasicAudio *iface) +{ + IFilterGraphImpl *This = impl_from_IBasicAudio(iface); TRACE("(%p/%p)->()\n", This, iface); return Filtergraph_AddRef(This); } -static ULONG WINAPI BasicAudio_Release(IBasicAudio *iface) { - ICOM_THIS_MULTI(IFilterGraphImpl, IBasicAudio_vtbl, iface); +static ULONG WINAPI BasicAudio_Release(IBasicAudio *iface) +{ + IFilterGraphImpl *This = impl_from_IBasicAudio(iface); TRACE("(%p/%p)->()\n", This, iface); @@ -2795,9 +2800,9 @@ static ULONG WINAPI BasicAudio_Release(IBasicAudio *iface) { } /*** IDispatch methods ***/ -static HRESULT WINAPI BasicAudio_GetTypeInfoCount(IBasicAudio *iface, - UINT*pctinfo) { - ICOM_THIS_MULTI(IFilterGraphImpl, IBasicAudio_vtbl, iface); +static HRESULT WINAPI BasicAudio_GetTypeInfoCount(IBasicAudio *iface, UINT *pctinfo) +{ + IFilterGraphImpl *This = impl_from_IBasicAudio(iface); IBasicAudio* pBasicAudio; HRESULT hr; @@ -2815,11 +2820,10 @@ static HRESULT WINAPI BasicAudio_GetTypeInfoCount(IBasicAudio *iface, return hr; } -static HRESULT WINAPI BasicAudio_GetTypeInfo(IBasicAudio *iface, - UINT iTInfo, - LCID lcid, - ITypeInfo**ppTInfo) { - ICOM_THIS_MULTI(IFilterGraphImpl, IBasicAudio_vtbl, iface); +static HRESULT WINAPI BasicAudio_GetTypeInfo(IBasicAudio *iface, UINT iTInfo, LCID lcid, + ITypeInfo **ppTInfo) +{ + IFilterGraphImpl *This = impl_from_IBasicAudio(iface); IBasicAudio* pBasicAudio; HRESULT hr; @@ -2837,13 +2841,10 @@ static HRESULT WINAPI BasicAudio_GetTypeInfo(IBasicAudio *iface, return hr; } -static HRESULT WINAPI BasicAudio_GetIDsOfNames(IBasicAudio *iface, - REFIID riid, - LPOLESTR*rgszNames, - UINT cNames, - LCID lcid, - DISPID*rgDispId) { - ICOM_THIS_MULTI(IFilterGraphImpl, IBasicAudio_vtbl, iface); +static HRESULT WINAPI BasicAudio_GetIDsOfNames(IBasicAudio *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + IFilterGraphImpl *This = impl_from_IBasicAudio(iface); IBasicAudio* pBasicAudio; HRESULT hr; @@ -2861,16 +2862,11 @@ static HRESULT WINAPI BasicAudio_GetIDsOfNames(IBasicAudio *iface, 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) { - ICOM_THIS_MULTI(IFilterGraphImpl, IBasicAudio_vtbl, iface); +static HRESULT WINAPI BasicAudio_Invoke(IBasicAudio *iface, DISPID dispIdMember, REFIID riid, + LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo, + UINT *puArgErr) +{ + IFilterGraphImpl *This = impl_from_IBasicAudio(iface); IBasicAudio* pBasicAudio; HRESULT hr; @@ -2889,9 +2885,9 @@ static HRESULT WINAPI BasicAudio_Invoke(IBasicAudio *iface, } /*** IBasicAudio methods ***/ -static HRESULT WINAPI BasicAudio_put_Volume(IBasicAudio *iface, - LONG lVolume) { - ICOM_THIS_MULTI(IFilterGraphImpl, IBasicAudio_vtbl, iface); +static HRESULT WINAPI BasicAudio_put_Volume(IBasicAudio *iface, LONG lVolume) +{ + IFilterGraphImpl *This = impl_from_IBasicAudio(iface); IBasicAudio* pBasicAudio; HRESULT hr; @@ -2909,9 +2905,9 @@ static HRESULT WINAPI BasicAudio_put_Volume(IBasicAudio *iface, return hr; } -static HRESULT WINAPI BasicAudio_get_Volume(IBasicAudio *iface, - LONG *plVolume) { - ICOM_THIS_MULTI(IFilterGraphImpl, IBasicAudio_vtbl, iface); +static HRESULT WINAPI BasicAudio_get_Volume(IBasicAudio *iface, LONG *plVolume) +{ + IFilterGraphImpl *This = impl_from_IBasicAudio(iface); IBasicAudio* pBasicAudio; HRESULT hr; @@ -2929,9 +2925,9 @@ static HRESULT WINAPI BasicAudio_get_Volume(IBasicAudio *iface, return hr; } -static HRESULT WINAPI BasicAudio_put_Balance(IBasicAudio *iface, - LONG lBalance) { - ICOM_THIS_MULTI(IFilterGraphImpl, IBasicAudio_vtbl, iface); +static HRESULT WINAPI BasicAudio_put_Balance(IBasicAudio *iface, LONG lBalance) +{ + IFilterGraphImpl *This = impl_from_IBasicAudio(iface); IBasicAudio* pBasicAudio; HRESULT hr; @@ -2949,9 +2945,9 @@ static HRESULT WINAPI BasicAudio_put_Balance(IBasicAudio *iface, return hr; } -static HRESULT WINAPI BasicAudio_get_Balance(IBasicAudio *iface, - LONG *plBalance) { - ICOM_THIS_MULTI(IFilterGraphImpl, IBasicAudio_vtbl, iface); +static HRESULT WINAPI BasicAudio_get_Balance(IBasicAudio *iface, LONG *plBalance) +{ + IFilterGraphImpl *This = impl_from_IBasicAudio(iface); IBasicAudio* pBasicAudio; HRESULT hr; @@ -5479,7 +5475,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) fimpl->IFilterGraph2_iface.lpVtbl = &IFilterGraph2_VTable; fimpl->IMediaControl_iface.lpVtbl = &IMediaControl_VTable; fimpl->IMediaSeeking_iface.lpVtbl = &IMediaSeeking_VTable; - fimpl->IBasicAudio_vtbl = &IBasicAudio_VTable; + fimpl->IBasicAudio_iface.lpVtbl = &IBasicAudio_VTable; fimpl->IBasicVideo_vtbl = &IBasicVideo_VTable; fimpl->IVideoWindow_vtbl = &IVideoWindow_VTable; fimpl->IMediaEventEx_vtbl = &IMediaEventEx_VTable;

1 0

Michael Stefaniuc : quartz: COM cleanup for the IMediaSeeking iface.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: deb489c2d21688e243f7035b86d5c8a395239123 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deb489c2d21688e243f7035b8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 00:34:00 2011 +0200 quartz: COM cleanup for the IMediaSeeking iface. --- dlls/quartz/filtergraph.c | 164 ++++++++++++++++++++++---------------------- 1 files changed, 82 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=deb489c2d21688e243f70…

1 0

Michael Stefaniuc : quartz: COM cleanup for the IMediaControl iface.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: 6c3e62fdaf3d15956187633034ff1f8a6d72507d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c3e62fdaf3d1595618763303… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 00:33:21 2011 +0200 quartz: COM cleanup for the IMediaControl iface. --- dlls/quartz/filtergraph.c | 141 +++++++++++++++++++++++---------------------- 1 files changed, 72 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c3e62fdaf3d159561876…

1 0

Michael Stefaniuc : quartz: Pass the object instead of the iface to an internal helper.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: 2d589407b3cf8fdc2ea41feaf4f98e37217a09f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d589407b3cf8fdc2ea41feaf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 00:32:32 2011 +0200 quartz: Pass the object instead of the iface to an internal helper. --- dlls/quartz/filtergraph.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index b1b50cc..20c0d78 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1903,9 +1903,8 @@ static HRESULT WINAPI SendGetState(IBaseFilter *pFilter, DWORD_PTR data) } -static HRESULT SendFilterMessage(IMediaControl *iface, fnFoundFilter FoundFilter, DWORD_PTR data) +static HRESULT SendFilterMessage(IFilterGraphImpl *This, fnFoundFilter FoundFilter, DWORD_PTR data) { - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaControl_vtbl, iface); int i; IBaseFilter* pfilter; IEnumPins* pEnum; @@ -1913,7 +1912,8 @@ static HRESULT SendFilterMessage(IMediaControl *iface, fnFoundFilter FoundFilter IPin* pPin; DWORD dummy; PIN_DIRECTION dir; - TRACE("(%p/%p)->()\n", This, iface); + + TRACE("(%p)->()\n", This); /* Explorer the graph from source filters to renderers, determine renderers * number and run filters from renderers to source filters */ @@ -1985,7 +1985,7 @@ static HRESULT WINAPI MediaControl_Run(IMediaControl *iface) { } else This->start_time = 0; - SendFilterMessage(iface, SendRun, (DWORD_PTR)&This->start_time); + SendFilterMessage(This, SendRun, (DWORD_PTR)&This->start_time); This->state = State_Running; out: LeaveCriticalSection(&This->cs); @@ -2005,7 +2005,7 @@ static HRESULT WINAPI MediaControl_Pause(IMediaControl *iface) { else This->pause_time = -1; - SendFilterMessage(iface, SendPause, 0); + SendFilterMessage(This, SendPause, 0); This->state = State_Paused; out: LeaveCriticalSection(&This->cs); @@ -2019,8 +2019,8 @@ static HRESULT WINAPI MediaControl_Stop(IMediaControl *iface) { if (This->state == State_Stopped) return S_OK; EnterCriticalSection(&This->cs); - if (This->state == State_Running) SendFilterMessage(iface, SendPause, 0); - SendFilterMessage(iface, SendStop, 0); + if (This->state == State_Running) SendFilterMessage(This, SendPause, 0); + SendFilterMessage(This, SendStop, 0); This->state = State_Stopped; LeaveCriticalSection(&This->cs); return S_OK; @@ -2053,7 +2053,7 @@ static HRESULT WINAPI MediaControl_GetState(IMediaControl *iface, end = 0; } if (end) - SendFilterMessage(iface, SendGetState, end); + SendFilterMessage(This, SendGetState, end); LeaveCriticalSection(&This->cs);

1 0

Michael Stefaniuc : quartz: COM cleanup for the IFilterGraph2 iface.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: f888eb9135ed6d016cdfdf96b67d26a88d7faa2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f888eb9135ed6d016cdfdf96b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 00:30:45 2011 +0200 quartz: COM cleanup for the IFilterGraph2 iface. --- dlls/quartz/filtergraph.c | 147 +++++++++++++++++++++++---------------------- 1 files changed, 74 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f888eb9135ed6d016cdfd…

1 0

Henri Verbeet : wined3d: Make the surface parameter to context_surface_update() const.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: c20b23eb003ad14ac84530e5228e9d4b04e926b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c20b23eb003ad14ac84530e52… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 29 23:14:15 2011 +0200 wined3d: Make the surface parameter to context_surface_update() const. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 0391672..ed80b78 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -641,7 +641,7 @@ void context_resource_unloaded(const struct wined3d_device *device, } } -void context_surface_update(struct wined3d_context *context, struct wined3d_surface *surface) +void context_surface_update(struct wined3d_context *context, const struct wined3d_surface *surface) { const struct wined3d_gl_info *gl_info = context->gl_info; struct fbo_entry *entry = context->current_fbo; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4420e13..e8fddb7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1243,7 +1243,7 @@ void context_resource_unloaded(const struct wined3d_device *device, BOOL context_set_current(struct wined3d_context *ctx) DECLSPEC_HIDDEN; void context_set_draw_buffer(struct wined3d_context *context, GLenum buffer) DECLSPEC_HIDDEN; void context_set_tls_idx(DWORD idx) DECLSPEC_HIDDEN; -void context_surface_update(struct wined3d_context *context, struct wined3d_surface *surface) DECLSPEC_HIDDEN; +void context_surface_update(struct wined3d_context *context, const struct wined3d_surface *surface) DECLSPEC_HIDDEN; /* Macros for doing basic GPU detection based on opengl capabilities */ #define WINE_D3D6_CAPABLE(gl_info) (gl_info->supported[ARB_MULTITEXTURE])

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2011