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

Piotr Caban : winex11.drv: Don' t assume that owner is top-level window in set_style_hints.
by Alexandre Julliard July 3, 2016

July 3, 2016

Module: wine Branch: master Commit: 6afecf22237ba7dfc1eead69dd29374c26210637 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6afecf22237ba7dfc1eead69d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jun 25 13:59:49 2016 +0200 winex11.drv: Don't assume that owner is top-level window in set_style_hints. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 06ce26e..31ffefe 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -748,10 +748,16 @@ static void set_style_hints( struct x11drv_win_data *data, DWORD style, DWORD ex { Window group_leader = data->whole_window; HWND owner = GetWindow( data->hwnd, GW_OWNER ); - Window owner_win = X11DRV_get_whole_window( owner ); + Window owner_win = 0; XWMHints *wm_hints; Atom window_type; + if (owner) + { + owner = GetAncestor( owner, GA_ROOT ); + owner_win = X11DRV_get_whole_window( owner ); + } + if (owner_win) { XSetTransientForHint( data->display, data->whole_window, owner_win );

1 0

Vincent Povirk : gdiplus: Account for world transform in GdipGraphicsClear.
by Alexandre Julliard July 3, 2016

July 3, 2016

Module: wine Branch: master Commit: 9df85c48aa33dea81c7c16d82b65abdbc21ee1ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=9df85c48aa33dea81c7c16d82… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jun 24 12:51:39 2016 -0500 gdiplus: Account for world transform in GdipGraphicsClear. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c74f2eb..58d59fe 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4382,7 +4382,7 @@ GpStatus WINGDIPAPI GdipGraphicsClear(GpGraphics *graphics, ARGB color) if((stat = GdipCreateSolidFill(color, &brush)) != Ok) return stat; - if((stat = get_graphics_bounds(graphics, &wnd_rect)) != Ok){ + if((stat = GdipGetVisibleClipBounds(graphics, &wnd_rect)) != Ok){ GdipDeleteBrush((GpBrush*)brush); return stat; }

1 0

Jacek Caban : mshtml: Added IHTMLElement:: ondragstart and onhelp properties implementation.
by Alexandre Julliard July 3, 2016

July 3, 2016

Module: wine Branch: master Commit: 4a96d20945ff25697d1ee4352699791712424fc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a96d20945ff25697d1ee4352… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 1 11:20:42 2016 +0200 mshtml: Added IHTMLElement::ondragstart and onhelp properties implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 7c665c3..93448b7 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -902,15 +902,19 @@ static HRESULT WINAPI HTMLElement_get_style(IHTMLElement *iface, IHTMLStyle **p) static HRESULT WINAPI HTMLElement_put_onhelp(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_node_event(&This->node, EVENTID_HELP, &v); } static HRESULT WINAPI HTMLElement_get_onhelp(IHTMLElement *iface, VARIANT *p) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->node, EVENTID_HELP, p); } static HRESULT WINAPI HTMLElement_put_onclick(IHTMLElement *iface, VARIANT v) @@ -1804,15 +1808,19 @@ static HRESULT WINAPI HTMLElement_get_filters(IHTMLElement *iface, static HRESULT WINAPI HTMLElement_put_ondragstart(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_node_event(&This->node, EVENTID_DRAGSTART, &v); } static HRESULT WINAPI HTMLElement_get_ondragstart(IHTMLElement *iface, VARIANT *p) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->node, EVENTID_DRAGSTART, p); } static HRESULT WINAPI HTMLElement_toString(IHTMLElement *iface, BSTR *String)

1 0

Jacek Caban : mshtml: Added IHTMLElement6:: on* properties implementation for supported events.
by Alexandre Julliard July 3, 2016

July 3, 2016

