wine-commits September 2019

wine-commits@winehq.org

2 participants
629 discussions

Dmitry Timoshkov : rpcrt4: Reimplement rpcrt4_conn_np_wait_for_incoming_data() using asynchronous read with zero sized buffer.
by Alexandre Julliard 25 Sep '19

25 Sep '19

Module: wine Branch: master Commit: a6fe4f6e65e595ffcba625d22a62e340c5e22e62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6fe4f6e65e595ffcba625d2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 25 15:25:20 2019 +0800 rpcrt4: Reimplement rpcrt4_conn_np_wait_for_incoming_data() using asynchronous read with zero sized buffer. The problem with NtFsControlFile(FSCTL_PIPE_PEEK) is that it happily returns STATUS_SUCCESS with 0 bytes of data available. That makes the client think that the server already sent a reply and try to read the reply data, which hangs. A solution to this is call NtReadFile() with zero sized buffer, which has correct behaviour: just waits for incoming data to appear without mangling the data in the pipe. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 12d15f8654..243c4780bf 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -465,31 +465,7 @@ static void rpcrt4_conn_np_cancel_call(RpcConnection *conn) static int rpcrt4_conn_np_wait_for_incoming_data(RpcConnection *conn) { - RpcConnection_np *connection = (RpcConnection_np *)conn; - FILE_PIPE_PEEK_BUFFER buf; - HANDLE event; - NTSTATUS status; - int ret; - - event = get_np_event(connection); - if (!event) return -1; - - status = NtFsControlFile(connection->pipe, event, NULL, NULL, &connection->io_status, FSCTL_PIPE_PEEK, NULL, 0, &buf, sizeof(buf)); - if (status == STATUS_SUCCESS) - ret = 0; - else if (status == STATUS_PENDING) - { - WaitForSingleObject(event, INFINITE); - ret = 0; - } - else - { - WARN("NtFsControlFile error %08x\n", status); - ret = -1; - } - - release_np_event(connection, event); - return ret; + return rpcrt4_conn_np_read(conn, NULL, 0); } static size_t rpcrt4_ncacn_np_get_top_of_tower(unsigned char *tower_data,

1 0

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

25 Sep '19

Module: wine Branch: master Commit: 86d1a24e4417372b418b14d93c7c69d1d225c9d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86d1a24e4417372b418b14d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 25 19:23:14 2019 +0200 scrobj: Add InvokeEx implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 56 +++++++++++++++++++++++++++++++++++++++++++++- dlls/scrobj/tests/scrobj.c | 22 ------------------ 2 files changed, 55 insertions(+), 23 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index b0a8dc7d55..e9262c53dc 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -1072,7 +1072,61 @@ static HRESULT WINAPI scriptlet_InvokeEx(IDispatchEx *iface, DISPID id, LCID lci VARIANT *res, EXCEPINFO *pei, IServiceProvider *caller) { struct scriptlet_instance *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, flags, pdp, res, pei, caller); + struct object_member *member; + + TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, flags, pdp, res, pei, caller); + + if (id < 1 || id > This->member_cnt) + { + WARN("Unknown id %xu\n", id); + return DISP_E_MEMBERNOTFOUND; + } + member = &This->members[id - 1]; + + switch (member->type) + { + case MEMBER_METHOD: + if ((flags & ~DISPATCH_PROPERTYGET) != DISPATCH_METHOD) + { + FIXME("unsupported method flags %x\n", flags); + return DISP_E_MEMBERNOTFOUND; + } + return IDispatchEx_InvokeEx(member->u.method.host->script_dispatch, member->u.method.id, lcid, + DISPATCH_METHOD, pdp, res, pei, caller); + case MEMBER_PROPERTY: + if (flags & DISPATCH_PROPERTYGET) + { + if (!member->u.property.get.host) + { + FIXME("No %s getter\n", debugstr_w(member->name)); + return DISP_E_MEMBERNOTFOUND; + } + return IDispatchEx_InvokeEx(member->u.property.get.host->script_dispatch, member->u.property.get.id, lcid, + DISPATCH_METHOD, pdp, res, pei, caller); + } + if (flags & DISPATCH_PROPERTYPUT) + { + DISPPARAMS dp; + + if (!member->u.property.put.host) + { + FIXME("No %s setter\n", debugstr_w(member->name)); + return DISP_E_MEMBERNOTFOUND; + } + if (pdp->cNamedArgs != 1 || pdp->rgdispidNamedArgs[0] != DISPID_PROPERTYPUT) + { + FIXME("no propput argument\n"); + return E_FAIL; + } + dp = *pdp; + dp.cNamedArgs = 0; + return IDispatchEx_InvokeEx(member->u.property.put.host->script_dispatch, member->u.property.put.id, lcid, + DISPATCH_METHOD, &dp, res, pei, caller); + } + + FIXME("unsupported flags %x\n", flags); + } + return DISP_E_MEMBERNOTFOUND; } diff --git a/dlls/scrobj/tests/scrobj.c b/dlls/scrobj/tests/scrobj.c index d61815ef65..023aa30f92 100644 --- a/dlls/scrobj/tests/scrobj.c +++ b/dlls/scrobj/tests/scrobj.c @@ -890,11 +890,8 @@ static void test_create_object(void) dp.cArgs = 1; dp.rgvarg = &v; hres = IDispatchEx_InvokeEx(dispex, vb_add_one_id, 0, DISPATCH_PROPERTYGET|DISPATCH_METHOD, &dp, &r, &ei, NULL); - todo_wine ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); - todo_wine ok(V_VT(&r) == VT_I4, "V_VT(r) = %d\n", V_VT(&r)); - todo_wine ok(V_I4(&r) == 3, "V_I4(r) = %d\n", V_I4(&r)); memset(&ei, 0, sizeof(ei)); @@ -905,11 +902,8 @@ static void test_create_object(void) dp.cArgs = 1; dp.rgvarg = &v; hres = IDispatchEx_InvokeEx(dispex, js_add_two_id, 0, DISPATCH_PROPERTYGET|DISPATCH_METHOD, &dp, &r, &ei, NULL); - todo_wine ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); - todo_wine ok(V_VT(&r) == VT_I4, "V_VT(r) = %d\n", V_VT(&r)); - todo_wine ok(V_I4(&r) == 6, "V_I4(r) = %d\n", V_I4(&r)); memset(&ei, 0, sizeof(ei)); @@ -921,13 +915,9 @@ static void test_create_object(void) dp.rgvarg = &v; SET_EXPECT(InvokeEx); hres = IDispatchEx_InvokeEx(dispex, wt_test_id, 0x100, DISPATCH_PROPERTYGET|DISPATCH_METHOD, &dp, &r, &ei, (void*)0xdeadbeef); - todo_wine ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); - todo_wine CHECK_CALLED(InvokeEx); - 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)); @@ -935,13 +925,9 @@ static void test_create_object(void) V_VT(&r) = VT_ERROR; SET_EXPECT(InvokeEx); hres = IDispatchEx_InvokeEx(dispex, wt_test_id, 0x100, DISPATCH_METHOD, &dp, &r, &ei, (void*)0xdeadbeef); - todo_wine ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); - todo_wine CHECK_CALLED(InvokeEx); - 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)); @@ -953,13 +939,9 @@ static void test_create_object(void) 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)); @@ -973,13 +955,9 @@ static void test_create_object(void) 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);

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

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: 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: 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/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: Zero initialize scriptlet instance.
by Alexandre Julliard 25 Sep '19

25 Sep '19

Module: wine Branch: master Commit: e10d8f6dfb613f986091813430afba75f95ea729 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e10d8f6dfb613f9860918134… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 25 19:22:26 2019 +0200 scrobj: Zero initialize scriptlet instance. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 9596c6b551..29116e29b1 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -1013,7 +1013,7 @@ static HRESULT create_scriptlet_instance(struct scriptlet_factory *factory, IDis struct scriptlet_instance *obj; HRESULT hres; - if (!(obj = heap_alloc(sizeof(*obj)))) return E_OUTOFMEMORY; + if (!(obj = heap_alloc_zero(sizeof(*obj)))) return E_OUTOFMEMORY; obj->IDispatchEx_iface.lpVtbl = &DispatchExVtbl; obj->ref = 1;

1 0

Vincent Povirk : mscoree: Update Wine Mono to 4.9.3.
by Alexandre Julliard 25 Sep '19

25 Sep '19

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 : msscript.ocx: Fix VARIANT access.
by Alexandre Julliard 25 Sep '19

25 Sep '19

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

← Newer
1
...
11
12
13
14
15
16
17
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2019