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

Jacek Caban : mshtml: Added IHTMLElement2:: onscroll and onresize properties implementation.
by Alexandre Julliard 03 Jul '16

03 Jul '16

Module: wine Branch: master Commit: d715fdf2c864d7ead0daa06533916b7b5b6581ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d715fdf2c864d7ead0daa0653… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 1 11:20:52 2016 +0200 mshtml: Added IHTMLElement2::onscroll and onresize 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 93448b7..b0834ee 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -2207,15 +2207,19 @@ static HRESULT WINAPI HTMLElement2_doScroll(IHTMLElement2 *iface, VARIANT compon static HRESULT WINAPI HTMLElement2_put_onscroll(IHTMLElement2 *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement2(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_node_event(&This->node, EVENTID_SCROLL, &v); } static HRESULT WINAPI HTMLElement2_get_onscroll(IHTMLElement2 *iface, VARIANT *p) { HTMLElement *This = impl_from_IHTMLElement2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->node, EVENTID_SCROLL, p); } static HRESULT WINAPI HTMLElement2_put_ondrag(IHTMLElement2 *iface, VARIANT v) @@ -2576,15 +2580,19 @@ static HRESULT WINAPI HTMLElement2_get_onfocus(IHTMLElement2 *iface, VARIANT *p) static HRESULT WINAPI HTMLElement2_put_onresize(IHTMLElement2 *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement2(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_node_event(&This->node, EVENTID_RESIZE, &v); } static HRESULT WINAPI HTMLElement2_get_onresize(IHTMLElement2 *iface, VARIANT *p) { HTMLElement *This = impl_from_IHTMLElement2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->node, EVENTID_RESIZE, p); } static HRESULT WINAPI HTMLElement2_blur(IHTMLElement2 *iface)

1 0

Jacek Caban : mshtml: Added missing release_dispex call in HTMLRect destructor.
by Alexandre Julliard 03 Jul '16

03 Jul '16

Module: wine Branch: master Commit: cb1be040ea30eba40169e6f6908c88a09c65ddcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb1be040ea30eba40169e6f69… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 1 11:21:07 2016 +0200 mshtml: Added missing release_dispex call in HTMLRect destructor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index b0834ee..7467822 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -372,6 +372,7 @@ static ULONG WINAPI HTMLRect_Release(IHTMLRect *iface) if(!ref) { if(This->nsrect) nsIDOMClientRect_Release(This->nsrect); + release_dispex(&This->dispex); heap_free(This); }

1 0

Jacek Caban : mshtml: Added IHTMLElement6:: getElementsByClassName implementation.
by Alexandre Julliard 03 Jul '16

03 Jul '16

Module: wine Branch: master Commit: 244abfcb77d48b7f01b3f463d80fb96d418a1df3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=244abfcb77d48b7f01b3f463d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 1 11:21:27 2016 +0200 mshtml: Added IHTMLElement6::getElementsByClassName implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 21 +++++++++++++++++++-- dlls/mshtml/htmlelemcol.c | 3 ++- dlls/mshtml/tests/dom.c | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 7467822..df4377a 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -4103,8 +4103,25 @@ static HRESULT WINAPI HTMLElement6_get_nodeName(IHTMLElement6 *iface, BSTR *p) static HRESULT WINAPI HTMLElement6_getElementsByClassName(IHTMLElement6 *iface, BSTR v, IHTMLElementCollection **pel) { HTMLElement *This = impl_from_IHTMLElement6(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(v), pel); - return E_NOTIMPL; + nsIDOMHTMLCollection *nscol = NULL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pel); + + if(This->nselem) { + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMHTMLElement_GetElementsByClassName(This->nselem, &nsstr, &nscol); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("GetElementsByClassName failed: %08x\n", nsres); + return E_FAIL; + } + } + + *pel = create_collection_from_htmlcol(This->node.doc, nscol); + nsIDOMHTMLCollection_Release(nscol); + return S_OK; } static HRESULT WINAPI HTMLElement6_msMatchesSelector(IHTMLElement6 *iface, BSTR v, VARIANT_BOOL *pfMatches) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index c6c65b1..6bf599d 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -723,7 +723,8 @@ IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode *doc, ns HTMLDOMNode *node; HRESULT hres = S_OK; - nsIDOMHTMLCollection_GetLength(nscol, &length); + if(nscol) + nsIDOMHTMLCollection_GetLength(nscol, &length); buf.len = buf.size = length; if(buf.len) { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index dce65d5..dec9cdd 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -8038,6 +8038,43 @@ static void test_selectors(IHTMLDocument2 *doc, IHTMLElement *div) IElementSelector_Release(elem_selector); } +static void test_elemsbyclass(IHTMLElement *div) +{ + IHTMLElementCollection *collection; + IHTMLElement6 *elem; + BSTR str; + HRESULT hres; + + static const elem_type_t types[] = {ET_DIV, ET_FORM}; + + test_elem_set_innerhtml((IUnknown*)div, "<div class=\"cl1\"><form class=\"cl1\"></form></div><div class=\"cl2\"></div>"); + + hres = IHTMLElement_QueryInterface(div, &IID_IHTMLElement6, (void**)&elem); + ok(hres == S_OK || broken(hres == E_NOINTERFACE), "Could not get IHTMLElement6 iface: %08x\n", hres); + if(FAILED(hres)) { + win_skip("IHTMLElement6 tests skipped.\n"); + return; + } + + collection = NULL; + str = a2bstr("nomatch"); + hres = IHTMLElement6_getElementsByClassName(elem, str, &collection); + ok(hres == S_OK, "getElementsByClassName failed: %08x\n", hres); + ok(collection != NULL, "collection == NULL\n"); + test_elem_collection((IUnknown*)collection, NULL, 0); + IHTMLElementCollection_Release(collection); + + collection = NULL; + str = a2bstr("cl1"); + hres = IHTMLElement6_getElementsByClassName(elem, str, &collection); + ok(hres == S_OK, "getElementsByClassName failed: %08x\n", hres); + ok(collection != NULL, "collection == NULL\n"); + test_elem_collection((IUnknown*)collection, types, sizeof(types)/sizeof(*types)); + IHTMLElementCollection_Release(collection); + + IHTMLElement6_Release(elem); +} + static void test_elems(IHTMLDocument2 *doc) { IHTMLElementCollection *col; @@ -9113,6 +9150,7 @@ static void test_elems2(IHTMLDocument2 *doc) } test_selectors(doc, div); + test_elemsbyclass(div); test_elem_set_innerhtml((IUnknown*)div, "<div id=\"elemid\">test</div>"); elem = get_elem_by_id(doc, "elemid", TRUE);

