September 2019 - Wine-Commits

Gabriel Ivăncescu : msscript.ocx/tests: Add tests for IScriptControl::ExecuteStatement.
by Alexandre Julliard Sept. 25, 2019

Sept. 25, 2019

Module: wine Branch: master Commit: f99b9868e586e96a5957bec5f6ea512bbd87251c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f99b9868e586e96a5957bec5… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 25 17:01:53 2019 +0200 msscript.ocx/tests: Add tests for IScriptControl::ExecuteStatement. 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 | 87 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index d3f0955ca7..0345b3f392 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -1675,6 +1675,92 @@ static void test_IScriptControl_AddCode(void) } } +static void test_IScriptControl_ExecuteStatement(void) +{ + IScriptControl *sc; + HRESULT hr; + BSTR str; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void**)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + str = a2bstr("1 + 1"); + hr = IScriptControl_ExecuteStatement(sc, str); + ok(hr == E_FAIL, "IScriptControl_ExecuteStatement returned: 0x%08x.\n", hr); + SysFreeString(str); + + hr = IScriptControl_ExecuteStatement(sc, NULL); + ok(hr == E_FAIL, "IScriptControl_ExecuteStatement returned: 0x%08x.\n", hr); + + str = a2bstr("jscript"); + hr = IScriptControl_put_Language(sc, str); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + SysFreeString(str); + + str = a2bstr("1 + 1"); + hr = IScriptControl_ExecuteStatement(sc, str); + ok(hr == S_OK, "IScriptControl_ExecuteStatement failed: 0x%08x.\n", hr); + SysFreeString(str); + todo_wine CHECK_ERROR(sc, 0); + + str = a2bstr("invalid syntax"); + hr = IScriptControl_ExecuteStatement(sc, str); + todo_wine ok(hr == 0x800a03ec, "IScriptControl_ExecuteStatement returned: 0x%08x.\n", hr); + SysFreeString(str); + todo_wine CHECK_ERROR(sc, 1004); + + IScriptControl_Release(sc); + + /* custom script engine */ + if (have_custom_engine) + { + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void**)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + SET_EXPECT(CreateInstance); + SET_EXPECT(SetInterfaceSafetyOptions); + SET_EXPECT(SetScriptSite); + SET_EXPECT(QI_IActiveScriptParse); + SET_EXPECT(InitNew); + + str = a2bstr("testscript"); + hr = IScriptControl_put_Language(sc, str); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + SysFreeString(str); + + CHECK_CALLED(CreateInstance); + CHECK_CALLED(SetInterfaceSafetyOptions); + CHECK_CALLED(SetScriptSite); + CHECK_CALLED(QI_IActiveScriptParse); + CHECK_CALLED(InitNew); + + SET_EXPECT(SetScriptState_STARTED); + SET_EXPECT(ParseScriptText); + parse_flags = 0; + str = a2bstr("1 + 1"); + hr = IScriptControl_ExecuteStatement(sc, str); + ok(hr == S_OK, "IScriptControl_ExecuteStatement failed: 0x%08x.\n", hr); + SysFreeString(str); + CHECK_CALLED(SetScriptState_STARTED); + CHECK_CALLED(ParseScriptText); + + SET_EXPECT(ParseScriptText); + str = a2bstr("0x100"); + hr = IScriptControl_ExecuteStatement(sc, str); + ok(hr == S_OK, "IScriptControl_ExecuteStatement failed: 0x%08x.\n", hr); + SysFreeString(str); + CHECK_CALLED(ParseScriptText); + + IActiveScriptSite_Release(site); + + SET_EXPECT(Close); + IScriptControl_Release(sc); + CHECK_CALLED(Close); + } +} + START_TEST(msscript) { IUnknown *unk; @@ -1710,6 +1796,7 @@ START_TEST(msscript) test_State(); test_IScriptControl_Eval(); test_IScriptControl_AddCode(); + test_IScriptControl_ExecuteStatement(); init_registry(FALSE);

1 0

Jacek Caban : msscript.ocx: Fix VARIANT access.
by Alexandre Julliard Sept. 25, 2019

Sept. 25, 2019

Module: wine Branch: master Commit: 12db3a102af292e9e07927ff82152533c3ec42bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=12db3a102af292e9e07927ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 25 17:02:04 2019 +0200 msscript.ocx: Fix VARIANT access. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/tests/msscript.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 0345b3f392..95b2a69cf6 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -1525,11 +1525,9 @@ static void test_IScriptControl_Eval(void) parse_flags = SCRIPTTEXT_ISEXPRESSION; script_str = a2bstr("var1 = 1 + 1"); V_VT(&var) = VT_NULL; - V_I4(&var) = 0xdeadbeef; hr = IScriptControl_Eval(sc, script_str, &var); ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); - ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", - V_VT(&var), V_I4(&var)); + ok(V_VT(&var) == VT_EMPTY, "V_VT(var) = %d.\n", V_VT(&var)); SysFreeString(script_str); CHECK_CALLED(SetScriptState_STARTED); CHECK_CALLED(ParseScriptText); @@ -1657,11 +1655,9 @@ static void test_IScriptControl_AddCode(void) parse_flags = SCRIPTTEXT_ISEXPRESSION; code_str = a2bstr("var2 = 10 + var1"); V_VT(&var) = VT_NULL; - V_I4(&var) = 0xdeadbeef; hr = IScriptControl_Eval(sc, code_str, &var); ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); - ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", - V_VT(&var), V_I4(&var)); + ok(V_VT(&var) == VT_EMPTY, "V_VT(var) = %d.\n", V_VT(&var)); SysFreeString(code_str); CHECK_CALLED(ParseScriptText);

