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

Michael Stefaniuc : quartz: Don' t set the VideoRenderer object on creation failure.
by Alexandre Julliard July 2, 2012

July 2, 2012

Module: wine Branch: master Commit: eb6388c4a5922a8e87794569fe854c681a6bd884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb6388c4a5922a8e87794569f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 2 01:05:01 2012 +0200 quartz: Don't set the VideoRenderer object on creation failure. --- dlls/quartz/videorenderer.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 3e632cb..0edf406 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -668,8 +668,6 @@ HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) if (FAILED(hr)) goto fail; - *ppv = pVideoRenderer; - hr = BaseControlWindow_Init(&pVideoRenderer->baseControlWindow, &IVideoWindow_VTable, &pVideoRenderer->renderer.filter, &pVideoRenderer->renderer.filter.csFilter, &pVideoRenderer->renderer.pInputPin->pin, &renderer_BaseWindowFuncTable); if (FAILED(hr)) goto fail; @@ -678,10 +676,14 @@ HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) if (FAILED(hr)) goto fail; - if (!CreateRenderingSubsystem(pVideoRenderer)) - return E_FAIL; + if (!CreateRenderingSubsystem(pVideoRenderer)) { + hr = E_FAIL; + goto fail; + } + + *ppv = pVideoRenderer; + return S_OK; - return hr; fail: BaseRendererImpl_Release(&pVideoRenderer->renderer.filter.IBaseFilter_iface); CoTaskMemFree(pVideoRenderer);

1 0

Dmitry Timoshkov : gdiplus: Add a test for 'value' pointer in the PropertyItem structure.
by Alexandre Julliard July 2, 2012

July 2, 2012