Module: wine Branch: master Commit: 7e86918a7732106b8aca6129ff9fa8c3342971e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e86918a7732106b8aca6129f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 1 11:20:26 2016 +0200 mshtml: Added IHTMLElement6::on* properties implementation for supported events. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 60 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index f23c1ae..7c665c3 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -4100,15 +4100,19 @@ static HRESULT WINAPI HTMLElement6_msMatchesSelector(IHTMLElement6 *iface, BSTR static HRESULT WINAPI HTMLElement6_put_onabort(IHTMLElement6 *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement6(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_node_event(&This->node, EVENTID_ABORT, &v); } static HRESULT WINAPI HTMLElement6_get_onabort(IHTMLElement6 *iface, VARIANT *p) { HTMLElement *This = impl_from_IHTMLElement6(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->node, EVENTID_ABORT, p); } static HRESULT WINAPI HTMLElement6_put_oncanplay(IHTMLElement6 *iface, VARIANT v) @@ -4142,15 +4146,19 @@ static HRESULT WINAPI HTMLElement6_get_oncanplaythrough(IHTMLElement6 *iface, VA static HRESULT WINAPI HTMLElement6_put_onchange(IHTMLElement6 *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement6(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_node_event(&This->node, EVENTID_CHANGE, &v); } static HRESULT WINAPI HTMLElement6_get_onchange(IHTMLElement6 *iface, VARIANT *p) { HTMLElement *This = impl_from_IHTMLElement6(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->node, EVENTID_CHANGE, p); } static HRESULT WINAPI HTMLElement6_put_ondurationchange(IHTMLElement6 *iface, VARIANT v) @@ -4198,15 +4206,19 @@ static HRESULT WINAPI HTMLElement6_get_onended(IHTMLElement6 *iface, VARIANT *p) static HRESULT WINAPI HTMLElement6_put_onerror(IHTMLElement6 *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement6(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_node_event(&This->node, EVENTID_ERROR, &v); } static HRESULT WINAPI HTMLElement6_get_onerror(IHTMLElement6 *iface, VARIANT *p) { HTMLElement *This = impl_from_IHTMLElement6(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->node, EVENTID_ERROR, p); } static HRESULT WINAPI HTMLElement6_put_oninput(IHTMLElement6 *iface, VARIANT v) @@ -4226,15 +4238,19 @@ static HRESULT WINAPI HTMLElement6_get_oninput(IHTMLElement6 *iface, VARIANT *p) static HRESULT WINAPI HTMLElement6_put_onload(IHTMLElement6 *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement6(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_node_event(&This->node, EVENTID_LOAD, &v); } static HRESULT WINAPI HTMLElement6_get_onload(IHTMLElement6 *iface, VARIANT *p) { HTMLElement *This = impl_from_IHTMLElement6(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->node, EVENTID_LOAD, p); } static HRESULT WINAPI HTMLElement6_put_onloadeddata(IHTMLElement6 *iface, VARIANT v) @@ -4422,15 +4438,19 @@ static HRESULT WINAPI HTMLElement6_get_onstalled(IHTMLElement6 *iface, VARIANT * static HRESULT WINAPI HTMLElement6_put_onsubmit(IHTMLElement6 *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement6(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_node_event(&This->node, EVENTID_SUBMIT, &v); } static HRESULT WINAPI HTMLElement6_get_onsubmit(IHTMLElement6 *iface, VARIANT *p) { HTMLElement *This = impl_from_IHTMLElement6(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->node, EVENTID_SUBMIT, p); } static HRESULT WINAPI HTMLElement6_put_onsuspend(IHTMLElement6 *iface, VARIANT v)

1 0

Michael Stefaniuc : ole32: Use the proper COM method wrapper.
by Alexandre Julliard July 3, 2016

July 3, 2016

Module: wine Branch: master Commit: 123dd735916ef34a77a104af052b593f52d7b7c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=123dd735916ef34a77a104af0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 29 09:49:16 2016 +0200 ole32: Use the proper COM method wrapper. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/moniker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 2d6e8e8..afe2343 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -1527,7 +1527,7 @@ static HRESULT WINAPI MonikerMarshalInner_QueryInterface(IUnknown *iface, REFIID if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IMarshal, riid)) { *ppv = &This->IMarshal_iface; - IUnknown_AddRef((IUnknown *)&This->IMarshal_iface); + IMarshal_AddRef(&This->IMarshal_iface); return S_OK; } FIXME("No interface for %s\n", debugstr_guid(riid));

1 0

Michael Stefaniuc : mshtml: Don't cast from an iface to a COM object.
by Alexandre Julliard July 3, 2016

July 3, 2016

Module: wine Branch: master Commit: 7701c2c1661417b12265c4c7f25f60ffe60fd48c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7701c2c1661417b12265c4c7f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 29 09:50:37 2016 +0200 mshtml: Don't cast from an iface to a COM object. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/protocol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 0d822b4..c7ea603 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -575,7 +575,7 @@ static ULONG WINAPI ResProtocol_AddRef(IInternetProtocol *iface) static ULONG WINAPI ResProtocol_Release(IInternetProtocol *iface) { - ResProtocol *This = (ResProtocol*)iface; + ResProtocol *This = ResProtocol_from_IInternetProtocol(iface); IUnknown *pUnkOuter = This->pUnkOuter; ULONG ref = InterlockedDecrement(&This->ref);

1 0

Marcus Meissner : dwrite: Use correct collection (Coverity).
by Alexandre Julliard July 3, 2016

July 3, 2016

Module: wine Branch: master Commit: 64ccbcbf2fa5164d9d7ab030acb9a6d3d1fe20a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64ccbcbf2fa5164d9d7ab030a… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jun 28 22:07:32 2016 +0200 dwrite: Use correct collection (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 926a2cf..6d3d8b7 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -807,7 +807,7 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) else IDWriteFactory_GetSystemFontCollection((IDWriteFactory*)layout->factory, &collection, FALSE); - hr = create_matching_font(range->collection, range->fontfamily, range->weight, + hr = create_matching_font(collection, range->fontfamily, range->weight, range->style, range->stretch, &font); IDWriteFontCollection_Release(collection);

1 0

Aaryaman Vasishta : d3drm: Move IUnknown methods of viewports from version 1->2.
by Alexandre Julliard July 3, 2016

July 3, 2016

Module: wine Branch: master Commit: e81d4953575656f8a7c59ee2766f862ac6e4f93d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e81d4953575656f8a7c59ee27… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Wed Jun 29 15:39:04 2016 +0200 d3drm: Move IUnknown methods of viewports from version 1->2. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/viewport.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 7081caa..9fd627d 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -53,15 +53,6 @@ static HRESULT WINAPI d3drm_viewport2_QueryInterface(IDirect3DRMViewport2 *iface TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - return IDirect3DRMViewport_QueryInterface(&viewport->IDirect3DRMViewport_iface, riid, out); -} - -static HRESULT WINAPI d3drm_viewport1_QueryInterface(IDirect3DRMViewport *iface, REFIID riid, void **out) -{ - struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface); - - TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_IDirect3DRMViewport) || IsEqualGUID(riid, &IID_IDirect3DRMObject) || IsEqualGUID(riid, &IID_IUnknown)) @@ -83,18 +74,18 @@ static HRESULT WINAPI d3drm_viewport1_QueryInterface(IDirect3DRMViewport *iface, return S_OK; } -static ULONG WINAPI d3drm_viewport2_AddRef(IDirect3DRMViewport2 *iface) +static HRESULT WINAPI d3drm_viewport1_QueryInterface(IDirect3DRMViewport *iface, REFIID riid, void **out) { - struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport2(iface); + struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface); - TRACE("iface %p.\n", iface); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - return IDirect3DRMViewport_AddRef(&viewport->IDirect3DRMViewport_iface); + return d3drm_viewport2_QueryInterface(&viewport->IDirect3DRMViewport2_iface, riid, out); } -static ULONG WINAPI d3drm_viewport1_AddRef(IDirect3DRMViewport *iface) +static ULONG WINAPI d3drm_viewport2_AddRef(IDirect3DRMViewport2 *iface) { - struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface); + struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport2(iface); ULONG refcount = InterlockedIncrement(&viewport->obj.ref); TRACE("%p increasing refcount to %u.\n", iface, refcount); @@ -102,18 +93,18 @@ static ULONG WINAPI d3drm_viewport1_AddRef(IDirect3DRMViewport *iface) return refcount; } -static ULONG WINAPI d3drm_viewport2_Release(IDirect3DRMViewport2 *iface) +static ULONG WINAPI d3drm_viewport1_AddRef(IDirect3DRMViewport *iface) { - struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport2(iface); + struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface); TRACE("iface %p.\n", iface); - return IDirect3DRMViewport_Release(&viewport->IDirect3DRMViewport_iface); + return d3drm_viewport2_AddRef(&viewport->IDirect3DRMViewport2_iface); } -static ULONG WINAPI d3drm_viewport1_Release(IDirect3DRMViewport *iface) +static ULONG WINAPI d3drm_viewport2_Release(IDirect3DRMViewport2 *iface) { - struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface); + struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport2(iface); ULONG refcount = InterlockedDecrement(&viewport->obj.ref); TRACE("%p decreasing refcount to %u.\n", iface, refcount); @@ -124,6 +115,15 @@ static ULONG WINAPI d3drm_viewport1_Release(IDirect3DRMViewport *iface) return refcount; } +static ULONG WINAPI d3drm_viewport1_Release(IDirect3DRMViewport *iface) +{ + struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface); + + TRACE("iface %p.\n", iface); + + return d3drm_viewport2_Release(&viewport->IDirect3DRMViewport2_iface); +} + static HRESULT WINAPI d3drm_viewport2_Clone(IDirect3DRMViewport2 *iface, IUnknown *outer, REFIID iid, void **out) {

1 0

Vincent Povirk : gdiplus: Account for GDI+ drawing operations in the metafile frame.
by Alexandre Julliard July 3, 2016

July 3, 2016

Module: wine Branch: master Commit: da31ddb797485be02a938d88dc846ebefccda099 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da31ddb797485be02a938d88d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jun 24 12:51:43 2016 -0500 gdiplus: Account for GDI+ drawing operations in the metafile frame. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 2 + dlls/gdiplus/metafile.c | 107 +++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/metafile.c | 8 +-- 3 files changed, 113 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index e21085f..25ae5ee 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -348,6 +348,8 @@ struct GpMetafile{ DWORD comment_data_size; DWORD comment_data_length; IStream *record_stream; + BOOL auto_frame; /* If true, determine the frame automatically */ + GpPointF auto_frame_min, auto_frame_max; /* playback */ GpGraphics *playback_graphics; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index b1c38db..022af38 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -277,6 +277,15 @@ GpStatus WINGDIPAPI GdipRecordMetafile(HDC hdc, EmfType type, GDIPCONST GpRectF (*metafile)->comment_data_length = 0; (*metafile)->hemf = NULL; + if (!frameRect) + { + (*metafile)->auto_frame = TRUE; + (*metafile)->auto_frame_min.X = 0; + (*metafile)->auto_frame_min.Y = 0; + (*metafile)->auto_frame_max.X = -1; + (*metafile)->auto_frame_max.Y = -1; + } + stat = METAFILE_WriteHeader(*metafile, hdc); if (stat != Ok) @@ -335,6 +344,30 @@ GpStatus WINGDIPAPI GdipRecordMetafileStream(IStream *stream, HDC hdc, EmfType t return stat; } +static void METAFILE_AdjustFrame(GpMetafile* metafile, const GpPointF *points, + UINT num_points) +{ + int i; + + if (!metafile->auto_frame || !num_points) + return; + + if (metafile->auto_frame_max.X < metafile->auto_frame_min.X) + metafile->auto_frame_max = metafile->auto_frame_min = points[0]; + + for (i=0; i<num_points; i++) + { + if (points[i].X < metafile->auto_frame_min.X) + metafile->auto_frame_min.X = points[i].X; + if (points[i].X > metafile->auto_frame_max.X) + metafile->auto_frame_max.X = points[i].X; + if (points[i].Y < metafile->auto_frame_min.Y) + metafile->auto_frame_min.Y = points[i].Y; + if (points[i].Y > metafile->auto_frame_max.Y) + metafile->auto_frame_max.Y = points[i].Y; + } +} + GpStatus METAFILE_GetGraphicsContext(GpMetafile* metafile, GpGraphics **result) { GpStatus stat; @@ -473,6 +506,29 @@ GpStatus METAFILE_FillRectangles(GpMetafile* metafile, GpBrush* brush, METAFILE_WriteRecords(metafile); } + if (metafile->auto_frame) + { + GpPointF corners[4]; + int i; + + for (i=0; i<count; i++) + { + corners[0].X = rects[i].X; + corners[0].Y = rects[i].Y; + corners[1].X = rects[i].X + rects[i].Width; + corners[1].Y = rects[i].Y; + corners[2].X = rects[i].X; + corners[2].Y = rects[i].Y + rects[i].Height; + corners[3].X = rects[i].X + rects[i].Width; + corners[3].Y = rects[i].Y + rects[i].Height; + + GdipTransformPoints(metafile->record_graphics, CoordinateSpaceDevice, + CoordinateSpaceWorld, corners, 4); + + METAFILE_AdjustFrame(metafile, corners, 4); + } + } + return Ok; } @@ -526,6 +582,57 @@ GpStatus METAFILE_GraphicsDeleted(GpMetafile* metafile) MetafileHeader header; stat = GdipGetMetafileHeaderFromEmf(metafile->hemf, &header); + if (stat == Ok && metafile->auto_frame && + metafile->auto_frame_max.X >= metafile->auto_frame_min.X) + { + RECTL bounds_rc, gdi_bounds_rc; + REAL x_scale = 2540.0 / header.DpiX; + REAL y_scale = 2540.0 / header.DpiY; + BYTE* buffer; + UINT buffer_size; + + bounds_rc.left = floorf(metafile->auto_frame_min.X * x_scale); + bounds_rc.top = floorf(metafile->auto_frame_min.Y * y_scale); + bounds_rc.right = ceilf(metafile->auto_frame_max.X * x_scale); + bounds_rc.bottom = ceilf(metafile->auto_frame_max.Y * y_scale); + + gdi_bounds_rc = header.EmfHeader.rclBounds; + if (gdi_bounds_rc.right > gdi_bounds_rc.left && gdi_bounds_rc.bottom > gdi_bounds_rc.top) + { + bounds_rc.left = min(bounds_rc.left, gdi_bounds_rc.left); + bounds_rc.top = min(bounds_rc.top, gdi_bounds_rc.top); + bounds_rc.right = max(bounds_rc.right, gdi_bounds_rc.right); + bounds_rc.bottom = max(bounds_rc.bottom, gdi_bounds_rc.bottom); + } + + buffer_size = GetEnhMetaFileBits(metafile->hemf, 0, NULL); + buffer = heap_alloc(buffer_size); + if (buffer) + { + HENHMETAFILE new_hemf; + + GetEnhMetaFileBits(metafile->hemf, buffer_size, buffer); + + ((ENHMETAHEADER*)buffer)->rclFrame = bounds_rc; + + new_hemf = SetEnhMetaFileBits(buffer_size, buffer); + + if (new_hemf) + { + DeleteEnhMetaFile(metafile->hemf); + metafile->hemf = new_hemf; + } + else + stat = OutOfMemory; + + heap_free(buffer); + } + else + stat = OutOfMemory; + + if (stat == Ok) + stat = GdipGetMetafileHeaderFromEmf(metafile->hemf, &header); + } if (stat == Ok) { metafile->bounds.X = header.X; diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 68dc407..e8281ba 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -1010,10 +1010,10 @@ static void test_nullframerect(void) { stat = GdipGetImageBounds((GpImage*)metafile, &bounds, &unit); expect(Ok, stat); expect(UnitPixel, unit); - todo_wine expectf_(25.0, bounds.X, 0.05); - todo_wine expectf_(25.0, bounds.Y, 0.05); - todo_wine expectf_(75.0, bounds.Width, 0.05); - todo_wine expectf_(75.0, bounds.Height, 0.05); + expectf_(25.0, bounds.X, 0.05); + expectf_(25.0, bounds.Y, 0.05); + expectf_(75.0, bounds.Width, 0.05); + expectf_(75.0, bounds.Height, 0.05); stat = GdipDisposeImage((GpImage*)metafile); expect(Ok, stat);

1 0

Vincent Povirk : gdiplus: Implement writing Clear operation to metafiles.
by Alexandre Julliard July 3, 2016

July 3, 2016

Module: wine Branch: master Commit: 5c6247f7e25e566afa34aa8253f1985b9f6b91a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c6247f7e25e566afa34aa825… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jun 24 12:51:41 2016 -0500 gdiplus: Implement writing Clear operation to metafiles. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 3 ++ dlls/gdiplus/metafile.c | 27 +++++++++++++ dlls/gdiplus/tests/metafile.c | 90 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 121 insertions(+) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 8924ae6..e21085f 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -86,6 +86,7 @@ extern GpStatus graphics_from_image(GpImage *image, GpGraphics **graphics) DECLS extern GpStatus METAFILE_GetGraphicsContext(GpMetafile* metafile, GpGraphics **result) DECLSPEC_HIDDEN; extern GpStatus METAFILE_GetDC(GpMetafile* metafile, HDC *hdc) DECLSPEC_HIDDEN; extern GpStatus METAFILE_ReleaseDC(GpMetafile* metafile, HDC hdc) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_GraphicsClear(GpMetafile* metafile, ARGB color) DECLSPEC_HIDDEN; extern GpStatus METAFILE_FillRectangles(GpMetafile* metafile, GpBrush* brush, GDIPCONST GpRectF* rects, INT count) DECLSPEC_HIDDEN; extern GpStatus METAFILE_SetPageTransform(GpMetafile* metafile, GpUnit unit, REAL scale) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 58d59fe..37990cf 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4379,6 +4379,9 @@ GpStatus WINGDIPAPI GdipGraphicsClear(GpGraphics *graphics, ARGB color) if(graphics->busy) return ObjectBusy; + if (graphics->image && graphics->image->type == ImageTypeMetafile) + return METAFILE_GraphicsClear((GpMetafile*)graphics->image, color); + if((stat = GdipCreateSolidFill(color, &brush)) != Ok) return stat; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index ca8aac4..2a5d830 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -57,6 +57,12 @@ typedef struct EmfPlusHeader DWORD LogicalDpiY; } EmfPlusHeader; +typedef struct EmfPlusClear +{ + EmfPlusRecordHeader Header; + DWORD Color; +} EmfPlusClear; + typedef struct EmfPlusFillRects { EmfPlusRecordHeader Header; @@ -370,6 +376,27 @@ GpStatus METAFILE_GetDC(GpMetafile* metafile, HDC *hdc) return Ok; } +GpStatus METAFILE_GraphicsClear(GpMetafile* metafile, ARGB color) +{ + if (metafile->metafile_type == MetafileTypeEmfPlusOnly || metafile->metafile_type == MetafileTypeEmfPlusDual) + { + EmfPlusClear *record; + GpStatus stat; + + stat = METAFILE_AllocateRecord(metafile, sizeof(EmfPlusClear), (void**)&record); + if (stat != Ok) + return stat; + + record->Header.Type = EmfPlusRecordTypeClear; + record->Header.Flags = 0; + record->Color = color; + + METAFILE_WriteRecords(metafile); + } + + return Ok; +} + static BOOL is_integer_rect(const GpRectF *rect) { SHORT x, y, width, height; diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 741f752..4686c41 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -862,6 +862,95 @@ static void test_fillrect(void) expect(Ok, stat); } +static const emfplus_record clear_emf_records[] = { + {0, EMR_HEADER}, + {0, EmfPlusRecordTypeHeader}, + {0, EmfPlusRecordTypeClear}, + {1, EMR_SAVEDC}, + {1, EMR_SETICMMODE}, + {1, EMR_BITBLT}, + {1, EMR_RESTOREDC}, + {0, EmfPlusRecordTypeEndOfFile}, + {0, EMR_EOF}, + {0} +}; + +static void test_clear(void) +{ + GpStatus stat; + GpMetafile *metafile; + GpGraphics *graphics; + HDC hdc; + HENHMETAFILE hemf; + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + static const GpPointF dst_points[3] = {{10.0,10.0},{20.0,10.0},{10.0,20.0}}; + static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + GpBitmap *bitmap; + ARGB color; + + hdc = CreateCompatibleDC(0); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + + DeleteDC(hdc); + + if (stat != Ok) + return; + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(InvalidParameter, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipGraphicsClear(graphics, 0xffffff00); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + save_metafile(metafile, "clear.emf"); + + stat = GdipCreateBitmapFromScan0(30, 30, 0, PixelFormat32bppRGB, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, stat); + + stat = GdipDrawImagePointsRect(graphics, (GpImage*)metafile, dst_points, 3, + 0.0, 0.0, 100.0, 100.0, UnitPixel, NULL, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap, 5, 5, &color); + expect(Ok, stat); + expect(0xff000000, color); + + stat = GdipBitmapGetPixel(bitmap, 15, 15, &color); + expect(Ok, stat); + todo_wine expect(0xffffff00, color); + + stat = GdipBitmapGetPixel(bitmap, 25, 25, &color); + expect(Ok, stat); + expect(0xff000000, color); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)bitmap); + expect(Ok, stat); + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); + + check_emfplus(hemf, clear_emf_records, "clear emf"); + + DeleteEnhMetaFile(hemf); +} + static void test_nullframerect(void) { GpStatus stat; GpMetafile *metafile; @@ -1345,6 +1434,7 @@ START_TEST(metafile) test_getdc(); test_emfonly(); test_fillrect(); + test_clear(); test_nullframerect(); test_pagetransform(); test_converttoemfplus();

1 0