February 2020 - Wine-Commits

Jacek Caban : vbscript: Don't convert hex literals ending with '&' to short in parse_hex_literal.
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: 8def4dfa0ee9c2d70fd4c98daa50447b6a15ad3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8def4dfa0ee9c2d70fd4c98d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 3 19:57:03 2020 +0100 vbscript: Don't convert hex literals ending with '&' to short in parse_hex_literal. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 6 +++--- dlls/vbscript/lex.c | 8 +++++--- dlls/vbscript/tests/lang.vbs | 7 ++++++- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index d42091990b..a4442960d9 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2793,7 +2793,7 @@ static const builtin_prop_t global_props[] = { {L"vbFormFeed", NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbFormFeed}, {L"vbFriday", NULL, BP_GET, VT_I2, 6}, {L"vbGeneralDate", NULL, BP_GET, VT_I2, 0}, - {L"vbGreen", NULL, BP_GET, VT_I4, (INT16)0x00ff00}, + {L"vbGreen", NULL, BP_GET, VT_I4, 0x00ff00}, {L"vbIgnore", NULL, BP_GET, VT_I2, IDIGNORE}, {L"vbInformation", NULL, BP_GET, VT_I2, MB_ICONASTERISK}, {L"vbInteger", NULL, BP_GET, VT_I2, VT_I2}, @@ -2840,7 +2840,7 @@ static const builtin_prop_t global_props[] = { {L"vbVerticalTab", NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbVerticalTab}, {L"vbWednesday", NULL, BP_GET, VT_I2, 4}, {L"vbWhite", NULL, BP_GET, VT_I4, 0xffffff}, - {L"vbYellow", NULL, BP_GET, VT_I4, (INT16)0x00ffff}, + {L"vbYellow", NULL, BP_GET, VT_I4, 0x00ffff}, {L"vbYes", NULL, BP_GET, VT_I2, IDYES}, {L"vbYesNo", NULL, BP_GET, VT_I2, MB_YESNO}, {L"vbYesNoCancel", NULL, BP_GET, VT_I2, MB_YESNOCANCEL}, @@ -2945,7 +2945,7 @@ static HRESULT Err_Raise(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VA if(SUCCEEDED(hres)) { script_ctx_t *ctx = This->ctx; - error = (code == (INT16)code) ? MAKE_VBSERROR((UINT16)code) : map_hres(code); + error = (code & ~0xffff) ? map_hres(code) : MAKE_VBSERROR(code); if(source) { SysFreeString(ctx->ei.bstrSource); diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index f6070134f4..5b93739d02 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -320,10 +320,12 @@ static int parse_hex_literal(parser_ctx_t *ctx, LONG *ret) return 0; } - if(*ctx->ptr == '&') + if(*ctx->ptr == '&') { ctx->ptr++; - - *ret = l == (UINT16)l ? (INT16)l : l; + *ret = l; + }else { + *ret = l == (UINT16)l ? (INT16)l : l; + } return tInt; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 04e3cbfe91..c50b8bbe59 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -55,6 +55,9 @@ Call ok(&hff = 255, "&hff <> 255") Call ok(&Hff = 255, "&Hff <> 255") Call ok(&hffff = -1, "&hffff <> -1") Call ok(&hfffe = -2, "&hfffe <> -2") +Call ok(&hffff& = 65535, "&hffff& <> -1") +Call ok(&hfffe& = 65534, "&hfffe& <> -2") +Call ok(&hffffffff& = -1, "&hffffffff& <> -1") W = 5 Call ok(W = 5, "W = " & W & " expected " & 5) @@ -90,7 +93,9 @@ Call ok(getVT(&h10&) = "VT_I2", "getVT(&h10&) is not VT_I2") Call ok(getVT(&h10000&) = "VT_I4", "getVT(&h10000&) is not VT_I4") Call ok(getVT(&H10000&) = "VT_I4", "getVT(&H10000&) is not VT_I4") Call ok(getVT(&hffFFffFF&) = "VT_I2", "getVT(&hffFFffFF&) is not VT_I2") -Call ok(getVT(&hffFFffFE&) = "VT_I2", "getVT(&hffFFffFE &) is not VT_I2") +Call ok(getVT(&hffFFffFE&) = "VT_I2", "getVT(&hffFFffFE &) is not VT_I2") +Call ok(getVT(&hffF&) = "VT_I2", "getVT(&hffFF&) is not VT_I2") +Call ok(getVT(&hffFF&) = "VT_I4", "getVT(&hffFF&) is not VT_I4") Call ok(getVT(1e2) = "VT_R8", "getVT(1e2) is not VT_R8") Call ok(getVT(1e0) = "VT_R8", "getVT(1e0) is not VT_R8") Call ok(getVT(0.1e2) = "VT_R8", "getVT(0.1e2) is not VT_R8")

