July 2012 - Wine-commits - list.winehq.org

Bruno Jesus : po: Fix a sentence in pt_BR translation.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: dc59a05bee7e490ce12d8bf41ce57c18ea6c0c02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc59a05bee7e490ce12d8bf41… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Jul 1 18:50:57 2012 -0300 po: Fix a sentence in pt_BR translation. --- po/pt_BR.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 91e8c10..8990e86 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -10113,7 +10113,7 @@ msgid "" "Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" -"Número de Volume de Série é %1!04x!-%2!04x!\n" +"Número de Série do Volume é %1!04x!-%2!04x!\n" "\n" #: cmd.rc:345

1 0

Michael Stefaniuc : quartz: Handle wrong COM aggregation attempts in IClassFactory_CreateInstance.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: ec9951892bab811ac6a8cedda7f7a6bf05e20b5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec9951892bab811ac6a8cedda… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 2 00:54:55 2012 +0200 quartz: Handle wrong COM aggregation attempts in IClassFactory_CreateInstance. --- dlls/quartz/main.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index a75a794..edb9cbc 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -124,10 +124,13 @@ static HRESULT WINAPI DSCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter IClassFactoryImpl *This = (IClassFactoryImpl *)iface; HRESULT hres; LPUNKNOWN punk; - + TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); *ppobj = NULL; + if(pOuter && !IsEqualGUID(&IID_IUnknown, riid)) + return E_NOINTERFACE; + hres = This->pfnCreateInstance(pOuter, (LPVOID *) &punk); if (SUCCEEDED(hres)) { hres = IUnknown_QueryInterface(punk, riid, ppobj);

1 0

Michael Stefaniuc : quartz: Standardize COM aggregation for FilterGraph.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: 692814e1f22eb9f4f4c4ea494ed5fc7013716169 URL: http://source.winehq.org/git/wine.git/?a=commit;h=692814e1f22eb9f4f4c4ea494… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 2 00:56:13 2012 +0200 quartz: Standardize COM aggregation for FilterGraph. --- dlls/quartz/filtergraph.c | 199 +++++++++++++++++---------------------------- 1 files changed, 76 insertions(+), 123 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=692814e1f22eb9f4f4c4e…

1 0

Michael Stefaniuc : quartz: Standardize COM aggregation for FilterMapper.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: d2d3a9c462fa389fecc6950922dadfdc53abbf46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2d3a9c462fa389fecc695092… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 2 00:57:23 2012 +0200 quartz: Standardize COM aggregation for FilterMapper. --- dlls/quartz/filtermapper.c | 111 +++++++++++++++---------------------------- 1 files changed, 39 insertions(+), 72 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 11a0bd3..464caee 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -47,14 +47,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct FilterMapper3Impl { + IUnknown IUnknown_inner; IFilterMapper3 IFilterMapper3_iface; IFilterMapper IFilterMapper_iface; IAMFilterData IAMFilterData_iface; - const IUnknownVtbl *IInner_vtbl; - LONG refCount; - IUnknown * pUnkOuter; - BOOL bUnkOuterValid; - BOOL bAggregatable; + IUnknown *outer_unk; + LONG ref; } FilterMapper3Impl; static const IUnknownVtbl IInner_VTable; @@ -77,9 +75,9 @@ static inline FilterMapper3Impl *impl_from_IAMFilterData( IAMFilterData *iface ) return CONTAINING_RECORD(iface, FilterMapper3Impl, IAMFilterData_iface); } -static inline FilterMapper3Impl *impl_from_inner_IUnknown( IUnknown *iface ) +static inline FilterMapper3Impl *impl_from_IUnknown( IUnknown *iface ) { - return (FilterMapper3Impl *)((char*)iface - FIELD_OFFSET(FilterMapper3Impl, IInner_vtbl)); + return CONTAINING_RECORD(iface, FilterMapper3Impl, IUnknown_inner); } static const WCHAR wszClsidSlash[] = {'C','L','S','I','D','\\',0}; @@ -192,16 +190,18 @@ HRESULT FilterMapper2_create(IUnknown *pUnkOuter, LPVOID *ppObj) if (!pFM2impl) return E_OUTOFMEMORY; - pFM2impl->pUnkOuter = pUnkOuter; - pFM2impl->bUnkOuterValid = FALSE; - pFM2impl->bAggregatable = FALSE; - pFM2impl->IInner_vtbl = &IInner_VTable; + pFM2impl->IUnknown_inner.lpVtbl = &IInner_VTable; pFM2impl->IFilterMapper3_iface.lpVtbl = &fm3vtbl; pFM2impl->IFilterMapper_iface.lpVtbl = &fmvtbl; pFM2impl->IAMFilterData_iface.lpVtbl = &AMFilterDataVtbl; - pFM2impl->refCount = 1; + pFM2impl->ref = 1; - *ppObj = pFM2impl; + if (pUnkOuter) + pFM2impl->outer_unk = pUnkOuter; + else + pFM2impl->outer_unk = &pFM2impl->IUnknown_inner; + + *ppObj = &pFM2impl->IUnknown_inner; TRACE("-- created at %p\n", pFM2impl); @@ -226,21 +226,17 @@ HRESULT FilterMapper_create(IUnknown *pUnkOuter, LPVOID *ppObj) /*** IUnknown (inner) methods ***/ -static HRESULT WINAPI Inner_QueryInterface(IUnknown * iface, REFIID riid, LPVOID * ppv) +static HRESULT WINAPI Inner_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { - FilterMapper3Impl *This = impl_from_inner_IUnknown(iface); - TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); + FilterMapper3Impl *This = impl_from_IUnknown(iface); - if (This->bAggregatable) - This->bUnkOuterValid = TRUE; + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = &This->IInner_vtbl; - else if (IsEqualIID(riid, &IID_IFilterMapper2) || - IsEqualIID(riid, &IID_IFilterMapper3)) - *ppv = This; + *ppv = &This->IUnknown_inner; + else if (IsEqualIID(riid, &IID_IFilterMapper2) || IsEqualIID(riid, &IID_IFilterMapper3)) + *ppv = &This->IFilterMapper3_iface; else if (IsEqualIID(riid, &IID_IFilterMapper)) *ppv = &This->IFilterMapper_iface; else if (IsEqualIID(riid, &IID_IAMFilterData)) @@ -256,29 +252,27 @@ static HRESULT WINAPI Inner_QueryInterface(IUnknown * iface, REFIID riid, LPVOID return E_NOINTERFACE; } -static ULONG WINAPI Inner_AddRef(IUnknown * iface) +static ULONG WINAPI Inner_AddRef(IUnknown *iface) { - FilterMapper3Impl *This = impl_from_inner_IUnknown(iface); - ULONG refCount = InterlockedIncrement(&This->refCount); + FilterMapper3Impl *This = impl_from_IUnknown(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->() AddRef from %d\n", This, refCount - 1); + TRACE("(%p)->(): new ref = %d\n", This, ref); - return refCount; + return ref; } -static ULONG WINAPI Inner_Release(IUnknown * iface) +static ULONG WINAPI Inner_Release(IUnknown *iface) { - FilterMapper3Impl *This = impl_from_inner_IUnknown(iface); - ULONG refCount = InterlockedDecrement(&This->refCount); + FilterMapper3Impl *This = impl_from_IUnknown(iface); + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->() Release from %d\n", This, refCount + 1); + TRACE("(%p)->(): new ref = %d\n", This, ref); - if (refCount == 0) - { + if (ref == 0) CoTaskMemFree(This); - return 0; - } - return refCount; + + return ref; } static const IUnknownVtbl IInner_VTable = @@ -292,48 +286,21 @@ static HRESULT WINAPI FilterMapper3_QueryInterface(IFilterMapper3 * iface, REFII { FilterMapper3Impl *This = impl_from_IFilterMapper3(iface); - if (This->bAggregatable) - This->bUnkOuterValid = TRUE; - - if (This->pUnkOuter) - { - if (This->bAggregatable) - return IUnknown_QueryInterface(This->pUnkOuter, riid, ppv); - - if (IsEqualIID(riid, &IID_IUnknown)) - { - HRESULT hr; - - IUnknown_AddRef((IUnknown *)&(This->IInner_vtbl)); - hr = IUnknown_QueryInterface((IUnknown *)&(This->IInner_vtbl), riid, ppv); - IUnknown_Release((IUnknown *)&(This->IInner_vtbl)); - This->bAggregatable = TRUE; - return hr; - } - - *ppv = NULL; - return E_NOINTERFACE; - } - - return IUnknown_QueryInterface((IUnknown *)&(This->IInner_vtbl), riid, ppv); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } static ULONG WINAPI FilterMapper3_AddRef(IFilterMapper3 * iface) { FilterMapper3Impl *This = impl_from_IFilterMapper3(iface); - if (This->pUnkOuter && This->bUnkOuterValid) - return IUnknown_AddRef(This->pUnkOuter); - return IUnknown_AddRef((IUnknown *)&(This->IInner_vtbl)); + return IUnknown_AddRef(This->outer_unk); } static ULONG WINAPI FilterMapper3_Release(IFilterMapper3 * iface) { FilterMapper3Impl *This = impl_from_IFilterMapper3(iface); - if (This->pUnkOuter && This->bUnkOuterValid) - return IUnknown_Release(This->pUnkOuter); - return IUnknown_Release((IUnknown *)&(This->IInner_vtbl)); + return IUnknown_Release(This->outer_unk); } /*** IFilterMapper3 methods ***/ @@ -1206,14 +1173,14 @@ static ULONG WINAPI FilterMapper_AddRef(IFilterMapper * iface) { FilterMapper3Impl *This = impl_from_IFilterMapper(iface); - return FilterMapper3_AddRef(&This->IFilterMapper3_iface); + return IUnknown_AddRef(This->outer_unk); } static ULONG WINAPI FilterMapper_Release(IFilterMapper * iface) { FilterMapper3Impl *This = impl_from_IFilterMapper(iface); - return FilterMapper3_Release(&This->IFilterMapper3_iface); + return IUnknown_Release(This->outer_unk); } /*** IFilterMapper methods ***/ @@ -1708,21 +1675,21 @@ static HRESULT WINAPI AMFilterData_QueryInterface(IAMFilterData * iface, REFIID { FilterMapper3Impl *This = impl_from_IAMFilterData(iface); - return FilterMapper3_QueryInterface(&This->IFilterMapper3_iface, riid, ppv); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } static ULONG WINAPI AMFilterData_AddRef(IAMFilterData * iface) { FilterMapper3Impl *This = impl_from_IAMFilterData(iface); - return FilterMapper3_AddRef(&This->IFilterMapper3_iface); + return IUnknown_AddRef(This->outer_unk); } static ULONG WINAPI AMFilterData_Release(IAMFilterData * iface) { FilterMapper3Impl *This = impl_from_IAMFilterData(iface); - return FilterMapper3_Release(&This->IFilterMapper3_iface); + return IUnknown_Release(This->outer_unk); } /*** IAMFilterData methods ***/

1 0

Michael Stefaniuc : quartz: Move the FilterMapper_create to avoid forward declarations.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: 7fa17be7c5c8ea8b2f8ff0d7995e050d70209c3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fa17be7c5c8ea8b2f8ff0d79… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 2 00:58:29 2012 +0200 quartz: Move the FilterMapper_create to avoid forward declarations. --- dlls/quartz/filtermapper.c | 93 +++++++++++++++++++++----------------------- 1 files changed, 44 insertions(+), 49 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 464caee..51b5ed7 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -55,11 +55,6 @@ typedef struct FilterMapper3Impl LONG ref; } FilterMapper3Impl; -static const IUnknownVtbl IInner_VTable; -static const IFilterMapper3Vtbl fm3vtbl; -static const IFilterMapperVtbl fmvtbl; -static const IAMFilterDataVtbl AMFilterDataVtbl; - static inline FilterMapper3Impl *impl_from_IFilterMapper3( IFilterMapper3 *iface ) { return CONTAINING_RECORD(iface, FilterMapper3Impl, IFilterMapper3_iface); @@ -180,50 +175,6 @@ static void delete_vector(struct Vector * v) v->capacity = 0; } -HRESULT FilterMapper2_create(IUnknown *pUnkOuter, LPVOID *ppObj) -{ - FilterMapper3Impl * pFM2impl; - - TRACE("(%p, %p)\n", pUnkOuter, ppObj); - - pFM2impl = CoTaskMemAlloc(sizeof(*pFM2impl)); - if (!pFM2impl) - return E_OUTOFMEMORY; - - pFM2impl->IUnknown_inner.lpVtbl = &IInner_VTable; - pFM2impl->IFilterMapper3_iface.lpVtbl = &fm3vtbl; - pFM2impl->IFilterMapper_iface.lpVtbl = &fmvtbl; - pFM2impl->IAMFilterData_iface.lpVtbl = &AMFilterDataVtbl; - pFM2impl->ref = 1; - - if (pUnkOuter) - pFM2impl->outer_unk = pUnkOuter; - else - pFM2impl->outer_unk = &pFM2impl->IUnknown_inner; - - *ppObj = &pFM2impl->IUnknown_inner; - - TRACE("-- created at %p\n", pFM2impl); - - return S_OK; -} - -HRESULT FilterMapper_create(IUnknown *pUnkOuter, LPVOID *ppObj) -{ - FilterMapper3Impl *pFM2impl; - HRESULT hr; - - TRACE("(%p, %p)\n", pUnkOuter, ppObj); - - hr = FilterMapper2_create(pUnkOuter, (LPVOID*)&pFM2impl); - if (FAILED(hr)) - return hr; - - *ppObj = &pFM2impl->IFilterMapper_iface; - - return hr; -} - /*** IUnknown (inner) methods ***/ static HRESULT WINAPI Inner_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) @@ -1737,3 +1688,47 @@ static const IAMFilterDataVtbl AMFilterDataVtbl = { AMFilterData_ParseFilterData, AMFilterData_CreateFilterData }; + +HRESULT FilterMapper2_create(IUnknown *pUnkOuter, LPVOID *ppObj) +{ + FilterMapper3Impl * pFM2impl; + + TRACE("(%p, %p)\n", pUnkOuter, ppObj); + + pFM2impl = CoTaskMemAlloc(sizeof(*pFM2impl)); + if (!pFM2impl) + return E_OUTOFMEMORY; + + pFM2impl->IUnknown_inner.lpVtbl = &IInner_VTable; + pFM2impl->IFilterMapper3_iface.lpVtbl = &fm3vtbl; + pFM2impl->IFilterMapper_iface.lpVtbl = &fmvtbl; + pFM2impl->IAMFilterData_iface.lpVtbl = &AMFilterDataVtbl; + pFM2impl->ref = 1; + + if (pUnkOuter) + pFM2impl->outer_unk = pUnkOuter; + else + pFM2impl->outer_unk = &pFM2impl->IUnknown_inner; + + *ppObj = &pFM2impl->IUnknown_inner; + + TRACE("-- created at %p\n", pFM2impl); + + return S_OK; +} + +HRESULT FilterMapper_create(IUnknown *pUnkOuter, LPVOID *ppObj) +{ + FilterMapper3Impl *pFM2impl; + HRESULT hr; + + TRACE("(%p, %p)\n", pUnkOuter, ppObj); + + hr = FilterMapper2_create(pUnkOuter, (LPVOID*)&pFM2impl); + if (FAILED(hr)) + return hr; + + *ppObj = &pFM2impl->IFilterMapper_iface; + + return hr; +}

