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

Michael Stefaniuc : quartz: Don' t set the VideoRenderer object on creation failure.
by Alexandre Julliard 02 Jul '12

02 Jul '12

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

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

02 Jul '12

Module: wine Branch: master Commit: 37cfaa2d026ec71ed8d522bfbe7f93c70199367b URL: http://source.winehq.org/git/wine.git/?a=commit;h=37cfaa2d026ec71ed8d522bfb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 2 01:06:01 2012 +0200 quartz: Standardize COM aggregation for VideoRenderer. --- dlls/quartz/quartz_private.h | 2 - dlls/quartz/videorenderer.c | 101 +++++++++++++++-------------------------- 2 files changed, 37 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=37cfaa2d026ec71ed8d52…

1 0

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

02 Jul '12

Module: wine Branch: master Commit: 02216db8ca82c5e370dcc788c70c652bbcd6add3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02216db8ca82c5e370dcc788c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 2 01:07:46 2012 +0200 quartz: Move VideoRenderer_create() to avoid forward declarations. --- dlls/quartz/videorenderer.c | 124 +++++++++++++++++++++--------------------- 1 files changed, 62 insertions(+), 62 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 69437a1..a045ba8 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -42,12 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); -static const IBaseFilterVtbl VideoRenderer_Vtbl; -static const IUnknownVtbl IInner_VTable; -static const IBasicVideoVtbl IBasicVideo_VTable; -static const IVideoWindowVtbl IVideoWindow_VTable; -static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl; - typedef struct VideoRendererImpl { BaseRenderer renderer; @@ -640,62 +634,6 @@ static const BaseControlVideoFuncTable renderer_BaseControlVideoFuncTable = { VideoRenderer_SetTargetRect }; -HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) -{ - HRESULT hr; - VideoRendererImpl * pVideoRenderer; - - TRACE("(%p, %p)\n", pUnkOuter, ppv); - - *ppv = NULL; - - pVideoRenderer = CoTaskMemAlloc(sizeof(VideoRendererImpl)); - pVideoRenderer->IUnknown_inner.lpVtbl = &IInner_VTable; - pVideoRenderer->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl; - - pVideoRenderer->init = 0; - ZeroMemory(&pVideoRenderer->SourceRect, sizeof(RECT)); - ZeroMemory(&pVideoRenderer->DestRect, sizeof(RECT)); - ZeroMemory(&pVideoRenderer->WindowPos, sizeof(RECT)); - - if (pUnkOuter) - pVideoRenderer->outer_unk = pUnkOuter; - else - pVideoRenderer->outer_unk = &pVideoRenderer->IUnknown_inner; - - hr = BaseRenderer_Init(&pVideoRenderer->renderer, &VideoRenderer_Vtbl, pUnkOuter, &CLSID_VideoRenderer, (DWORD_PTR)(__FILE__ ": VideoRendererImpl.csFilter"), &BaseFuncTable); - - if (FAILED(hr)) - goto fail; - - 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; - - hr = BaseControlVideo_Init(&pVideoRenderer->baseControlVideo, &IBasicVideo_VTable, &pVideoRenderer->renderer.filter, &pVideoRenderer->renderer.filter.csFilter, &pVideoRenderer->renderer.pInputPin->pin, &renderer_BaseControlVideoFuncTable); - if (FAILED(hr)) - goto fail; - - if (!CreateRenderingSubsystem(pVideoRenderer)) { - hr = E_FAIL; - goto fail; - } - - *ppv = &pVideoRenderer->IUnknown_inner; - return S_OK; - -fail: - BaseRendererImpl_Release(&pVideoRenderer->renderer.filter.IBaseFilter_iface); - CoTaskMemFree(pVideoRenderer); - return hr; -} - -HRESULT VideoRendererDefault_create(IUnknown * pUnkOuter, LPVOID * ppv) -{ - /* TODO: Attempt to use the VMR-7 renderer instead when possible */ - return VideoRenderer_create(pUnkOuter, ppv); -} - static inline VideoRendererImpl *impl_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, VideoRendererImpl, IUnknown_inner); @@ -1060,3 +998,65 @@ static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl = { AMFilterMiscFlags_Release, AMFilterMiscFlags_GetMiscFlags }; + +HRESULT VideoRenderer_create(IUnknown *pUnkOuter, void **ppv) +{ + HRESULT hr; + VideoRendererImpl * pVideoRenderer; + + TRACE("(%p, %p)\n", pUnkOuter, ppv); + + *ppv = NULL; + + pVideoRenderer = CoTaskMemAlloc(sizeof(VideoRendererImpl)); + pVideoRenderer->IUnknown_inner.lpVtbl = &IInner_VTable; + pVideoRenderer->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl; + + pVideoRenderer->init = 0; + ZeroMemory(&pVideoRenderer->SourceRect, sizeof(RECT)); + ZeroMemory(&pVideoRenderer->DestRect, sizeof(RECT)); + ZeroMemory(&pVideoRenderer->WindowPos, sizeof(RECT)); + + if (pUnkOuter) + pVideoRenderer->outer_unk = pUnkOuter; + else + pVideoRenderer->outer_unk = &pVideoRenderer->IUnknown_inner; + + hr = BaseRenderer_Init(&pVideoRenderer->renderer, &VideoRenderer_Vtbl, pUnkOuter, + &CLSID_VideoRenderer, (DWORD_PTR)(__FILE__ ": VideoRendererImpl.csFilter"), + &BaseFuncTable); + + if (FAILED(hr)) + goto fail; + + 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; + + hr = BaseControlVideo_Init(&pVideoRenderer->baseControlVideo, &IBasicVideo_VTable, + &pVideoRenderer->renderer.filter, &pVideoRenderer->renderer.filter.csFilter, + &pVideoRenderer->renderer.pInputPin->pin, &renderer_BaseControlVideoFuncTable); + if (FAILED(hr)) + goto fail; + + if (!CreateRenderingSubsystem(pVideoRenderer)) { + hr = E_FAIL; + goto fail; + } + + *ppv = &pVideoRenderer->IUnknown_inner; + return S_OK; + +fail: + BaseRendererImpl_Release(&pVideoRenderer->renderer.filter.IBaseFilter_iface); + CoTaskMemFree(pVideoRenderer); + return hr; +} + +HRESULT VideoRendererDefault_create(IUnknown * pUnkOuter, LPVOID * ppv) +{ + /* TODO: Attempt to use the VMR-7 renderer instead when possible */ + return VideoRenderer_create(pUnkOuter, ppv); +}

