wine-commits June 2020

wine-commits@winehq.org

1 participants
947 discussions

Jacek Caban : mshtml: Add IHTMLCSSStyleDeclaration2::transform property implementation.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: 8d40873d02c6613d9ccf06045d7243ddbe94aec6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d40873d02c6613d9ccf0604… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 5 18:28:48 2020 +0200 mshtml: Add IHTMLCSSStyleDeclaration2::transform property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 12 ++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 33 ++++++++++++++++++++++++++++++++- 3 files changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 15e2f26303..fb58d09063 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -793,6 +793,10 @@ static const style_tbl_entry_t style_tbl[] = { DISPID_IHTMLCSSSTYLEDECLARATION_TOP, STDPROPID_XOBJ_TOP }, + { + L"transform", + DISPID_IHTMLCSSSTYLEDECLARATION2_TRANSFORM + }, { vertical_alignW, DISPID_IHTMLCSSSTYLEDECLARATION_VERTICALALIGN, @@ -9577,15 +9581,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_msTouchSelect(IHTMLCSSStyleDe static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_transform(IHTMLCSSStyleDeclaration2 *iface, BSTR v) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + return set_style_property(This, STYLEID_TRANSFORM, v); } static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_transform(IHTMLCSSStyleDeclaration2 *iface, BSTR *p) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_style_property(This, STYLEID_TRANSFORM, p); } static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_transformOrigin(IHTMLCSSStyleDeclaration2 *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 7a83897043..5e7ba0b6e1 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -126,6 +126,7 @@ typedef enum { STYLEID_TEXT_INDENT, STYLEID_TEXT_TRANSFORM, STYLEID_TOP, + STYLEID_TRANSFORM, STYLEID_VERTICAL_ALIGN, STYLEID_VISIBILITY, STYLEID_WHITE_SPACE, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index d79d1bef06..de685dd318 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -829,6 +829,34 @@ static void test_css_style_declaration(IHTMLCSSStyleDeclaration *css_style) VariantClear(&v); } +static void test_css_style_declaration2(IHTMLCSSStyleDeclaration2 *css_style) +{ + BSTR str; + HRESULT hres; + + str = SysAllocString(L"translate(30px, 20px)"); + hres = IHTMLCSSStyleDeclaration2_put_transform(css_style, str); + ok(hres == S_OK, "put_transform failed: %08x\n", hres); + SysFreeString(str); + + str = NULL; + hres = IHTMLCSSStyleDeclaration2_get_transform(css_style, &str); + ok(hres == S_OK, "get_transform failed: %08x\n", hres); + ok(!lstrcmpW(str, L"translate(30px, 20px)"), "transform = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = SysAllocString(L"none"); + hres = IHTMLCSSStyleDeclaration2_put_transform(css_style, str); + ok(hres == S_OK, "put_transform failed: %08x\n", hres); + SysFreeString(str); + + str = NULL; + hres = IHTMLCSSStyleDeclaration2_get_transform(css_style, &str); + ok(hres == S_OK, "get_transform failed: %08x\n", hres); + ok(!lstrcmpW(str, L"none"), "transform = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); +} + static void test_body_style(IHTMLStyle *style) { IHTMLCSSStyleDeclaration *css_style; @@ -2977,8 +3005,11 @@ static void test_body_style(IHTMLStyle *style) win_skip("IHTMLStyle6 not available\n"); } - if(compat_mode >= COMPAT_IE9) + if(compat_mode >= COMPAT_IE9) { test_css_style_declaration(css_style); + if(css_style2) + test_css_style_declaration2(css_style2); + } if(css_style2) IHTMLCSSStyleDeclaration2_Release(css_style2);

1 0

Jacek Caban : mshtml: Use default white value in IHTMLDocument2::get_bgColor.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: d90c1e1c7fad0178a921d5737c9a4769c34046dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=d90c1e1c7fad0178a921d573… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 5 18:28:37 2020 +0200 mshtml: Use default white value in IHTMLDocument2::get_bgColor. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49062 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 36 ++++++++++++++---------------------- dlls/mshtml/tests/dom.c | 8 ++++++++ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index a000884dc8..57ec662de8 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -711,34 +711,26 @@ static HRESULT WINAPI HTMLDocument_put_bgColor(IHTMLDocument2 *iface, VARIANT v) static HRESULT WINAPI HTMLDocument_get_bgColor(IHTMLDocument2 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - IHTMLElement *element = NULL; - IHTMLBodyElement *body; - HRESULT hr; + nsAString nsstr; + nsresult nsres; + HRESULT hres; TRACE("(%p)->(%p)\n", This, p); - hr = IHTMLDocument2_get_body(iface, &element); - if (FAILED(hr)) - { - ERR("Failed to get body (0x%08x)\n", hr); - return hr; - } - - if(!element) - { - FIXME("Empty body element.\n"); - return hr; + if(!This->doc_node->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; } - hr = IHTMLElement_QueryInterface(element, &IID_IHTMLBodyElement, (void**)&body); - if (SUCCEEDED(hr)) - { - hr = IHTMLBodyElement_get_bgColor(body, p); - IHTMLBodyElement_Release(body); + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLDocument_GetBgColor(This->doc_node->nsdoc, &nsstr); + hres = return_nsstr_variant(nsres, &nsstr, NSSTR_COLOR, p); + if(hres == S_OK && V_VT(p) == VT_BSTR && !V_BSTR(p)) { + TRACE("default #ffffff"); + if(!(V_BSTR(p) = SysAllocString(L"#ffffff"))) + hres = E_OUTOFMEMORY; } - IHTMLElement_Release(element); - - return hr; + return hres; } static HRESULT WINAPI HTMLDocument_put_fgColor(IHTMLDocument2 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 25b8b3536c..ff33ff76ef 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6695,6 +6695,10 @@ static void test_body_funs(IHTMLBodyElement *body, IHTMLDocument2 *doc) ok(V_VT(&vDefaultbg) == VT_BSTR, "bstr != NULL\n"); ok(!V_BSTR(&vDefaultbg), "V_BSTR(bgColor) = %s\n", wine_dbgstr_w(V_BSTR(&vDefaultbg))); + hres = IHTMLDocument2_get_bgColor(doc, &vbg); + ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(V_VT(&vbg) == VT_BSTR && V_BSTR(&vbg) && !wcscmp(V_BSTR(&vbg), L"#ffffff"), "bgColor = %s\n", wine_dbgstr_variant(&vbg)); + V_VT(&vbg) = VT_BSTR; V_BSTR(&vbg) = SysAllocString(L"red"); hres = IHTMLBodyElement_put_bgColor(body, vbg); @@ -6707,6 +6711,10 @@ static void test_body_funs(IHTMLBodyElement *body, IHTMLDocument2 *doc) ok(!lstrcmpW(V_BSTR(&vbg), L"#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); VariantClear(&vbg); + hres = IHTMLDocument2_get_bgColor(doc, &vbg); + ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(V_VT(&vbg) == VT_BSTR && V_BSTR(&vbg) && !wcscmp(V_BSTR(&vbg), L"#ff0000"), "bgColor = %s\n", wine_dbgstr_variant(&vbg)); + hres = IHTMLDocument2_get_bgColor(doc, &vbg); ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); ok(V_VT(&vbg) == VT_BSTR, "V_VT(&vbg) != VT_BSTR\n");

1 0

Jacek Caban : mshtml: Use return_nsstr_variant in IHTMLBodyElement::get_bgColor.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: 7f465761c2f898ca5dde5a357576b44ba47b8bc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f465761c2f898ca5dde5a35… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 5 18:27:01 2020 +0200 mshtml: Use return_nsstr_variant in IHTMLBodyElement::get_bgColor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlbody.c | 21 ++++----------------- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsembed.c | 22 +++++++++++++--------- 3 files changed, 18 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 981d93f9b4..a49f8162c0 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -407,27 +407,14 @@ static HRESULT WINAPI HTMLBodyElement_put_bgColor(IHTMLBodyElement *iface, VARIA static HRESULT WINAPI HTMLBodyElement_get_bgColor(IHTMLBodyElement *iface, VARIANT *p) { HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - nsAString strColor; + nsAString nsstr; nsresult nsres; - HRESULT hres; TRACE("(%p)->(%p)\n", This, p); - nsAString_Init(&strColor, NULL); - nsres = nsIDOMHTMLBodyElement_GetBgColor(This->nsbody, &strColor); - if(NS_SUCCEEDED(nsres)) { - const PRUnichar *color; - - nsAString_GetData(&strColor, &color); - V_VT(p) = VT_BSTR; - hres = nscolor_to_str(color, &V_BSTR(p)); - }else { - ERR("SetBgColor failed: %08x\n", nsres); - hres = E_FAIL; - } - - nsAString_Finish(&strColor); - return hres; + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLBodyElement_GetBgColor(This->nsbody, &nsstr); + return return_nsstr_variant(nsres, &nsstr, NSSTR_COLOR, p); } static HRESULT WINAPI HTMLBodyElement_put_text(IHTMLBodyElement *iface, VARIANT v) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 565a2428ba..7b2f927e19 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -982,6 +982,7 @@ UINT32 nsAString_GetData(const nsAString*,const PRUnichar**) DECLSPEC_HIDDEN; void nsAString_Finish(nsAString*) DECLSPEC_HIDDEN; #define NSSTR_IMPLICIT_PX 0x01 +#define NSSTR_COLOR 0x02 HRESULT map_nsresult(nsresult) DECLSPEC_HIDDEN; HRESULT return_nsstr(nsresult,nsAString*,BSTR*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 2d1eb817dc..9a23785ca6 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -964,14 +964,15 @@ HRESULT return_nsstr(nsresult nsres, nsAString *nsstr, BSTR *p) HRESULT return_nsstr_variant(nsresult nsres, nsAString *nsstr, unsigned flags, VARIANT *p) { + HRESULT hres = S_OK; + if(NS_FAILED(nsres)) { ERR("failed: %08x\n", nsres); nsAString_Finish(nsstr); - return E_FAIL; + return map_nsresult(nsres); } if(NS_StringGetIsVoid(nsstr)) { - TRACE("ret null\n"); V_VT(p) = VT_NULL; }else { const WCHAR *str; @@ -989,20 +990,23 @@ HRESULT return_nsstr_variant(nsresult nsres, nsAString *nsstr, unsigned flags, V if(iter == str + len && dot) len = dot - str; } } - TRACE("ret %s\n", debugstr_wn(str, len)); - if(*str) { + if(flags & NSSTR_COLOR) { + hres = nscolor_to_str(str, &V_BSTR(p)); + }else if(*str) { V_BSTR(p) = SysAllocStringLen(str, len); - if(!V_BSTR(p)) { - nsAString_Finish(nsstr); - return E_OUTOFMEMORY; - } + if(!V_BSTR(p)) + hres = E_OUTOFMEMORY; }else { V_BSTR(p) = NULL; } - V_VT(p) = VT_BSTR; + if(SUCCEEDED(hres)) + V_VT(p) = VT_BSTR; } nsAString_Finish(nsstr); + if(FAILED(hres)) + return hres; + TRACE("ret %s\n", debugstr_variant(p)); return S_OK; }

1 0

Jacek Caban : jscript: Add Object.preventExtensions semi-stub implementation.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: 2e767e81cc1682597b3d42a0ca1dcebdf909aaaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e767e81cc1682597b3d42a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 5 18:26:39 2020 +0200 jscript: Add Object.preventExtensions semi-stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/object.c | 24 +++++++++++++++++++++++- dlls/mshtml/tests/es5.js | 23 ++++++++++++++++++++++- 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index bac79ebde2..1e94f16344 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -671,13 +671,35 @@ static HRESULT Object_keys(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, return hres; } +static HRESULT Object_preventExtensions(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +{ + jsdisp_t *obj; + + if(!argc || !is_object_instance(argv[0]) || !get_object(argv[0])) { + FIXME("invalid arguments\n"); + return E_NOTIMPL; + } + + FIXME("(%s) semi-stub\n", debugstr_jsval(argv[0])); + + obj = to_jsdisp(get_object(argv[0])); + if(!obj) { + FIXME("Non-JS object\n"); + return E_NOTIMPL; + } + + if(r) *r = jsval_obj(jsdisp_addref(obj)); + return S_OK; +} + static const builtin_prop_t ObjectConstr_props[] = { {L"create", Object_create, PROPF_ES5|PROPF_METHOD|2}, {L"defineProperties", Object_defineProperties, PROPF_ES5|PROPF_METHOD|2}, {L"defineProperty", Object_defineProperty, PROPF_ES5|PROPF_METHOD|2}, {L"getOwnPropertyDescriptor", Object_getOwnPropertyDescriptor, PROPF_ES5|PROPF_METHOD|2}, {L"getPrototypeOf", Object_getPrototypeOf, PROPF_ES5|PROPF_METHOD|1}, - {L"keys", Object_keys, PROPF_ES5|PROPF_METHOD|1} + {L"keys", Object_keys, PROPF_ES5|PROPF_METHOD|1}, + {L"preventExtensions", Object_preventExtensions, PROPF_ES5|PROPF_METHOD|1}, }; static const builtin_info_t ObjectConstr_info = { diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index f268eba24c..ded25df512 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -924,7 +924,28 @@ sync_test("reduce", function() { try { [].reduce(function(a) { return 0; }); ok(false, "expected exception"); - }catch(e) {trace(e.message);} + }catch(e) {} ok(Array.prototype.reduce.length === 1, "Array.prototype.reduce.length = " + Array.prototype.reduce.length); }); + +sync_test("preventExtensions", function() { + var o = {}; + var r = Object.preventExtensions(o); + ok(r === o, "r != o"); + o.x = 1; + todo_wine. + ok(!("x" in o), "x property added to o"); + try { + Object.defineProperty(o, "y", { value: true }); + todo_wine. + ok(false, "expected exception"); + }catch(e) { + ok(e.name === "TypeError", "got " + e.name + " exception"); + } + + r = Object.preventExtensions(o); + ok(r === o, "r != o"); + + ok(Object.preventExtensions.length === 1, "Object.preventExtensions.length = " + Object.preventExtensions.length); +});

1 0

Jacek Caban : jscript: Support passing non-string flags to RegExp constructor.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: fe0bd340cddd9c148af2501e7a3eabe5421ef243 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe0bd340cddd9c148af2501e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 5 18:26:25 2020 +0200 jscript: Support passing non-string flags to RegExp constructor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsregexp.c | 24 ++++++++++-------------- dlls/jscript/tests/regexp.js | 12 ++++++++++++ 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index f9578195d9..94abb6a3c9 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -671,7 +671,7 @@ HRESULT create_regexp(script_ctx_t *ctx, jsstr_t *src, DWORD flags, jsdisp_t **r HRESULT create_regexp_var(script_ctx_t *ctx, jsval_t src_arg, jsval_t *flags_arg, jsdisp_t **ret) { - unsigned flags, opt_len = 0; + unsigned flags = 0; const WCHAR *opt = NULL; jsstr_t *src; HRESULT hres = S_OK; @@ -700,24 +700,20 @@ HRESULT create_regexp_var(script_ctx_t *ctx, jsval_t src_arg, jsval_t *flags_arg if(FAILED(hres)) return hres; - if(flags_arg) { + if(flags_arg && !is_undefined(*flags_arg)) { jsstr_t *opt_str; - if(!is_string(*flags_arg)) { - FIXME("unimplemented for %s\n", debugstr_jsval(*flags_arg)); - return E_NOTIMPL; - } - - opt_str = get_string(*flags_arg); - opt = jsstr_flatten(opt_str); - if(!opt) { - jsstr_release(src); - return E_OUTOFMEMORY; + hres = to_string(ctx, *flags_arg, &opt_str); + if(SUCCEEDED(hres)) { + opt = jsstr_flatten(opt_str); + if(opt) + hres = parse_regexp_flags(opt, jsstr_length(opt_str), &flags); + else + hres = E_OUTOFMEMORY; + jsstr_release(opt_str); } - opt_len = jsstr_length(opt_str); } - hres = parse_regexp_flags(opt, opt_len, &flags); if(SUCCEEDED(hres)) hres = create_regexp(ctx, src, flags, ret); jsstr_release(src); diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index e261bf9d3a..31b8321623 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -701,4 +701,16 @@ ok(re.ignoreCase === false, "re.ignoreCase = " + re.ignoreCase); ok(re.multiline === false, "re.multiline = " + re.multiline); ok(re.global === false, "re.global = " + re.global); +re = new RegExp("test", undefined); +ok(re.source === "test", "re.source = " + re.source); +ok(re.ignoreCase === false, "re.ignoreCase = " + re.ignoreCase); +ok(re.multiline === false, "re.multiline = " + re.multiline); +ok(re.global === false, "re.global = " + re.global); + +re = new RegExp("test", { toString: function() { return "mg"; } }); +ok(re.source === "test", "re.source = " + re.source); +ok(re.ignoreCase === false, "re.ignoreCase = " + re.ignoreCase); +ok(re.multiline === true, "re.multiline = " + re.multiline); +ok(re.global === true, "re.global = " + re.global); + reportSuccess();

1 0

Jacek Caban : jscript: Support passing non-string pattern to RegExp constructor.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: 4e8874930aad89d13f007b6acc8384f4e49fb6ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e8874930aad89d13f007b6a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 5 18:26:11 2020 +0200 jscript: Support passing non-string pattern to RegExp constructor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsregexp.c | 33 +++++++++++++++------------------ dlls/jscript/tests/regexp.js | 24 ++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 18 deletions(-) diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index 32800fe227..f9578195d9 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -674,7 +674,7 @@ HRESULT create_regexp_var(script_ctx_t *ctx, jsval_t src_arg, jsval_t *flags_arg unsigned flags, opt_len = 0; const WCHAR *opt = NULL; jsstr_t *src; - HRESULT hres; + HRESULT hres = S_OK; if(is_object_instance(src_arg)) { jsdisp_t *obj; @@ -693,12 +693,12 @@ HRESULT create_regexp_var(script_ctx_t *ctx, jsval_t src_arg, jsval_t *flags_arg } } - if(!is_string(src_arg)) { - FIXME("src_arg = %s\n", debugstr_jsval(src_arg)); - return E_NOTIMPL; - } - - src = get_string(src_arg); + if(is_undefined(src_arg)) + src = jsstr_empty(); + else + hres = to_string(ctx, src_arg, &src); + if(FAILED(hres)) + return hres; if(flags_arg) { jsstr_t *opt_str; @@ -710,16 +710,18 @@ HRESULT create_regexp_var(script_ctx_t *ctx, jsval_t src_arg, jsval_t *flags_arg opt_str = get_string(*flags_arg); opt = jsstr_flatten(opt_str); - if(!opt) + if(!opt) { + jsstr_release(src); return E_OUTOFMEMORY; + } opt_len = jsstr_length(opt_str); } hres = parse_regexp_flags(opt, opt_len, &flags); - if(FAILED(hres)) - return hres; - - return create_regexp(ctx, src, flags, ret); + if(SUCCEEDED(hres)) + hres = create_regexp(ctx, src, flags, ret); + jsstr_release(src); + return hres; } HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, jsstr_t *jsstr, jsval_t *r) @@ -953,12 +955,7 @@ static HRESULT RegExpConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags jsdisp_t *ret; HRESULT hres; - if(!argc) { - FIXME("no args\n"); - return E_NOTIMPL; - } - - hres = create_regexp_var(ctx, argv[0], argc > 1 ? argv+1 : NULL, &ret); + hres = create_regexp_var(ctx, argc ? argv[0] : jsval_undefined(), argc > 1 ? argv+1 : NULL, &ret); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index b20036426e..e261bf9d3a 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -677,4 +677,28 @@ ok(re.ignoreCase === false, "re.ignoreCase = " + re.ignoreCase); ok(re.multiline === true, "re.multiline = " + re.multiline); ok(re.global === true, "re.global = " + re.global); +re = new RegExp(undefined); +ok(re.source === "", "re.source = " + re.source); +ok(re.ignoreCase === false, "re.ignoreCase = " + re.ignoreCase); +ok(re.multiline === false, "re.multiline = " + re.multiline); +ok(re.global === false, "re.global = " + re.global); + +re = new RegExp(); +ok(re.source === "", "re.source = " + re.source); +ok(re.ignoreCase === false, "re.ignoreCase = " + re.ignoreCase); +ok(re.multiline === false, "re.multiline = " + re.multiline); +ok(re.global === false, "re.global = " + re.global); + +re = new RegExp(true); +ok(re.source === "true", "re.source = " + re.source); +ok(re.ignoreCase === false, "re.ignoreCase = " + re.ignoreCase); +ok(re.multiline === false, "re.multiline = " + re.multiline); +ok(re.global === false, "re.global = " + re.global); + +re = new RegExp({ toString: function() { return "test"; } }); +ok(re.source === "test", "re.source = " + re.source); +ok(re.ignoreCase === false, "re.ignoreCase = " + re.ignoreCase); +ok(re.multiline === false, "re.multiline = " + re.multiline); +ok(re.global === false, "re.global = " + re.global); + reportSuccess();

1 0

Alexandre Julliard : wininet/tests: Update for new WineHQ certificate.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: ccd6b205fa99360e7437f1c5bc63e0075f8e6760 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccd6b205fa99360e7437f1c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 5 19:23:42 2020 +0200 wininet/tests: Update for new WineHQ certificate. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index e0ea78cfb4..c07d60d2a9 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -6079,13 +6079,12 @@ typedef struct { static const cert_struct_test_t test_winehq_org_cert = { "US\r\n" "55114\r\n" - "MN\r\n" + "Minnesota\r\n" "Saint Paul\r\n" "Ste 120\r\n" "700 Raymond Ave\r\n" "CodeWeavers\r\n" "IT\r\n" - "Secure Link SSL Wildcard\r\n" "*.winehq.org", "US\r\n"

1 0

Alexandre Julliard : secur32/tests: Update for new WineHQ certificate.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: 16254af818095216e10aee4d9032a8def3ac3344 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16254af818095216e10aee4d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 5 19:23:31 2020 +0200 secur32/tests: Update for new WineHQ certificate. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/schannel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index d51583d665..30022437bc 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -564,7 +564,7 @@ static void test_remote_cert(PCCERT_CONTEXT remote_cert) cert_cnt++; } - ok(cert_cnt == 4, "cert_cnt = %u\n", cert_cnt); + ok(cert_cnt == 2, "cert_cnt = %u\n", cert_cnt); ok(incl_remote, "context does not contain cert itself\n"); }

1 0

Ziqing Hui : windowscodecs/tests: Add more tests for DdsFrameDecode_Dds_CopyBlocks().
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: ac1adfc512286e08e31da3e7abb26a66646423f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac1adfc512286e08e31da3e7… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Jun 5 11:53:29 2020 +0800 windowscodecs/tests: Add more tests for DdsFrameDecode_Dds_CopyBlocks(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 42 +++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 327701f22c..5195dada13 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -471,30 +471,52 @@ static void test_dds_decoder_frame_data(IWICDdsFrameDecode *dds_frame, UINT fram { HRESULT hr; WICDdsFormatInfo format_info; - WICRect rect = { 0, 0, 1, 1 }; + WICRect rect = { 0, 0, 1, 1 }, rect_test_a = { 0, 0, 0, 0 }, rect_test_b = { 0, 0, 0xdeadbeaf, 0xdeadbeaf }; + WICRect rect_test_c = { -0xdeadbeaf, -0xdeadbeaf, 1, 1 }, rect_test_d = { 1, 1, 1, 1 }; BYTE buffer[32]; UINT stride, width_in_blocks, height_in_blocks; UINT width, height, depth, array_index; UINT block_offset; int slice_index; - hr = IWICDdsFrameDecode_GetSizeInBlocks(dds_frame, &width_in_blocks, &height_in_blocks); - ok (hr == S_OK, "%d: [frame %d] GetSizeInBlocks failed, hr=%x\n", i, frame_index, hr); - if (hr != S_OK) return; hr = IWICDdsFrameDecode_GetFormatInfo(dds_frame, &format_info); ok (hr == S_OK, "%d: [frame %d] GetFormatInfo failed, hr=%x\n", i, frame_index, hr); if (hr != S_OK) return; - stride = width_in_blocks * format_info.BytesPerBlock; + stride = rect.Width * format_info.BytesPerBlock; - hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, 0, 0, NULL); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect_test_a, stride, sizeof(buffer), buffer); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect_test_b, stride, sizeof(buffer), buffer); todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); - hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, 0, 0, buffer); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect_test_c, stride, sizeof(buffer), buffer); todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); - hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, 0, 32, buffer); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect_test_d, stride, sizeof(buffer), buffer); todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); - hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, stride, 32, buffer); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, stride, sizeof(buffer), buffer); todo_wine ok (hr == S_OK, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); - hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride, 32, buffer); + + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, 0, sizeof(buffer), buffer); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride - 1, sizeof(buffer), buffer); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride * 2, sizeof(buffer), buffer); + todo_wine ok (hr == S_OK, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride, 0, buffer); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride, 1, buffer); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride, stride * rect.Height - 1, buffer); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride, stride * rect.Height, buffer); + todo_wine ok (hr == S_OK, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride, sizeof(buffer), NULL); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, 0, 0, NULL); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride, sizeof(buffer), buffer); todo_wine ok (hr == S_OK, "%d: [frame %d] CopyBlocks failed, hr=%x\n", i, frame_index, hr); if (hr != S_OK) return;

