September 2019 - Wine-Commits

Dmitry Timoshkov : rpcrt4: Reimplement rpcrt4_conn_np_wait_for_incoming_data() using asynchronous read with zero sized buffer.
by Alexandre Julliard Sept. 25, 2019

Sept. 25, 2019

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 Sept. 25, 2019

Sept. 25, 2019

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

Zebediah Figura : strmbase: Rename pfnCheckMediaType() to pin_query_accept().
by Alexandre Julliard Sept. 25, 2019

Sept. 25, 2019

Module: wine Branch: master Commit: 9f1909be894c6a8f980314d1ba96b71f6f2e99d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f1909be894c6a8f980314d1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 24 19:10:10 2019 -0500 strmbase: Rename pfnCheckMediaType() to pin_query_accept(). And remove the unnecessary calling convention. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 13 ++++++------- dlls/qcap/avimux.c | 26 +++++++++++--------------- dlls/qcap/smartteefilter.c | 40 +++++++++++++++++----------------------- dlls/qcap/vfwcapture.c | 14 ++++++-------- dlls/quartz/filesource.c | 14 ++++++-------- dlls/strmbase/pin.c | 6 +++--- dlls/strmbase/renderer.c | 13 ++++++------- dlls/strmbase/transform.c | 27 ++++++++++++--------------- dlls/winegstreamer/gstdemux.c | 30 ++++++++++++++---------------- dlls/wineqtdecoder/qtsplitter.c | 18 ++++++++---------- include/wine/strmbase.h | 9 ++++----- 11 files changed, 93 insertions(+), 117 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9f1909be894c6a8f9803…

1 0

Zhiyi Zhang : winex11.drv: Trace display device counts.
by Alexandre Julliard Sept. 25, 2019

Sept. 25, 2019

