jscript: Propagate Invoke error code using jsexcept_t.

Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

jscript: Propagate Invoke error code using jsexcept_t.
83fa76c2 · Jacek Caban · Alexandre Julliard · c9f9f836 · 83fa76c2
Commit 83fa76c2 authored Feb 03, 2020 by Jacek Caban Committed by Alexandre Julliard Feb 03, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

dispex.c dlls/jscript/dispex.c +2 -1

No files found.
--- a/dlls/jscript/dispex.c
+++ b/dlls/jscript/dispex.c
@@ -1974,7 +1974,8 @@ static HRESULT disp_invoke(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD f

    if(hres == DISP_E_EXCEPTION) {
        TRACE("DISP_E_EXCEPTION: %08x %s %s\n", ei.scode, debugstr_w(ei.bstrSource), debugstr_w(ei.bstrDescription));
-        hres = SUCCEEDED(ei.scode) ? E_FAIL : ei.scode;
+        reset_ei(ctx->ei);
+        ctx->ei->error = (SUCCEEDED(ei.scode) || ei.scode == DISP_E_EXCEPTION) ? E_FAIL : ei.scode;
        SysFreeString(ei.bstrSource);
        SysFreeString(ei.bstrDescription);
        SysFreeString(ei.bstrHelpFile);