September 2019 - Wine-commits

Jacek Caban : scrobj/tests: Add property element tests.
by Alexandre Julliard 25 Sep '19

25 Sep '19

Module: wine Branch: master Commit: 3013d5d1e7dec454077b95f680e6d4507c70226f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3013d5d1e7dec454077b95f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 25 19:22:40 2019 +0200 scrobj/tests: Add property element tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/tests/scrobj.c | 125 +++++++++++++++++++++++++++++++++++++++---- dlls/scrobj/tests/scrobj.wsc | 8 +-- 2 files changed, 119 insertions(+), 14 deletions(-) diff --git a/dlls/scrobj/tests/scrobj.c b/dlls/scrobj/tests/scrobj.c index 709f005080..e0a3ace708 100644 --- a/dlls/scrobj/tests/scrobj.c +++ b/dlls/scrobj/tests/scrobj.c @@ -106,9 +106,15 @@ DEFINE_EXPECT(Clone); DEFINE_EXPECT(GetScriptDispatch); DEFINE_EXPECT(GetDispID_vbAddOne); DEFINE_EXPECT(GetDispID_wtTest); +DEFINE_EXPECT(GetDispID_get_gsProp); +DEFINE_EXPECT(GetDispID_put_gsProp); DEFINE_EXPECT(InvokeEx); +DEFINE_EXPECT(InvokeEx_get_gsProp); +DEFINE_EXPECT(InvokeEx_put_gsProp); -#define DISPID_WTTEST 100 +#define DISPID_WTTEST 100 +#define DISPID_GET_GSPROP 101 +#define DISPID_PUT_GSPROP 102 static DWORD parse_flags; static BOOL support_clone; @@ -182,6 +188,20 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR name, DWORD *pid = DISPID_WTTEST; return S_OK; } + if (!wcscmp(name, L"get_gsProp")) + { + CHECK_EXPECT(GetDispID_get_gsProp); + ok(!grfdex, "grfdex = %x\n", grfdex); + *pid = DISPID_GET_GSPROP; + return S_OK; + } + if (!wcscmp(name, L"put_gsProp")) + { + CHECK_EXPECT(GetDispID_put_gsProp); + ok(!grfdex, "grfdex = %x\n", grfdex); + *pid = DISPID_PUT_GSPROP; + return S_OK; + } ok(0, "unexpected name %s\n", wine_dbgstr_w(name)); return DISP_E_UNKNOWNNAME; } @@ -189,14 +209,35 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR name, DWORD static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD flags, DISPPARAMS *pdp, VARIANT *res, EXCEPINFO *pei, IServiceProvider *caller) { - CHECK_EXPECT(InvokeEx); - ok(id == DISPID_WTTEST, "id = %u\n", id); - ok(lcid == 0x100, "lcid = %x\n", lcid); - ok(flags == DISPATCH_METHOD, "flags = %x\n", flags); - ok(caller == (void*)0xdeadbeef, "called = %p\n", caller); - V_VT(res) = VT_BOOL; - V_BOOL(res) = VARIANT_TRUE; - return S_OK; + switch (id) + { + case DISPID_WTTEST: + CHECK_EXPECT(InvokeEx); + ok(lcid == 0x100, "lcid = %x\n", lcid); + ok(flags == DISPATCH_METHOD, "flags = %x\n", flags); + ok(caller == (void*)0xdeadbeef, "called = %p\n", caller); + V_VT(res) = VT_BOOL; + V_BOOL(res) = VARIANT_TRUE; + return S_OK; + case DISPID_GET_GSPROP: + CHECK_EXPECT(InvokeEx_get_gsProp); + ok(flags == DISPATCH_METHOD, "flags = %x\n", flags); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + V_VT(res) = VT_BOOL; + V_BOOL(res) = VARIANT_TRUE; + return S_OK; + case DISPID_PUT_GSPROP: + CHECK_EXPECT(InvokeEx_put_gsProp); + ok(flags == DISPATCH_METHOD, "flags = %x\n", flags); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(pdp->cNamedArgs == 0, "cNamedArgs = %d\n", pdp->cNamedArgs); + V_VT(res) = VT_BOOL; + V_BOOL(res) = VARIANT_FALSE; + return S_OK; + } + + ok(0, "unexpected id %u\n", id); + return E_FAIL; } static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR name, DWORD grfdex) @@ -530,6 +571,8 @@ static HRESULT WINAPI ActiveScript_Clone(IActiveScript *iface, IActiveScript **p SET_EXPECT(GetScriptDispatch); SET_EXPECT(GetDispID_vbAddOne); SET_EXPECT(GetDispID_wtTest); + SET_EXPECT(GetDispID_get_gsProp); + SET_EXPECT(GetDispID_put_gsProp); SET_EXPECT(SetScriptState_STARTED); SET_EXPECT(ParseScriptText); @@ -746,7 +789,8 @@ static void register_script_object(BOOL do_register, const WCHAR *file_name) static void test_create_object(void) { - DISPID vb_add_one_id, js_add_two_id, wt_test_id, id; + DISPID vb_add_one_id, js_add_two_id, wt_test_id, wt_gsprop_id, id; + DISPID id_propput = DISPID_PROPERTYPUT; IDispatchEx *dispex; IClassFactory *cf; IDispatch *disp; @@ -791,6 +835,10 @@ static void test_create_object(void) 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); @@ -820,6 +868,12 @@ static void test_create_object(void) 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 @@ -902,6 +956,44 @@ static void test_create_object(void) todo_wine ok(V_BOOL(&r) == VARIANT_TRUE, "V_I4(r) = %d\n", V_I4(&r)); + memset(&ei, 0, sizeof(ei)); + memset(&dp, 0, sizeof(dp)); + V_VT(&v) = VT_I4; + V_I4(&v) = 4; + V_VT(&r) = VT_ERROR; + dp.cArgs = 1; + dp.rgvarg = &v; + SET_EXPECT(InvokeEx_get_gsProp); + hres = IDispatchEx_InvokeEx(dispex, wt_gsprop_id, 0, DISPATCH_PROPERTYGET|DISPATCH_METHOD, &dp, &r, &ei, NULL); + todo_wine + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + todo_wine + CHECK_CALLED(InvokeEx_get_gsProp); + todo_wine + ok(V_VT(&r) == VT_BOOL, "V_VT(r) = %d\n", V_VT(&r)); + todo_wine + ok(V_BOOL(&r) == VARIANT_TRUE, "V_I4(r) = %d\n", V_I4(&r)); + + memset(&ei, 0, sizeof(ei)); + memset(&dp, 0, sizeof(dp)); + V_VT(&v) = VT_I4; + V_I4(&v) = 4; + V_VT(&r) = VT_ERROR; + dp.cArgs = 1; + dp.rgdispidNamedArgs = &id_propput; + dp.rgvarg = &v; + dp.cNamedArgs = 1; + SET_EXPECT(InvokeEx_put_gsProp); + hres = IDispatchEx_InvokeEx(dispex, wt_gsprop_id, 0, DISPATCH_PROPERTYPUT, &dp, &r, &ei, NULL); + todo_wine + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + todo_wine + CHECK_CALLED(InvokeEx_put_gsProp); + todo_wine + ok(V_VT(&r) == VT_BOOL, "V_VT(r) = %d\n", V_VT(&r)); + todo_wine + ok(V_BOOL(&r) == VARIANT_FALSE, "V_I4(r) = %d\n", V_I4(&r)); + hres = IDispatchEx_InvokeEx(dispex, wt_test_id, 0x100, DISPATCH_PROPERTYGET, &dp, &r, &ei, (void*)0xdeadbeef); ok(hres == DISP_E_MEMBERNOTFOUND, "InvokeEx returned: %08x\n", hres); @@ -914,7 +1006,6 @@ static void test_create_object(void) IDispatchEx_Release(dispex); SET_EXPECT(SetScriptState_UNINITIALIZED); - todo_wine SET_EXPECT(Close); IUnknown_Release(unk); CHECK_CALLED(SetScriptState_UNINITIALIZED); @@ -932,6 +1023,8 @@ static void test_create_object(void) SET_EXPECT(GetScriptDispatch); SET_EXPECT(GetDispID_vbAddOne); SET_EXPECT(GetDispID_wtTest); + SET_EXPECT(GetDispID_get_gsProp); + SET_EXPECT(GetDispID_put_gsProp); SET_EXPECT(SetScriptState_STARTED); SET_EXPECT(ParseScriptText); hres = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)&unk); @@ -949,6 +1042,10 @@ static void test_create_object(void) 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); @@ -967,6 +1064,8 @@ static void test_create_object(void) SET_EXPECT(GetScriptDispatch); SET_EXPECT(GetDispID_vbAddOne); SET_EXPECT(GetDispID_wtTest); + SET_EXPECT(GetDispID_get_gsProp); + SET_EXPECT(GetDispID_put_gsProp); SET_EXPECT(SetScriptState_STARTED); hres = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "Could not create scriptlet instance: %08x\n", hres); @@ -981,6 +1080,10 @@ static void test_create_object(void) 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); SET_EXPECT(SetScriptState_UNINITIALIZED); diff --git a/dlls/scrobj/tests/scrobj.wsc b/dlls/scrobj/tests/scrobj.wsc index 41c7626cee..4cc4224dd7 100644 --- a/dlls/scrobj/tests/scrobj.wsc +++ b/dlls/scrobj/tests/scrobj.wsc @@ -6,12 +6,14 @@ <method name="vbAddOne"> <PARAMETER name="n"></PARAMETER> </method> - <method name="jsAddTwo"> - <Parameter name="n"/> - </method> + <method name="jsAddTwo" /> <method name="wtTest"> <Parameter name="i"/> </method> + <property name="gsProp"> + <get /> + <put> </put> + </property> </public> <script language="VBScript"> <![CDATA[