1 0

Jacek Caban : mshtml.idl: Added IHTMLElement6 methods to element dispinterfaces.
by Alexandre Julliard 03 Jul '16

03 Jul '16

Module: wine Branch: master Commit: 6a252eb2677bdce04802ccade0e116069ae81b68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a252eb2677bdce04802ccade… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 1 11:21:47 2016 +0200 mshtml.idl: Added IHTMLElement6 methods to element dispinterfaces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtml.idl | 243 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 243 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a252eb2677bdce04802c…

1 0

Jacek Caban : mshtml: Specify locale in VarBstrFrom* calls.
by Alexandre Julliard 03 Jul '16

03 Jul '16

Module: wine Branch: master Commit: 39cba73ab57b02dae8666aa369adb7055a5a8c32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39cba73ab57b02dae8666aa36… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 1 11:33:47 2016 +0200 mshtml: Specify locale in VarBstrFrom* calls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmltable.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 7e894c0..523d5fd 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -68,13 +68,13 @@ static HRESULT var2str(const VARIANT *p, nsAString *nsstr) return nsAString_Init(nsstr, V_BSTR(p))? S_OK : E_OUTOFMEMORY; case VT_R8: - hres = VarBstrFromR8(V_R8(p), 0, 0, &str); + hres = VarBstrFromR8(V_R8(p), MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT), 0, &str); break; case VT_R4: - hres = VarBstrFromR4(V_R4(p), 0, 0, &str); + hres = VarBstrFromR4(V_R4(p), MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT), 0, &str); break; case VT_I4: - hres = VarBstrFromI4(V_I4(p), 0, 0, &str); + hres = VarBstrFromI4(V_I4(p), MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT), 0, &str); break; default: FIXME("unsupported arg %s\n", debugstr_variant(p));

1 0

Vincent Povirk : gdiplus: Account for world transform in GdipGraphicsClear.
by Alexandre Julliard 03 Jul '16

03 Jul '16

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

Vincent Povirk : gdiplus: Clip metafile drawing to destination points.
by Alexandre Julliard 03 Jul '16

03 Jul '16

