March 2015 - Wine-Commits - list.winehq.org

Henri Verbeet : d3d10core: Implement d3d10_shader_resource_view_GetPrivateData().
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: 777ae5b7c5d05f22cfa164d0b2726dc46dee3771 URL: http://source.winehq.org/git/wine.git/?a=commit;h=777ae5b7c5d05f22cfa164d0b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 13 09:49:26 2015 +0100 d3d10core: Implement d3d10_shader_resource_view_GetPrivateData(). --- dlls/d3d10core/view.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index 68b460c..3e72f34 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -936,10 +936,12 @@ static void STDMETHODCALLTYPE d3d10_shader_resource_view_GetDevice(ID3D10ShaderR static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_GetPrivateData(ID3D10ShaderResourceView *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + struct d3d10_shader_resource_view *view = impl_from_ID3D10ShaderResourceView(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_get_private_data(&view->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_SetPrivateData(ID3D10ShaderResourceView *iface,

1 0

Nikolay Sivov : dwrite: Fix GetClusterMetrics() return value.
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: e6ce0e9f26d563b4f3c2eb5aed7527419e093432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6ce0e9f26d563b4f3c2eb5ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 11:59:26 2015 +0300 dwrite: Fix GetClusterMetrics() return value. --- dlls/dwrite/layout.c | 2 +- dlls/dwrite/tests/layout.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 26d84a3..24fb580 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1730,7 +1730,7 @@ static HRESULT WINAPI dwritetextlayout_GetClusterMetrics(IDWriteTextLayout2 *ifa memcpy(metrics, This->clusters, sizeof(DWRITE_CLUSTER_METRICS)*min(max_count, This->clusters_count)); *count = This->clusters_count; - return max_count < This->clusters_count ? S_OK : E_NOT_SUFFICIENT_BUFFER; + return max_count >= This->clusters_count ? S_OK : E_NOT_SUFFICIENT_BUFFER; } static HRESULT WINAPI dwritetextlayout_DetermineMinWidth(IDWriteTextLayout2 *iface, FLOAT* min_width) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index eb00e53..a0de75e 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -947,7 +947,6 @@ static void test_GetClusterMetrics(void) count = 0; hr = IDWriteTextLayout_GetClusterMetrics(layout, NULL, 0, &count); -todo_wine ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); ok(count == 4, "got %u\n", count); @@ -962,10 +961,10 @@ todo_wine /* inline object takes a separate cluster, replaced codepoints number doesn't matter */ count = 0; hr = IDWriteTextLayout_GetClusterMetrics(layout, NULL, 0, &count); -todo_wine { ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); +todo_wine ok(count == 3, "got %u\n", count); -} + IDWriteInlineObject_Release(trimm); IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format);

1 0

Henri Verbeet : d3d10core: Implement d3d10_shader_resource_view_SetPrivateDataInterface().
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: 171d61a06a77f26ad417e68d407d62a799dc3402 URL: http://source.winehq.org/git/wine.git/?a=commit;h=171d61a06a77f26ad417e68d4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 13 09:49:25 2015 +0100 d3d10core: Implement d3d10_shader_resource_view_SetPrivateDataInterface(). --- dlls/d3d10core/view.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index 1a1c3d2..68b460c 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -956,9 +956,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_SetPrivateData(ID3D1 static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_SetPrivateDataInterface(ID3D10ShaderResourceView *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d10_shader_resource_view *view = impl_from_ID3D10ShaderResourceView(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d10_set_private_data_interface(&view->private_store, guid, data); } /* ID3D10View methods */

1 0

Francois Gouget : localui: Remove an uneeded NONAMELESSUNION directive.
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: ddddd79aec608542653bec9a518eb7a950a4339e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddddd79aec608542653bec9a5… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 10:32:19 2015 +0100 localui: Remove an uneeded NONAMELESSUNION directive. --- dlls/localui/localui.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/localui/localui.c b/dlls/localui/localui.c index 382e2db..4ea653e 100644 --- a/dlls/localui/localui.c +++ b/dlls/localui/localui.c @@ -20,8 +20,6 @@ #include <stdarg.h> -#define NONAMELESSUNION - #include "windef.h" #include "winbase.h" #include "wingdi.h"

1 0