1 0

Jacek Caban : scrobj: Add property element parser support.
by Alexandre Julliard 25 Sep '19

25 Sep '19

Module: wine Branch: master Commit: 47e7d4bea23ed21bad896547f167a96db2e67e9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=47e7d4bea23ed21bad896547… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 25 19:22:31 2019 +0200 scrobj: Add property element parser support. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 143 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 116 insertions(+), 27 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 29116e29b1..736dce9557 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -55,11 +55,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(scrobj); static HINSTANCE scrobj_instance; +enum member_type +{ + MEMBER_METHOD, + MEMBER_PROPERTY +}; + +#define PROP_GETTER 0x01 +#define PROP_SETTER 0x02 + struct scriptlet_member { struct list entry; + enum member_type type; WCHAR *name; - struct list parameters; + union + { + struct list parameters; + unsigned int flags; + } u; }; struct method_parameter @@ -1223,10 +1237,14 @@ static HRESULT parse_scriptlet_registration(struct scriptlet_factory *factory) static HRESULT parse_scriptlet_public(struct scriptlet_factory *factory) { - struct scriptlet_member *member; + struct scriptlet_member *member, *member_iter; + enum member_type member_type; XmlNodeType node_type; + BOOL empty; HRESULT hres; + TRACE("\n"); + if (factory->have_public) { FIXME("duplicated public element\n"); @@ -1246,29 +1264,53 @@ static HRESULT parse_scriptlet_public(struct scriptlet_factory *factory) } if (is_xml_name(factory, L"method")) + member_type = MEMBER_METHOD; + else if (is_xml_name(factory, L"property")) + member_type = MEMBER_PROPERTY; + else { - hres = IXmlReader_MoveToAttributeByName(factory->xml_reader, L"name", NULL); - if (hres != S_OK) - { - FIXME("Missing method name\n"); - return E_FAIL; - } + FIXME("Unexpected element %s\n", debugstr_xml_name(factory)); + return E_NOTIMPL; + } - if (!(member = heap_alloc(sizeof(*member)))) return E_OUTOFMEMORY; + empty = IXmlReader_IsEmptyElement(factory->xml_reader); - hres = read_xml_value(factory, &member->name); - if (FAILED(hres)) + hres = IXmlReader_MoveToAttributeByName(factory->xml_reader, L"name", NULL); + if (hres != S_OK) + { + FIXME("Missing method name\n"); + return E_FAIL; + } + + if (!(member = heap_alloc(sizeof(*member)))) return E_OUTOFMEMORY; + member->type = member_type; + + hres = read_xml_value(factory, &member->name); + if (FAILED(hres)) + { + heap_free(member); + return hres; + } + + LIST_FOR_EACH_ENTRY(member_iter, &factory->members, struct scriptlet_member, entry) + { + if (!wcsicmp(member_iter->name, member->name)) { - heap_free(member); - return hres; + FIXME("Duplicated member %s\n", debugstr_w(member->name)); + return E_FAIL; } - list_init(&member->parameters); - list_add_tail(&factory->members, &member->entry); + } + list_add_tail(&factory->members, &member->entry); + switch (member_type) + { + case MEMBER_METHOD: + list_init(&member->u.parameters); + + if (empty) break; for (;;) { struct method_parameter *parameter; - BOOL empty; hres = next_xml_node(factory, &node_type); if (FAILED(hres)) return hres; @@ -1297,14 +1339,58 @@ static HRESULT parse_scriptlet_public(struct scriptlet_factory *factory) hres = read_xml_value(factory, &parameter->name); if (FAILED(hres)) return hres; - list_add_tail(&member->parameters, &parameter->entry); + list_add_tail(&member->u.parameters, &parameter->entry); if (!empty && FAILED(hres = expect_end_element(factory))) return hres; } - } - else - { - FIXME("Unexpected element %s\n", debugstr_xml_name(factory)); - return E_NOTIMPL; + break; + + case MEMBER_PROPERTY: + member->u.flags = 0; + + if (empty) break; + for (;;) + { + hres = next_xml_node(factory, &node_type); + if (FAILED(hres)) return hres; + if (node_type == XmlNodeType_EndElement) break; + if (node_type != XmlNodeType_Element) + { + FIXME("Unexpected node type %u\n", node_type); + return E_FAIL; + } + if (is_case_xml_name(factory, L"get")) + { + if (member->u.flags & PROP_GETTER) + { + FIXME("Duplicated getter\n"); + return E_FAIL; + } + member->u.flags |= PROP_GETTER; + } + else if (is_case_xml_name(factory, L"put")) + { + if (member->u.flags & PROP_SETTER) + { + FIXME("Duplicated setter\n"); + return E_FAIL; + } + member->u.flags |= PROP_SETTER; + } + else + { + FIXME("Unexpected property element %s\n", debugstr_xml_name(factory)); + return E_FAIL; + } + + empty = IXmlReader_IsEmptyElement(factory->xml_reader); + if (!empty && FAILED(hres = expect_end_element(factory))) return hres; + } + if (!member->u.flags) + { + FIXME("No getter or setter\n"); + return E_NOTIMPL; + } + break; } if (FAILED(hres)) return hres; } @@ -1499,12 +1585,15 @@ static ULONG WINAPI scriptlet_factory_Release(IClassFactory *iface) struct scriptlet_member *member = LIST_ENTRY(list_head(&This->members), struct scriptlet_member, entry); list_remove(&member->entry); heap_free(member->name); - while (!list_empty(&member->parameters)) + if (member->type == MEMBER_METHOD) { - struct method_parameter *parameter = LIST_ENTRY(list_head(&member->parameters), struct method_parameter, entry); - list_remove(&parameter->entry); - heap_free(parameter->name); - heap_free(parameter); + while (!list_empty(&member->u.parameters)) + { + struct method_parameter *parameter = LIST_ENTRY(list_head(&member->u.parameters), struct method_parameter, entry); + list_remove(&parameter->entry); + heap_free(parameter->name); + heap_free(parameter); + } } heap_free(member); }