1 0

Michael Stefaniuc : quartz/tests: Add COM aggregation test for NullRenderer .
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: 8309a38d6aeb5b885d7905ab58cc9149725ca8ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=8309a38d6aeb5b885d7905ab5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 2 01:25:43 2012 +0200 quartz/tests: Add COM aggregation test for NullRenderer. --- dlls/quartz/tests/misc.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/tests/misc.c b/dlls/quartz/tests/misc.c index 74c386b..748c0f2 100644 --- a/dlls/quartz/tests/misc.c +++ b/dlls/quartz/tests/misc.c @@ -69,6 +69,11 @@ static void test_aggregation(const CLSID clsidOuter, const CLSID clsidInner, /* for aggregation, we should only be able to request IUnknown */ hr = CoCreateInstance(&clsidInner, pUnkOuter, CLSCTX_INPROC_SERVER, &iidInner, (LPVOID*)&pUnkInnerFail); + if (hr == REGDB_E_CLASSNOTREG) + { + skip("Class not registered\n"); + return; + } ok(hr == E_NOINTERFACE, "CoCreateInstance returned %x\n", hr); ok(pUnkInnerFail == NULL, "pUnkInnerFail is not NULL\n"); @@ -157,6 +162,19 @@ static void test_aggregation(const CLSID clsidOuter, const CLSID clsidInner, } while (refCount); } +static void test_null_renderer_aggregations(void) +{ + const IID * iids[] = { + &IID_IMediaFilter, &IID_IBaseFilter + }; + int i; + + for (i = 0; i < sizeof(iids) / sizeof(iids[0]); i++) + { + test_aggregation(CLSID_SystemClock, CLSID_NullRenderer, IID_IReferenceClock, *iids[i]); + } +} + static void test_video_renderer_aggregations(void) { const IID * iids[] = { @@ -206,6 +224,7 @@ START_TEST(misc) { CoInitialize(NULL); + test_null_renderer_aggregations(); test_video_renderer_aggregations(); test_filter_graph_aggregations(); test_filter_mapper_aggregations();

1 0

Alexandre Julliard : gdi32: Fix bitmap glyph allocation size in ExtTextOut fallback implementation.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: 4c3cc50104a193dcffa988116b52b9ff3042a5f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c3cc50104a193dcffa988116… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 2 10:58:23 2012 +0200 gdi32: Fix bitmap glyph allocation size in ExtTextOut fallback implementation. --- dlls/gdi32/font.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index bb97902..5fefa2f 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1799,7 +1799,7 @@ static void draw_glyph( HDC hdc, INT origin_x, INT origin_y, const GLYPHMETRICS const struct gdi_image_bits *image, const RECT *clip ) { static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; - UINT x, y, i, count; + UINT x, y, i, count, max_count; BYTE *ptr = image->ptr; int stride = get_dib_stride( metrics->gmBlackBoxX, 1 ); POINT *pts; @@ -1812,8 +1812,8 @@ static void draw_glyph( HDC hdc, INT origin_x, INT origin_y, const GLYPHMETRICS if (!clip) clipped_rect = rect; else if (!intersect_rect( &clipped_rect, &rect, clip )) return; - pts = HeapAlloc( GetProcessHeap(), 0, - max(2,metrics->gmBlackBoxX) * metrics->gmBlackBoxY * sizeof(*pts) ); + max_count = (metrics->gmBlackBoxX + 1) * metrics->gmBlackBoxY; + pts = HeapAlloc( GetProcessHeap(), 0, max_count * sizeof(*pts) ); if (!pts) return; count = 0; @@ -1833,6 +1833,7 @@ static void draw_glyph( HDC hdc, INT origin_x, INT origin_y, const GLYPHMETRICS } } } + assert( count <= max_count ); DPtoLP( hdc, pts, count ); for (i = 0; i < count; i += 2) Polyline( hdc, pts + i, 2 ); HeapFree( GetProcessHeap(), 0, pts );

1 0

Dmitry Timoshkov : gdiplus: Add a test to show that GdipCloneImage is not supposed to increase refcount of the source image .
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: c7ea378f6a26e50766de52d80f01fab9a77534dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7ea378f6a26e50766de52d80… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 2 12:57:30 2012 +0900 gdiplus: Add a test to show that GdipCloneImage is not supposed to increase refcount of the source image. --- dlls/gdiplus/tests/image.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 8c972ee..b6cc322 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -2674,9 +2674,9 @@ static GpImage *load_image(const BYTE *image_data, UINT image_size) BYTE *data; HRESULT hr; GpStatus status; - GpImage *image = NULL; + GpImage *image = NULL, *clone; ImageType image_type; - LONG refcount; + LONG refcount, old_refcount; hmem = GlobalAlloc(0, image_size); data = GlobalLock(hmem); @@ -2696,6 +2696,22 @@ static GpImage *load_image(const BYTE *image_data, UINT image_size) status = GdipGetImageType(image, &image_type); ok(status == Ok, "GdipGetImageType error %d\n", status); + refcount = obj_refcount(stream); + if (image_type == ImageTypeBitmap) + ok(refcount > 1, "expected stream refcount > 1, got %d\n", refcount); + else + ok(refcount == 1, "expected stream refcount 1, got %d\n", refcount); + old_refcount = refcount; + + status = GdipCloneImage(image, &clone); + ok(status == Ok, "GdipCloneImage error %d\n", status); + refcount = obj_refcount(stream); + ok(refcount == old_refcount, "expected stream refcount %d, got %d\n", old_refcount, refcount); + status = GdipDisposeImage(clone); + ok(status == Ok, "GdipDisposeImage error %d\n", status); + refcount = obj_refcount(stream); + ok(refcount == old_refcount, "expected stream refcount %d, got %d\n", old_refcount, refcount); + refcount = IStream_Release(stream); if (image_type == ImageTypeBitmap) ok(refcount >= 1, "expected stream refcount != 0\n");

1 0

Dmitry Timoshkov : gdiplus: Add a test for 'value' pointer in the PropertyItem structure.
by Alexandre Julliard 02 Jul '12

02 Jul '12

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 02 Jul '12

02 Jul '12

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 02 Jul '12

02 Jul '12

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

Dmitry Timoshkov : gdiplus: Add some tests for GdipGetPropertySize and GdipGetAllPropertyItems.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: b61a1ba3226e41b82dc8960464505b284fd1dd84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b61a1ba3226e41b82dc896046… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 2 13:00:20 2012 +0900 gdiplus: Add some tests for GdipGetPropertySize and GdipGetAllPropertyItems. --- dlls/gdiplus/tests/image.c | 169 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 169 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index c49276d..c001a86 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3127,6 +3127,174 @@ static void test_tiff_properties(void) GdipDisposeImage(image); } +static void test_GdipGetAllPropertyItems(void) +{ + static const struct test_data + { + ULONG type, id, length; + BYTE value[32]; + } td[16] = + { + { PropertyTagTypeLong, 0xfe, 4, { 0 } }, + { PropertyTagTypeShort, 0x100, 2, { 1 } }, + { PropertyTagTypeShort, 0x101, 2, { 1 } }, + { PropertyTagTypeShort, 0x102, 6, { 8,0,8,0,8,0 } }, + { PropertyTagTypeShort, 0x103, 2, { 1 } }, + { PropertyTagTypeShort, 0x106, 2, { 2,0 } }, + { PropertyTagTypeASCII, 0x10d, 27, "/home/meh/Desktop/test.tif" }, + { PropertyTagTypeLong, 0x111, 4, { 8,0,0,0 } }, + { PropertyTagTypeShort, 0x112, 2, { 1 } }, + { PropertyTagTypeShort, 0x115, 2, { 3,0 } }, + { PropertyTagTypeShort, 0x116, 2, { 0x40,0 } }, + { PropertyTagTypeLong, 0x117, 4, { 3,0,0,0 } }, + { PropertyTagTypeRational, 0x11a, 8, { 0,0,0,72,0,0,0,1 } }, + { PropertyTagTypeRational, 0x11b, 8, { 0,0,0,72,0,0,0,1 } }, + { PropertyTagTypeShort, 0x11c, 2, { 1 } }, + { PropertyTagTypeShort, 0x128, 2, { 2 } } + }; + GpStatus status; + GpImage *image; + GUID guid; + UINT dim_count, frame_count, prop_count, prop_size, i; + UINT total_size, total_count; + PROPID *prop_id; + PropertyItem *prop_item; + const char *item_data; + + image = load_image(tiffimage, sizeof(tiffimage)); + ok(image != 0, "Failed to load TIFF image data\n"); + if (!image) return; + + dim_count = 0xdeadbeef; + status = GdipImageGetFrameDimensionsCount(image, &dim_count); + expect(Ok, status); + expect(1, dim_count); + + status = GdipImageGetFrameDimensionsList(image, &guid, 1); + expect(Ok, status); + expect_guid(&FrameDimensionPage, &guid, __LINE__, FALSE); + + frame_count = 0xdeadbeef; + status = GdipImageGetFrameCount(image, &guid, &frame_count); + expect(Ok, status); + expect(1, frame_count); + + prop_count = 0xdeadbeef; + status = GdipGetPropertyCount(image, &prop_count); + expect(Ok, status); + ok(prop_count == sizeof(td)/sizeof(td[0]), + "expected property count %u, got %u\n", (UINT)(sizeof(td)/sizeof(td[0])), prop_count); + + prop_id = HeapAlloc(GetProcessHeap(), 0, prop_count * sizeof(*prop_id)); + + status = GdipGetPropertyIdList(image, prop_count, prop_id); + expect(Ok, status); + + prop_size = 0; + for (i = 0; i < prop_count; i++) + { + UINT size; + status = GdipGetPropertyItemSize(image, prop_id[i], &size); + expect(Ok, status); + if (status != Ok) break; + ok(size > sizeof(*prop_item), "%u: too small item length %u\n", i, size); + + prop_size += size; + + prop_item = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + status = GdipGetPropertyItem(image, prop_id[i], 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, + "%u: expected type %u, got %u\n", i, td[i].type, prop_item->type); + ok(td[i].id == prop_item->id, "%u: expected id %#x, got %#x\n", i, td[i].id, prop_item->id); + size -= sizeof(*prop_item); + ok(prop_item->length == size, "%u: expected length %u, got %u\n", i, size, prop_item->length); + ok(td[i].length == prop_item->length, "%u: expected length %u, got %u\n", i, td[i].length, prop_item->length); + if (td[i].length == prop_item->length) + { + int match = memcmp(td[i].value, prop_item->value, td[i].length) == 0; + ok(match, "%u: data mismatch\n", i); + if (!match) + { + UINT j; + BYTE *data = prop_item->value; + printf("id %#x:", prop_item->id); + for (j = 0; j < prop_item->length; j++) + printf(" %02x", data[j]); + printf("\n"); + } + } + HeapFree(GetProcessHeap(), 0, prop_item); + } + + HeapFree(GetProcessHeap(), 0, prop_id); + + status = GdipGetPropertySize(NULL, &total_size, &total_count); + expect(InvalidParameter, status); + status = GdipGetPropertySize(image, &total_size, NULL); + expect(InvalidParameter, status); + status = GdipGetPropertySize(image, NULL, &total_count); + expect(InvalidParameter, status); + status = GdipGetPropertySize(image, NULL, NULL); + expect(InvalidParameter, status); + total_size = 0xdeadbeef; + total_count = 0xdeadbeef; + status = GdipGetPropertySize(image, &total_size, &total_count); + expect(Ok, status); + ok(prop_count == total_count, + "expected total property count %u, got %u\n", prop_count, total_count); + ok(prop_size == total_size, + "expected total property size %u, got %u\n", prop_size, total_size); + + prop_item = HeapAlloc(GetProcessHeap(), 0, prop_size); + + status = GdipGetAllPropertyItems(image, 0, prop_count, prop_item); + expect(InvalidParameter, status); + status = GdipGetAllPropertyItems(image, prop_size, 1, prop_item); + expect(InvalidParameter, status); + status = GdipGetAllPropertyItems(image, prop_size, prop_count, NULL); + expect(InvalidParameter, status); + status = GdipGetAllPropertyItems(image, prop_size, prop_count, NULL); + expect(InvalidParameter, status); + status = GdipGetAllPropertyItems(image, 0, 0, NULL); + expect(InvalidParameter, status); + status = GdipGetAllPropertyItems(image, prop_size + 1, prop_count, prop_item); + expect(InvalidParameter, status); + status = GdipGetAllPropertyItems(image, prop_size, prop_count, prop_item); + expect(Ok, status); + + item_data = (const char *)(prop_item + prop_count); + for (i = 0; i < prop_count; i++) + { + ok(prop_item[i].value == item_data, "%u: expected value %p, got %p\n", + i, item_data, prop_item[i].value); + ok(td[i].type == prop_item[i].type, + "%u: expected type %u, got %u\n", i, td[i].type, prop_item[i].type); + ok(td[i].id == prop_item[i].id, "%u: expected id %#x, got %#x\n", i, td[i].id, prop_item[i].id); + ok(td[i].length == prop_item[i].length, "%u: expected length %u, got %u\n", i, td[i].length, prop_item[i].length); + if (td[i].length == prop_item[i].length) + { + int match = memcmp(td[i].value, prop_item[i].value, td[i].length) == 0; + ok(match, "%u: data mismatch\n", i); + if (!match) + { + UINT j; + BYTE *data = prop_item[i].value; + printf("id %#x:", prop_item[i].id); + for (j = 0; j < prop_item[i].length; j++) + printf(" %02x", data[j]); + printf("\n"); + } + } + item_data += prop_item[i].length; + } + + HeapFree(GetProcessHeap(), 0, prop_item); + + GdipDisposeImage(image); +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -3139,6 +3307,7 @@ START_TEST(image) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + test_GdipGetAllPropertyItems(); test_tiff_properties(); test_image_properties(); test_Scan0();

1 0