February 2020 - Wine-commits

Jacek Caban : vbscript: Add SetScriptState(SCRIPTSTATE_CLOSED) implementation.
by Alexandre Julliard 03 Feb '20

03 Feb '20

Module: wine Branch: master Commit: 1c6649d443f73cc44167f0dd71ac88dddff752ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c6649d443f73cc44167f0dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 3 19:57:11 2020 +0100 vbscript: Add SetScriptState(SCRIPTSTATE_CLOSED) implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/vbscript.c | 71 ++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.c | 5 ++- 2 files changed, 75 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index f0b75ad2f3..10af993ba5 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -1520,10 +1520,81 @@ static void test_vbscript_uninitializing(void) hres = IActiveScriptParse_InitNew(parse); ok(hres == E_UNEXPECTED, "InitNew failed: %08x\n", hres); + /* initialize again and use SetScriptState(SCRIPTSTATE_CLOSED) to uninitialize it */ + + SET_EXPECT(GetLCID); + SET_EXPECT(OnStateChange_INITIALIZED); + hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + CHECK_CALLED(GetLCID); + CHECK_CALLED(OnStateChange_INITIALIZED); + + SET_EXPECT(OnStateChange_CONNECTED); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_CONNECTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_CONNECTED) failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_CONNECTED); + + SET_EXPECT(OnStateChange_DISCONNECTED); + SET_EXPECT(OnStateChange_INITIALIZED); + SET_EXPECT(OnStateChange_CLOSED); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_CLOSED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_CLOSED) failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_DISCONNECTED); + CHECK_CALLED(OnStateChange_INITIALIZED); + CHECK_CALLED(OnStateChange_CLOSED); + + test_state(script, SCRIPTSTATE_CLOSED); + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_CLOSED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_CLOSED) failed: %08x\n", hres); + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_INITIALIZED); + ok(hres == E_UNEXPECTED, "SetScriptState(SCRIPTSTATE_INITIALIZED) failed: %08x\n", hres); + + hres = IActiveScript_Close(script); + ok(hres == S_OK, "Close failed: %08x\n", hres); + + SET_EXPECT(GetLCID); + SET_EXPECT(OnStateChange_INITIALIZED); + hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + CHECK_CALLED(GetLCID); + CHECK_CALLED(OnStateChange_INITIALIZED); + + SET_EXPECT(OnStateChange_CONNECTED); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_CONNECTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_CONNECTED) failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_CONNECTED); + + SET_EXPECT(OnStateChange_DISCONNECTED); + SET_EXPECT(OnStateChange_INITIALIZED); + SET_EXPECT(OnStateChange_CLOSED); + hres = IActiveScript_Close(script); + ok(hres == S_OK, "Close failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_DISCONNECTED); + CHECK_CALLED(OnStateChange_INITIALIZED); + CHECK_CALLED(OnStateChange_CLOSED); + + test_state(script, SCRIPTSTATE_CLOSED); + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_CLOSED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_CLOSED) failed: %08x\n", hres); + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_INITIALIZED); + ok(hres == E_UNEXPECTED, "SetScriptState(SCRIPTSTATE_INITIALIZED) failed: %08x\n", hres); + IActiveScriptParse_Release(parse); ref = IActiveScript_Release(script); ok(!ref, "ref = %d\n", ref); + + script = create_vbscript(); + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_CLOSED); + ok(hres == E_UNEXPECTED, "SetScriptState(SCRIPTSTATE_CLOSED) failed: %08x\n", hres); + + ref = IActiveScript_Release(script); + ok(!ref, "ref = %d\n", ref); } static void test_vbscript_release(void) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index b597389a9a..4f00128217 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -559,7 +559,7 @@ static HRESULT WINAPI VBScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE return S_OK; } - if(!This->is_initialized || !This->ctx->site) + if(!This->is_initialized || (!This->ctx->site && ss != SCRIPTSTATE_CLOSED)) return E_UNEXPECTED; switch(ss) { @@ -573,6 +573,9 @@ static HRESULT WINAPI VBScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE case SCRIPTSTATE_INITIALIZED: decrease_state(This, SCRIPTSTATE_INITIALIZED); return S_OK; + case SCRIPTSTATE_CLOSED: + decrease_state(This, SCRIPTSTATE_CLOSED); + return S_OK; case SCRIPTSTATE_DISCONNECTED: FIXME("unimplemented SCRIPTSTATE_DISCONNECTED\n"); return S_OK;