1 0

Jacek Caban : scrobj: Store script dispatch in script host.
by Alexandre Julliard 25 Sep '19

25 Sep '19

Module: wine Branch: master Commit: fac907b0a9553b7c983ed99cc304934e908a286a URL: https://source.winehq.org/git/wine.git/?a=commit;h=fac907b0a9553b7c983ed99c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 25 19:22:48 2019 +0200 scrobj: Store script dispatch in script host. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 18 ++++++++++++++++++ dlls/scrobj/tests/scrobj.c | 3 --- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 736dce9557..946dd685f5 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -139,6 +139,7 @@ struct script_host IActiveScript *active_script; IActiveScriptParse *parser; + IDispatchEx *script_dispatch; struct scriptlet_instance *object; SCRIPTSTATE state; BOOL cloned; @@ -806,6 +807,11 @@ static void detach_script_hosts(struct list *hosts) if (host->state != SCRIPTSTATE_UNINITIALIZED) set_script_state(host, SCRIPTSTATE_UNINITIALIZED); list_remove(&host->entry); host->object = NULL; + if (host->script_dispatch) + { + IDispatchEx_Release(host->script_dispatch); + host->script_dispatch = NULL; + } if (host->parser) { IActiveScript_Close(host->active_script); @@ -1025,6 +1031,7 @@ static HRESULT create_scriptlet_instance(struct scriptlet_factory *factory, IDis { struct script_host *factory_host, *host; struct scriptlet_instance *obj; + IDispatch *script_dispatch; HRESULT hres; if (!(obj = heap_alloc_zero(sizeof(*obj)))) return E_OUTOFMEMORY; @@ -1053,6 +1060,17 @@ static HRESULT create_scriptlet_instance(struct scriptlet_factory *factory, IDis hres = IActiveScript_AddNamedItem(host->active_script, L"globals", SCRIPTITEM_ISVISIBLE); if (FAILED(hres)) break; + + hres = IActiveScript_GetScriptDispatch(host->active_script, NULL, &script_dispatch); + if (FAILED(hres)) return hres; + + hres = IDispatch_QueryInterface(script_dispatch, &IID_IDispatchEx, (void**)&host->script_dispatch); + IDispatch_Release(script_dispatch); + if (FAILED(hres)) + { + FIXME("IDispatchEx not supported by script engine\n"); + return hres; + } } if (SUCCEEDED(hres)) hres = parse_scripts(factory, &obj->hosts, TRUE); diff --git a/dlls/scrobj/tests/scrobj.c b/dlls/scrobj/tests/scrobj.c index e0a3ace708..37b5769368 100644 --- a/dlls/scrobj/tests/scrobj.c +++ b/dlls/scrobj/tests/scrobj.c @@ -829,7 +829,6 @@ static void test_create_object(void) CHECK_CALLED(SetScriptSite); CHECK_CALLED(AddNamedItem_scriptlet); CHECK_CALLED(AddNamedItem_globals); - todo_wine CHECK_CALLED(GetScriptDispatch); todo_wine CHECK_CALLED(GetDispID_vbAddOne); @@ -1036,7 +1035,6 @@ static void test_create_object(void) CHECK_CALLED(SetScriptSite); CHECK_CALLED(AddNamedItem_scriptlet); CHECK_CALLED(AddNamedItem_globals); - todo_wine CHECK_CALLED(GetScriptDispatch); todo_wine CHECK_CALLED(GetDispID_vbAddOne); @@ -1074,7 +1072,6 @@ static void test_create_object(void) CHECK_CALLED(SetScriptSite); CHECK_CALLED(AddNamedItem_scriptlet); CHECK_CALLED(AddNamedItem_globals); - todo_wine CHECK_CALLED(GetScriptDispatch); todo_wine CHECK_CALLED(GetDispID_vbAddOne);