1 0

Jacek Caban : wscript/tests: Get rid of strcmp_wa.
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: 3324137f7257418e63f30f4b877154c4106522cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=3324137f7257418e63f30f4b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 3 20:45:42 2020 +0100 wscript/tests: Get rid of strcmp_wa. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wscript/tests/run.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index 96ce03044c..9e5021c55d 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -74,13 +74,6 @@ static const GUID CLSID_TestObj = static const char *script_name; static HANDLE wscript_process; -static int strcmp_wa(LPCWSTR strw, const char *stra) -{ - WCHAR buf[512]; - MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, ARRAY_SIZE(buf)); - return lstrcmpW(strw, buf); -} - static const WCHAR* mystrrchr(const WCHAR *str, WCHAR ch) { const WCHAR *pos = NULL, *current = str; @@ -143,19 +136,19 @@ static HRESULT WINAPI Dispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, unsigned i; for(i=0; i<cNames; i++) { - if(!strcmp_wa(rgszNames[i], "ok")) { + if(!lstrcmpW(rgszNames[i], L"ok")) { rgDispId[i] = DISPID_TESTOBJ_OK; - }else if(!strcmp_wa(rgszNames[i], "trace")) { + }else if(!lstrcmpW(rgszNames[i], L"trace")) { rgDispId[i] = DISPID_TESTOBJ_TRACE; - }else if(!strcmp_wa(rgszNames[i], "reportSuccess")) { + }else if(!lstrcmpW(rgszNames[i], L"reportSuccess")) { rgDispId[i] = DISPID_TESTOBJ_REPORTSUCCESS; - }else if(!strcmp_wa(rgszNames[i], "wscriptFullName")) { + }else if(!lstrcmpW(rgszNames[i], L"wscriptFullName")) { rgDispId[i] = DISPID_TESTOBJ_WSCRIPTFULLNAME; - }else if(!strcmp_wa(rgszNames[i], "wscriptPath")) { + }else if(!lstrcmpW(rgszNames[i], L"wscriptPath")) { rgDispId[i] = DISPID_TESTOBJ_WSCRIPTPATH; - }else if(!strcmp_wa(rgszNames[i], "wscriptScriptName")) { + }else if(!lstrcmpW(rgszNames[i], L"wscriptScriptName")) { rgDispId[i] = DISPID_TESTOBJ_WSCRIPTSCRIPTNAME; - }else if(!strcmp_wa(rgszNames[i], "wscriptScriptFullName")) { + }else if(!lstrcmpW(rgszNames[i], L"wscriptScriptFullName")) { rgDispId[i] = DISPID_TESTOBJ_WSCRIPTSCRIPTFULLNAME; }else { ok(0, "unexpected name %s\n", wine_dbgstr_w(rgszNames[i]));

1 0

Alex Henrie : iphlpapi: Consolidate append_*_row functions.
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: 87875e12bcdca659e578849fa62585b1b5316a50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87875e12bcdca659e578849f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Feb 1 13:03:11 2020 -0700 iphlpapi: Consolidate append_*_row functions. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 151 ++++++++++-------------------------------------- 1 file changed, 32 insertions(+), 119 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=87875e12bcdca659e578…

1 0

Jacek Caban : vbscript: Silence QueryInterface FIXME.
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: ddfae943e683f6fe7b640151c022873f533de9aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddfae943e683f6fe7b640151… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 3 19:57:18 2020 +0100 vbscript: Silence QueryInterface FIXME. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 4f00128217..88574fe5c5 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -465,7 +465,7 @@ static HRESULT WINAPI VBScript_QueryInterface(IActiveScript *iface, REFIID riid, TRACE("(%p)->(IID_IObjectSafety %p)\n", This, ppv); *ppv = &This->IObjectSafety_iface; }else { - FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; return E_NOINTERFACE; }

1 0

Jacek Caban : wscript/tests: Get rid of mystrchr.
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: f90be6e1acb176f224cb32be681d2982920b4575 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f90be6e1acb176f224cb32be… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 3 20:45:48 2020 +0100 wscript/tests: Get rid of mystrchr. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wscript/tests/run.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index 9e5021c55d..dbd10f537a 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -74,17 +74,6 @@ static const GUID CLSID_TestObj = static const char *script_name; static HANDLE wscript_process; -static const WCHAR* mystrrchr(const WCHAR *str, WCHAR ch) -{ - const WCHAR *pos = NULL, *current = str; - while(*current != 0) { - if(*current == ch) - pos = current; - ++current; - } - return pos; -} - static BSTR a2bstr(const char *str) { BSTR ret; @@ -232,7 +221,7 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF res = GetModuleFileNameExW(wscript_process, NULL, fullPath, ARRAY_SIZE(fullPath)); if(res == 0) return E_FAIL; - pos = mystrrchr(fullPath, '\\'); + pos = wcsrchr(fullPath, '\\'); if(!(V_BSTR(pVarResult) = SysAllocStringLen(fullPath, pos-fullPath))) return E_OUTOFMEMORY; break;

1 0

Jacek Caban : jscript: Add GetSourcePosition implementation.
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: 348eef2e02eb3d9fcbbf6a0eb2aa473c816c08c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=348eef2e02eb3d9fcbbf6a0e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 3 14:48:07 2020 +0100 jscript: Add GetSourcePosition implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jscript.c | 25 +++++++++++++++++++++---- dlls/jscript/tests/run.c | 3 --- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 8f79ea4bd4..860fb01cf5 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -178,15 +178,32 @@ static HRESULT WINAPI JScriptError_GetExceptionInfo(IActiveScriptError *iface, E static HRESULT WINAPI JScriptError_GetSourcePosition(IActiveScriptError *iface, DWORD *source_context, ULONG *line, LONG *character) { JScriptError *This = impl_from_IActiveScriptError(iface); + bytecode_t *code = This->ei.code; + const WCHAR *nl, *p; + unsigned l; - FIXME("(%p)->(%p %p %p)\n", This, source_context, line, character); + TRACE("(%p)->(%p %p %p)\n", This, source_context, line, character); + + if(!This->ei.code) { + FIXME("unknown position\n"); + return E_FAIL; + } if(source_context) - *source_context = 0; + *source_context = This->ei.code->source_context; + if(!line && !character) + return S_OK; + + l = code->start_line; + for(nl = p = code->source; p < code->source + This->ei.loc; p++) { + if(*p != '\n') continue; + l++; + nl = p + 1; + } if(line) - *line = 0; + *line = l; if(character) - *character = 0; + *character = code->source + This->ei.loc - nl; return S_OK; } diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 1d11e00f44..6e2250882d 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2285,19 +2285,16 @@ static void test_error_reports(void) source_context = 0xdeadbeef; hres = IActiveScriptError_GetSourcePosition(script_error, &source_context, NULL, NULL); ok(hres == S_OK, "GetSourcePosition failed0x%08x\n", hres); - todo_wine ok(source_context == 10, "source_context = %x\n", source_context); line_number = 0xdeadbeef; hres = IActiveScriptError_GetSourcePosition(script_error, NULL, &line_number, NULL); ok(hres == S_OK, "GetSourcePosition failed%08x\n", hres); - todo_wine_if(tests[i].line) ok(line_number == tests[i].line, "[%u] line = %u expected %u\n", i, line_number, tests[i].line); character = 0xdeadbeef; hres = IActiveScriptError_GetSourcePosition(script_error, NULL, NULL, &character); ok(hres == S_OK, "GetSourcePosition failed: %08x\n", hres); - todo_wine_if(tests[i].character) ok(character == tests[i].character, "[%u] character = %u expected %u\n", i, character, tests[i].character); hres = IActiveScriptError_GetSourceLineText(script_error, NULL);

1 0

Jacek Caban : jscript: Delay error object creation for builtin errors with message string until it's needed.
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: bfb2e5d9591272267203dba7192f405609bdd63b URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfb2e5d9591272267203dba7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 3 14:47:32 2020 +0100 jscript: Delay error object creation for builtin errors with message string until it's needed. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 12 ++++++------ dlls/jscript/engine.c | 10 ++++------ dlls/jscript/error.c | 41 ++++++++--------------------------------- dlls/jscript/jscript.h | 2 +- 4 files changed, 19 insertions(+), 46 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 4ed327ad72..e986de6ef2 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2483,13 +2483,13 @@ HRESULT jsdisp_define_property(jsdisp_t *obj, const WCHAR *name, property_desc_t if(((desc->mask & PROPF_CONFIGURABLE) && (desc->flags & PROPF_CONFIGURABLE)) || ((desc->mask & PROPF_ENUMERABLE) && ((desc->flags & PROPF_ENUMERABLE) != (prop->flags & PROPF_ENUMERABLE)))) - return throw_type_error(obj->ctx, JS_E_NONCONFIGURABLE_REDEFINED, name); + return throw_error(obj->ctx, JS_E_NONCONFIGURABLE_REDEFINED, name); } if(desc->explicit_value || (desc->mask & PROPF_WRITABLE)) { if(prop->type == PROP_ACCESSOR) { if(!(prop->flags & PROPF_CONFIGURABLE)) - return throw_type_error(obj->ctx, JS_E_NONCONFIGURABLE_REDEFINED, name); + return throw_error(obj->ctx, JS_E_NONCONFIGURABLE_REDEFINED, name); if(prop->u.accessor.getter) jsdisp_release(prop->u.accessor.getter); if(prop->u.accessor.setter) @@ -2504,7 +2504,7 @@ HRESULT jsdisp_define_property(jsdisp_t *obj, const WCHAR *name, property_desc_t }else { if(!(prop->flags & PROPF_CONFIGURABLE) && !(prop->flags & PROPF_WRITABLE)) { if((desc->mask & PROPF_WRITABLE) && (desc->flags & PROPF_WRITABLE)) - return throw_type_error(obj->ctx, JS_E_NONWRITABLE_MODIFIED, name); + return throw_error(obj->ctx, JS_E_NONWRITABLE_MODIFIED, name); if(desc->explicit_value) { if(prop->type == PROP_JSVAL) { BOOL eq; @@ -2512,7 +2512,7 @@ HRESULT jsdisp_define_property(jsdisp_t *obj, const WCHAR *name, property_desc_t if(FAILED(hres)) return hres; if(!eq) - return throw_type_error(obj->ctx, JS_E_NONWRITABLE_MODIFIED, name); + return throw_error(obj->ctx, JS_E_NONWRITABLE_MODIFIED, name); }else { FIXME("redefinition of property type %d\n", prop->type); } @@ -2533,7 +2533,7 @@ HRESULT jsdisp_define_property(jsdisp_t *obj, const WCHAR *name, property_desc_t }else if(desc->explicit_getter || desc->explicit_setter) { if(prop->type != PROP_ACCESSOR) { if(!(prop->flags & PROPF_CONFIGURABLE)) - return throw_type_error(obj->ctx, JS_E_NONCONFIGURABLE_REDEFINED, name); + return throw_error(obj->ctx, JS_E_NONCONFIGURABLE_REDEFINED, name); if(prop->type == PROP_JSVAL) jsval_release(prop->u.val); prop->type = PROP_ACCESSOR; @@ -2541,7 +2541,7 @@ HRESULT jsdisp_define_property(jsdisp_t *obj, const WCHAR *name, property_desc_t }else if(!(prop->flags & PROPF_CONFIGURABLE)) { if((desc->explicit_getter && desc->getter != prop->u.accessor.getter) || (desc->explicit_setter && desc->setter != prop->u.accessor.setter)) - return throw_type_error(obj->ctx, JS_E_NONCONFIGURABLE_REDEFINED, name); + return throw_error(obj->ctx, JS_E_NONCONFIGURABLE_REDEFINED, name); } if(desc->explicit_getter) { diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index e84dd4e3d7..054b0c7602 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -918,7 +918,7 @@ static HRESULT interp_throw_type(script_ctx_t *ctx) TRACE("%08x %s\n", hres, debugstr_jsstr(str)); ptr = jsstr_flatten(str); - return ptr ? throw_type_error(ctx, hres, ptr) : E_OUTOFMEMORY; + return ptr ? throw_error(ctx, hres, ptr) : E_OUTOFMEMORY; } /* ECMA-262 3rd Edition 12.14 */ @@ -1287,7 +1287,7 @@ static HRESULT identifier_value(script_ctx_t *ctx, BSTR identifier) return hres; if(exprval.type == EXPRVAL_INVALID) - return throw_type_error(ctx, exprval.u.hres, identifier); + return throw_error(ctx, exprval.u.hres, identifier); hres = exprval_to_value(ctx, &exprval, &v); if(FAILED(hres)) @@ -2777,10 +2777,8 @@ static HRESULT unwind_exception(script_ctx_t *ctx, HRESULT exception_hres) } frame = ctx->call_ctx; - if(exception_hres != DISP_E_EXCEPTION) { - reset_ei(ei); - ei->error = exception_hres; - } + if(exception_hres != DISP_E_EXCEPTION) + throw_error(ctx, exception_hres, NULL); set_error_location(ei, frame->bytecode, frame->bytecode->instrs[frame->ip].loc, IDS_RUNTIME_ERROR); while(!frame->except_frame) { diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index b58210d2a7..eca6c90138 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -409,40 +409,15 @@ static jsstr_t *format_error_message(HRESULT error, const WCHAR *arg) return r; } -static HRESULT throw_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str, jsdisp_t *constr) +HRESULT throw_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str) { - jsdisp_t *err; - jsstr_t *msg; - HRESULT hres; - - if(!is_jscript_error(error)) - return error; - - msg = format_error_message(error, str); - if(!msg) - return E_OUTOFMEMORY; - - WARN("%s\n", debugstr_jsstr(msg)); - - hres = create_error(ctx, constr, error, msg, &err); - jsstr_release(msg); - if(FAILED(hres)) - return hres; - - reset_ei(ctx->ei); - ctx->ei->valid_value = TRUE; - ctx->ei->value = jsval_obj(err); - return error; -} - -HRESULT throw_syntax_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str) -{ - return throw_error(ctx, error, str, ctx->syntax_error_constr); -} - -HRESULT throw_type_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str) -{ - return throw_error(ctx, error, str, ctx->type_error_constr); + jsexcept_t *ei = ctx->ei; + TRACE("%08x\n", error); + reset_ei(ei); + ei->error = error; + if(str) + ei->message = format_error_message(error, str); + return DISP_E_EXCEPTION; } void set_error_location(jsexcept_t *ei, bytecode_t *code, unsigned loc, unsigned source_id) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 9933347950..8db76bb50d 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -312,7 +312,7 @@ HRESULT Function_get_value(script_ctx_t*,jsdisp_t*,jsval_t*) DECLSPEC_HIDDEN; struct _function_code_t *Function_get_code(jsdisp_t*) DECLSPEC_HIDDEN; #define DEFAULT_FUNCTION_VALUE {NULL, Function_value,0, Function_get_value} -HRESULT throw_type_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN; +HRESULT throw_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN; jsdisp_t *create_builtin_error(script_ctx_t *ctx) DECLSPEC_HIDDEN; HRESULT create_object(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : dwrite: Do not create intermediate object to return face reference from family.
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: 82df524e7ed541b1500548c26db632e33460e045 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82df524e7ed541b1500548c2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 3 19:08:30 2020 +0300 dwrite: Do not create intermediate object to return face reference from family. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 507099b24e..a3d36a5206 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2429,21 +2429,19 @@ static HRESULT WINAPI dwritefontfamily1_GetFont(IDWriteFontFamily2 *iface, UINT3 static HRESULT WINAPI dwritefontfamily1_GetFontFaceReference(IDWriteFontFamily2 *iface, UINT32 index, IDWriteFontFaceReference **reference) { - IDWriteFont3 *font; - HRESULT hr; + struct dwrite_fontfamily *family = impl_from_IDWriteFontFamily2(iface); + const struct dwrite_font_data *font; TRACE("%p, %u, %p.\n", iface, index, reference); *reference = NULL; - hr = IDWriteFontFamily2_GetFont(iface, index, &font); - if (FAILED(hr)) - return hr; - - hr = IDWriteFont3_GetFontFaceReference(font, reference); - IDWriteFont3_Release(font); + if (index >= family->data->count) + return E_FAIL; - return hr; + font = family->data->fonts[index]; + return IDWriteFactory5_CreateFontFaceReference_((IDWriteFactory5 *)family->collection->factory, + font->file, font->face_index, font->simulations, reference); } static HRESULT WINAPI dwritefontfamily2_GetMatchingFonts(IDWriteFontFamily2 *iface,

1 0

Jacek Caban : jscript: Return error source and description from GetExceptionInfo.
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: ed3e5404dd0c9bc6ed7747e23a1b818b4d60e503 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed3e5404dd0c9bc6ed7747e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 3 14:47:59 2020 +0100 jscript: Return error source and description from GetExceptionInfo. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jscript.c | 4 ++++ dlls/jscript/tests/run.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 0e8d3ec2e9..8f79ea4bd4 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -168,6 +168,10 @@ static HRESULT WINAPI JScriptError_GetExceptionInfo(IActiveScriptError *iface, E memset(excepinfo, 0, sizeof(*excepinfo)); excepinfo->scode = This->ei.error; + if(This->ei.source) + jsstr_to_bstr(This->ei.source, &excepinfo->bstrSource); + if(This->ei.message) + jsstr_to_bstr(This->ei.message, &excepinfo->bstrDescription); return S_OK; } diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 8b3cc8a1d2..1d11e00f44 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2345,13 +2345,12 @@ static void test_error_reports(void) if (is_lang_english()) { if(tests[i].error_source) - todo_wine ok(ei.bstrSource && !lstrcmpW(ei.bstrSource, tests[i].error_source), "[%u] bstrSource = %s expected %s\n", i, wine_dbgstr_w(ei.bstrSource), wine_dbgstr_w(tests[i].error_source)); else ok(!ei.bstrSource, "[%u] bstrSource = %s expected NULL\n", i, wine_dbgstr_w(ei.bstrSource)); if(tests[i].description) - todo_wine + todo_wine_if(tests[i].todo_flags & ERROR_TODO_DESCRIPTION) ok(ei.bstrDescription && !lstrcmpW(ei.bstrDescription, tests[i].description), "[%u] bstrDescription = %s expected %s\n", i, wine_dbgstr_w(ei.bstrDescription), wine_dbgstr_w(tests[i].description)); else

1 0

Jacek Caban : jscript: Support propagating error message.
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: bcba07229a74f8a4e7edaa9da1a3ee4750da3492 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcba07229a74f8a4e7edaa9d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 3 14:47:25 2020 +0100 jscript: Support propagating error message. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 2 ++ dlls/jscript/engine.c | 14 ++++++++++++-- dlls/jscript/engine.h | 1 + dlls/jscript/error.c | 4 +++- dlls/jscript/jscript.c | 4 ++++ 5 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 2038173dca..4ed327ad72 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1978,6 +1978,8 @@ static HRESULT disp_invoke(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD f ctx->ei->error = (SUCCEEDED(ei.scode) || ei.scode == DISP_E_EXCEPTION) ? E_FAIL : ei.scode; if(ei.bstrSource) ctx->ei->source = jsstr_alloc_len(ei.bstrSource, SysStringLen(ei.bstrSource)); + if(ei.bstrDescription) + ctx->ei->message = jsstr_alloc_len(ei.bstrDescription, SysStringLen(ei.bstrDescription)); SysFreeString(ei.bstrSource); SysFreeString(ei.bstrDescription); SysFreeString(ei.bstrHelpFile); diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 520b62fad2..e84dd4e3d7 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -867,6 +867,7 @@ static void set_error_value(script_ctx_t *ctx, jsval_t value) if(is_object_instance(value) && get_object(value) && (obj = to_jsdisp(get_object(value)))) { UINT32 number; + jsstr_t *str; jsval_t v; HRESULT hres; @@ -879,8 +880,15 @@ static void set_error_value(script_ctx_t *ctx, jsval_t value) ei->error = FAILED(number) ? number : E_FAIL; jsval_release(v); } - } + hres = jsdisp_propget_name(obj, L"description", &v); + if(SUCCEEDED(hres)) { + hres = to_string(ctx, v, &str); + if(SUCCEEDED(hres)) + ei->message = str; + jsval_release(v); + } + } } /* ECMA-262 3rd Edition 12.13 */ @@ -2769,8 +2777,10 @@ static HRESULT unwind_exception(script_ctx_t *ctx, HRESULT exception_hres) } frame = ctx->call_ctx; - if(exception_hres != DISP_E_EXCEPTION) + if(exception_hres != DISP_E_EXCEPTION) { + reset_ei(ei); ei->error = exception_hres; + } set_error_location(ei, frame->bytecode, frame->bytecode->instrs[frame->ip].loc, IDS_RUNTIME_ERROR); while(!frame->except_frame) { diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 839d38d822..bb991c442e 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -228,6 +228,7 @@ struct _jsexcept_t { jsval_t value; jsstr_t *source; + jsstr_t *message; bytecode_t *code; unsigned loc; diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 5551ab3a89..b58210d2a7 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -455,6 +455,8 @@ void set_error_location(jsexcept_t *ei, bytecode_t *code, unsigned loc, unsigned len = LoadStringW(jscript_hinstance, source_id, (WCHAR*)&res, 0); ei->source = jsstr_alloc_len(res, len); } + if(!ei->message) + ei->message = format_error_message(ei->error, NULL); } TRACE("source %s in %s\n", debugstr_w(code->source + loc), debugstr_w(code->source)); @@ -538,6 +540,6 @@ jsdisp_t *create_builtin_error(script_ctx_t *ctx) } } - hres = create_error(ctx, constr, ei->error, jsstr_empty(), &r); + hres = create_error(ctx, constr, ei->error, ei->message ? ei->message : jsstr_empty(), &r); return SUCCEEDED(hres) ? r : NULL; } diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 09d002dbca..0e8d3ec2e9 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -223,6 +223,10 @@ void reset_ei(jsexcept_t *ei) jsstr_release(ei->source); ei->source = NULL; } + if(ei->message) { + jsstr_release(ei->message); + ei->message = NULL; + } } void enter_script(script_ctx_t *ctx, jsexcept_t *ei)

1 0