Piotr Caban : gdiplus/tests: Add gif frames composition tests.
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: a3822f973e0d1f71f69ce89492e30c7cc6155cca URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3822f973e0d1f71f69ce8949… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 12 10:17:46 2015 +0100 gdiplus/tests: Add gif frames composition tests. --- dlls/gdiplus/tests/image.c | 95 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 94 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index f33cb90..cc8ae2d 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -2423,6 +2423,51 @@ static const unsigned char gifanimation[72] = { 0x00,0x00,0x02,0x02,0x44,0x01,0x00,0x3b }; +/* Generated with ImageMagick: + * convert -transparent black -delay 100 -size 8x2 xc:black \ + * -dispose none -page +0+0 -size 2x2 xc:red \ + * -dispose background -page +2+0 -size 2x2 xc:blue \ + * -dispose previous -page +4+0 -size 2x2 xc:green \ + * -dispose undefined -page +6+0 -size 2x2 xc:gray \ + * test.gif + */ +static const unsigned char gifanimation2[] = { + 0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0x08, 0x00, + 0x02, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x21, 0xf9, 0x04, 0x01, 0x64, + 0x00, 0x00, 0x00, 0x21, 0xff, 0x0b, 0x4e, 0x45, + 0x54, 0x53, 0x43, 0x41, 0x50, 0x45, 0x32, 0x2e, + 0x30, 0x03, 0x01, 0x00, 0x00, 0x00, 0x2c, 0x00, + 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00, + 0x02, 0x04, 0x84, 0x8f, 0x09, 0x05, 0x00, 0x21, + 0xf9, 0x04, 0x04, 0x64, 0x00, 0x00, 0x00, 0x2c, + 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, + 0x81, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, + 0x00, 0x00, 0xff, 0x00, 0x00, 0x02, 0x03, 0x44, + 0x34, 0x05, 0x00, 0x21, 0xf9, 0x04, 0x08, 0x64, + 0x00, 0x00, 0x00, 0x2c, 0x02, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x02, 0x00, 0x81, 0x00, 0x00, 0xff, + 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, + 0xff, 0x02, 0x03, 0x44, 0x34, 0x05, 0x00, 0x21, + 0xf9, 0x04, 0x0c, 0x64, 0x00, 0x00, 0x00, 0x2c, + 0x04, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, + 0x81, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, + 0x80, 0x00, 0x00, 0x80, 0x00, 0x02, 0x03, 0x44, + 0x34, 0x05, 0x00, 0x21, 0xf9, 0x04, 0x00, 0x64, + 0x00, 0x00, 0x00, 0x2c, 0x06, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x02, 0x00, 0x80, 0x7e, 0x7e, 0x7e, + 0x00, 0x00, 0x00, 0x02, 0x02, 0x84, 0x51, 0x00, + 0x3b +}; + +static ARGB gifanimation2_pixels[5][4] = { + {0, 0, 0, 0}, + {0xffff0000, 0, 0, 0}, + {0xffff0000, 0xff0000ff, 0, 0}, + {0xffff0000, 0, 0xff008000, 0}, + {0xffff0000, 0, 0, 0xff7e7e7e} +}; + static void test_multiframegif(void) { LPSTREAM stream; @@ -2435,7 +2480,7 @@ static void test_multiframegif(void) UINT count; GUID dimension; PixelFormat pixel_format; - INT palette_size; + INT palette_size, i, j; /* Test frame functions with an animated GIF */ hglob = GlobalAlloc (0, sizeof(gifanimation)); @@ -2575,6 +2620,54 @@ static void test_multiframegif(void) GdipDisposeImage((GpImage*)bmp); IStream_Release(stream); + + /* Test frame dispose methods */ + hglob = GlobalAlloc (0, sizeof(gifanimation2)); + data = GlobalLock (hglob); + memcpy(data, gifanimation2, sizeof(gifanimation2)); + GlobalUnlock(hglob); + + hres = CreateStreamOnHGlobal(hglob, TRUE, &stream); + ok(hres == S_OK, "Failed to create a stream\n"); + + stat = GdipCreateBitmapFromStream(stream, &bmp); + ok(stat == Ok, "Failed to create a Bitmap\n"); + IStream_Release(stream); + + stat = GdipImageGetFrameDimensionsList((GpImage*)bmp, &dimension, 1); + expect(Ok, stat); + expect_guid(&FrameDimensionTime, &dimension, __LINE__, FALSE); + + stat = GdipImageGetFrameCount((GpImage*)bmp, &dimension, &count); + expect(Ok, stat); + expect(5, count); + + stat = GdipBitmapGetPixel(bmp, 0, 0, &color); + expect(Ok, stat); + expect(0, color); + + stat = GdipImageSelectActiveFrame((GpImage*)bmp, &dimension, 3); + stat = GdipBitmapGetPixel(bmp, 2, 0, &color); + expect(Ok, stat); + ok(color==0 || broken(color==0xff0000ff), "color = %x\n", color); + if(color != 0) { + win_skip("broken animated gif support\n"); + GdipDisposeImage((GpImage*)bmp); + return; + } + + for(i=0; i<6; i++) { + stat = GdipImageSelectActiveFrame((GpImage*)bmp, &dimension, i%5); + expect(Ok, stat); + + for(j=0; j<4; j++) { + stat = GdipBitmapGetPixel(bmp, j*2, 0, &color); + expect(Ok, stat); + ok(gifanimation2_pixels[i%5][j] == color, "at %d,%d got %x, expected %x\n", i, j, color, gifanimation2_pixels[i%5][j]); + } + } + + GdipDisposeImage((GpImage*)bmp); } static void test_rotateflip(void)