1 0

Jacek Caban : scrobj: Lookup object members implementations in scripts when createating scriptlet instance.
by Alexandre Julliard 25 Sep '19

25 Sep '19

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

Jacek Caban : scrobj: Add GetDispID implementation.
by Alexandre Julliard 25 Sep '19

25 Sep '19

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

Alexandre Julliard : include: Remove no longer needed dependency on setjmp.h.
by Alexandre Julliard 25 Sep '19

25 Sep '19

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/WineRunReconfig: Tweak formatting of a notification email.
by Alexandre Julliard 25 Sep '19

25 Sep '19

Module: tools Branch: master Commit: 358f63b80f3eeff4ce35b212263b12e962878719 URL: https://source.winehq.org/git/tools.git/?a=commit;h=358f63b80f3eeff4ce35b21… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 25 08:51:22 2019 +0200 testbot/WineRunReconfig: Tweak formatting of a notification email. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index bfbc5ab..1103120 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -299,8 +299,8 @@ sub FatalTAError($$) # since neither the VM nor the task are at fault. Error("$ErrMessage\n"); NotifyAdministrator("Putting the ". $VM->Name ." VM offline", - "A TestAgent operation to the ". $VM->Name ." VM failed:\n". - "\n$ErrMessage\n". + "A TestAgent operation to the ". $VM->Name ." VM failed:\n\n". + "$ErrMessage\n\n". "So the VM has been put offline and the TestBot will try to regain access to it."); WrapUpAndExit('queued'); }