1 0

Michael Stefaniuc : quartz: COM cleanup for IAMFilterMiscFlags in NullRenderer.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: 3501cb7b12c7ac6fb5dbe3abba87aec3c4183810 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3501cb7b12c7ac6fb5dbe3abb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 2 01:00:40 2012 +0200 quartz: COM cleanup for IAMFilterMiscFlags in NullRenderer. --- dlls/quartz/nullrenderer.c | 30 ++++++++++++++++++------------ 1 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index 5d2680f..d3b04ce 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -50,7 +50,7 @@ typedef struct NullRendererImpl BaseRenderer renderer; const IUnknownVtbl * IInner_vtbl; - const IAMFilterMiscFlagsVtbl *IAMFilterMiscFlags_vtbl; + IAMFilterMiscFlags IAMFilterMiscFlags_iface; IUnknown * pUnkOuter; BOOL bUnkOuterValid; @@ -104,7 +104,7 @@ HRESULT NullRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) pNullRenderer->bUnkOuterValid = FALSE; pNullRenderer->bAggregatable = FALSE; pNullRenderer->IInner_vtbl = &IInner_VTable; - pNullRenderer->IAMFilterMiscFlags_vtbl = &IAMFilterMiscFlags_Vtbl; + pNullRenderer->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl; hr = BaseRenderer_Init(&pNullRenderer->renderer, &NullRenderer_Vtbl, pUnkOuter, &CLSID_NullRenderer, (DWORD_PTR)(__FILE__ ": NullRendererImpl.csFilter"), &RendererFuncTable); @@ -132,7 +132,7 @@ static HRESULT WINAPI NullRendererInner_QueryInterface(IUnknown * iface, REFIID if (IsEqualIID(riid, &IID_IUnknown)) *ppv = &This->IInner_vtbl; else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags)) - *ppv = &This->IAMFilterMiscFlags_vtbl; + *ppv = &This->IAMFilterMiscFlags_iface; else { HRESULT hr; @@ -248,26 +248,32 @@ static const IBaseFilterVtbl NullRenderer_Vtbl = BaseFilterImpl_QueryVendorInfo }; -static NullRendererImpl *from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface) { - return (NullRendererImpl*)((char*)iface - offsetof(NullRendererImpl, IAMFilterMiscFlags_vtbl)); +static NullRendererImpl *impl_from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface) +{ + return CONTAINING_RECORD(iface, NullRendererImpl, IAMFilterMiscFlags_iface); } -static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, REFIID riid, void **ppv) { - NullRendererImpl *This = from_IAMFilterMiscFlags(iface); +static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, REFIID riid, + void **ppv) +{ + NullRendererImpl *This = impl_from_IAMFilterMiscFlags(iface); return IUnknown_QueryInterface((IUnknown*)This, riid, ppv); } -static ULONG WINAPI AMFilterMiscFlags_AddRef(IAMFilterMiscFlags *iface) { - NullRendererImpl *This = from_IAMFilterMiscFlags(iface); +static ULONG WINAPI AMFilterMiscFlags_AddRef(IAMFilterMiscFlags *iface) +{ + NullRendererImpl *This = impl_from_IAMFilterMiscFlags(iface); return IUnknown_AddRef((IUnknown*)This); } -static ULONG WINAPI AMFilterMiscFlags_Release(IAMFilterMiscFlags *iface) { - NullRendererImpl *This = from_IAMFilterMiscFlags(iface); +static ULONG WINAPI AMFilterMiscFlags_Release(IAMFilterMiscFlags *iface) +{ + NullRendererImpl *This = impl_from_IAMFilterMiscFlags(iface); return IUnknown_Release((IUnknown*)This); } -static ULONG WINAPI AMFilterMiscFlags_GetMiscFlags(IAMFilterMiscFlags *iface) { +static ULONG WINAPI AMFilterMiscFlags_GetMiscFlags(IAMFilterMiscFlags *iface) +{ return AM_FILTER_MISC_FLAGS_IS_RENDERER; }

1 0

Michael Stefaniuc : quartz: Standardize COM aggregation for NullRenderer.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: ad75caa4838c792ce3d51e2db2d4afb94389d20b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad75caa4838c792ce3d51e2db… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 2 01:01:26 2012 +0200 quartz: Standardize COM aggregation for NullRenderer. --- dlls/quartz/nullrenderer.c | 100 ++++++++++++++++---------------------------- 1 files changed, 36 insertions(+), 64 deletions(-) diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index d3b04ce..922d64e 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -48,13 +48,9 @@ static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl; typedef struct NullRendererImpl { BaseRenderer renderer; - - const IUnknownVtbl * IInner_vtbl; + IUnknown IUnknown_inner; IAMFilterMiscFlags IAMFilterMiscFlags_iface; - - IUnknown * pUnkOuter; - BOOL bUnkOuterValid; - BOOL bAggregatable; + IUnknown *outer_unk; } NullRendererImpl; static HRESULT WINAPI NullRenderer_DoRenderSample(BaseRenderer *iface, IMediaSample *pMediaSample) @@ -100,13 +96,17 @@ HRESULT NullRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) *ppv = NULL; pNullRenderer = CoTaskMemAlloc(sizeof(NullRendererImpl)); - pNullRenderer->pUnkOuter = pUnkOuter; - pNullRenderer->bUnkOuterValid = FALSE; - pNullRenderer->bAggregatable = FALSE; - pNullRenderer->IInner_vtbl = &IInner_VTable; + pNullRenderer->IUnknown_inner.lpVtbl = &IInner_VTable; pNullRenderer->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl; - hr = BaseRenderer_Init(&pNullRenderer->renderer, &NullRenderer_Vtbl, pUnkOuter, &CLSID_NullRenderer, (DWORD_PTR)(__FILE__ ": NullRendererImpl.csFilter"), &RendererFuncTable); + if (pUnkOuter) + pNullRenderer->outer_unk = pUnkOuter; + else + pNullRenderer->outer_unk = &pNullRenderer->IUnknown_inner; + + hr = BaseRenderer_Init(&pNullRenderer->renderer, &NullRenderer_Vtbl, pUnkOuter, + &CLSID_NullRenderer, (DWORD_PTR)(__FILE__ ": NullRendererImpl.csFilter"), + &RendererFuncTable); if (FAILED(hr)) { @@ -114,23 +114,26 @@ HRESULT NullRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) CoTaskMemFree(pNullRenderer); } else - *ppv = pNullRenderer; + *ppv = &pNullRenderer->IUnknown_inner; - return hr; + return S_OK; } -static HRESULT WINAPI NullRendererInner_QueryInterface(IUnknown * iface, REFIID riid, LPVOID * ppv) +static inline NullRendererImpl *impl_from_IUnknown(IUnknown *iface) { - ICOM_THIS_MULTI(NullRendererImpl, IInner_vtbl, iface); - TRACE("(%p/%p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv); + return CONTAINING_RECORD(iface, NullRendererImpl, IUnknown_inner); +} + +static HRESULT WINAPI NullRendererInner_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + NullRendererImpl *This = impl_from_IUnknown(iface); - if (This->bAggregatable) - This->bUnkOuterValid = TRUE; + TRACE("(%p/%p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv); *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = &This->IInner_vtbl; + *ppv = &This->IUnknown_inner; else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags)) *ppv = &This->IAMFilterMiscFlags_iface; else @@ -143,7 +146,7 @@ static HRESULT WINAPI NullRendererInner_QueryInterface(IUnknown * iface, REFIID if (*ppv) { - IUnknown_AddRef((IUnknown *)(*ppv)); + IUnknown_AddRef((IUnknown *)*ppv); return S_OK; } @@ -153,25 +156,24 @@ static HRESULT WINAPI NullRendererInner_QueryInterface(IUnknown * iface, REFIID return E_NOINTERFACE; } -static ULONG WINAPI NullRendererInner_AddRef(IUnknown * iface) +static ULONG WINAPI NullRendererInner_AddRef(IUnknown *iface) { - ICOM_THIS_MULTI(NullRendererImpl, IInner_vtbl, iface); + NullRendererImpl *This = impl_from_IUnknown(iface); return BaseFilterImpl_AddRef(&This->renderer.filter.IBaseFilter_iface); } -static ULONG WINAPI NullRendererInner_Release(IUnknown * iface) +static ULONG WINAPI NullRendererInner_Release(IUnknown *iface) { - ICOM_THIS_MULTI(NullRendererImpl, IInner_vtbl, iface); - ULONG refCount = BaseRendererImpl_Release(&This->renderer.filter.IBaseFilter_iface); + NullRendererImpl *This = impl_from_IUnknown(iface); + ULONG refCount = BaseFilterImpl_Release(&This->renderer.filter.IBaseFilter_iface); if (!refCount) { TRACE("Destroying Null Renderer\n"); CoTaskMemFree(This); - return 0; } - else - return refCount; + + return refCount; } static const IUnknownVtbl IInner_VTable = @@ -184,49 +186,19 @@ static const IUnknownVtbl IInner_VTable = static HRESULT WINAPI NullRenderer_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) { NullRendererImpl *This = (NullRendererImpl *)iface; - - if (This->bAggregatable) - This->bUnkOuterValid = TRUE; - - if (This->pUnkOuter) - { - if (This->bAggregatable) - return IUnknown_QueryInterface(This->pUnkOuter, riid, ppv); - - if (IsEqualIID(riid, &IID_IUnknown)) - { - HRESULT hr; - - IUnknown_AddRef((IUnknown *)&(This->IInner_vtbl)); - hr = IUnknown_QueryInterface((IUnknown *)&(This->IInner_vtbl), riid, ppv); - IUnknown_Release((IUnknown *)&(This->IInner_vtbl)); - This->bAggregatable = TRUE; - return hr; - } - - *ppv = NULL; - return E_NOINTERFACE; - } - - return IUnknown_QueryInterface((IUnknown *)&(This->IInner_vtbl), riid, ppv); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } static ULONG WINAPI NullRenderer_AddRef(IBaseFilter * iface) { NullRendererImpl *This = (NullRendererImpl *)iface; - - if (This->pUnkOuter && This->bUnkOuterValid) - return IUnknown_AddRef(This->pUnkOuter); - return IUnknown_AddRef((IUnknown *)&(This->IInner_vtbl)); + return IUnknown_AddRef(This->outer_unk); } static ULONG WINAPI NullRenderer_Release(IBaseFilter * iface) { NullRendererImpl *This = (NullRendererImpl *)iface; - - if (This->pUnkOuter && This->bUnkOuterValid) - return IUnknown_Release(This->pUnkOuter); - return IUnknown_Release((IUnknown *)&(This->IInner_vtbl)); + return IUnknown_Release(This->outer_unk); } static const IBaseFilterVtbl NullRenderer_Vtbl = @@ -257,19 +229,19 @@ static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface void **ppv) { NullRendererImpl *This = impl_from_IAMFilterMiscFlags(iface); - return IUnknown_QueryInterface((IUnknown*)This, riid, ppv); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } static ULONG WINAPI AMFilterMiscFlags_AddRef(IAMFilterMiscFlags *iface) { NullRendererImpl *This = impl_from_IAMFilterMiscFlags(iface); - return IUnknown_AddRef((IUnknown*)This); + return IUnknown_AddRef(This->outer_unk); } static ULONG WINAPI AMFilterMiscFlags_Release(IAMFilterMiscFlags *iface) { NullRendererImpl *This = impl_from_IAMFilterMiscFlags(iface); - return IUnknown_Release((IUnknown*)This); + return IUnknown_Release(This->outer_unk); } static ULONG WINAPI AMFilterMiscFlags_GetMiscFlags(IAMFilterMiscFlags *iface)