1 0

Zhipeng Zhao : wlanapi: Add WlanQueryInterface stub implementation.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: c82c71be649ed155a66d4e5f5579b77442c58354 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c82c71be649ed155a66d4e5f… Author: Zhipeng Zhao <zhaozhipeng(a)uniontech.com> Date: Fri Jun 5 01:34:18 2020 -0700 wlanapi: Add WlanQueryInterface stub implementation. Signed-off-by: Zhipeng Zhao <zhaozhipeng(a)uniontech.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/main.c | 8 ++++++++ dlls/wlanapi/wlanapi.spec | 2 +- include/wlanapi.h | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index 5ec0e0bf84..cfffeedb11 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -164,6 +164,14 @@ DWORD WINAPI WlanGetAvailableNetworkList(HANDLE handle, const GUID *guid, DWORD return ERROR_CALL_NOT_IMPLEMENTED; } +DWORD WINAPI WlanQueryInterface(HANDLE handle, const GUID *guid, WLAN_INTF_OPCODE opcode, + void *reserved, DWORD *data_size, void **data, WLAN_OPCODE_VALUE_TYPE *opcode_type) +{ + FIXME("(%p, %s, 0x%x, %p, %p, %p, %p) stub\n", + handle, wine_dbgstr_guid(guid), opcode, reserved, data_size, data, opcode_type); + + return ERROR_CALL_NOT_IMPLEMENTED; +} void WINAPI WlanFreeMemory(void *ptr) { TRACE("(%p)\n", ptr); diff --git a/dlls/wlanapi/wlanapi.spec b/dlls/wlanapi/wlanapi.spec index dc1b907809..1c21ab5a2e 100644 --- a/dlls/wlanapi/wlanapi.spec +++ b/dlls/wlanapi/wlanapi.spec @@ -17,7 +17,7 @@ @ stub WlanIhvControl @ stdcall WlanOpenHandle(long ptr ptr ptr) @ stub WlanQueryAutoConfigParameter -@ stub WlanQueryInterface +@ stdcall WlanQueryInterface(ptr ptr long ptr ptr ptr ptr) @ stub WlanReasonCodeToString @ stdcall WlanRegisterNotification(ptr long long ptr ptr ptr ptr) @ stub WlanRenameProfile diff --git a/include/wlanapi.h b/include/wlanapi.h index 1cd8c93e65..a3288d7778 100644 --- a/include/wlanapi.h +++ b/include/wlanapi.h @@ -142,6 +142,44 @@ typedef struct _WLAN_AVAILABLE_NETWORK DWORD dwReserved; } WLAN_AVAILABLE_NETWORK, *PWLAN_AVAILABLE_NETWORK; +typedef enum _WLAN_INTF_OPCODE +{ + wlan_intf_opcode_autoconf_start = 0x000000000, + wlan_intf_opcode_autoconf_enabled, + wlan_intf_opcode_background_scan_enabled, + wlan_intf_opcode_media_streaming_mode, + wlan_intf_opcode_radio_state, + wlan_intf_opcode_bss_type, + wlan_intf_opcode_interface_state, + wlan_intf_opcode_current_connection, + wlan_intf_opcode_channel_number, + wlan_intf_opcode_supported_infrastructure_auth_cipher_pairs, + wlan_intf_opcode_supported_adhoc_auth_cipher_pairs, + wlan_intf_opcode_supported_country_or_region_string_list, + wlan_intf_opcode_current_operation_mode, + wlan_intf_opcode_supported_safe_mode, + wlan_intf_opcode_certified_safe_mode, + wlan_intf_opcode_hosted_network_capable, + wlan_intf_opcode_management_frame_protection_capable, + wlan_intf_opcode_autoconf_end = 0x0fffffff, + wlan_intf_opcode_msm_start = 0x10000100, + wlan_intf_opcode_statistics, + wlan_intf_opcode_rssi, + wlan_intf_opcode_msm_end = 0x1fffffff, + wlan_intf_opcode_security_start = 0x20010000, + wlan_intf_opcode_security_end = 0x2fffffff, + wlan_intf_opcode_ihv_start = 0x30000000, + wlan_intf_opcode_ihv_end = 0x3fffffff +} WLAN_INTF_OPCODE, *PWLAN_INTF_OPCODE; + +typedef enum _WLAN_OPCODE_VALUE_TYPE +{ + wlan_opcode_value_type_query_only = 0, + wlan_opcode_value_type_set_by_group_policy, + wlan_opcode_value_type_set_by_user, + wlan_opcode_value_type_invalid +} WLAN_OPCODE_VALUE_TYPE, *PWLAN_OPCODE_VALUE_TYPE; + typedef struct _WLAN_AVAILABLE_NETWORK_LIST { DWORD dwNumberOfItems; @@ -157,5 +195,6 @@ void WINAPI WlanFreeMemory(void *); DWORD WINAPI WlanScan(HANDLE, const GUID *, const DOT11_SSID *, const WLAN_RAW_DATA *, void *); DWORD WINAPI WlanRegisterNotification(HANDLE, DWORD, BOOL, WLAN_NOTIFICATION_CALLBACK, void *, void *, DWORD *); DWORD WINAPI WlanGetAvailableNetworkList(HANDLE, const GUID *, DWORD, void *, WLAN_AVAILABLE_NETWORK_LIST **); +DWORD WINAPI WlanQueryInterface(HANDLE, const GUID *, WLAN_INTF_OPCODE, void *, DWORD *, void **, WLAN_OPCODE_VALUE_TYPE *); #endif /* _WLAN_WLANAPI_H */

1 0

← Newer
1
...
63
64
65
66
67
68
69
...
95
Older →

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 June 2020