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

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

July 3, 2016

Module: wine Branch: master Commit: a04c393a73445f3016e1e3852c22846eb4295bb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a04c393a73445f3016e1e3852… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jun 25 13:59:42 2016 +0200 winemac.drv: Don't assume that owner is top-level window in set_cocoa_window_properties. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/window.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 0d507f4..db1e528 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -342,6 +342,8 @@ static void set_cocoa_window_properties(struct macdrv_win_data *data) ex_style = GetWindowLongW(data->hwnd, GWL_EXSTYLE); owner = GetWindow(data->hwnd, GW_OWNER); + if (owner) + owner = GetAncestor(owner, GA_ROOT); owner_win = macdrv_get_cocoa_window(owner, TRUE); macdrv_set_cocoa_parent_window(data->cocoa_window, owner_win);

1 0

Jacek Caban : mshtml.idl: Added IHTMLElement6 methods to element dispinterfaces.
by Alexandre Julliard July 3, 2016

July 3, 2016

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: Added IHTMLElement6:: getElementsByClassName implementation.
by Alexandre Julliard July 3, 2016

July 3, 2016

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: Added missing release_dispex call in HTMLRect destructor.
by Alexandre Julliard July 3, 2016

July 3, 2016

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 IHTMLElement2:: onscroll and onresize properties implementation.
by Alexandre Julliard July 3, 2016

July 3, 2016

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 IHTMLElement6 stub implementation.
by Alexandre Julliard July 3, 2016

July 3, 2016

Module: wine Branch: master Commit: 1b04f09be44a0d2b00e4ab1759611122412e2502 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b04f09be44a0d2b00e4ab175… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 1 11:20:11 2016 +0200 mshtml: Added IHTMLElement6 stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 666 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 + 2 files changed, 668 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b04f09be44a0d2b00e4a…

1 0

Jacek Caban : mshtml.idl: Added IHTMLElement6 declaration.
by Alexandre Julliard July 3, 2016

July 3, 2016

Module: wine Branch: master Commit: 09460e6c20193bb429b02eef8f57c167d63caab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09460e6c20193bb429b02eef8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 1 11:19:18 2016 +0200 mshtml.idl: Added IHTMLElement6 declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 49 ++++++++++ include/mshtml.idl | 273 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 322 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=09460e6c20193bb429b02…

1 0

Vincent Povirk : gdiplus: Implement playback of Clear operations.
by Alexandre Julliard July 3, 2016

July 3, 2016

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

Jacek Caban : mshtml: Specify locale in VarBstrFrom* calls.
by Alexandre Julliard July 3, 2016

July 3, 2016

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

Jacek Caban : mshtml: Added FIXME for drag and dragstart events.
by Alexandre Julliard July 3, 2016

July 3, 2016

Module: wine Branch: master Commit: b04cc8d278b2187e77d2d04eb4dc5092699370a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b04cc8d278b2187e77d2d04eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 1 11:20:34 2016 +0200 mshtml: Added FIXME for drag and dragstart events. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 0477e91..71f2768 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -196,9 +196,9 @@ static const event_info_t event_info[] = { {dblclickW, ondblclickW, EVENTT_MOUSE, DISPID_EVMETH_ONDBLCLICK, EVENT_DEFAULTLISTENER|EVENT_BUBBLE|EVENT_CANCELABLE}, {dragW, ondragW, EVENTT_MOUSE, DISPID_EVMETH_ONDRAG, - EVENT_CANCELABLE}, + EVENT_FIXME|EVENT_CANCELABLE}, {dragstartW, ondragstartW, EVENTT_MOUSE, DISPID_EVMETH_ONDRAGSTART, - EVENT_CANCELABLE}, + EVENT_FIXME|EVENT_CANCELABLE}, {errorW, onerrorW, EVENTT_NONE, DISPID_EVMETH_ONERROR, EVENT_BIND_TO_BODY}, {focusW, onfocusW, EVENTT_HTML, DISPID_EVMETH_ONFOCUS,

1 0