August 2020 - Wine-commits - list.winehq.org

Paul Gofman : wmc: Add Null facility.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: 2255a21bc64a3f5a26764009cd99b31de680b15a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2255a21bc64a3f5a26764009… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Aug 25 16:22:38 2020 +0300 wmc: Add Null facility. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wmc/mcl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/wmc/mcl.c b/tools/wmc/mcl.c index 829f955606..579d4b8788 100644 --- a/tools/wmc/mcl.c +++ b/tools/wmc/mcl.c @@ -85,6 +85,7 @@ static const WCHAR ustr_language[] = { 'L', 'a', 'n', 'g', 'u', 'a', 'g', 'e', 0 static const WCHAR ustr_languagenames[] = { 'L', 'a', 'n', 'g', 'u', 'a', 'g', 'e', 'N', 'a', 'm', 'e', 's', 0}; static const WCHAR ustr_messageid[] = { 'M', 'e', 's', 's', 'a', 'g', 'e', 'I', 'd', 0 }; static const WCHAR ustr_messageidtypedef[] = { 'M', 'e', 's', 's', 'a', 'g', 'e', 'I', 'd', 'T', 'y', 'p', 'e', 'd', 'e', 'f', 0 }; +static const WCHAR ustr_null[] = { 'N', 'u', 'l', 'l', 0 }; static const WCHAR ustr_outputbase[] = { 'O', 'u', 't', 'p', 'u', 't', 'B', 'a', 's', 'e', 0 }; static const WCHAR ustr_severity[] = { 'S', 'e', 'v', 'e', 'r', 'i', 't', 'y', 0 }; static const WCHAR ustr_severitynames[] = { 'S', 'e', 'v', 'e', 'r', 'i', 't', 'y', 'N', 'a', 'm', 'e', 's', 0 }; @@ -551,6 +552,7 @@ int mcy_lex(void) add_token(tok_severity, ustr_success, 0x00, 0, NULL, 0); add_token(tok_facility, ustr_application, 0xFFF, 0, NULL, 0); add_token(tok_facility, ustr_system, 0x0FF, 0, NULL, 0); + add_token(tok_facility, ustr_null, 0x000, 0, NULL, 0); add_token(tok_language, ustr_english, 0x409, 437, ustr_msg00001, 0); }

1 0

Gabriel Ivăncescu : msscript.ocx: Add the ScriptError stub implementation.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: 4aaaae158611da4a502ca8d6b364ab6bf82cbf27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4aaaae158611da4a502ca8d6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Aug 24 17:56:10 2020 +0300 msscript.ocx: Add the ScriptError stub implementation. The error object has to be separate from the control, as it can be referenced while the control is released. It is also available even without a script host, and in fact the same object will be used (same address) when a host is instantiated. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 240 ++++++++++++++++++++++++++++++++++++- dlls/msscript.ocx/tests/msscript.c | 39 +++--- 2 files changed, 256 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4aaaae158611da4a502c…

1 0