Module: wine Branch: master Commit: 10516308a8d018e6016431d069f38b9ad292afd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10516308a8d018e6016431d06… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jun 24 12:51:40 2016 -0500 gdiplus: Clip metafile drawing to destination points. 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/metafile.c | 46 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 22478a3..8924ae6 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -358,6 +358,7 @@ struct GpMetafile{ GpMatrix *world_transform; GpUnit page_unit; REAL page_scale; + GpRegion *base_clip; /* clip region in device space for all metafile output */ }; struct GpBitmap{ diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index ee16d8e..ca8aac4 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -591,6 +591,11 @@ static void METAFILE_PlaybackReleaseDC(GpMetafile *metafile) } } +static GpStatus METAFILE_PlaybackUpdateClip(GpMetafile *metafile) +{ + return GdipCombineRegionRegion(metafile->playback_graphics->clip, metafile->base_clip, CombineModeReplace); +} + static GpStatus METAFILE_PlaybackUpdateWorldTransform(GpMetafile *metafile) { GpMatrix *real_transform; @@ -822,6 +827,7 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics *graphics, GpStatus stat; GpMetafile *real_metafile = (GpMetafile*)metafile; /* whoever made this const was joking */ GraphicsContainer state; + GpPath *dst_path; TRACE("(%p,%p,%p,%i,%p,%i,%p,%p,%p)\n", graphics, metafile, destPoints, count, srcRect, srcUnit, callback, callbackData, @@ -862,6 +868,38 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics *graphics, stat = GdipSetPageUnit(graphics, UnitPixel); if (stat == Ok) + stat = GdipResetWorldTransform(graphics); + + if (stat == Ok) + stat = GdipCreateRegion(&real_metafile->base_clip); + + if (stat == Ok) + stat = GdipGetClip(graphics, real_metafile->base_clip); + + if (stat == Ok) + stat = GdipCreatePath(FillModeAlternate, &dst_path); + + if (stat == Ok) + { + GpPointF clip_points[4]; + + clip_points[0] = real_metafile->playback_points[0]; + clip_points[1] = real_metafile->playback_points[1]; + clip_points[2].X = real_metafile->playback_points[1].X + real_metafile->playback_points[2].X + - real_metafile->playback_points[0].X; + clip_points[2].Y = real_metafile->playback_points[1].Y + real_metafile->playback_points[2].Y + - real_metafile->playback_points[0].Y; + clip_points[3] = real_metafile->playback_points[2]; + + stat = GdipAddPathPolygon(dst_path, clip_points, 4); + + if (stat == Ok) + stat = GdipCombineRegionPath(real_metafile->base_clip, dst_path, CombineModeIntersect); + + GdipDeletePath(dst_path); + } + + if (stat == Ok) stat = GdipCreateMatrix(&real_metafile->world_transform); if (stat == Ok) @@ -871,6 +909,11 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics *graphics, stat = METAFILE_PlaybackUpdateWorldTransform(real_metafile); } + if (stat == Ok) + { + stat = METAFILE_PlaybackUpdateClip(real_metafile); + } + if (stat == Ok && (metafile->metafile_type == MetafileTypeEmf || metafile->metafile_type == MetafileTypeWmfPlaceable || metafile->metafile_type == MetafileTypeWmf)) @@ -884,6 +927,9 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics *graphics, GdipDeleteMatrix(real_metafile->world_transform); real_metafile->world_transform = NULL; + GdipDeleteRegion(real_metafile->base_clip); + real_metafile->base_clip = NULL; + GdipEndContainer(graphics, state); }

1 0

Vincent Povirk : gdiplus: Implement writing Clear operation to metafiles.
by Alexandre Julliard 03 Jul '16

03 Jul '16

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

Vincent Povirk : gdiplus: Implement playback of Clear operations.
by Alexandre Julliard 03 Jul '16

03 Jul '16

Module: wine Branch: master Commit: 0f3db73628414dc23f0277e665c9363b84f72c9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f3db73628414dc23f0277e66… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jun 24 12:51:42 2016 -0500 gdiplus: Implement playback of Clear operations. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 6 ++++++ dlls/gdiplus/tests/metafile.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 2a5d830..b1c38db 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -700,6 +700,12 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, case EmfPlusRecordTypeGetDC: METAFILE_PlaybackGetDC((GpMetafile*)metafile); break; + case EmfPlusRecordTypeClear: + { + EmfPlusClear *record = (EmfPlusClear*)header; + + return GdipGraphicsClear(metafile->playback_graphics, record->Color); + } case EmfPlusRecordTypeFillRects: { EmfPlusFillRects *record = (EmfPlusFillRects*)header; diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 4686c41..68dc407 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -928,7 +928,7 @@ static void test_clear(void) stat = GdipBitmapGetPixel(bitmap, 15, 15, &color); expect(Ok, stat); - todo_wine expect(0xffffff00, color); + expect(0xffffff00, color); stat = GdipBitmapGetPixel(bitmap, 25, 25, &color); expect(Ok, stat);

1 0

Vincent Povirk : gdiplus: Account for GDI+ drawing operations in the metafile frame.
by Alexandre Julliard 03 Jul '16

03 Jul '16

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