1 0

Vincent Povirk : mscoree: Update Wine Mono to 4.9.3.
by Alexandre Julliard Sept. 25, 2019

Sept. 25, 2019

Module: wine Branch: master Commit: 621c2de4601effe7023891985bb2cf3b600537b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=621c2de4601effe702389198… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 25 10:41:18 2019 -0500 mscoree: Update Wine Mono to 4.9.3. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 8be579d6dc..e501054e16 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -58,8 +58,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.9.2" -#define MONO_SHA "b91f4656fca72d036934c2a9e845b2dfadad291e48e0b013fb2b08698200ff74" +#define MONO_VERSION "4.9.3" +#define MONO_SHA "7cf6b7674697f9de9cd1630ceb1de4c56adebb617fcca4d179a22cb7e1b2476d" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index bcad7f4f25..db18aff3eb 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "4.9.2" +#define WINE_MONO_VERSION "4.9.3" /* Mono embedding */ typedef struct _MonoDomain MonoDomain;

1 0

Jacek Caban : scrobj: Add GetDispID implementation.
by Alexandre Julliard Sept. 25, 2019

Sept. 25, 2019

Module: wine Branch: master Commit: dd2fcd6afabdcedfab955cff78a08f8b610856a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd2fcd6afabdcedfab955cff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 25 19:23:06 2019 +0200 scrobj: Add GetDispID implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 22 ++++++++++++++++++++-- dlls/scrobj/tests/scrobj.c | 8 -------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 350efd9340..b0a8dc7d55 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -1046,8 +1046,26 @@ static HRESULT WINAPI scriptlet_Invoke(IDispatchEx *iface, DISPID dispIdMember, static HRESULT WINAPI scriptlet_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { struct scriptlet_instance *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); - return E_NOTIMPL; + unsigned i; + + TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); + + if (grfdex & ~(fdexNameCaseInsensitive|fdexNameCaseSensitive)) + FIXME("Unsupported grfdex %x\n", grfdex); + + for (i = 0; i < This->member_cnt; i++) + { + if (grfdex & fdexNameCaseInsensitive) + { + if (wcsicmp(This->members[i].name, bstrName)) continue; + } + else if (wcscmp(This->members[i].name, bstrName)) continue; + *pid = i + 1; + return S_OK; + } + + WARN("Unknown property %s\n", debugstr_w(bstrName)); + return DISP_E_UNKNOWNNAME; } static HRESULT WINAPI scriptlet_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD flags, DISPPARAMS *pdp, diff --git a/dlls/scrobj/tests/scrobj.c b/dlls/scrobj/tests/scrobj.c index 340e08874c..d61815ef65 100644 --- a/dlls/scrobj/tests/scrobj.c +++ b/dlls/scrobj/tests/scrobj.c @@ -848,45 +848,37 @@ static void test_create_object(void) str = SysAllocString(L"vbAddOne"); hres = IDispatchEx_GetDispID(dispex, str, fdexNameCaseSensitive, &vb_add_one_id); - todo_wine ok(hres == S_OK, "Could not get vkAddOne id: %08x\n", hres); SysFreeString(str); str = SysAllocString(L"jsAddTwo"); hres = IDispatchEx_GetDispID(dispex, str, fdexNameCaseSensitive, &js_add_two_id); - todo_wine ok(hres == S_OK, "Could not get jsAddTwo id: %08x\n", hres); SysFreeString(str); str = SysAllocString(L"wtTest"); hres = IDispatchEx_GetDispID(dispex, str, fdexNameCaseSensitive, &wt_test_id); - todo_wine ok(hres == S_OK, "Could not get wtTest id: %08x\n", hres); SysFreeString(str); str = SysAllocString(L"gsProp"); hres = IDispatchEx_GetDispID(dispex, str, fdexNameCaseSensitive, &wt_gsprop_id); - todo_wine ok(hres == S_OK, "Could not get wtTest id: %08x\n", hres); SysFreeString(str); str = SysAllocString(L"vbaddone"); hres = IDispatchEx_GetDispID(dispex, str, fdexNameCaseSensitive, &id); - todo_wine ok(hres == DISP_E_UNKNOWNNAME, "invalid case returned: %08x\n", hres); SysFreeString(str); str = SysAllocString(L"vbaddone"); hres = IDispatchEx_GetDispID(dispex, str, 0, &id); - todo_wine ok(hres == DISP_E_UNKNOWNNAME, "invalid case returned: %08x\n", hres); SysFreeString(str); str = SysAllocString(L"vbaddone"); hres = IDispatchEx_GetDispID(dispex, str, fdexNameCaseInsensitive, &id); - todo_wine ok(hres == S_OK, "case insensitive returned: %08x\n", hres); - todo_wine ok(id == vb_add_one_id, "id = %u, expected %u\n", id, vb_add_one_id); SysFreeString(str);