1 0

Michael Stefaniuc : quartz: Use impl_from_IBaseFilter() instead of casts.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: 4e1302c2fbafe664d9cbe93696e6c04af40d703f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e1302c2fbafe664d9cbe9369… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 2 01:02:24 2012 +0200 quartz: Use impl_from_IBaseFilter() instead of casts. --- dlls/quartz/nullrenderer.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index 922d64e..6d93dca 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -183,21 +183,26 @@ static const IUnknownVtbl IInner_VTable = NullRendererInner_Release }; +static inline NullRendererImpl *impl_from_IBaseFilter(IBaseFilter *iface) +{ + return CONTAINING_RECORD(iface, NullRendererImpl, renderer.filter.IBaseFilter_iface); +} + static HRESULT WINAPI NullRenderer_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) { - NullRendererImpl *This = (NullRendererImpl *)iface; + NullRendererImpl *This = impl_from_IBaseFilter(iface); return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } static ULONG WINAPI NullRenderer_AddRef(IBaseFilter * iface) { - NullRendererImpl *This = (NullRendererImpl *)iface; + NullRendererImpl *This = impl_from_IBaseFilter(iface); return IUnknown_AddRef(This->outer_unk); } static ULONG WINAPI NullRenderer_Release(IBaseFilter * iface) { - NullRendererImpl *This = (NullRendererImpl *)iface; + NullRendererImpl *This = impl_from_IBaseFilter(iface); return IUnknown_Release(This->outer_unk); }

