March 2019 - Wine-commits - list.winehq.org

Isira Seneviratne : winecfg: Fix some punctuation in error messages.
by Alexandre Julliard 26 Mar '19

26 Mar '19

1 0

Józef Kucia : wined3d: Pass context to vp_free() and free_private().
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 6cc36f7296836a8c8da46441edb252a1a5672de4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cc36f7296836a8c8da46441… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 26 18:29:46 2019 +0100 wined3d: Pass context to vp_free() and free_private(). Avoid using "adapter->gl_info". Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 20 ++++++++++-------- dlls/wined3d/ati_fragment_shader.c | 10 +++++---- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/glsl_shader.c | 40 +++++++++++++++++++----------------- dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/shader.c | 8 ++++---- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/wined3d_private.h | 6 +++--- 8 files changed, 50 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6cc36f7296836a8c8da4…

1 0

Gijs Vermeulen : hnetcfg: Initialize INetFwRules:: get__NewEnum out parameter.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 16803516ef0967b1290bcdac269f4e157af163f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16803516ef0967b1290bcdac… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Mar 26 17:04:44 2019 +0100 hnetcfg: Initialize INetFwRules::get__NewEnum out parameter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46906 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/policy.c | 4 ++++ dlls/hnetcfg/tests/policy.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/dlls/hnetcfg/policy.c b/dlls/hnetcfg/policy.c index 53f39ae..26b7cc1 100644 --- a/dlls/hnetcfg/policy.c +++ b/dlls/hnetcfg/policy.c @@ -238,6 +238,10 @@ static HRESULT WINAPI netfw_rules_get__NewEnum( fw_rules *This = impl_from_INetFwRules( iface ); FIXME("%p, %p\n", This, newEnum); + + if (!newEnum) return E_POINTER; + *newEnum = NULL; + return E_NOTIMPL; } diff --git a/dlls/hnetcfg/tests/policy.c b/dlls/hnetcfg/tests/policy.c index 3fa8348..8701455 100644 --- a/dlls/hnetcfg/tests/policy.c +++ b/dlls/hnetcfg/tests/policy.c @@ -60,6 +60,9 @@ static void test_policy2_rules(INetFwPolicy2 *policy2) INetFwServiceRestriction_Release(restriction); } + hr = INetFwRules_get__NewEnum(rules, NULL); + ok(hr == E_POINTER, "got %08x\n", hr); + INetFwRules_Release(rules); INetFwRules_Release(rules2); }

1 0