1 0

Jacek Caban : scrobj: Lookup object members implementations in scripts when createating scriptlet instance.
by Alexandre Julliard Sept. 25, 2019

Sept. 25, 2019

Module: wine Branch: master Commit: b3b78b4226f6307369d5412084c17ae59301b19d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3b78b4226f6307369d54120… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 25 19:22:56 2019 +0200 scrobj: Lookup object members implementations in scripts when createating scriptlet instance. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/scrobj/tests/scrobj.c | 9 ----- 2 files changed, 92 insertions(+), 9 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 946dd685f5..350efd9340 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -118,12 +118,35 @@ struct scriptlet_factory struct list scripts; }; +struct script_reference +{ + struct script_host *host; + DISPID id; +}; + +struct object_member +{ + enum member_type type; + BSTR name; + union + { + struct script_reference method; + struct + { + struct script_reference get; + struct script_reference put; + } property; + } u; +}; + struct scriptlet_instance { IDispatchEx IDispatchEx_iface; LONG ref; struct list hosts; struct scriptlet_global *global; + unsigned member_cnt; + struct object_member *members; }; struct script_host @@ -705,6 +728,70 @@ static HRESULT parse_scripts(struct scriptlet_factory *factory, struct list *hos return S_OK; } +static HRESULT lookup_script_properties(struct scriptlet_instance *object, BSTR name, struct script_reference *ret) +{ + struct script_host *host; + HRESULT hres; + + LIST_FOR_EACH_ENTRY(host, &object->hosts, struct script_host, entry) + { + hres = IDispatchEx_GetDispID(host->script_dispatch, name, 0, &ret->id); + if (FAILED(hres)) continue; + ret->host = host; + return S_OK; + } + + FIXME("Could not find %s in scripts\n", debugstr_w(name)); + return E_FAIL; +} + +static HRESULT lookup_object_properties(struct scriptlet_instance *object, struct scriptlet_factory *factory) +{ + struct scriptlet_member *member; + unsigned i = 0, member_cnt = 0; + size_t len; + BSTR name; + HRESULT hres; + + LIST_FOR_EACH_ENTRY(member, &factory->members, struct scriptlet_member, entry) + member_cnt++; + + if (!member_cnt) return S_OK; + + if (!(object->members = heap_alloc_zero(member_cnt * sizeof(*object->members)))) return E_OUTOFMEMORY; + object->member_cnt = member_cnt; + + LIST_FOR_EACH_ENTRY(member, &factory->members, struct scriptlet_member, entry) + { + object->members[i].type = member->type; + if (!(object->members[i].name = SysAllocString(member->name))) return E_OUTOFMEMORY; + switch (member->type) + { + case MEMBER_METHOD: + hres = lookup_script_properties(object, object->members[i].name, &object->members[i].u.method); + if (FAILED(hres)) return hres; + break; + case MEMBER_PROPERTY: + len = wcslen(member->name); + if (!(name = SysAllocStringLen(NULL, len + 4))) return E_OUTOFMEMORY; + wcscpy(name, L"get_"); + wcscat(name, member->name); + hres = lookup_script_properties(object, name, &object->members[i].u.property.get); + if (SUCCEEDED(hres)) + { + memcpy(name, L"put", 3 * sizeof(WCHAR)); + hres = lookup_script_properties(object, name, &object->members[i].u.property.put); + } + SysFreeString(name); + if (FAILED(hres)) return hres; + break; + } + i++; + } + + return S_OK; +} + static HRESULT init_script_host(struct script_host *host, IActiveScript *clone) { HRESULT hres; @@ -900,6 +987,10 @@ static ULONG WINAPI scriptlet_Release(IDispatchEx *iface) if (!ref) { + unsigned i; + for (i = 0; i < This->member_cnt; i++) + SysFreeString(This->members[i].name); + heap_free(This->members); detach_script_hosts(&This->hosts); if (This->global) IDispatchEx_Release(&This->global->IDispatchEx_iface); heap_free(This); @@ -1074,6 +1165,7 @@ static HRESULT create_scriptlet_instance(struct scriptlet_factory *factory, IDis } if (SUCCEEDED(hres)) hres = parse_scripts(factory, &obj->hosts, TRUE); + if (SUCCEEDED(hres)) hres = lookup_object_properties(obj, factory); if (FAILED(hres)) { IDispatchEx_Release(&obj->IDispatchEx_iface); diff --git a/dlls/scrobj/tests/scrobj.c b/dlls/scrobj/tests/scrobj.c index 37b5769368..340e08874c 100644 --- a/dlls/scrobj/tests/scrobj.c +++ b/dlls/scrobj/tests/scrobj.c @@ -832,11 +832,8 @@ static void test_create_object(void) CHECK_CALLED(GetScriptDispatch); todo_wine CHECK_CALLED(GetDispID_vbAddOne); - todo_wine CHECK_CALLED(GetDispID_wtTest); - todo_wine CHECK_CALLED(GetDispID_get_gsProp); - todo_wine CHECK_CALLED(GetDispID_put_gsProp); CHECK_CALLED(SetScriptState_STARTED); CHECK_CALLED(ParseScriptText); @@ -1038,11 +1035,8 @@ static void test_create_object(void) CHECK_CALLED(GetScriptDispatch); todo_wine CHECK_CALLED(GetDispID_vbAddOne); - todo_wine CHECK_CALLED(GetDispID_wtTest); - todo_wine CHECK_CALLED(GetDispID_get_gsProp); - todo_wine CHECK_CALLED(GetDispID_put_gsProp); CHECK_CALLED(SetScriptState_STARTED); CHECK_CALLED(ParseScriptText); @@ -1075,11 +1069,8 @@ static void test_create_object(void) CHECK_CALLED(GetScriptDispatch); todo_wine CHECK_CALLED(GetDispID_vbAddOne); - todo_wine CHECK_CALLED(GetDispID_wtTest); - todo_wine CHECK_CALLED(GetDispID_get_gsProp); - todo_wine CHECK_CALLED(GetDispID_put_gsProp); CHECK_CALLED(SetScriptState_STARTED);

1 0

Alexandre Julliard : include: Remove no longer needed dependency on setjmp.h.
by Alexandre Julliard Sept. 25, 2019

Sept. 25, 2019

Module: wine Branch: master Commit: 8d40f81d1e8d01f35cb6c27d06052bea463455a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d40f81d1e8d01f35cb6c27d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 25 16:26:59 2019 +0200 include: Remove no longer needed dependency on setjmp.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/exception.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/include/wine/exception.h b/include/wine/exception.h index 3281130c50..90ce30d6a2 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -21,7 +21,6 @@ #ifndef __WINE_WINE_EXCEPTION_H #define __WINE_WINE_EXCEPTION_H -#include <setjmp.h> #include <windef.h> #include <excpt.h> @@ -92,11 +91,7 @@ extern "C" { #else /* USE_COMPILER_EXCEPTIONS */ -/* jmp_buf definition that should be compatible with the one in msvcrt/setjmp.h */ - -#if defined(__MINGW32__) || defined(__WINE_SETJMP_H) -typedef _JUMP_BUFFER __wine_jmp_buf; -#elif defined(__i386__) +#ifdef __i386__ typedef struct { int reg[16]; } __wine_jmp_buf; #elif defined(__x86_64__) typedef struct { DECLSPEC_ALIGN(16) struct { unsigned __int64 Part[2]; } reg[16]; } __wine_jmp_buf;

1 0

Francois Gouget : testbot/Engine: Redirect stderr so Perl errors are logged.
by Alexandre Julliard Sept. 25, 2019

Sept. 25, 2019

Module: tools Branch: master Commit: a071a4e1daf1f7dc269fb45077a73786e6bb4878 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a071a4e1daf1f7dc269fb45… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 25 08:52:02 2019 +0200 testbot/Engine: Redirect stderr so Perl errors are logged. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 81d3afc..aed0e51 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -742,6 +742,7 @@ sub main() } $SIG{CHLD} = \&REAPER; + WineTestBot::Log::SetupRedirects(); $WineTestBot::Engine::Notify::RunningInEngine = 1; LogMsg "Starting the WineTestBot Engine\n";

1 0

Francois Gouget : testbot: Add SpecialJobs to handle the reconfig / winetest jobs.
by Alexandre Julliard Sept. 25, 2019

Sept. 25, 2019

Module: tools Branch: master Commit: 06d7cd9e91f4b26decfb883c1757a4edc08c9237 URL: https://source.winehq.org/git/tools.git/?a=commit;h=06d7cd9e91f4b26decfb883… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 25 08:52:48 2019 +0200 testbot: Add SpecialJobs to handle the reconfig / winetest jobs. This allows creating these jobs without having to go through CheckForWinetestUpdate.pl. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/CheckForWinetestUpdate.pl | 284 ++++++--------------------------- testbot/lib/WineTestBot/SpecialJobs.pm | 276 ++++++++++++++++++++++++++++++++ 2 files changed, 323 insertions(+), 237 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=06d7cd9e91f4b26decf…

1 0

Francois Gouget : testbot/web: Always check the https connection the same way.
by Alexandre Julliard Sept. 25, 2019

Sept. 25, 2019

Module: tools Branch: master Commit: 613132f21c51ec8bb32dca9acb942713a7d7925c URL: https://source.winehq.org/git/tools.git/?a=commit;h=613132f21c51ec8bb32dca9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 25 08:52:33 2019 +0200 testbot/web: Always check the https connection the same way. The standard way the TestBot checks the https connection is with '$UseSSL && ! SecureConnection())' so use that form in CheckSecurePage() too. This actually simplifies it too. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index d1442c1..c1a8c8c 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -73,12 +73,10 @@ sub CheckSecurePage($$) { my ($self, $Page) = @_; - if (! $UseSSL || SecureConnection()) + if ($UseSSL && ! SecureConnection()) { - return; + $self->Redirect($Page, MakeSecureURL($ENV{"REQUEST_URI"})); } - - $self->Redirect($Page, MakeSecureURL($ENV{"REQUEST_URI"})); } sub GenerateHttpHeaders($)

1 0

Francois Gouget : testbot/web: Use GetTaskURL() to link to the task pages.
by Alexandre Julliard Sept. 25, 2019

Sept. 25, 2019

Module: tools Branch: master Commit: 96ddaa8798ff97c700e636f3934abb6c74607792 URL: https://source.winehq.org/git/tools.git/?a=commit;h=96ddaa8798ff97c700e636f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 25 08:52:13 2019 +0200 testbot/web: Use GetTaskURL() to link to the task pages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Activity.pl | 4 ++-- testbot/web/Stats.pl | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index bf7d6b9..fe056aa 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -231,9 +231,9 @@ EOF $Label .= "/64" if ($Bitness); } } - my $Key = $VMStatus->{job}->Id ."#k". ($VMStatus->{step}->No * 100 + $VMStatus->{task}->No); + my $URL = GetTaskURL($VMStatus->{job}->Id, $VMStatus->{step}->No, $VMStatus->{task}->No); my $Title = $self->escapeHTML($VMStatus->{job}->Remarks); - $Label = "<a href='/JobDetails.pl?Key=$Key' title='$Title'>$Label</a>"; + $Label = "<a href='$URL' title='$Title'>$Label</a>"; } elsif ($VMStatus->{status} eq "dirty") { diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 70e812d..91106bb 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -131,8 +131,7 @@ sub _GetStatHtml($$;$$) my ($JobId, $StepNo, $TaskNo) = ObjectModel::Collection::SplitKey(undef, $SrcObj->GetFullKey()); if (defined $TaskNo) { - my $Key = "$JobId#k". ($StepNo * 100 + $TaskNo); - return "<a href='/JobDetails.pl?Key=$Key'>$Value</a>"; + return "<a href='". GetTaskURL($JobId, $StepNo, $TaskNo) ."'>$Value</a>"; } return "<a href='/index.pl#job$JobId'>$Value</a>"; }

1 0