Module: wine Branch: master Commit: eb564a316017e9e484cdaec55c76bd636b4eabed URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb564a316017e9e484cdaec55… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 2 12:58:10 2012 +0900 gdiplus: Add a test for 'value' pointer in the PropertyItem structure. --- dlls/gdiplus/tests/image.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index b6cc322..c49276d 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3093,8 +3093,9 @@ static void test_tiff_properties(void) prop_item = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, prop_size); status = GdipGetPropertyItem(image, prop_id[i], prop_size, prop_item); expect(Ok, status); + ok(prop_item->value == prop_item + 1, "expected item->value %p, got %p\n", prop_item + 1, prop_item->value); ok(td[i].type == prop_item->type || - /* Win7 stopped using proper but not documented types, and it's + /* Win7 stopped using proper but not documented types, and it looks broken since TypeFloat and TypeDouble now reported as TypeUndefined, and signed types reported as unsigned. */ broken(prop_item->type == documented_type(td[i].type)),

1 0

Dmitry Timoshkov : gdiplus: Implement GdipGetPropertySize.
by Alexandre Julliard July 2, 2012

July 2, 2012

Module: wine Branch: master Commit: 430355ef837587060e346ca409a79ce8d8c3dbde URL: http://source.winehq.org/git/wine.git/?a=commit;h=430355ef837587060e346ca40… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 2 12:58:48 2012 +0900 gdiplus: Implement GdipGetPropertySize. --- dlls/gdiplus/image.c | 57 ++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 51 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index fe56377..39431b4 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2671,16 +2671,61 @@ GpStatus WINGDIPAPI GdipGetPropertyItem(GpImage *image, PROPID propid, UINT size return stat; } -GpStatus WINGDIPAPI GdipGetPropertySize(GpImage *image, UINT* size, UINT* num) +GpStatus WINGDIPAPI GdipGetPropertySize(GpImage *image, UINT *size, UINT *count) { - static int calls; + HRESULT hr; + IWICMetadataReader *reader; + IWICEnumMetadataItem *enumerator; + UINT prop_count, prop_size, i; + PROPVARIANT id, value; - TRACE("(%p,%p,%p)\n", image, size, num); + TRACE("(%p,%p,%p)\n", image, size, count); - if(!(calls++)) - FIXME("not implemented\n"); + if (!image || !size || !count) return InvalidParameter; - return InvalidParameter; + if (image->type != ImageTypeBitmap) + { + FIXME("Not implemented for type %d\n", image->type); + return NotImplemented; + } + + reader = ((GpBitmap *)image)->metadata_reader; + if (!reader) return PropertyNotFound; + + hr = IWICMetadataReader_GetCount(reader, &prop_count); + if (FAILED(hr)) return hresult_to_status(hr); + + hr = IWICMetadataReader_GetEnumerator(reader, &enumerator); + if (FAILED(hr)) return hresult_to_status(hr); + + IWICEnumMetadataItem_Reset(enumerator); + + prop_size = 0; + + PropVariantInit(&id); + PropVariantInit(&value); + + for (i = 0; i < prop_count; i++) + { + UINT items_returned, item_size; + + hr = IWICEnumMetadataItem_Next(enumerator, 1, NULL, &id, &value, &items_returned); + if (hr != S_OK) break; + + item_size = propvariant_size(&value); + if (item_size) prop_size += sizeof(PropertyItem) + item_size; + + PropVariantClear(&id); + PropVariantClear(&value); + } + + IWICEnumMetadataItem_Release(enumerator); + + if (hr != S_OK) return PropertyNotFound; + + *count = prop_count; + *size = prop_size; + return Ok; } struct image_format_dimension

1 0

Dmitry Timoshkov : gdiplus: Implement GdipGetAllPropertyItems.
by Alexandre Julliard July 2, 2012

July 2, 2012

Module: wine Branch: master Commit: 3c9805d4713585920dca7054a01b7c2d011c665d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c9805d4713585920dca7054a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 2 12:59:27 2012 +0900 gdiplus: Implement GdipGetAllPropertyItems. --- dlls/gdiplus/image.c | 93 +++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 80 insertions(+), 13 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 39431b4..a4dade8 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2390,19 +2390,6 @@ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromStream(IStream *stream, return Ok; } -GpStatus WINGDIPAPI GdipGetAllPropertyItems(GpImage *image, UINT size, - UINT num, PropertyItem* items) -{ - static int calls; - - TRACE("(%p, %u, %u, %p)\n", image, size, num, items); - - if(!(calls++)) - FIXME("not implemented\n"); - - return InvalidParameter; -} - GpStatus WINGDIPAPI GdipGetPropertyCount(GpImage *image, UINT *num) { TRACE("(%p, %p)\n", image, num); @@ -2728,6 +2715,86 @@ GpStatus WINGDIPAPI GdipGetPropertySize(GpImage *image, UINT *size, UINT *count) return Ok; } +GpStatus WINGDIPAPI GdipGetAllPropertyItems(GpImage *image, UINT size, + UINT count, PropertyItem *buf) +{ + GpStatus status; + HRESULT hr; + IWICMetadataReader *reader; + IWICEnumMetadataItem *enumerator; + UINT prop_count, prop_size, i; + PROPVARIANT id, value; + char *item_value; + + TRACE("(%p,%u,%u,%p)\n", image, size, count, buf); + + if (!image || !buf) return InvalidParameter; + + if (image->type != ImageTypeBitmap) + { + FIXME("Not implemented for type %d\n", image->type); + return NotImplemented; + } + + status = GdipGetPropertySize(image, &prop_size, &prop_count); + if (status != Ok) return status; + + if (prop_count != count || prop_size != size) return InvalidParameter; + + reader = ((GpBitmap *)image)->metadata_reader; + if (!reader) return PropertyNotFound; + + hr = IWICMetadataReader_GetEnumerator(reader, &enumerator); + if (FAILED(hr)) return hresult_to_status(hr); + + IWICEnumMetadataItem_Reset(enumerator); + + item_value = (char *)(buf + prop_count); + + PropVariantInit(&id); + PropVariantInit(&value); + + for (i = 0; i < prop_count; i++) + { + PropertyItem *item; + UINT items_returned, item_size; + + hr = IWICEnumMetadataItem_Next(enumerator, 1, NULL, &id, &value, &items_returned); + if (hr != S_OK) break; + + if (id.vt != VT_UI2) + { + FIXME("not supported propvariant type for id: %u\n", id.vt); + continue; + } + + item_size = propvariant_size(&value); + if (item_size) + { + item = HeapAlloc(GetProcessHeap(), 0, item_size + sizeof(*item)); + + propvariant_to_item(&value, item, item_size + sizeof(*item), id.u.uiVal); + buf[i].id = item->id; + buf[i].type = item->type; + buf[i].length = item_size; + buf[i].value = item_value; + memcpy(item_value, item->value, item_size); + item_value += item_size; + + HeapFree(GetProcessHeap(), 0, item); + } + + PropVariantClear(&id); + PropVariantClear(&value); + } + + IWICEnumMetadataItem_Release(enumerator); + + if (hr != S_OK) return PropertyNotFound; + + return Ok; +} + struct image_format_dimension { const GUID *format;

1 0

Michael Stefaniuc : quartz: Standardize COM aggregation for NullRenderer.
by Alexandre Julliard July 2, 2012

July 2, 2012

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: Standardize COM aggregation for FilterMapper.
by Alexandre Julliard July 2, 2012

July 2, 2012

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: Standardize COM aggregation for FilterGraph.
by Alexandre Julliard July 2, 2012

July 2, 2012

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

Bruno Jesus : po: Fix a sentence in pt_BR translation.
by Alexandre Julliard July 2, 2012

July 2, 2012

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

Jaime Rave : winhttp: Show discovery via DHCP not supported just one time.
by Alexandre Julliard July 2, 2012

July 2, 2012

Module: wine Branch: master Commit: 37431c5b88a13217ec1923086caefe8dc17251c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37431c5b88a13217ec1923086… Author: Jaime Rave <jaimerave(a)gmail.com> Date: Sat Jun 30 16:41:54 2012 -0500 winhttp: Show discovery via DHCP not supported just one time. --- dlls/winhttp/session.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 1f5d825..b4a46e0 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1194,7 +1194,11 @@ BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url ) set_last_error( ERROR_INVALID_PARAMETER ); return FALSE; } - if (flags & WINHTTP_AUTO_DETECT_TYPE_DHCP) FIXME("discovery via DHCP not supported\n"); + if (flags & WINHTTP_AUTO_DETECT_TYPE_DHCP) + { + static int fixme_shown; + if (!fixme_shown++) FIXME("discovery via DHCP not supported\n"); + } if (flags & WINHTTP_AUTO_DETECT_TYPE_DNS_A) { #ifdef HAVE_GETADDRINFO

1 0

Michael Stefaniuc : quartz: Handle wrong COM aggregation attempts in IClassFactory_CreateInstance.
by Alexandre Julliard July 2, 2012

July 2, 2012

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