1 0

Michael Stefaniuc : quartz: Move NullRenderer_create() to avoid forward declarations.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: 67cb8da5cb8f8ee0d9cf770d567f20f4e0238ab5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67cb8da5cb8f8ee0d9cf770d5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 2 01:03:21 2012 +0200 quartz: Move NullRenderer_create() to avoid forward declarations. --- dlls/quartz/nullrenderer.c | 70 ++++++++++++++++++++----------------------- 1 files changed, 33 insertions(+), 37 deletions(-) diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index 6d93dca..16a24ac 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -41,10 +41,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); -static const IBaseFilterVtbl NullRenderer_Vtbl; -static const IUnknownVtbl IInner_VTable; -static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl; - typedef struct NullRendererImpl { BaseRenderer renderer; @@ -86,39 +82,6 @@ static const BaseRendererFuncTable RendererFuncTable = { NULL, }; -HRESULT NullRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) -{ - HRESULT hr; - NullRendererImpl * pNullRenderer; - - TRACE("(%p, %p)\n", pUnkOuter, ppv); - - *ppv = NULL; - - pNullRenderer = CoTaskMemAlloc(sizeof(NullRendererImpl)); - pNullRenderer->IUnknown_inner.lpVtbl = &IInner_VTable; - pNullRenderer->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl; - - if (pUnkOuter) - pNullRenderer->outer_unk = pUnkOuter; - else - pNullRenderer->outer_unk = &pNullRenderer->IUnknown_inner; - - hr = BaseRenderer_Init(&pNullRenderer->renderer, &NullRenderer_Vtbl, pUnkOuter, - &CLSID_NullRenderer, (DWORD_PTR)(__FILE__ ": NullRendererImpl.csFilter"), - &RendererFuncTable); - - if (FAILED(hr)) - { - BaseRendererImpl_Release(&pNullRenderer->renderer.filter.IBaseFilter_iface); - CoTaskMemFree(pNullRenderer); - } - else - *ppv = &pNullRenderer->IUnknown_inner; - - return S_OK; -} - static inline NullRendererImpl *impl_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, NullRendererImpl, IUnknown_inner); @@ -260,3 +223,36 @@ static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl = { AMFilterMiscFlags_Release, AMFilterMiscFlags_GetMiscFlags }; + +HRESULT NullRenderer_create(IUnknown *pUnkOuter, void **ppv) +{ + HRESULT hr; + NullRendererImpl *pNullRenderer; + + TRACE("(%p, %p)\n", pUnkOuter, ppv); + + *ppv = NULL; + + pNullRenderer = CoTaskMemAlloc(sizeof(NullRendererImpl)); + pNullRenderer->IUnknown_inner.lpVtbl = &IInner_VTable; + pNullRenderer->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl; + + if (pUnkOuter) + pNullRenderer->outer_unk = pUnkOuter; + else + pNullRenderer->outer_unk = &pNullRenderer->IUnknown_inner; + + hr = BaseRenderer_Init(&pNullRenderer->renderer, &NullRenderer_Vtbl, pUnkOuter, + &CLSID_NullRenderer, (DWORD_PTR)(__FILE__ ": NullRendererImpl.csFilter"), + &RendererFuncTable); + + if (FAILED(hr)) + { + BaseRendererImpl_Release(&pNullRenderer->renderer.filter.IBaseFilter_iface); + CoTaskMemFree(pNullRenderer); + } + else + *ppv = &pNullRenderer->IUnknown_inner; + + return S_OK; +}