1 0

Stefan Dösinger : d3d9: Correct ColorFill validation.
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: d25cc9695bfe9a2a735fbbd69c87b6702edc5dfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d25cc9695bfe9a2a735fbbd69… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 12 10:55:15 2015 +0100 d3d9: Correct ColorFill validation. --- dlls/d3d9/device.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index a80b30a..da462b1 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1287,18 +1287,22 @@ static HRESULT WINAPI d3d9_device_ColorFill(IDirect3DDevice9Ex *iface, wined3d_resource = wined3d_surface_get_resource(surface_impl->wined3d_surface); wined3d_resource_get_desc(wined3d_resource, &desc); - /* This method is only allowed with surfaces that are render targets, or - * offscreen plain surfaces in D3DPOOL_DEFAULT. */ - if (!(desc.usage & WINED3DUSAGE_RENDERTARGET) && desc.pool != WINED3D_POOL_DEFAULT) + if (desc.pool != WINED3D_POOL_DEFAULT) { wined3d_mutex_unlock(); - WARN("Surface is not a render target, or not a stand-alone D3DPOOL_DEFAULT surface\n"); + WARN("Colorfill is not allowed on surfaces in pool %#x, returning D3DERR_INVALIDCALL.\n", desc.pool); return D3DERR_INVALIDCALL; } - - if (desc.pool != WINED3D_POOL_DEFAULT && desc.pool != WINED3D_POOL_SYSTEM_MEM) + if ((desc.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_TEXTURE)) == WINED3DUSAGE_TEXTURE) + { + wined3d_mutex_unlock(); + WARN("Colorfill is not allowed on non-RT textures, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } + if (desc.usage & WINED3DUSAGE_DEPTHSTENCIL) { - WARN("Color-fill not allowed on surfaces in pool %#x.\n", desc.pool); + wined3d_mutex_unlock(); + WARN("Colorfill is not allowed on depth stencil surfaces, returning D3DERR_INVALIDCALL.\n"); return D3DERR_INVALIDCALL; }

1 0

Francois Gouget : mmsystem.dll16: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: b295ba36ac374cb3d4f4c9b075ce85334190d82a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b295ba36ac374cb3d4f4c9b07… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 10:33:01 2015 +0100 mmsystem.dll16: Remove unneeded NONAMELESSXXX directives. --- dlls/mmsystem.dll16/mci16.c | 2 -- dlls/mmsystem.dll16/mmio16.c | 2 -- dlls/mmsystem.dll16/mmsystem.c | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/mmsystem.dll16/mci16.c b/dlls/mmsystem.dll16/mci16.c index 2ad82a6..b356a44 100644 --- a/dlls/mmsystem.dll16/mci16.c +++ b/dlls/mmsystem.dll16/mci16.c @@ -23,8 +23,6 @@ #include <string.h> #include <stdio.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "mmsystem.h" diff --git a/dlls/mmsystem.dll16/mmio16.c b/dlls/mmsystem.dll16/mmio16.c index df28a66..366d4a5 100644 --- a/dlls/mmsystem.dll16/mmio16.c +++ b/dlls/mmsystem.dll16/mmio16.c @@ -22,8 +22,6 @@ #include <stdarg.h> #include <string.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "mmsystem.h" diff --git a/dlls/mmsystem.dll16/mmsystem.c b/dlls/mmsystem.dll16/mmsystem.c index fe8f587..fdf1318 100644 --- a/dlls/mmsystem.dll16/mmsystem.c +++ b/dlls/mmsystem.dll16/mmsystem.c @@ -30,7 +30,7 @@ #include <string.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" #include "mmsystem.h"

1 0

Francois Gouget : mapi32: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: 548f986e2516ebc811f9c647e482af709e1c3eb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=548f986e2516ebc811f9c647e… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 10:32:38 2015 +0100 mapi32: Remove unneeded NONAMELESSXXX directives. --- dlls/mapi32/imalloc.c | 3 +-- dlls/mapi32/prop.c | 3 +-- dlls/mapi32/util.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/mapi32/imalloc.c b/dlls/mapi32/imalloc.c index eec81b6..90f29a1 100644 --- a/dlls/mapi32/imalloc.c +++ b/dlls/mapi32/imalloc.c @@ -21,8 +21,7 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" #include "winreg.h" diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index ce122a3..530c41e 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -19,8 +19,7 @@ */ #include <stdarg.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" #include "winreg.h" diff --git a/dlls/mapi32/util.c b/dlls/mapi32/util.c index c94e3cf..1d16a33 100644 --- a/dlls/mapi32/util.c +++ b/dlls/mapi32/util.c @@ -23,8 +23,7 @@ #include <stdio.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" #include "winreg.h"

1 0

Piotr Caban : gdiplus: Fix animated gif frames composition.
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: 821932dab90969c1c09a6b5021f9e43f7be1b26b URL: http://source.winehq.org/git/wine.git/?a=commit;h=821932dab90969c1c09a6b502… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 12 10:17:40 2015 +0100 gdiplus: Fix animated gif frames composition. --- dlls/gdiplus/gdiplus_private.h | 5 ++ dlls/gdiplus/image.c | 184 +++++++++++++++++++++++++++++++++++------ 2 files changed, 166 insertions(+), 23 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 0d62eef..065f5ed 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -42,6 +42,11 @@ #define VERSION_MAGIC 0xdbc01001 #define TENSION_CONST (0.3) +#define GIF_DISPOSE_UNSPECIFIED 0 +#define GIF_DISPOSE_DO_NOT_DISPOSE 1 +#define GIF_DISPOSE_RESTORE_TO_BKGND 2 +#define GIF_DISPOSE_RESTORE_TO_PREV 3 + COLORREF ARGB2COLORREF(ARGB color) DECLSPEC_HIDDEN; HBITMAP ARGB2BMP(ARGB color) DECLSPEC_HIDDEN; extern INT arc2polybezier(GpPointF * points, REAL x1, REAL y1, REAL x2, REAL y2, diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 409a3c6..4bce334 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3238,14 +3238,13 @@ static PropertyItem *get_gif_transparent_idx(IWICMetadataReader *reader) return index; } -static LONG get_gif_frame_delay(IWICBitmapFrameDecode *frame) +static LONG get_gif_frame_property(IWICBitmapFrameDecode *frame, const GUID *format, const WCHAR *property) { - static const WCHAR delayW[] = { 'D','e','l','a','y',0 }; HRESULT hr; IWICMetadataBlockReader *block_reader; IWICMetadataReader *reader; UINT block_count, i; - PropertyItem *delay; + PropertyItem *prop; LONG value = 0; hr = IWICBitmapFrameDecode_QueryInterface(frame, &IID_IWICMetadataBlockReader, (void **)&block_reader); @@ -3259,13 +3258,15 @@ static LONG get_gif_frame_delay(IWICBitmapFrameDecode *frame) hr = IWICMetadataBlockReader_GetReaderByIndex(block_reader, i, &reader); if (hr == S_OK) { - delay = get_property(reader, &GUID_MetadataFormatGCE, delayW); - if (delay) + prop = get_property(reader, format, property); + if (prop) { - if (delay->type == PropertyTagTypeShort && delay->length == 2) - value = *(SHORT *)delay->value; + if (prop->type == PropertyTagTypeByte && prop->length == 1) + value = *(BYTE *)prop->value; + else if (prop->type == PropertyTagTypeShort && prop->length == 2) + value = *(SHORT *)prop->value; - GdipFree(delay); + GdipFree(prop); } IWICMetadataReader_Release(reader); } @@ -3279,6 +3280,7 @@ static LONG get_gif_frame_delay(IWICBitmapFrameDecode *frame) static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UINT active_frame) { + static const WCHAR delayW[] = { 'D','e','l','a','y',0 }; HRESULT hr; IWICBitmapFrameDecode *frame; IWICMetadataBlockReader *block_reader; @@ -3307,7 +3309,7 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI hr = IWICBitmapDecoder_GetFrame(decoder, i, &frame); if (hr == S_OK) { - value[i] = get_gif_frame_delay(frame); + value[i] = get_gif_frame_property(frame, &GUID_MetadataFormatGCE, delayW); IWICBitmapFrameDecode_Release(frame); } else value[i] = 0; @@ -3603,23 +3605,159 @@ static GpStatus select_frame_wic(GpImage *image, UINT active_frame) return Ok; } -static GpStatus select_frame_gif(GpImage *image, UINT active_frame) +static HRESULT get_gif_frame_rect(IWICBitmapFrameDecode *frame, + UINT *left, UINT *top, UINT *width, UINT *height) { - GpImage *new_image; - GpStatus status; + static const WCHAR leftW[] = {'L','e','f','t',0}; + static const WCHAR topW[] = {'T','o','p',0}; - status = decode_frame_wic(image->decoder, TRUE, active_frame, gif_metadata_reader, &new_image); - if(status != Ok) - return status; + *left = get_gif_frame_property(frame, &GUID_MetadataFormatIMD, leftW); + *top = get_gif_frame_property(frame, &GUID_MetadataFormatIMD, topW); - memcpy(&new_image->format, &image->format, sizeof(GUID)); - free_image_data(image); - if (image->type == ImageTypeBitmap) - *(GpBitmap *)image = *(GpBitmap *)new_image; - else if (image->type == ImageTypeMetafile) - *(GpMetafile *)image = *(GpMetafile *)new_image; - new_image->type = ~0; - GdipFree(new_image); + return IWICBitmapFrameDecode_GetSize(frame, width, height); +} + +static HRESULT blit_gif_frame(GpBitmap *bitmap, IWICBitmapFrameDecode *frame, BOOL first_frame) +{ + UINT i, j, left, top, width, height; + IWICBitmapSource *source; + BYTE *new_bits; + HRESULT hr; + + hr = get_gif_frame_rect(frame, &left, &top, &width, &height); + if(FAILED(hr)) + return hr; + + hr = WICConvertBitmapSource(&GUID_WICPixelFormat32bppBGRA, (IWICBitmapSource*)frame, &source); + if(FAILED(hr)) + return hr; + + new_bits = GdipAlloc(width*height*4); + if(!new_bits) + return E_OUTOFMEMORY; + + hr = IWICBitmapSource_CopyPixels(source, NULL, width*4, width*height*4, new_bits); + IWICBitmapSource_Release(source); + if(FAILED(hr)) { + GdipFree(new_bits); + return hr; + } + + for(i=0; i<height && i+top<bitmap->height; i++) { + for(j=0; j<width && j+left<bitmap->width; j++) { + DWORD *src = (DWORD*)(new_bits+i*width*4+j*4); + DWORD *dst = (DWORD*)(bitmap->bits+(i+top)*bitmap->stride+(j+left)*4); + + if(first_frame || *src>>24 != 0) + *dst = *src; + } + } + GdipFree(new_bits); + return hr; +} + +static DWORD get_gif_background_color(GpBitmap *bitmap) +{ + BYTE bgcolor_idx = 0; + UINT i; + + for(i=0; i<bitmap->prop_count; i++) { + if(bitmap->prop_item[i].id == PropertyTagIndexBackground) { + bgcolor_idx = *(BYTE*)bitmap->prop_item[i].value; + break; + } + } + + for(i=0; i<bitmap->prop_count; i++) { + if(bitmap->prop_item[i].id == PropertyTagIndexTransparent) { + BYTE transparent_idx; + transparent_idx = *(BYTE*)bitmap->prop_item[i].value; + + if(transparent_idx == bgcolor_idx) + return 0; + } + } + + for(i=0; i<bitmap->prop_count; i++) { + if(bitmap->prop_item[i].id == PropertyTagGlobalPalette) { + if(bitmap->prop_item[i].length/3 > bgcolor_idx) { + BYTE *color = ((BYTE*)bitmap->prop_item[i].value)+bgcolor_idx*3; + return color[2] + (color[1]<<8) + (color[0]<<16) + (0xff<<24); + } + break; + } + } + + FIXME("can't get gif background color\n"); + return 0xffffffff; +} + +static GpStatus select_frame_gif(GpImage* image, UINT active_frame) +{ + static const WCHAR disposalW[] = {'D','i','s','p','o','s','a','l',0}; + + GpBitmap *bitmap = (GpBitmap*)image; + IWICBitmapFrameDecode *frame; + int cur_frame=0, disposal; + BOOL bgcolor_set = FALSE; + DWORD bgcolor = 0; + HRESULT hr; + + if(active_frame > image->current_frame) { + hr = IWICBitmapDecoder_GetFrame(bitmap->image.decoder, image->current_frame, &frame); + if(FAILED(hr)) + return hresult_to_status(hr); + disposal = get_gif_frame_property(frame, &GUID_MetadataFormatGCE, disposalW); + IWICBitmapFrameDecode_Release(frame); + + if(disposal == GIF_DISPOSE_RESTORE_TO_BKGND) + cur_frame = image->current_frame; + else if(disposal != GIF_DISPOSE_RESTORE_TO_PREV) + cur_frame = image->current_frame+1; + } + + while(cur_frame != active_frame) { + hr = IWICBitmapDecoder_GetFrame(bitmap->image.decoder, cur_frame, &frame); + if(FAILED(hr)) + return hresult_to_status(hr); + disposal = get_gif_frame_property(frame, &GUID_MetadataFormatGCE, disposalW); + + if(disposal==GIF_DISPOSE_UNSPECIFIED || disposal==GIF_DISPOSE_DO_NOT_DISPOSE) { + hr = blit_gif_frame(bitmap, frame, cur_frame==0); + if(FAILED(hr)) + return hresult_to_status(hr); + }else if(disposal == GIF_DISPOSE_RESTORE_TO_BKGND) { + UINT left, top, width, height, i, j; + + if(!bgcolor_set) { + bgcolor = get_gif_background_color(bitmap); + bgcolor_set = TRUE; + } + + hr = get_gif_frame_rect(frame, &left, &top, &width, &height); + if(FAILED(hr)) + return hresult_to_status(hr); + for(i=top; i<top+height && i<bitmap->height; i++) { + DWORD *bits = (DWORD*)(bitmap->bits+i*bitmap->stride); + for(j=left; j<left+width && j<bitmap->width; j++) + bits[j] = bgcolor; + } + } + + IWICBitmapFrameDecode_Release(frame); + cur_frame++; + } + + hr = IWICBitmapDecoder_GetFrame(bitmap->image.decoder, active_frame, &frame); + if(FAILED(hr)) + return hresult_to_status(hr); + + hr = blit_gif_frame(bitmap, frame, cur_frame==0); + IWICBitmapFrameDecode_Release(frame); + if(FAILED(hr)) + return hresult_to_status(hr); + + image->current_frame = active_frame; return Ok; }

1 0

Piotr Caban : gdiplus: Don't store stream reference in GpImage, it' s done by IWICBitmapDecoder.
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: b3a9c698e855d7212f37400a6bb3bf1988e5ad94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3a9c698e855d7212f37400a6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 12 10:17:25 2015 +0100 gdiplus: Don't store stream reference in GpImage, it's done by IWICBitmapDecoder. --- dlls/gdiplus/gdiplus_private.h | 1 - dlls/gdiplus/image.c | 42 ++++++++++++++++++++++-------------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 1d53da1..0d62eef 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -270,7 +270,6 @@ struct GpAdustableArrowCap{ struct GpImage{ IPicture *picture; - IStream *stream; /* source stream */ IWICBitmapDecoder *decoder; ImageType type; GUID format; diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 07eb07e..36502d7 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1871,7 +1871,6 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, (*bitmap)->height = height; (*bitmap)->format = format; (*bitmap)->image.picture = NULL; - (*bitmap)->image.stream = NULL; (*bitmap)->image.decoder = NULL; (*bitmap)->hbitmap = hbitmap; (*bitmap)->hdc = NULL; @@ -2089,9 +2088,6 @@ static void move_bitmap(GpBitmap *dst, GpBitmap *src, BOOL clobber_palette) GdipFree(dst->prop_item); dst->prop_item = src->prop_item; dst->prop_count = src->prop_count; - if (dst->image.stream) - IStream_Release(dst->image.stream); - dst->image.stream = src->image.stream; if (dst->image.decoder) IWICBitmapDecoder_Release(dst->image.decoder); dst->image.decoder = src->image.decoder; @@ -2140,8 +2136,6 @@ static GpStatus free_image_data(GpImage *image) } if (image->picture) IPicture_Release(image->picture); - if (image->stream) - IStream_Release(image->stream); if (image->decoder) IWICBitmapDecoder_Release(image->decoder); GdipFree(image->palette); @@ -3427,7 +3421,7 @@ static GpStatus initialize_decoder_wic(IStream *stream, REFGUID container, IWICB typedef void (*metadata_reader_func)(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UINT frame); -static GpStatus decode_frame_wic(IStream *stream, IWICBitmapDecoder *decoder, +static GpStatus decode_frame_wic(IWICBitmapDecoder *decoder, UINT active_frame, metadata_reader_func metadata_reader, GpImage **image) { GpStatus status=Ok; @@ -3556,7 +3550,6 @@ static GpStatus decode_frame_wic(IStream *stream, IWICBitmapDecoder *decoder, bitmap->image.flags |= ImageFlagsReadOnly|ImageFlagsHasRealPixelSize|ImageFlagsHasRealDPI|ImageFlagsColorSpaceRGB; bitmap->image.frame_count = frame_count; bitmap->image.current_frame = active_frame; - bitmap->image.stream = stream; bitmap->image.decoder = decoder; IWICBitmapDecoder_AddRef(decoder); if (palette) @@ -3569,8 +3562,6 @@ static GpStatus decode_frame_wic(IStream *stream, IWICBitmapDecoder *decoder, if (IsEqualGUID(&wic_format, &GUID_WICPixelFormatBlackWhite)) bitmap->image.palette->Flags = 0; } - /* Pin the source stream */ - IStream_AddRef(stream); TRACE("=> %p\n", *image); } @@ -3587,7 +3578,7 @@ static GpStatus decode_image_wic(IStream *stream, REFGUID container, if(status != Ok) return status; - status = decode_frame_wic(stream, decoder, 0, metadata_reader, image); + status = decode_frame_wic(decoder, 0, metadata_reader, image); IWICBitmapDecoder_Release(decoder); return status; } @@ -3597,7 +3588,7 @@ static GpStatus select_frame_wic(GpImage *image, UINT active_frame) GpImage *new_image; GpStatus status; - status = decode_frame_wic(image->stream, image->decoder, active_frame, NULL, &new_image); + status = decode_frame_wic(image->decoder, active_frame, NULL, &new_image); if(status != Ok) return status; @@ -3617,7 +3608,7 @@ static GpStatus select_frame_gif(GpImage *image, UINT active_frame) GpImage *new_image; GpStatus status; - status = decode_frame_wic(image->stream, image->decoder, active_frame, gif_metadata_reader, &new_image); + status = decode_frame_wic(image->decoder, active_frame, gif_metadata_reader, &new_image); if(status != Ok) return status; @@ -3782,6 +3773,23 @@ static GpStatus get_decoder_info(IStream* stream, const struct image_codec **res return GenericError; } +static GpStatus get_decoder_info_from_image(GpImage *image, const struct image_codec **result) +{ + int i; + + for (i = 0; i < NUM_CODECS; i++) { + if ((codecs[i].info.Flags & ImageCodecFlagsDecoder) && + IsEqualIID(&codecs[i].info.FormatID, &image->format)) + { + *result = &codecs[i]; + return Ok; + } + } + + TRACE("no match for format: %s\n", wine_dbgstr_guid(&image->format)); + return GenericError; +} + GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage *image, GDIPCONST GUID *dimensionID, UINT frame) { @@ -3808,12 +3816,6 @@ GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage *image, GDIPCONST GUID *d if (image->current_frame == frame) return Ok; - if (!image->stream) - { - TRACE("image doesn't have an associated stream\n"); - return Ok; - } - if (!image->decoder) { TRACE("image doesn't have an associated decoder\n"); @@ -3821,7 +3823,7 @@ GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage *image, GDIPCONST GUID *d } /* choose an appropriate image decoder */ - stat = get_decoder_info(image->stream, &codec); + stat = get_decoder_info_from_image(image, &codec); if (stat != Ok) { WARN("can't find decoder info\n");

1 0