1 0

Francois Gouget : testbot/LibvirtTool: Create the locale snapshots as needed.
by Alexandre Julliard 25 Sep '19

25 Sep '19

Module: tools Branch: master Commit: d19b0f740497ffce9a1780ccd75cc9eff417e537 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d19b0f740497ffce9a1780c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 25 08:51:57 2019 +0200 testbot/LibvirtTool: Create the locale snapshots as needed. A VM may have a lot of locale live snapshots. This removes the need for manually creating them (or recreating them after restoring the VM from backup or after a QEmu upgrade). Sadly the locales must still be manually installed beforehand. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 73 ++++++++++++++++++++++++++++---- testbot/{scripts => bin}/SetWinLocale | 0 testbot/bin/WineRunReconfig.pl | 2 +- testbot/lib/WineTestBot/LibvirtDomain.pm | 5 +-- 4 files changed, 67 insertions(+), 13 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index d1402bc..936c386 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -365,9 +365,9 @@ sub CheckOff() return ChangeStatus("dirty", "off", "done"); } -sub SetupTestAgentd($$) +sub SetupTestAgentd($$$) { - my ($VM, $Booting) = @_; + my ($VM, $Booting, $ResetStartCount) = @_; Debug(Elapsed($Start), " Setting up the $VMKey TestAgent server\n"); LogMsg "Setting up the $VMKey TestAgent server\n"; @@ -379,6 +379,23 @@ sub SetupTestAgentd($$) my $ErrMessage = $TA->GetLastError(); FatalError("Could not connect to the $VMKey TestAgent: $ErrMessage\n"); } + + if ($ResetStartCount) + { + # If SetProperty() is not supported neither is --show-restarts. + # So it all works out. + $TA->SetProperty("start.count", 0); + } + else + { + # Check that TestAgentd is not displaying the "Has Windows rebooted?" + # warning. + my $Count = $TA->GetProperties("start.count"); + if (defined $Count and $Count > 1) + { + FatalError("Cannot take a live snapshot because start.count=$Count > 1"); + } + } $TA->Disconnect(); } @@ -435,9 +452,17 @@ sub Revert() $CurrentStatus = "reverting"; my $DomainSnapshot = $VM->IdleSnapshot; my $ExtraTimeout = 0; - my $CreateSnapshot; + my ($SetLocale, $CreateSnapshot); my $Domain = $VM->GetDomain(); + if (!$Domain->HasSnapshot($DomainSnapshot) and + $DomainSnapshot =~ s/-([a-z]{2})[_-]([A-Z]{2})$//) + { + # Add some extra time to set up the VM locale and reboot it + $ExtraTimeout += $VMToolTimeout; + $SetLocale = "$1-$2"; + Debug(Elapsed($Start), " $VMKey does not yet have a $DomainSnapshot-$SetLocale snapshot\n"); + } if (!$Domain->HasSnapshot($DomainSnapshot) and $DomainSnapshot =~ s/-live$//) { # Add some extra time to boot the VM and create the live snapshot @@ -484,19 +509,49 @@ sub Revert() # Mark the VM as sleeping which allows the scheduler to abort the revert in # favor of higher priority tasks. But don't allow interruptions in the # middle of snapshot creation! - if (!$CreateSnapshot) + if (!$CreateSnapshot and !$SetLocale) { return 1 if (ChangeStatus("reverting", "sleeping")); } - # Set up the TestAgent server - SetupTestAgentd($VM, $Booting); + # Set up the TestAgent server. Note that setting the locale will require a + # reboot so reset start.count in that case. + SetupTestAgentd($VM, $Booting, $SetLocale); if ($CreateSnapshot) { - CreateSnapshot($Domain, $VM->IdleSnapshot); + $DomainSnapshot .= "-live"; + CreateSnapshot($Domain, $DomainSnapshot); } - else + + # Set up the VM locale + if ($SetLocale) + { + Debug(Elapsed($Start), " Setting up the $SetLocale locale on $VMKey\n"); + if (system("$BinDir/SetWinLocale", "--vm", $VMKey, "--default", $SetLocale)) + { + FatalError("Could not set the $VMKey locale to $SetLocale\n"); + } + + Debug(Elapsed($Start), " Wait for the $VMKey locale-setting reboot to complete\n"); + LogMsg "Wait for the $VMKey locale-setting reboot to complete\n"; + while (1) + { + my $TA = $VM->GetAgent(); + my $Count = $TA->GetProperties("start.count"); + $TA->Disconnect(); + + # SetupTestAgentd() has reset start.count to zero. + # It will only change after the reboot. + last if (defined $Count and $Count != 0); + + sleep(1); + } + + $DomainSnapshot .= "-$SetLocale"; + CreateSnapshot($Domain, $DomainSnapshot); + } + elsif (!$CreateSnapshot) { my $Sleep = ($Booting and $SleepAfterBoot > $SleepAfterRevert) ? $SleepAfterBoot : $SleepAfterRevert; @@ -505,7 +560,7 @@ sub Revert() sleep($Sleep); } - if ($CreateSnapshot) + if ($CreateSnapshot or $SetLocale) { # The activity monitor does not like it when VMs skip the sleeping step return 1 if (ChangeStatus("reverting", "sleeping")); diff --git a/testbot/scripts/SetWinLocale b/testbot/bin/SetWinLocale similarity index 100% rename from testbot/scripts/SetWinLocale rename to testbot/bin/SetWinLocale diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 1103120..2e62a2e 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -512,7 +512,7 @@ if ($NewStatus eq 'completed') } Debug(Elapsed($Start), " Recreating the $IdleSnapshot snapshot\n"); - $ErrMessage = $Domain->CreateSnapshot(); + $ErrMessage = $Domain->CreateSnapshot($IdleSnapshot); if (defined $ErrMessage) { # Without the snapshot the VM is not usable anymore but FatalError() will diff --git a/testbot/lib/WineTestBot/LibvirtDomain.pm b/testbot/lib/WineTestBot/LibvirtDomain.pm index 14bf71d..9613e83 100644 --- a/testbot/lib/WineTestBot/LibvirtDomain.pm +++ b/testbot/lib/WineTestBot/LibvirtDomain.pm @@ -328,14 +328,13 @@ sub RevertToSnapshot($$) return (undef, $Reason != Sys::Virt::Domain::STATE_RUNNING_FROM_SNAPSHOT); } -sub CreateSnapshot($) +sub CreateSnapshot($$) { - my ($self) = @_; + my ($self, $SnapshotName) = @_; my ($ErrMessage, $Domain) = $self->_GetDomain(); return $ErrMessage if (defined $ErrMessage); - my $SnapshotName = $self->{VM}->IdleSnapshot; # FIXME: XML escaping my $Xml = "<domainsnapshot><name>$SnapshotName</name></domainsnapshot>"; eval { $Domain->create_snapshot($Xml, 0) };

1 0

Francois Gouget : testbot/Engine: Redirect stderr so Perl errors are logged.
by Alexandre Julliard 25 Sep '19

25 Sep '19

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/web: Use GetTaskURL() to link to the task pages.
by Alexandre Julliard 25 Sep '19

25 Sep '19

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