1 0

Michael Stefaniuc : quartz: COM cleanup for IAMFilterMiscFlags in VideoRenderer.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: d28971a23e16b920474cde06b1099a6276092e76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d28971a23e16b920474cde06b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 2 01:04:04 2012 +0200 quartz: COM cleanup for IAMFilterMiscFlags in VideoRenderer. --- dlls/quartz/videorenderer.c | 30 ++++++++++++++++++------------ 1 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 87f3ea9..3e632cb 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -55,7 +55,7 @@ typedef struct VideoRendererImpl BaseControlVideo baseControlVideo; const IUnknownVtbl * IInner_vtbl; - const IAMFilterMiscFlagsVtbl *IAMFilterMiscFlags_vtbl; + IAMFilterMiscFlags IAMFilterMiscFlags_iface; BOOL init; HANDLE hThread; @@ -656,7 +656,7 @@ HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) pVideoRenderer->bUnkOuterValid = FALSE; pVideoRenderer->bAggregatable = FALSE; pVideoRenderer->IInner_vtbl = &IInner_VTable; - pVideoRenderer->IAMFilterMiscFlags_vtbl = &IAMFilterMiscFlags_Vtbl; + pVideoRenderer->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl; pVideoRenderer->init = 0; ZeroMemory(&pVideoRenderer->SourceRect, sizeof(RECT)); @@ -711,7 +711,7 @@ static HRESULT WINAPI VideoRendererInner_QueryInterface(IUnknown * iface, REFIID else if (IsEqualIID(riid, &IID_IVideoWindow)) *ppv = &This->baseControlWindow.IVideoWindow_iface; else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags)) - *ppv = &This->IAMFilterMiscFlags_vtbl; + *ppv = &This->IAMFilterMiscFlags_iface; else { HRESULT hr; @@ -1050,26 +1050,32 @@ static const IVideoWindowVtbl IVideoWindow_VTable = BaseControlWindowImpl_IsCursorHidden }; -static VideoRendererImpl *from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface) { - return (VideoRendererImpl*)((char*)iface - offsetof(VideoRendererImpl, IAMFilterMiscFlags_vtbl)); +static VideoRendererImpl *impl_from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface) +{ + return CONTAINING_RECORD(iface, VideoRendererImpl, IAMFilterMiscFlags_iface); } -static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, REFIID riid, void **ppv) { - VideoRendererImpl *This = from_IAMFilterMiscFlags(iface); +static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, REFIID riid, + void **ppv) +{ + VideoRendererImpl *This = impl_from_IAMFilterMiscFlags(iface); return IUnknown_QueryInterface((IUnknown*)This, riid, ppv); } -static ULONG WINAPI AMFilterMiscFlags_AddRef(IAMFilterMiscFlags *iface) { - VideoRendererImpl *This = from_IAMFilterMiscFlags(iface); +static ULONG WINAPI AMFilterMiscFlags_AddRef(IAMFilterMiscFlags *iface) +{ + VideoRendererImpl *This = impl_from_IAMFilterMiscFlags(iface); return IUnknown_AddRef((IUnknown*)This); } -static ULONG WINAPI AMFilterMiscFlags_Release(IAMFilterMiscFlags *iface) { - VideoRendererImpl *This = from_IAMFilterMiscFlags(iface); +static ULONG WINAPI AMFilterMiscFlags_Release(IAMFilterMiscFlags *iface) +{ + VideoRendererImpl *This = impl_from_IAMFilterMiscFlags(iface); return IUnknown_Release((IUnknown*)This); } -static ULONG WINAPI AMFilterMiscFlags_GetMiscFlags(IAMFilterMiscFlags *iface) { +static ULONG WINAPI AMFilterMiscFlags_GetMiscFlags(IAMFilterMiscFlags *iface) +{ return AM_FILTER_MISC_FLAGS_IS_RENDERER; }

1 0