Gabriel Ivăncescu : msscript.ocx: Implement IScriptError::Clear.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: 7c5885117a34490b3215e12e00cec59323bcfc4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c5885117a34490b3215e12e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Aug 24 17:56:11 2020 +0300 msscript.ocx: Implement IScriptError::Clear. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index c92a86a493..967b8d6a75 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -121,6 +121,7 @@ struct procedure_enum { typedef struct { IScriptError IScriptError_iface; + IActiveScriptError *object; LONG ref; } ScriptError; @@ -132,6 +133,7 @@ struct ScriptHost { IActiveScript *script; IActiveScriptParse *parse; + ScriptError *error; SCRIPTSTATE script_state; CLSID clsid; @@ -676,9 +678,15 @@ static HRESULT WINAPI ActiveScriptSite_OnScriptError(IActiveScriptSite *iface, I { ScriptHost *This = impl_from_IActiveScriptSite(iface); - FIXME("(%p, %p)\n", This, script_error); + TRACE("(%p, %p)\n", This, script_error); - return E_NOTIMPL; + if (This->error) + { + IScriptError_Clear(&This->error->IScriptError_iface); + IActiveScriptError_AddRef(script_error); + This->error->object = script_error; + } + return S_FALSE; } static HRESULT WINAPI ActiveScriptSite_OnEnterScript(IActiveScriptSite *iface) @@ -1438,7 +1446,11 @@ static void detach_script_host(ScriptHost *host) if (host->parse) IActiveScriptParse_Release(host->parse); + if (host->error) + IScriptError_Release(&host->error->IScriptError_iface); + host->parse = NULL; + host->error = NULL; host->script = NULL; } @@ -2138,6 +2150,7 @@ static ULONG WINAPI ScriptError_Release(IScriptError *iface) if (!ref) { + IScriptError_Clear(&This->IScriptError_iface); heap_free(This); } @@ -2281,9 +2294,15 @@ static HRESULT WINAPI ScriptError_Clear(IScriptError *iface) { ScriptError *This = impl_from_IScriptError(iface); - FIXME("(%p)->()\n", This); + TRACE("(%p)->()\n", This); - return E_NOTIMPL; + if (This->object) + { + IActiveScriptError_Release(This->object); + This->object = NULL; + } + + return S_OK; } static const IScriptErrorVtbl ScriptErrorVtbl = { @@ -2305,7 +2324,7 @@ static const IScriptErrorVtbl ScriptErrorVtbl = { ScriptError_Clear }; -static HRESULT init_script_host(const CLSID *clsid, ScriptHost **ret) +static HRESULT init_script_host(ScriptControl *control, const CLSID *clsid, ScriptHost **ret) { IObjectSafety *objsafety; ScriptHost *host; @@ -2365,6 +2384,8 @@ static HRESULT init_script_host(const CLSID *clsid, ScriptHost **ret) goto failed; } host->script_state = SCRIPTSTATE_INITIALIZED; + host->error = control->error; + IScriptError_AddRef(&host->error->IScriptError_iface); *ret = host; return S_OK; @@ -2559,7 +2580,7 @@ static HRESULT WINAPI ScriptControl_put_Language(IScriptControl *iface, BSTR lan if (!language) return S_OK; - hres = init_script_host(&clsid, &This->host); + hres = init_script_host(This, &clsid, &This->host); if (FAILED(hres)) return hres;

1 0

Gabriel Ivăncescu : msscript.ocx: Implement IScriptError::get_Number.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: 4ca537b015206d16c19842e536533827174e60e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ca537b015206d16c19842e5… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Aug 24 17:56:12 2020 +0300 msscript.ocx: Implement IScriptError::get_Number. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 30 ++++++++++++++++++++++++++++-- dlls/msscript.ocx/tests/msscript.c | 16 +++++++++------- 2 files changed, 37 insertions(+), 9 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 967b8d6a75..0b316afa89 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -123,6 +123,10 @@ typedef struct { IScriptError IScriptError_iface; IActiveScriptError *object; LONG ref; + + HRESULT number; + + BOOLEAN info_filled; } ScriptError; struct ScriptHost { @@ -2111,6 +2115,23 @@ static const IScriptModuleCollectionVtbl ScriptModuleCollectionVtbl = { ScriptModuleCollection_Add }; +static void fill_error_info(ScriptError *error) +{ + EXCEPINFO info; + + if (error->info_filled) return; + error->info_filled = TRUE; + + if (!error->object) + return; + if (FAILED(IActiveScriptError_GetExceptionInfo(error->object, &info))) + return; + if (info.pfnDeferredFillIn) + info.pfnDeferredFillIn(&info); + + error->number = info.scode; +} + static HRESULT WINAPI ScriptError_QueryInterface(IScriptError *iface, REFIID riid, void **ppv) { ScriptError *This = impl_from_IScriptError(iface); @@ -2222,9 +2243,11 @@ static HRESULT WINAPI ScriptError_get_Number(IScriptError *iface, LONG *plNumber { ScriptError *This = impl_from_IScriptError(iface); - FIXME("(%p)->(%p)\n", This, plNumber); + TRACE("(%p)->(%p)\n", This, plNumber); - return E_NOTIMPL; + fill_error_info(This); + *plNumber = This->number; + return S_OK; } static HRESULT WINAPI ScriptError_get_Source(IScriptError *iface, BSTR *pbstrSource) @@ -2302,6 +2325,9 @@ static HRESULT WINAPI ScriptError_Clear(IScriptError *iface) This->object = NULL; } + This->number = 0; + + This->info_filled = FALSE; return S_OK; } diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 9bbbe4c94d..6e94fa95d5 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -2066,8 +2066,9 @@ static void test_State(void) } } -#define CHECK_ERROR(sc,exp_num) _check_error(sc, exp_num, __LINE__) -static void _check_error(IScriptControl *sc, LONG exp_num, int line) +#define CHECK_ERROR(sc,exp_num) _check_error(sc, exp_num, FALSE, __LINE__) +#define CHECK_ERROR_TODO(sc,exp_num) _check_error(sc, exp_num, TRUE, __LINE__) +static void _check_error(IScriptControl *sc, LONG exp_num, BOOL todo, int line) { IScriptError *script_err; LONG error_num; @@ -2077,8 +2078,9 @@ static void _check_error(IScriptControl *sc, LONG exp_num, int line) ok_(__FILE__,line)(hr == S_OK, "IScriptControl_get_Error failed: 0x%08x.\n", hr); error_num = 0xdeadbeef; hr = IScriptError_get_Number(script_err, &error_num); - todo_wine ok_(__FILE__,line)(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.\n", hr); - todo_wine ok_(__FILE__,line)(error_num == exp_num, "got wrong error number: %d, expected %d.\n", + ok_(__FILE__,line)(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.\n", hr); +todo_wine_if(todo == TRUE) + ok_(__FILE__,line)(error_num == exp_num, "got wrong error number: %d, expected %d.\n", error_num, exp_num); IScriptError_Release(script_err); } @@ -2157,7 +2159,7 @@ static void test_IScriptControl_Eval(void) ok(V_I4(&var) == 0xdeadbeef || broken(V_I4(&var) == 0) /* after Win8 */, "V_I4(var) = %d.\n", V_I4(&var)); SysFreeString(script_str); - CHECK_ERROR(sc, 1004); + CHECK_ERROR_TODO(sc, 1004); script_str = SysAllocString(L"var2 = var1 + var2"); V_VT(&var) = VT_NULL; @@ -2290,7 +2292,7 @@ static void test_IScriptControl_AddCode(void) hr = IScriptControl_AddCode(sc, code_str); todo_wine ok(hr == 0x800a03ec, "IScriptControl_AddCode returned: 0x%08x.\n", hr); SysFreeString(code_str); - CHECK_ERROR(sc, 1004); + CHECK_ERROR_TODO(sc, 1004); IScriptControl_Release(sc); @@ -2391,7 +2393,7 @@ static void test_IScriptControl_ExecuteStatement(void) hr = IScriptControl_ExecuteStatement(sc, str); todo_wine ok(hr == 0x800a03ec, "IScriptControl_ExecuteStatement returned: 0x%08x.\n", hr); SysFreeString(str); - CHECK_ERROR(sc, 1004); + CHECK_ERROR_TODO(sc, 1004); IScriptControl_Release(sc);

1 0

Gabriel Ivăncescu : msscript.ocx/tests: Add initial tests for ScriptError.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: 503434cae7492d3596137c85cb94ec58816136a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=503434cae7492d3596137c85… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Aug 24 17:56:13 2020 +0300 msscript.ocx/tests: Add initial tests for ScriptError. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/tests/msscript.c | 281 +++++++++++++++++++++++++++++++++++++ 1 file changed, 281 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=503434cae7492d359613…

1 0

Gabriel Ivăncescu : msscript.ocx: Implement IScriptError::get_Source.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: 7b46eb1ef70abf87a598da748e0804533ddbc4fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b46eb1ef70abf87a598da74… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Aug 24 17:56:14 2020 +0300 msscript.ocx: Implement IScriptError::get_Source. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 10 ++++++++-- dlls/msscript.ocx/tests/msscript.c | 23 +++++++++++++++++++---- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 0b316afa89..30125af7f3 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -125,6 +125,7 @@ typedef struct { LONG ref; HRESULT number; + BSTR source; BOOLEAN info_filled; } ScriptError; @@ -2130,6 +2131,7 @@ static void fill_error_info(ScriptError *error) info.pfnDeferredFillIn(&info); error->number = info.scode; + error->source = info.bstrSource; } static HRESULT WINAPI ScriptError_QueryInterface(IScriptError *iface, REFIID riid, void **ppv) @@ -2254,9 +2256,11 @@ static HRESULT WINAPI ScriptError_get_Source(IScriptError *iface, BSTR *pbstrSou { ScriptError *This = impl_from_IScriptError(iface); - FIXME("(%p)->(%p)\n", This, pbstrSource); + TRACE("(%p)->(%p)\n", This, pbstrSource); - return E_NOTIMPL; + fill_error_info(This); + *pbstrSource = SysAllocString(This->source); + return S_OK; } static HRESULT WINAPI ScriptError_get_Description(IScriptError *iface, BSTR *pbstrDescription) @@ -2324,8 +2328,10 @@ static HRESULT WINAPI ScriptError_Clear(IScriptError *iface) IActiveScriptError_Release(This->object); This->object = NULL; } + SysFreeString(This->source); This->number = 0; + This->source = NULL; This->info_filled = FALSE; return S_OK; diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 4a885204e7..d42ce9ed78 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -3336,6 +3336,9 @@ static void test_IScriptControl_get_Error(void) hr = IScriptError_get_Number(error, &x); ok(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.\n", hr); ok(x == 0, "Error Number is not 0, got %d.\n", x); + hr = IScriptError_get_Source(error, &str); + ok(hr == S_OK, "IScriptError_get_Source failed: 0x%08x.\n", hr); + ok(str == NULL, "Error Source is not (null), got %s.\n", wine_dbgstr_w(str)); str = SysAllocString(L"jscript"); hr = IScriptControl_put_Language(sc, str); @@ -3354,6 +3357,10 @@ static void test_IScriptControl_get_Error(void) hr = IScriptError_get_Number(error, &x); ok(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.\n", hr); todo_wine ok(x > 1000, "Error Number is wrong, got %d.\n", x); + hr = IScriptError_get_Source(error, &str); + ok(hr == S_OK, "IScriptError_get_Source failed: 0x%08x.\n", hr); + ok(str != NULL, "Error Source is (null).\n"); + SysFreeString(str); hr = IScriptError_Clear(error); ok(hr == S_OK, "IScriptError_Clear failed: 0x%08x.\n", hr); @@ -3361,6 +3368,9 @@ static void test_IScriptControl_get_Error(void) hr = IScriptError_get_Number(error, &x); ok(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.\n", hr); ok(x == 0, "Error Number is not 0, got %d.\n", x); + hr = IScriptError_get_Source(error, &str); + ok(hr == S_OK, "IScriptError_get_Source failed: 0x%08x.\n", hr); + ok(str == NULL, "Error Source is not (null), got %s.\n", wine_dbgstr_w(str)); hr = IScriptControl_get_Error(sc, &error2); ok(hr == S_OK, "IScriptControl_get_Error failed: 0x%08x.\n", hr); @@ -3411,6 +3421,9 @@ static void test_IScriptControl_get_Error(void) ok(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.\n", hr); ok(x == 0, "Error Number is not 0, got %d.\n", x); CHECK_CALLED(GetExceptionInfo); + hr = IScriptError_get_Source(error, &str); + ok(hr == S_OK, "IScriptError_get_Source failed: 0x%08x.\n", hr); + ok(str == NULL, "Error Source is not (null), got %s.\n", wine_dbgstr_w(str)); SET_EXPECT(GetSourceLineText); hr = IScriptError_get_Text(error, &str); @@ -3439,8 +3452,9 @@ static void test_IScriptControl_get_Error(void) CHECK_CALLED(GetExceptionInfo); CHECK_CALLED(DeferredFillIn); hr = IScriptError_get_Source(error, &str); - todo_wine ok(hr == S_OK, "IScriptError_get_Source failed: 0x%08x.\n", hr); - if (SUCCEEDED(hr)) SysFreeString(str); + ok(hr == S_OK, "IScriptError_get_Source failed: 0x%08x.\n", hr); + ok(!lstrcmpW(str, L"foobar"), "Error Source is wrong, got %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); hr = IScriptError_get_Description(error, &str); todo_wine ok(hr == S_OK, "IScriptError_get_Description failed: 0x%08x.\n", hr); if (SUCCEEDED(hr)) SysFreeString(str); @@ -3472,8 +3486,9 @@ static void test_IScriptControl_get_Error(void) ok(x == 0xbeef, "Error Number is not 0xbeef, got 0x%04x.\n", x); CHECK_CALLED(GetExceptionInfo); hr = IScriptError_get_Source(error, &str); - todo_wine ok(hr == S_OK, "IScriptError_get_Source failed: 0x%08x.\n", hr); - if (SUCCEEDED(hr)) SysFreeString(str); + ok(hr == S_OK, "IScriptError_get_Source failed: 0x%08x.\n", hr); + ok(!lstrcmpW(str, L"source"), "Error Source is wrong, got %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); hr = IScriptError_get_Description(error, &str); todo_wine ok(hr == S_OK, "IScriptError_get_Description failed: 0x%08x.\n", hr); if (SUCCEEDED(hr)) SysFreeString(str);

1 0

Gabriel Ivăncescu : msscript.ocx: Implement IScriptError::get_Description.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: 24d9f52fea1372d99205a32f6755c698f64844de URL: https://source.winehq.org/git/wine.git/?a=commit;h=24d9f52fea1372d99205a32f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Aug 24 17:56:15 2020 +0300 msscript.ocx: Implement IScriptError::get_Description. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 10 ++++++++-- dlls/msscript.ocx/tests/msscript.c | 22 ++++++++++++++++++---- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 30125af7f3..288056bbdb 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -126,6 +126,7 @@ typedef struct { HRESULT number; BSTR source; + BSTR desc; BOOLEAN info_filled; } ScriptError; @@ -2132,6 +2133,7 @@ static void fill_error_info(ScriptError *error) error->number = info.scode; error->source = info.bstrSource; + error->desc = info.bstrDescription; } static HRESULT WINAPI ScriptError_QueryInterface(IScriptError *iface, REFIID riid, void **ppv) @@ -2267,9 +2269,11 @@ static HRESULT WINAPI ScriptError_get_Description(IScriptError *iface, BSTR *pbs { ScriptError *This = impl_from_IScriptError(iface); - FIXME("(%p)->(%p)\n", This, pbstrDescription); + TRACE("(%p)->(%p)\n", This, pbstrDescription); - return E_NOTIMPL; + fill_error_info(This); + *pbstrDescription = SysAllocString(This->desc); + return S_OK; } static HRESULT WINAPI ScriptError_get_HelpFile(IScriptError *iface, BSTR *pbstrHelpFile) @@ -2329,9 +2333,11 @@ static HRESULT WINAPI ScriptError_Clear(IScriptError *iface) This->object = NULL; } SysFreeString(This->source); + SysFreeString(This->desc); This->number = 0; This->source = NULL; + This->desc = NULL; This->info_filled = FALSE; return S_OK; diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index d42ce9ed78..46463c6ea4 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -3339,6 +3339,9 @@ static void test_IScriptControl_get_Error(void) hr = IScriptError_get_Source(error, &str); ok(hr == S_OK, "IScriptError_get_Source failed: 0x%08x.\n", hr); ok(str == NULL, "Error Source is not (null), got %s.\n", wine_dbgstr_w(str)); + hr = IScriptError_get_Description(error, &str); + ok(hr == S_OK, "IScriptError_get_Description failed: 0x%08x.\n", hr); + ok(str == NULL, "Error Description is not (null), got %s.\n", wine_dbgstr_w(str)); str = SysAllocString(L"jscript"); hr = IScriptControl_put_Language(sc, str); @@ -3361,6 +3364,10 @@ static void test_IScriptControl_get_Error(void) ok(hr == S_OK, "IScriptError_get_Source failed: 0x%08x.\n", hr); ok(str != NULL, "Error Source is (null).\n"); SysFreeString(str); + hr = IScriptError_get_Description(error, &str); + ok(hr == S_OK, "IScriptError_get_Description failed: 0x%08x.\n", hr); + ok(str != NULL, "Error Description is (null).\n"); + SysFreeString(str); hr = IScriptError_Clear(error); ok(hr == S_OK, "IScriptError_Clear failed: 0x%08x.\n", hr); @@ -3371,6 +3378,9 @@ static void test_IScriptControl_get_Error(void) hr = IScriptError_get_Source(error, &str); ok(hr == S_OK, "IScriptError_get_Source failed: 0x%08x.\n", hr); ok(str == NULL, "Error Source is not (null), got %s.\n", wine_dbgstr_w(str)); + hr = IScriptError_get_Description(error, &str); + ok(hr == S_OK, "IScriptError_get_Description failed: 0x%08x.\n", hr); + ok(str == NULL, "Error Description is not (null), got %s.\n", wine_dbgstr_w(str)); hr = IScriptControl_get_Error(sc, &error2); ok(hr == S_OK, "IScriptControl_get_Error failed: 0x%08x.\n", hr); @@ -3424,6 +3434,9 @@ static void test_IScriptControl_get_Error(void) hr = IScriptError_get_Source(error, &str); ok(hr == S_OK, "IScriptError_get_Source failed: 0x%08x.\n", hr); ok(str == NULL, "Error Source is not (null), got %s.\n", wine_dbgstr_w(str)); + hr = IScriptError_get_Description(error, &str); + ok(hr == S_OK, "IScriptError_get_Description failed: 0x%08x.\n", hr); + ok(str == NULL, "Error Description is not (null), got %s.\n", wine_dbgstr_w(str)); SET_EXPECT(GetSourceLineText); hr = IScriptError_get_Text(error, &str); @@ -3456,8 +3469,9 @@ static void test_IScriptControl_get_Error(void) ok(!lstrcmpW(str, L"foobar"), "Error Source is wrong, got %s.\n", wine_dbgstr_w(str)); SysFreeString(str); hr = IScriptError_get_Description(error, &str); - todo_wine ok(hr == S_OK, "IScriptError_get_Description failed: 0x%08x.\n", hr); - if (SUCCEEDED(hr)) SysFreeString(str); + ok(hr == S_OK, "IScriptError_get_Description failed: 0x%08x.\n", hr); + ok(!lstrcmpW(str, L"barfoo"), "Error Description is wrong, got %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); SET_EXPECT(GetSourceLineText); hr = IScriptError_get_Text(error, &str); @@ -3490,8 +3504,8 @@ static void test_IScriptControl_get_Error(void) ok(!lstrcmpW(str, L"source"), "Error Source is wrong, got %s.\n", wine_dbgstr_w(str)); SysFreeString(str); hr = IScriptError_get_Description(error, &str); - todo_wine ok(hr == S_OK, "IScriptError_get_Description failed: 0x%08x.\n", hr); - if (SUCCEEDED(hr)) SysFreeString(str); + ok(hr == S_OK, "IScriptError_get_Description failed: 0x%08x.\n", hr); + ok(str == NULL, "Error Description is not (null), got %s.\n", wine_dbgstr_w(str)); SET_EXPECT(GetSourceLineText); hr = IScriptError_get_Text(error, &str);

1 0

Gabriel Ivăncescu : msscript.ocx: Implement IScriptError::get_HelpFile.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: 79378814e407b8a8b6c4e5f750a03d66ab912d4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=79378814e407b8a8b6c4e5f7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Aug 24 17:56:16 2020 +0300 msscript.ocx: Implement IScriptError::get_HelpFile. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 10 ++++++++-- dlls/msscript.ocx/tests/msscript.c | 9 +++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 288056bbdb..dcea9674c9 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -127,6 +127,7 @@ typedef struct { HRESULT number; BSTR source; BSTR desc; + BSTR help_file; BOOLEAN info_filled; } ScriptError; @@ -2134,6 +2135,7 @@ static void fill_error_info(ScriptError *error) error->number = info.scode; error->source = info.bstrSource; error->desc = info.bstrDescription; + error->help_file = info.bstrHelpFile; } static HRESULT WINAPI ScriptError_QueryInterface(IScriptError *iface, REFIID riid, void **ppv) @@ -2280,9 +2282,11 @@ static HRESULT WINAPI ScriptError_get_HelpFile(IScriptError *iface, BSTR *pbstrH { ScriptError *This = impl_from_IScriptError(iface); - FIXME("(%p)->(%p)\n", This, pbstrHelpFile); + TRACE("(%p)->(%p)\n", This, pbstrHelpFile); - return E_NOTIMPL; + fill_error_info(This); + *pbstrHelpFile = SysAllocString(This->help_file); + return S_OK; } static HRESULT WINAPI ScriptError_get_HelpContext(IScriptError *iface, LONG *plHelpContext) @@ -2334,10 +2338,12 @@ static HRESULT WINAPI ScriptError_Clear(IScriptError *iface) } SysFreeString(This->source); SysFreeString(This->desc); + SysFreeString(This->help_file); This->number = 0; This->source = NULL; This->desc = NULL; + This->help_file = NULL; This->info_filled = FALSE; return S_OK; diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 46463c6ea4..aa0c31e73c 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -3342,6 +3342,9 @@ static void test_IScriptControl_get_Error(void) hr = IScriptError_get_Description(error, &str); ok(hr == S_OK, "IScriptError_get_Description failed: 0x%08x.\n", hr); ok(str == NULL, "Error Description is not (null), got %s.\n", wine_dbgstr_w(str)); + hr = IScriptError_get_HelpFile(error, &str); + ok(hr == S_OK, "IScriptError_get_HelpFile failed: 0x%08x.\n", hr); + ok(str == NULL, "Error HelpFile is not (null), got %s.\n", wine_dbgstr_w(str)); str = SysAllocString(L"jscript"); hr = IScriptControl_put_Language(sc, str); @@ -3381,6 +3384,9 @@ static void test_IScriptControl_get_Error(void) hr = IScriptError_get_Description(error, &str); ok(hr == S_OK, "IScriptError_get_Description failed: 0x%08x.\n", hr); ok(str == NULL, "Error Description is not (null), got %s.\n", wine_dbgstr_w(str)); + hr = IScriptError_get_HelpFile(error, &str); + ok(hr == S_OK, "IScriptError_get_HelpFile failed: 0x%08x.\n", hr); + ok(str == NULL, "Error HelpFile is not (null), got %s.\n", wine_dbgstr_w(str)); hr = IScriptControl_get_Error(sc, &error2); ok(hr == S_OK, "IScriptControl_get_Error failed: 0x%08x.\n", hr); @@ -3437,6 +3443,9 @@ static void test_IScriptControl_get_Error(void) hr = IScriptError_get_Description(error, &str); ok(hr == S_OK, "IScriptError_get_Description failed: 0x%08x.\n", hr); ok(str == NULL, "Error Description is not (null), got %s.\n", wine_dbgstr_w(str)); + hr = IScriptError_get_HelpFile(error, &str); + ok(hr == S_OK, "IScriptError_get_HelpFile failed: 0x%08x.\n", hr); + ok(str == NULL, "Error HelpFile is not (null), got %s.\n", wine_dbgstr_w(str)); SET_EXPECT(GetSourceLineText); hr = IScriptError_get_Text(error, &str);

1 0

Gabriel Ivăncescu : msscript.ocx: Implement IScriptError::get_HelpContext.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: 7bc6740a92d32e01c7e899f9e336753f5f3c8ce5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bc6740a92d32e01c7e899f9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Aug 24 17:56:17 2020 +0300 msscript.ocx: Implement IScriptError::get_HelpContext. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 9 +++++++-- dlls/msscript.ocx/tests/msscript.c | 9 +++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index dcea9674c9..05e6121a58 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -128,6 +128,7 @@ typedef struct { BSTR source; BSTR desc; BSTR help_file; + DWORD help_context; BOOLEAN info_filled; } ScriptError; @@ -2136,6 +2137,7 @@ static void fill_error_info(ScriptError *error) error->source = info.bstrSource; error->desc = info.bstrDescription; error->help_file = info.bstrHelpFile; + error->help_context = info.dwHelpContext; } static HRESULT WINAPI ScriptError_QueryInterface(IScriptError *iface, REFIID riid, void **ppv) @@ -2293,9 +2295,11 @@ static HRESULT WINAPI ScriptError_get_HelpContext(IScriptError *iface, LONG *plH { ScriptError *This = impl_from_IScriptError(iface); - FIXME("(%p)->(%p)\n", This, plHelpContext); + TRACE("(%p)->(%p)\n", This, plHelpContext); - return E_NOTIMPL; + fill_error_info(This); + *plHelpContext = This->help_context; + return S_OK; } static HRESULT WINAPI ScriptError_get_Text(IScriptError *iface, BSTR *pbstrText) @@ -2344,6 +2348,7 @@ static HRESULT WINAPI ScriptError_Clear(IScriptError *iface) This->source = NULL; This->desc = NULL; This->help_file = NULL; + This->help_context = 0; This->info_filled = FALSE; return S_OK; diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index aa0c31e73c..702fbb167a 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -3345,6 +3345,9 @@ static void test_IScriptControl_get_Error(void) hr = IScriptError_get_HelpFile(error, &str); ok(hr == S_OK, "IScriptError_get_HelpFile failed: 0x%08x.\n", hr); ok(str == NULL, "Error HelpFile is not (null), got %s.\n", wine_dbgstr_w(str)); + hr = IScriptError_get_HelpContext(error, &x); + ok(hr == S_OK, "IScriptError_get_HelpContext failed: 0x%08x.\n", hr); + ok(x == 0, "Error HelpContext is not 0, got %d.\n", x); str = SysAllocString(L"jscript"); hr = IScriptControl_put_Language(sc, str); @@ -3387,6 +3390,9 @@ static void test_IScriptControl_get_Error(void) hr = IScriptError_get_HelpFile(error, &str); ok(hr == S_OK, "IScriptError_get_HelpFile failed: 0x%08x.\n", hr); ok(str == NULL, "Error HelpFile is not (null), got %s.\n", wine_dbgstr_w(str)); + hr = IScriptError_get_HelpContext(error, &x); + ok(hr == S_OK, "IScriptError_get_HelpContext failed: 0x%08x.\n", hr); + ok(x == 0, "Error HelpContext is not 0, got %d.\n", x); hr = IScriptControl_get_Error(sc, &error2); ok(hr == S_OK, "IScriptControl_get_Error failed: 0x%08x.\n", hr); @@ -3446,6 +3452,9 @@ static void test_IScriptControl_get_Error(void) hr = IScriptError_get_HelpFile(error, &str); ok(hr == S_OK, "IScriptError_get_HelpFile failed: 0x%08x.\n", hr); ok(str == NULL, "Error HelpFile is not (null), got %s.\n", wine_dbgstr_w(str)); + hr = IScriptError_get_HelpContext(error, &x); + ok(hr == S_OK, "IScriptError_get_HelpContext failed: 0x%08x.\n", hr); + ok(x == 0, "Error HelpContext is not 0, got %d.\n", x); SET_EXPECT(GetSourceLineText); hr = IScriptError_get_Text(error, &str);

1 0

Gabriel Ivăncescu : msscript.ocx: Implement IScriptError::get_Text.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: 4a588d394360bb175c28a656d88e5044eed8b7cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a588d394360bb175c28a656… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Aug 24 17:56:18 2020 +0300 msscript.ocx: Implement IScriptError::get_Text. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 20 ++++++++++++++++++-- dlls/msscript.ocx/tests/msscript.c | 31 ++++++++++++++++++++++--------- 2 files changed, 40 insertions(+), 11 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 05e6121a58..89a18a085b 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -125,12 +125,14 @@ typedef struct { LONG ref; HRESULT number; + BSTR text; BSTR source; BSTR desc; BSTR help_file; DWORD help_context; BOOLEAN info_filled; + BOOLEAN text_filled; } ScriptError; struct ScriptHost { @@ -2140,6 +2142,15 @@ static void fill_error_info(ScriptError *error) error->help_context = info.dwHelpContext; } +static void fill_error_text(ScriptError *error) +{ + if (error->text_filled) return; + error->text_filled = TRUE; + + if (error->object) + IActiveScriptError_GetSourceLineText(error->object, &error->text); +} + static HRESULT WINAPI ScriptError_QueryInterface(IScriptError *iface, REFIID riid, void **ppv) { ScriptError *This = impl_from_IScriptError(iface); @@ -2306,9 +2317,11 @@ static HRESULT WINAPI ScriptError_get_Text(IScriptError *iface, BSTR *pbstrText) { ScriptError *This = impl_from_IScriptError(iface); - FIXME("(%p)->(%p)\n", This, pbstrText); + TRACE("(%p)->(%p)\n", This, pbstrText); - return E_NOTIMPL; + fill_error_text(This); + *pbstrText = SysAllocString(This->text); + return S_OK; } static HRESULT WINAPI ScriptError_get_Line(IScriptError *iface, LONG *plLine) @@ -2340,17 +2353,20 @@ static HRESULT WINAPI ScriptError_Clear(IScriptError *iface) IActiveScriptError_Release(This->object); This->object = NULL; } + SysFreeString(This->text); SysFreeString(This->source); SysFreeString(This->desc); SysFreeString(This->help_file); This->number = 0; + This->text = NULL; This->source = NULL; This->desc = NULL; This->help_file = NULL; This->help_context = 0; This->info_filled = FALSE; + This->text_filled = FALSE; return S_OK; } diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 702fbb167a..bcd669fc6e 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -3348,6 +3348,9 @@ static void test_IScriptControl_get_Error(void) hr = IScriptError_get_HelpContext(error, &x); ok(hr == S_OK, "IScriptError_get_HelpContext failed: 0x%08x.\n", hr); ok(x == 0, "Error HelpContext is not 0, got %d.\n", x); + hr = IScriptError_get_Text(error, &str); + ok(hr == S_OK, "IScriptError_get_Text failed: 0x%08x.\n", hr); + ok(str == NULL, "Error Text is not (null), got %s.\n", wine_dbgstr_w(str)); str = SysAllocString(L"jscript"); hr = IScriptControl_put_Language(sc, str); @@ -3374,6 +3377,10 @@ static void test_IScriptControl_get_Error(void) ok(hr == S_OK, "IScriptError_get_Description failed: 0x%08x.\n", hr); ok(str != NULL, "Error Description is (null).\n"); SysFreeString(str); + hr = IScriptError_get_Text(error, &str); + ok(hr == S_OK, "IScriptError_get_Text failed: 0x%08x.\n", hr); + ok(!lstrcmpW(str, L"this is an invalid line"), "Error Text is wrong, got %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); hr = IScriptError_Clear(error); ok(hr == S_OK, "IScriptError_Clear failed: 0x%08x.\n", hr); @@ -3393,6 +3400,9 @@ static void test_IScriptControl_get_Error(void) hr = IScriptError_get_HelpContext(error, &x); ok(hr == S_OK, "IScriptError_get_HelpContext failed: 0x%08x.\n", hr); ok(x == 0, "Error HelpContext is not 0, got %d.\n", x); + hr = IScriptError_get_Text(error, &str); + ok(hr == S_OK, "IScriptError_get_Text failed: 0x%08x.\n", hr); + ok(str == NULL, "Error Text is not (null), got %s.\n", wine_dbgstr_w(str)); hr = IScriptControl_get_Error(sc, &error2); ok(hr == S_OK, "IScriptControl_get_Error failed: 0x%08x.\n", hr); @@ -3458,9 +3468,10 @@ static void test_IScriptControl_get_Error(void) SET_EXPECT(GetSourceLineText); hr = IScriptError_get_Text(error, &str); - todo_wine ok(hr == S_OK, "IScriptError_get_Text failed: 0x%08x.\n", hr); - if (SUCCEEDED(hr)) SysFreeString(str); - todo_wine CHECK_CALLED(GetSourceLineText); + ok(hr == S_OK, "IScriptError_get_Text failed: 0x%08x.\n", hr); + ok(!lstrcmpW(str, L"source line"), "Error Text is wrong, got %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); + CHECK_CALLED(GetSourceLineText); SET_EXPECT(GetSourcePosition); hr = IScriptError_get_Line(error, &x); @@ -3493,9 +3504,10 @@ static void test_IScriptControl_get_Error(void) SET_EXPECT(GetSourceLineText); hr = IScriptError_get_Text(error, &str); - todo_wine ok(hr == S_OK, "IScriptError_get_Text failed: 0x%08x.\n", hr); - if (SUCCEEDED(hr)) SysFreeString(str); - todo_wine CHECK_CALLED(GetSourceLineText); + ok(hr == S_OK, "IScriptError_get_Text failed: 0x%08x.\n", hr); + ok(!lstrcmpW(str, L"source line"), "Error Text is wrong, got %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); + CHECK_CALLED(GetSourceLineText); SET_EXPECT(GetSourcePosition); hr = IScriptError_get_Line(error, &x); @@ -3527,9 +3539,10 @@ static void test_IScriptControl_get_Error(void) SET_EXPECT(GetSourceLineText); hr = IScriptError_get_Text(error, &str); - todo_wine ok(hr == S_OK, "IScriptError_get_Text failed: 0x%08x.\n", hr); - if (SUCCEEDED(hr)) SysFreeString(str); - todo_wine CHECK_CALLED(GetSourceLineText); + ok(hr == S_OK, "IScriptError_get_Text failed: 0x%08x.\n", hr); + ok(!lstrcmpW(str, L"source line"), "Error Text is wrong, got %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); + CHECK_CALLED(GetSourceLineText); SET_EXPECT(GetSourcePosition); hr = IScriptError_get_Line(error, &x);

1 0