Module: wine Branch: master Commit: 10b2a996babece63e493999d1ddcfbeeaef40257 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10b2a996babece63e493999d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 25 15:28:03 2019 +0800 winex11.drv: Trace display device counts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index f96fd93a54..107719a26f 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -472,6 +472,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) /* Initialize GPUs */ if (!handler.pGetGpus(&gpus, &gpu_count)) goto done; + TRACE("GPU count: %d\n", gpu_count); for (gpu = 0; gpu < gpu_count; gpu++) { @@ -481,11 +482,13 @@ void X11DRV_DisplayDevices_Init(BOOL force) /* Initialize adapters */ if (!handler.pGetAdapters(gpus[gpu].id, &adapters, &adapter_count)) goto done; + TRACE("GPU: %#lx %s, adapter count: %d\n", gpus[gpu].id, wine_dbgstr_w(gpus[gpu].name), adapter_count); for (adapter = 0; adapter < adapter_count; adapter++) { if (!handler.pGetMonitors(adapters[adapter].id, &monitors, &monitor_count)) goto done; + TRACE("adapter: %#lx, monitor count: %d\n", adapters[adapter].id, monitor_count); if (!X11DRV_InitAdapter(video_hkey, video_index, gpu, adapter, monitor_count, &gpus[gpu], guidW, driverW, &adapters[adapter])) @@ -494,6 +497,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) /* Initialize monitors */ for (monitor = 0; monitor < monitor_count; monitor++) { + TRACE("monitor: %#x %s\n", monitor, wine_dbgstr_w(monitors[monitor].name)); if (!X11DRV_InitMonitor(monitor_devinfo, &monitors[monitor], monitor, video_index)) goto done; }

1 0

Hans Leidekker : webservices: Add support for mapped HTTP headers.
by Alexandre Julliard Sept. 25, 2019

Sept. 25, 2019

Module: wine Branch: master Commit: 02962d92c4f3bac1ba326b2e6940cdc74ecd8118 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02962d92c4f3bac1ba326b2e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 25 14:29:58 2019 +0200 webservices: Add support for mapped HTTP headers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 141 ++++++++++++++-- dlls/webservices/msg.c | 297 ++++++++++++++++++++++++++++----- dlls/webservices/proxy.c | 2 +- dlls/webservices/tests/proxy.c | 118 ++++++++++++- dlls/webservices/webservices.spec | 2 +- dlls/webservices/webservices_private.h | 3 +- 6 files changed, 501 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02962d92c4f3bac1ba32…

1 0

Kevin Puetz : oleaut32: Fix RegisterTypeLib prototype.
by Alexandre Julliard Sept. 25, 2019

Sept. 25, 2019

Module: wine Branch: master Commit: e10e59fa0e2ac33a8a174a12bcb23c32cddb7a1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e10e59fa0e2ac33a8a174a12… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Wed Sep 25 16:09:41 2019 +0200 oleaut32: Fix RegisterTypeLib prototype. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 15 ++++----------- include/oleauto.h | 2 +- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b13f6dccf8..d7c5c977c6 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -643,11 +643,7 @@ static void TLB_register_interface(TLIBATTR *libattr, LPOLESTR name, TYPEATTR *t * Success: S_OK * Failure: Status */ -HRESULT WINAPI RegisterTypeLib( - ITypeLib * ptlib, /* [in] Pointer to the library*/ - OLECHAR * szFullPath, /* [in] full Path of the library*/ - OLECHAR * szHelpDir) /* [in] dir to the helpfile for the library, - may be NULL*/ +HRESULT WINAPI RegisterTypeLib(ITypeLib *ptlib, const WCHAR *szFullPath, const WCHAR *szHelpDir) { HRESULT res; TLIBATTR *attr; @@ -725,19 +721,18 @@ HRESULT WINAPI RegisterTypeLib( if (res == S_OK && RegCreateKeyExW(key, HELPDIRW, 0, NULL, 0, KEY_WRITE, NULL, &subKey, &disposition) == ERROR_SUCCESS) { - BOOL freeHelpDir = FALSE; + BSTR freeHelpDir = NULL; OLECHAR* pIndexStr; /* if we created a new key, and helpDir was null, set the helpdir to the directory which contains the typelib. However, if we just opened an existing key, we leave the helpdir alone */ if ((disposition == REG_CREATED_NEW_KEY) && (szHelpDir == NULL)) { - szHelpDir = SysAllocString(szFullPath); + szHelpDir = freeHelpDir = SysAllocString(szFullPath); pIndexStr = wcsrchr(szHelpDir, '\\'); if (pIndexStr) { *pIndexStr = 0; } - freeHelpDir = TRUE; } /* if we have an szHelpDir, set it! */ @@ -748,10 +743,8 @@ HRESULT WINAPI RegisterTypeLib( } } - /* tidy up */ - if (freeHelpDir) SysFreeString(szHelpDir); + SysFreeString(freeHelpDir); RegCloseKey(subKey); - } else { res = E_FAIL; } diff --git a/include/oleauto.h b/include/oleauto.h index 32b3b463bc..cc50f18947 100644 --- a/include/oleauto.h +++ b/include/oleauto.h @@ -752,7 +752,7 @@ HRESULT WINAPI LoadRegTypeLib(REFGUID,WORD,WORD,LCID,ITypeLib**); HRESULT WINAPI LoadTypeLib(const OLECHAR*,ITypeLib**); HRESULT WINAPI LoadTypeLibEx(LPCOLESTR,REGKIND,ITypeLib**); HRESULT WINAPI QueryPathOfRegTypeLib(REFGUID,WORD,WORD,LCID,LPBSTR); -HRESULT WINAPI RegisterTypeLib(ITypeLib*,OLECHAR*,OLECHAR*); +HRESULT WINAPI RegisterTypeLib(ITypeLib*,LPCOLESTR,LPCOLESTR); HRESULT WINAPI UnRegisterTypeLib(REFGUID,WORD,WORD,LCID,SYSKIND); HRESULT WINAPI RegisterTypeLibForUser(ITypeLib*,OLECHAR*,OLECHAR*); HRESULT WINAPI UnRegisterTypeLibForUser(REFGUID,WORD,WORD,LCID,SYSKIND);

1 0

Jacek Caban : scrobj: Store script dispatch in script host.
by Alexandre Julliard Sept. 25, 2019

Sept. 25, 2019

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

Hans Leidekker : webservices: Simplify WsAddressMessage.
by Alexandre Julliard Sept. 25, 2019

Sept. 25, 2019

Module: wine Branch: master Commit: fe9a28e819f81190a8938e1729c05de291e894d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe9a28e819f81190a8938e17… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 25 14:29:56 2019 +0200 webservices: Simplify WsAddressMessage. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index ed9394ef22..d6906cb5de 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -452,16 +452,13 @@ HRESULT WINAPI WsAddressMessage( WS_MESSAGE *handle, const WS_ENDPOINT_ADDRESS * } if (msg->state < WS_MESSAGE_STATE_INITIALIZED || msg->is_addressed) hr = WS_E_INVALID_OPERATION; - else + else if (addr && addr->url.length) { - if (addr && addr->url.length) + if (!(msg->addr.chars = heap_alloc( addr->url.length * sizeof(WCHAR) ))) hr = E_OUTOFMEMORY; + else { - if (!(msg->addr.chars = heap_alloc( addr->url.length * sizeof(WCHAR) ))) hr = E_OUTOFMEMORY; - else - { - memcpy( msg->addr.chars, addr->url.chars, addr->url.length * sizeof(WCHAR) ); - msg->addr.length = addr->url.length; - } + memcpy( msg->addr.chars, addr->url.chars, addr->url.length * sizeof(WCHAR) ); + msg->addr.length = addr->url.length; } } if (hr == S_OK) msg->is_addressed = TRUE;

1 0

Jacek Caban : scrobj/tests: Add property element tests.
by Alexandre Julliard Sept. 25, 2019

Sept. 25, 2019

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 Sept. 25, 2019

Sept. 25, 2019

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