wine-commits July 2016

wine-commits@winehq.org

2 participants
680 discussions

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 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 IHTMLElement:: ondragstart and onhelp properties implementation.
by Alexandre Julliard 03 Jul '16

03 Jul '16

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 FIXME for drag and dragstart events.
by Alexandre Julliard 03 Jul '16

03 Jul '16

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

Jacek Caban : mshtml: Added IHTMLElement6:: on* properties implementation for supported events.
by Alexandre Julliard 03 Jul '16

03 Jul '16

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

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

03 Jul '16

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 03 Jul '16

03 Jul '16

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

Michael Stefaniuc : shell32/tests: Avoid casts from a COM object to an iface.
by Alexandre Julliard 03 Jul '16

03 Jul '16

Module: wine Branch: master Commit: df63e1a169733431d7e83bebdc5f47e36007e3f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df63e1a169733431d7e83bebd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 29 09:53:10 2016 +0200 shell32/tests: Avoid casts from a COM object to an iface. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index e80e8a4..1591b7b 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3088,7 +3088,7 @@ static void test_SHGetIDListFromObject(void) punkimpl->ifaces = ifaces; punkimpl->unknown = 0; - hres = pSHGetIDListFromObject((IUnknown*)punkimpl, &pidl); + hres = pSHGetIDListFromObject(&punkimpl->IUnknown_iface, &pidl); ok(hres == E_NOINTERFACE, "Got %x\n", hres); ok(ifaces[0].count, "interface not requested.\n"); ok(ifaces[1].count, "interface not requested.\n"); @@ -3260,7 +3260,7 @@ static void test_SHGetItemFromObject(void) punkimpl->unknown = 0; /* The same as SHGetIDListFromObject */ - hres = pSHGetIDListFromObject((IUnknown*)punkimpl, &pidl); + hres = pSHGetIDListFromObject(&punkimpl->IUnknown_iface, &pidl); ok(hres == E_NOINTERFACE, "Got %x\n", hres); ok(ifaces[0].count, "interface not requested.\n"); ok(ifaces[1].count, "interface not requested.\n");

1 0

Michael Stefaniuc : ole32: Use the proper COM method wrapper.
by Alexandre Julliard 03 Jul '16

03 Jul '16

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 03 Jul '16

03 Jul '16

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2016