Jacek Caban : mshtml: Add IHTMLCSSStyleDeclaration:: getPropertyValue implementation.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 069d5de90af595f75272f2e446c3f16ccf25ff4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=069d5de90af595f75272f2e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 26 17:26:36 2019 +0100 mshtml: Add IHTMLCSSStyleDeclaration::getPropertyValue implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 16 +++++++++++++--- dlls/mshtml/tests/elements.js | 8 ++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 5e2d68a..88dd4a3 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -4989,11 +4989,21 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_get_parentRule(IHTMLCSSStyleDeclar return E_NOTIMPL; } -static HRESULT WINAPI HTMLCSSStyleDeclaration_getPropertyValue(IHTMLCSSStyleDeclaration *iface, BSTR bstrPropertyName, BSTR *pbstrPropertyValue) +static HRESULT WINAPI HTMLCSSStyleDeclaration_getPropertyValue(IHTMLCSSStyleDeclaration *iface, BSTR name, BSTR *value) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrPropertyName), pbstrPropertyValue); - return E_NOTIMPL; + const style_tbl_entry_t *style_entry; + nsAString name_str, value_str; + nsresult nsres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(name), value); + + style_entry = lookup_style_tbl(name); + nsAString_InitDepend(&name_str, style_entry ? style_entry->name : name); + nsAString_InitDepend(&value_str, NULL); + nsres = nsIDOMCSSStyleDeclaration_GetPropertyValue(This->nsstyle, &name_str, &value_str); + nsAString_Finish(&name_str); + return return_nsstr(nsres, &value_str, value); } static HRESULT WINAPI HTMLCSSStyleDeclaration_getPropertyPriority(IHTMLCSSStyleDeclaration *iface, BSTR bstrPropertyName, BSTR *pbstrPropertyPriority) diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index b23f5c1..188a277 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -238,6 +238,10 @@ function test_style_properties() { style.cssFloat = "left"; ok(style.cssFloat === "left", "cssFloat = " + style.cssFloat); + ok(style.getPropertyValue("float") === "left", + 'style.getPropertyValue("float") = ' + style.getPropertyValue("float")); + ok(style.getPropertyValue("cssFloat") === "", + 'style.getPropertyValue("cssFloat") = ' + style.getPropertyValue("cssFloat")); val = style.removeProperty("float"); ok(val === "left", "removeProperty() returned " + val); @@ -262,6 +266,10 @@ function test_style_properties() { style["z-index"] = 1; ok(style.zIndex === 1, "zIndex = " + style.zIndex); ok(style["z-index"] === 1, "z-index = " + style["z-index"]); + ok(style.getPropertyValue("z-index") === "1", + 'style.getPropertyValue("x-index") = ' + style.getPropertyValue("z-index")); + ok(style.getPropertyValue("zIndex") === "", + 'style.getPropertyValue("xIndex") = ' + style.getPropertyValue("zIndex")); style.setProperty("border-width", "5px"); ok(style.borderWidth === "5px", "style.borderWidth = " + style.borderWidth);

1 0

Jacek Caban : mshtml: Use CSSStyle for HTMLCurrentStyle implementation.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 68d0052b6306d06472f0809be748a73861f57edd URL: https://source.winehq.org/git/wine.git/?a=commit;h=68d0052b6306d06472f0809b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 26 17:26:53 2019 +0100 mshtml: Use CSSStyle for HTMLCurrentStyle implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlcurstyle.c | 106 ++++++++++++++++++--------------------------- dlls/mshtml/htmlstyle.c | 4 +- dlls/mshtml/htmlstyle.h | 2 + 3 files changed, 45 insertions(+), 67 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=68d0052b6306d06472f0…

1 0

Jacek Caban : mshtml: Pass style as CSSStyle to current style property getters.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: edb4eca7882b11d5b589ebe0bdf1901fea4eb0be URL: https://source.winehq.org/git/wine.git/?a=commit;h=edb4eca7882b11d5b589ebe0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 26 17:27:00 2019 +0100 mshtml: Pass style as CSSStyle to current style property getters. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/htmlstyle.c | 8 ++++---- dlls/mshtml/htmlstyle.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 668cc2b..63e8a25 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -45,12 +45,12 @@ struct HTMLCurrentStyle { static inline HRESULT get_current_style_property(HTMLCurrentStyle *current_style, styleid_t sid, BSTR *p) { - return get_nsstyle_property(current_style->css_style.nsstyle, sid, COMPAT_MODE_QUIRKS, p); + return get_style_property(&current_style->css_style, sid, p); } static inline HRESULT get_current_style_property_var(HTMLCurrentStyle *This, styleid_t sid, VARIANT *v) { - return get_nsstyle_property_var(This->css_style.nsstyle, sid, COMPAT_MODE_QUIRKS, v); + return get_style_property_var(&This->css_style, sid, v); } static inline HTMLCurrentStyle *impl_from_IHTMLCurrentStyle(IHTMLCurrentStyle *iface) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index e35c93b..425a53c 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1077,7 +1077,7 @@ static HRESULT nsstyle_to_bstr(const WCHAR *val, DWORD flags, BSTR *p) return S_OK; } -HRESULT get_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, compat_mode_t compat_mode, BSTR *p) +static HRESULT get_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, compat_mode_t compat_mode, BSTR *p) { nsAString str_value; const PRUnichar *value; @@ -1095,7 +1095,7 @@ HRESULT get_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, return hres; } -HRESULT get_nsstyle_property_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, compat_mode_t compat_mode, VARIANT *p) +static HRESULT get_nsstyle_property_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, compat_mode_t compat_mode, VARIANT *p) { unsigned flags = style_tbl[sid].flags; nsAString str_value; @@ -1145,12 +1145,12 @@ HRESULT get_nsstyle_property_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t s return S_OK; } -static inline HRESULT get_style_property(CSSStyle *style, styleid_t sid, BSTR *p) +HRESULT get_style_property(CSSStyle *style, styleid_t sid, BSTR *p) { return get_nsstyle_property(style->nsstyle, sid, dispex_compat_mode(&style->dispex), p); } -static inline HRESULT get_style_property_var(CSSStyle *style, styleid_t sid, VARIANT *v) +HRESULT get_style_property_var(CSSStyle *style, styleid_t sid, VARIANT *v) { return get_nsstyle_property_var(style->nsstyle, sid, dispex_compat_mode(&style->dispex), v); } diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 2a67ded..bb92a00 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -140,8 +140,8 @@ HRESULT HTMLStyle_Create(HTMLElement*,HTMLStyle**) DECLSPEC_HIDDEN; void init_css_style(CSSStyle*,nsIDOMCSSStyleDeclaration*,style_qi_t, dispex_static_data_t*,compat_mode_t) DECLSPEC_HIDDEN; -HRESULT get_nsstyle_property(nsIDOMCSSStyleDeclaration*,styleid_t,compat_mode_t,BSTR*) DECLSPEC_HIDDEN; -HRESULT get_nsstyle_property_var(nsIDOMCSSStyleDeclaration*,styleid_t,compat_mode_t,VARIANT*) DECLSPEC_HIDDEN; +HRESULT get_style_property(CSSStyle*,styleid_t,BSTR*) DECLSPEC_HIDDEN; +HRESULT get_style_property_var(CSSStyle*,styleid_t,VARIANT*) DECLSPEC_HIDDEN; HRESULT get_elem_style(HTMLElement*,styleid_t,BSTR*) DECLSPEC_HIDDEN; HRESULT set_elem_style(HTMLElement*,styleid_t,const WCHAR*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Use interface agnostic form of dispids for compat_dispid.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 9d35d09e894ed515a643c14af46a9714c00f4e53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d35d09e894ed515a643c14a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 26 17:27:10 2019 +0100 mshtml: Use interface agnostic form of dispids for compat_dispid. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 174 ++++++++++++++++++++++++------------------------ 1 file changed, 87 insertions(+), 87 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9d35d09e894ed515a643…

1 0

Jacek Caban : mshtml: Expose IHTMLCSSStyleDeclaration to scripts from current style object.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 2cd8ff37510e3326d9665ac5f3510c6782afcfb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cd8ff37510e3326d9665ac5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 26 17:27:16 2019 +0100 mshtml: Expose IHTMLCSSStyleDeclaration to scripts from current style object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlcurstyle.c | 5 +++-- dlls/mshtml/htmlstyle.c | 12 ++++++------ dlls/mshtml/htmlstyle.h | 3 +++ dlls/mshtml/tests/documentmode.js | 15 +++++++++++++++ dlls/mshtml/tests/elements.js | 6 ++++++ 5 files changed, 33 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 63e8a25..85ac99a 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -1301,9 +1301,10 @@ static const tid_t HTMLCurrentStyle_iface_tids[] = { 0 }; static dispex_static_data_t HTMLCurrentStyle_dispex = { - NULL, + &CSSStyle_dispex_vtbl, DispHTMLCurrentStyle_tid, - HTMLCurrentStyle_iface_tids + HTMLCurrentStyle_iface_tids, + CSSStyle_init_dispex_info }; HRESULT HTMLCurrentStyle_Create(HTMLElement *elem, IHTMLCurrentStyle **p) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index f885cec..584ac59 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -10128,7 +10128,7 @@ static const IHTMLCSSStyleDeclaration2Vtbl HTMLCSSStyleDeclaration2Vtbl = { HTMLCSSStyleDeclaration2_get_animationFillMode }; -static HRESULT HTMLStyle_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, DISPID *dispid) +static HRESULT CSSStyle_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, DISPID *dispid) { const style_tbl_entry_t *style_entry; @@ -10146,15 +10146,15 @@ static HRESULT HTMLStyle_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, return DISP_E_UNKNOWNNAME; } -static void HTMLStyle_init_dispex_info(dispex_data_t *info, compat_mode_t mode) +void CSSStyle_init_dispex_info(dispex_data_t *info, compat_mode_t mode) { if(mode >= COMPAT_MODE_IE9) dispex_info_add_interface(info, IHTMLCSSStyleDeclaration_tid, NULL); } -static const dispex_static_data_vtbl_t HTMLStyle_dispex_vtbl = { +const dispex_static_data_vtbl_t CSSStyle_dispex_vtbl = { NULL, - HTMLStyle_get_dispid, + CSSStyle_get_dispid, NULL, NULL }; @@ -10169,10 +10169,10 @@ static const tid_t HTMLStyle_iface_tids[] = { 0 }; static dispex_static_data_t HTMLStyle_dispex = { - &HTMLStyle_dispex_vtbl, + &CSSStyle_dispex_vtbl, DispHTMLStyle_tid, HTMLStyle_iface_tids, - HTMLStyle_init_dispex_info + CSSStyle_init_dispex_info }; static HRESULT get_style_from_elem(HTMLElement *elem, nsIDOMCSSStyleDeclaration **ret) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index bb92a00..2c4b76b 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -140,6 +140,9 @@ HRESULT HTMLStyle_Create(HTMLElement*,HTMLStyle**) DECLSPEC_HIDDEN; void init_css_style(CSSStyle*,nsIDOMCSSStyleDeclaration*,style_qi_t, dispex_static_data_t*,compat_mode_t) DECLSPEC_HIDDEN; +void CSSStyle_init_dispex_info(dispex_data_t *info, compat_mode_t mode) DECLSPEC_HIDDEN; +const dispex_static_data_vtbl_t CSSStyle_dispex_vtbl DECLSPEC_HIDDEN; + HRESULT get_style_property(CSSStyle*,styleid_t,BSTR*) DECLSPEC_HIDDEN; HRESULT get_style_property_var(CSSStyle*,styleid_t,VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 1cbf13e..63dad76 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -98,6 +98,8 @@ function test_window_props() { var v = document.documentMode; test_exposed("postMessage", true); + test_exposed("sessionStorage", true); + test_exposed("localStorage", true); test_exposed("addEventListener", v >= 9); test_exposed("removeEventListener", v >= 9); test_exposed("dispatchEvent", v >= 9); @@ -152,6 +154,19 @@ function test_style_props() { test_exposed("removeProperty", v >= 9); test_exposed("background-clip", v >= 9); + style = document.body.currentStyle; + + test_exposed("zIndex", true); + test_exposed("z-index", true); + test_exposed("filter", true); + test_exposed("pixelTop", false); + test_exposed("float", true); + test_exposed("css-float", false); + test_exposed("style-float", false); + test_exposed("setProperty", v >= 9); + test_exposed("removeProperty", v >= 9); + test_exposed("background-clip", v >= 9); + next_test(); } diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index 188a277..47a8dcc 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -234,6 +234,7 @@ function test_document_owner() { function test_style_properties() { var style = document.body.style; + var current_style = document.body.currentStyle; var val; style.cssFloat = "left"; @@ -295,6 +296,11 @@ function test_style_properties() { style.setProperty("border-width", "8px", undefined); ok(style.borderWidth === "7px", "style.borderWidth = " + style.borderWidth); + style.clip = "rect(1px 1px 10px 10px)"; + ok(style.clip === "rect(1px, 1px, 10px, 10px)", "style.clip = " + style.clip); + ok(current_style.clip === "rect(1px, 1px, 10px, 10px)", + "current_style.clip = " + current_style.clip); + next_test(); }

1 0

Jacek Caban : mshtml: Introduce map_nsresult and use it in return_nsstr.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 78a05ca6dd746325de4a17b4fbe892b9ff50a373 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78a05ca6dd746325de4a17b4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 26 17:27:22 2019 +0100 mshtml: Introduce map_nsresult and use it in return_nsstr. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsembed.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 33d251d..cebed37 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -848,14 +848,35 @@ void nsAString_Finish(nsAString *str) NS_StringContainerFinish(str); } +static HRESULT map_nsresult(nsresult nsres) +{ + switch(nsres) { + case NS_OK: + return S_OK; + case NS_ERROR_OUT_OF_MEMORY: + return E_OUTOFMEMORY; + case NS_ERROR_NOT_IMPLEMENTED: + return E_NOTIMPL; + case NS_NOINTERFACE: + return E_NOINTERFACE; + case NS_ERROR_INVALID_POINTER: + return E_POINTER; + case NS_ERROR_INVALID_ARG: + return E_INVALIDARG; + case NS_ERROR_UNEXPECTED: + return E_UNEXPECTED; + } + return E_FAIL; +} + HRESULT return_nsstr(nsresult nsres, nsAString *nsstr, BSTR *p) { const PRUnichar *str; if(NS_FAILED(nsres)) { - ERR("failed: %08x\n", nsres); + WARN("failed: %08x\n", nsres); nsAString_Finish(nsstr); - return E_FAIL; + return map_nsresult(nsres); } nsAString_GetData(nsstr, &str);

1 0

Jacek Caban : mshtml: Propagate nsIDOMCSSStyleDeclaration errors.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 9944c4bd688b40c3c856d37517c2587996157cd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9944c4bd688b40c3c856d375… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 26 17:27:32 2019 +0100 mshtml: Propagate nsIDOMCSSStyleDeclaration errors. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 31 +++++++++++-------------------- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/nsembed.c | 4 +++- dlls/mshtml/tests/dom.c | 36 +++++++++++++++++++++++++++++++++--- 4 files changed, 49 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 584ac59..7f99c89 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -921,16 +921,13 @@ static HRESULT set_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_ nsAString_InitDepend(&str_name, style_tbl[sid].name); nsAString_InitDepend(&str_value, value); nsAString_InitDepend(&str_empty, emptyW); - nsres = nsIDOMCSSStyleDeclaration_SetProperty(nsstyle, &str_name, &str_value, &str_empty); - if(NS_FAILED(nsres)) - ERR("SetProperty failed: %08x\n", nsres); - nsAString_Finish(&str_name); nsAString_Finish(&str_value); nsAString_Finish(&str_empty); - - return S_OK; + if(NS_FAILED(nsres)) + WARN("SetProperty failed: %08x\n", nsres); + return map_nsresult(nsres); } static HRESULT var_to_styleval(CSSStyle *style, const VARIANT *v, const style_tbl_entry_t *entry, WCHAR *buf, const WCHAR **ret) @@ -1023,12 +1020,9 @@ static HRESULT get_nsstyle_attr_nsval(nsIDOMCSSStyleDeclaration *nsstyle, stylei nsAString_InitDepend(&str_name, style_tbl[sid].name); nsres = nsIDOMCSSStyleDeclaration_GetPropertyValue(nsstyle, &str_name, value); nsAString_Finish(&str_name); - if(NS_FAILED(nsres)) { - ERR("SetProperty failed: %08x\n", nsres); - return E_FAIL; - } - - return S_OK; + if(NS_FAILED(nsres)) + WARN("GetPropertyValue failed: %08x\n", nsres); + return map_nsresult(nsres); } static HRESULT nsstyle_to_bstr(const WCHAR *val, DWORD flags, BSTR *p) @@ -3179,11 +3173,11 @@ static HRESULT WINAPI HTMLStyle_removeAttribute(IHTMLStyle *iface, BSTR strAttri nsAString_GetData(&ret_str, &ret); *pfSuccess = variant_bool(*ret); }else { - ERR("RemoveProperty failed: %08x\n", nsres); + WARN("RemoveProperty failed: %08x\n", nsres); } nsAString_Finish(&name_str); nsAString_Finish(&ret_str); - return NS_SUCCEEDED(nsres) ? S_OK : E_FAIL; + return map_nsresult(nsres); } static HRESULT WINAPI HTMLStyle_toString(IHTMLStyle *iface, BSTR *String) @@ -5063,12 +5057,9 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_setProperty(IHTMLCSSStyleDeclarati nsAString_Finish(&name_str); nsAString_Finish(&value_str); nsAString_Finish(&priority_str); - if(NS_FAILED(nsres)) { - FIXME("SetProperty failed: %08x\n", nsres); - return E_FAIL; - } - - return S_OK; + if(NS_FAILED(nsres)) + WARN("SetProperty failed: %08x\n", nsres); + return map_nsresult(nsres); } static HRESULT WINAPI HTMLCSSStyleDeclaration_item(IHTMLCSSStyleDeclaration *iface, LONG index, BSTR *pbstrPropertyName) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 14cc561..a2b05e7 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -56,6 +56,7 @@ #define NS_ERROR_NOT_AVAILABLE ((nsresult)0x80040111L) #define NS_ERROR_INVALID_ARG ((nsresult)0x80070057L) #define NS_ERROR_UNEXPECTED ((nsresult)0x8000ffffL) +#define NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR ((nsresult)0x80530007) #define NS_ERROR_MODULE_NETWORK 6 @@ -958,6 +959,7 @@ void nsAString_InitDepend(nsAString*,const PRUnichar*) DECLSPEC_HIDDEN; UINT32 nsAString_GetData(const nsAString*,const PRUnichar**) DECLSPEC_HIDDEN; void nsAString_Finish(nsAString*) DECLSPEC_HIDDEN; +HRESULT map_nsresult(nsresult) DECLSPEC_HIDDEN; HRESULT return_nsstr(nsresult,nsAString*,BSTR*) DECLSPEC_HIDDEN; HRESULT return_nsstr_variant(nsresult nsres, nsAString *nsstr, VARIANT *p) DECLSPEC_HIDDEN; HRESULT return_nsform(nsresult,nsIDOMHTMLFormElement*,IHTMLFormElement**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index cebed37..6aa2812 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -848,7 +848,7 @@ void nsAString_Finish(nsAString *str) NS_StringContainerFinish(str); } -static HRESULT map_nsresult(nsresult nsres) +HRESULT map_nsresult(nsresult nsres) { switch(nsres) { case NS_OK: @@ -865,6 +865,8 @@ static HRESULT map_nsresult(nsresult nsres) return E_INVALIDARG; case NS_ERROR_UNEXPECTED: return E_UNEXPECTED; + case NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR: + return 0x80700007; /* according to tests */ } return E_FAIL; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 8c7548a..bf23163 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6750,6 +6750,27 @@ static void test_xmlhttprequest(IHTMLWindow5 *window) VariantClear(&var); } +static void test_read_only_style(IHTMLCSSStyleDeclaration *style) +{ + BSTR none = a2bstr("none"), display = a2bstr("display"), str; + VARIANT v; + HRESULT hres; + + hres = IHTMLCSSStyleDeclaration_put_display(style, none); + ok(hres == 0x80700007, "put_display failed: %08x\n", hres); + + hres = IHTMLCSSStyleDeclaration_removeProperty(style, display, &str); + ok(hres == 0x80700007, "removeProperty failed: %08x\n", hres); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = none; + hres = IHTMLCSSStyleDeclaration_setProperty(style, display, &v, NULL); + ok(hres == 0x80700007, "setProperty returned: %08x\n", hres); + + SysFreeString(none); + SysFreeString(display); +} + static void test_window(IHTMLDocument2 *doc) { IHTMLWindow2 *window, *window2, *self, *parent; @@ -7099,10 +7120,19 @@ static void test_defaults(IHTMLDocument2 *doc) test_ifaces((IUnknown*)cstyle, cstyle_iids); hres = IHTMLCurrentStyle_QueryInterface(cstyle, &IID_IHTMLCurrentStyle4, (void**)&unk); - if(SUCCEEDED(hres)) + if(SUCCEEDED(hres)) { + IHTMLCSSStyleDeclaration *css_style; + + hres = IHTMLCurrentStyle_QueryInterface(cstyle, &IID_IHTMLCSSStyleDeclaration, (void**)&css_style); + if(SUCCEEDED(hres)) { + test_read_only_style(css_style); + IHTMLCSSStyleDeclaration_Release(css_style); + }else { + win_skip("IHTMLCSSStyleDeclaration not supported\n"); + } + IUnknown_Release(unk); - else - { + }else { /*IE6 doesn't have interface */ win_skip("IID_IHTMLCurrentStyle4 not supported\n"); }

1 0