1 0

Jacek Caban : vbscript: Silence QueryInterface FIXME.
by Alexandre Julliard 03 Feb '20

03 Feb '20

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 strcmp_wa.
by Alexandre Julliard 03 Feb '20

03 Feb '20

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

Jacek Caban : wscript/tests: Get rid of mystrchr.
by Alexandre Julliard 03 Feb '20

03 Feb '20

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

Alex Henrie : iphlpapi: Consolidate append_*_row functions.
by Alexandre Julliard 03 Feb '20

03 Feb '20

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 : jscript: Store error location in jsexcept_t.
by Alexandre Julliard 03 Feb '20

03 Feb '20

1 0

Jacek Caban : jscript: Support propagating error message.
by Alexandre Julliard 03 Feb '20

03 Feb '20

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

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

03 Feb '20

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

Jacek Caban : jscript: Propagate parser error location.
by Alexandre Julliard 03 Feb '20

03 Feb '20

Module: wine Branch: master Commit: 27e4881c686ad44c0fabb5928bde33d31d3fa2c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27e4881c686ad44c0fabb592… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 3 14:47:39 2020 +0100 jscript: Propagate parser error location. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 2 +- dlls/jscript/parser.h | 4 +++- dlls/jscript/parser.y | 29 ++++++++++++++++++----------- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index f1e005a6d3..1bf5f225de 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -2508,7 +2508,7 @@ HRESULT compile_script(script_ctx_t *ctx, const WCHAR *code, UINT64 source_conte } } - hres = script_parse(ctx, &compiler, compiler.code->source, delimiter, from_eval, &compiler.parser); + hres = script_parse(ctx, &compiler, compiler.code, delimiter, from_eval, &compiler.parser); if(FAILED(hres)) { release_bytecode(compiler.code); return hres; diff --git a/dlls/jscript/parser.h b/dlls/jscript/parser.h index 1870e6ae50..3fa699c86d 100644 --- a/dlls/jscript/parser.h +++ b/dlls/jscript/parser.h @@ -19,6 +19,7 @@ typedef struct _source_elements_t source_elements_t; typedef struct _expression_t expression_t; typedef struct _statement_t statement_t; +struct _bytecode_t; typedef struct { BOOL is_num; @@ -41,6 +42,7 @@ typedef struct _parser_ctx_t { BOOL is_html; BOOL lexer_error; HRESULT hres; + unsigned error_loc; ccval_t ccval; unsigned cc_if_depth; @@ -48,7 +50,7 @@ typedef struct _parser_ctx_t { heap_pool_t heap; } parser_ctx_t; -HRESULT script_parse(script_ctx_t*,struct _compiler_ctx_t*,const WCHAR*,const WCHAR*,BOOL,parser_ctx_t**) DECLSPEC_HIDDEN; +HRESULT script_parse(script_ctx_t*,struct _compiler_ctx_t*,struct _bytecode_t*,const WCHAR*,BOOL,parser_ctx_t**) DECLSPEC_HIDDEN; void parser_release(parser_ctx_t*) DECLSPEC_HIDDEN; int parser_lex(void*,unsigned*,parser_ctx_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 3eebebbcaa..5a71a84ffa 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -27,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); static int parser_error(unsigned*,parser_ctx_t*,const char*); -static void set_error(parser_ctx_t*,UINT); +static void set_error(parser_ctx_t*,unsigned,HRESULT); static BOOL explicit_error(parser_ctx_t*,void*,WCHAR); static BOOL allow_auto_semicolon(parser_ctx_t*); @@ -495,7 +495,7 @@ Expression_opt Expression_err : Expression { $$ = $1; } - | error { set_error(ctx, JS_E_SYNTAX); YYABORT; } + | error { set_error(ctx, @$, JS_E_SYNTAX); YYABORT; } /* ECMA-262 3rd Edition 11.14 */ Expression @@ -881,19 +881,19 @@ BooleanLiteral semicolon_opt : ';' - | error { if(!allow_auto_semicolon(ctx)) {YYABORT;} else { ctx->hres = S_OK; } } + | error { if(!allow_auto_semicolon(ctx)) {YYABORT;} else { ctx->hres = S_OK; ctx->error_loc = -1; } } left_bracket : '(' - | error { set_error(ctx, JS_E_MISSING_LBRACKET); YYABORT; } + | error { set_error(ctx, @$, JS_E_MISSING_LBRACKET); YYABORT; } right_bracket : ')' - | error { set_error(ctx, JS_E_MISSING_RBRACKET); YYABORT; } + | error { set_error(ctx, @$, JS_E_MISSING_RBRACKET); YYABORT; } semicolon : ';' - | error { set_error(ctx, JS_E_MISSING_SEMICOLON); YYABORT; } + | error { set_error(ctx, @$, JS_E_MISSING_SEMICOLON); YYABORT; } %% @@ -1464,22 +1464,25 @@ static expression_t *new_call_expression(parser_ctx_t *ctx, expression_t *expres static int parser_error(unsigned *loc, parser_ctx_t *ctx, const char *str) { + if(ctx->error_loc == -1) + ctx->error_loc = *loc; if(ctx->hres == S_OK) ctx->hres = JS_E_SYNTAX; WARN("%s: %s\n", debugstr_w(ctx->begin + *loc), str); return 0; } -static void set_error(parser_ctx_t *ctx, UINT error) +static void set_error(parser_ctx_t *ctx, unsigned loc, HRESULT error) { ctx->hres = error; + ctx->error_loc = loc; } static BOOL explicit_error(parser_ctx_t *ctx, void *obj, WCHAR next) { if(obj || *(ctx->ptr-1)==next) return TRUE; - set_error(ctx, JS_E_SYNTAX); + set_error(ctx, ctx->ptr - ctx->begin /* FIXME */, JS_E_SYNTAX); return FALSE; } @@ -1563,7 +1566,7 @@ void parser_release(parser_ctx_t *ctx) heap_free(ctx); } -HRESULT script_parse(script_ctx_t *ctx, struct _compiler_ctx_t *compiler, const WCHAR *code, const WCHAR *delimiter, BOOL from_eval, +HRESULT script_parse(script_ctx_t *ctx, struct _compiler_ctx_t *compiler, bytecode_t *code, const WCHAR *delimiter, BOOL from_eval, parser_ctx_t **ret) { parser_ctx_t *parser_ctx; @@ -1576,9 +1579,10 @@ HRESULT script_parse(script_ctx_t *ctx, struct _compiler_ctx_t *compiler, const if(!parser_ctx) return E_OUTOFMEMORY; + parser_ctx->error_loc = -1; parser_ctx->is_html = delimiter && !wcsicmp(delimiter, html_tagW); - parser_ctx->begin = parser_ctx->ptr = code; + parser_ctx->begin = parser_ctx->ptr = code->source; parser_ctx->end = parser_ctx->begin + lstrlenW(parser_ctx->begin); script_addref(ctx); @@ -1596,8 +1600,11 @@ HRESULT script_parse(script_ctx_t *ctx, struct _compiler_ctx_t *compiler, const if(FAILED(hres)) { WARN("parser failed around %s\n", debugstr_w(parser_ctx->begin+20 > parser_ctx->ptr ? parser_ctx->begin : parser_ctx->ptr-20)); + + throw_error(ctx, hres, NULL); + set_error_location(ctx->ei, code, parser_ctx->error_loc, IDS_COMPILATION_ERROR); parser_release(parser_ctx); - return hres; + return DISP_E_EXCEPTION; } *ret = parser_ctx;

1 0

Jacek Caban : jscript: Propagate compiler error location.
by Alexandre Julliard 03 Feb '20

03 Feb '20

Module: wine Branch: master Commit: ed22d71fd2781d91432993027c65274f6a2de320 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed22d71fd2781d9143299302… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 3 14:47:46 2020 +0100 jscript: Propagate compiler error location. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 1bf5f225de..2be5f24fae 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -2519,8 +2519,11 @@ HRESULT compile_script(script_ctx_t *ctx, const WCHAR *code, UINT64 source_conte heap_pool_free(&compiler.heap); parser_release(compiler.parser); if(FAILED(hres)) { + if(hres != DISP_E_EXCEPTION) + throw_error(ctx, hres, NULL); + set_error_location(ctx->ei, compiler.code, compiler.loc, IDS_COMPILATION_ERROR); release_bytecode(compiler.code); - return hres; + return DISP_E_EXCEPTION; } *ret = compiler.code;

1 0