October 2019 - Wine-Commits

Nikolay Sivov : mf: Add async command for stopping the session.
by Alexandre Julliard Oct. 4, 2019

Oct. 4, 2019

Module: wine Branch: master Commit: 3471b779a5aa33fee991cb7e2c8eb3005592a966 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3471b779a5aa33fee991cb7e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 4 14:42:44 2019 +0300 mf: Add async command for stopping the session. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 6b993b1d60..5ac8bd97ae 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -39,6 +39,7 @@ enum session_command SESSION_CMD_SET_TOPOLOGY, SESSION_CMD_START, SESSION_CMD_PAUSE, + SESSION_CMD_STOP, }; struct session_op @@ -736,9 +737,19 @@ static HRESULT WINAPI mfsession_Pause(IMFMediaSession *iface) static HRESULT WINAPI mfsession_Stop(IMFMediaSession *iface) { - FIXME("(%p)\n", iface); + struct media_session *session = impl_from_IMFMediaSession(iface); + struct session_op *op; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p.\n", iface); + + if (FAILED(hr = create_session_op(SESSION_CMD_STOP, &op))) + return hr; + + hr = session_submit_command(session, op); + IUnknown_Release(&op->IUnknown_iface); + + return hr; } static HRESULT WINAPI mfsession_Close(IMFMediaSession *iface)

1 0

Nikolay Sivov : mf: Rearrange topology queueing logic to simplify status notifications.
by Alexandre Julliard Oct. 4, 2019

Oct. 4, 2019

Module: wine Branch: master Commit: 82f03261b85f58f0eaaa915b868c4631b07af7a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82f03261b85f58f0eaaa915b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 4 14:42:46 2019 +0300 mf: Rearrange topology queueing logic to simplify status notifications. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 128 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 74 insertions(+), 54 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 9c0b80e340..e23481d5c9 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -66,6 +66,7 @@ struct queued_topology { struct list entry; IMFTopology *topology; + MF_TOPOSTATUS status; }; enum session_state @@ -114,7 +115,7 @@ struct media_session IMFQualityManager *quality_manager; struct { - IMFTopology *current_topology; + struct queued_topology current_topology; struct list sources; } presentation; struct list topologies; @@ -356,6 +357,31 @@ static void session_clear_topologies(struct media_session *session) } } +static void session_set_topo_status(struct media_session *session, struct queued_topology *topology, HRESULT status, + MF_TOPOSTATUS topo_status) +{ + IMFMediaEvent *event; + PROPVARIANT param; + + if (topo_status == MF_TOPOSTATUS_INVALID) + return; + + if (topo_status > topology->status) + { + param.vt = topology ? VT_UNKNOWN : VT_EMPTY; + param.punkVal = topology ? (IUnknown *)topology->topology : NULL; + + if (FAILED(MFCreateMediaEvent(MESessionTopologyStatus, &GUID_NULL, status, &param, &event))) + return; + + IMFMediaEvent_SetUINT32(event, &MF_EVENT_TOPOLOGY_STATUS, topo_status); + topology->status = topo_status; + IMFMediaEventQueue_QueueEvent(session->event_queue, event); + } + + IMFMediaEvent_Release(event); +} + static HRESULT session_bind_output_nodes(IMFTopology *topology) { MF_TOPOLOGY_TYPE node_type; @@ -422,19 +448,19 @@ static IMFTopology *session_get_next_topology(struct media_session *session) { struct queued_topology *queued; - if (!session->presentation.current_topology) + if (!session->presentation.current_topology.topology) { struct list *head = list_head(&session->topologies); if (!head) return NULL; queued = LIST_ENTRY(head, struct queued_topology, entry); - session->presentation.current_topology = queued->topology; + session->presentation.current_topology = *queued; list_remove(&queued->entry); heap_free(queued); } - return session->presentation.current_topology; + return session->presentation.current_topology.topology; } static void session_clear_presentation(struct media_session *session) @@ -442,10 +468,10 @@ static void session_clear_presentation(struct media_session *session) struct media_source *source, *source2; struct media_stream *stream, *stream2; - if (session->presentation.current_topology) + if (session->presentation.current_topology.topology) { - IMFTopology_Release(session->presentation.current_topology); - session->presentation.current_topology = NULL; + IMFTopology_Release(session->presentation.current_topology.topology); + session->presentation.current_topology.topology = NULL; } LIST_FOR_EACH_ENTRY_SAFE(source, source2, &session->presentation.sources, struct media_source, entry) @@ -924,6 +950,16 @@ static HRESULT WINAPI session_commands_callback_GetParameters(IMFAsyncCallback * return E_NOTIMPL; } +static void session_raise_topology_set(struct media_session *session, IMFTopology *topology, HRESULT status) +{ + PROPVARIANT param; + + param.vt = topology ? VT_UNKNOWN : VT_EMPTY; + param.punkVal = (IUnknown *)topology; + + IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionTopologySet, &GUID_NULL, status, &param); +} + static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct session_op *op = impl_op_from_IUnknown(IMFAsyncResult_GetStateNoAddRef(result)); @@ -944,26 +980,12 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, { IMFTopology *topology = op->u.set_topology.topology; MF_TOPOSTATUS topo_status = MF_TOPOSTATUS_INVALID; - struct queued_topology *queued_topology; + struct queued_topology *queued_topology = NULL; DWORD flags = op->u.set_topology.flags; - PROPVARIANT param; - if (flags & MFSESSION_SETTOPOLOGY_CLEAR_CURRENT) - { - EnterCriticalSection(&session->cs); - if ((topology && topology == session->presentation.current_topology) || !topology) - { - /* FIXME: stop current topology, queue next one. */ - session_clear_presentation(session); - } - else - status = S_FALSE; - topo_status = MF_TOPOSTATUS_READY; - LeaveCriticalSection(&session->cs); - } - else if (topology) + /* Resolve unless claimed to be full. */ + if (!(flags & MFSESSION_SETTOPOLOGY_CLEAR_CURRENT) && topology) { - /* Resolve unless claimed to be full. */ if (!(flags & MFSESSION_SETTOPOLOGY_NORESOLUTION)) { IMFTopology *resolved_topology = NULL; @@ -984,47 +1006,45 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, { if (!(queued_topology = heap_alloc_zero(sizeof(*queued_topology)))) status = E_OUTOFMEMORY; - else - { - EnterCriticalSection(&session->cs); - - if (flags & MFSESSION_SETTOPOLOGY_IMMEDIATE) - { - session_clear_topologies(session); - session_clear_presentation(session); - } - - queued_topology->topology = topology; - IMFTopology_AddRef(queued_topology->topology); - list_add_tail(&session->topologies, &queued_topology->entry); + } - LeaveCriticalSection(&session->cs); - } + if (SUCCEEDED(status)) + { + queued_topology->topology = topology; + IMFTopology_AddRef(queued_topology->topology); } } - if (topology) + EnterCriticalSection(&session->cs); + + if (flags & MFSESSION_SETTOPOLOGY_CLEAR_CURRENT) { - param.vt = VT_UNKNOWN; - param.punkVal = (IUnknown *)topology; + if ((topology && topology == session->presentation.current_topology.topology) || !topology) + { + /* FIXME: stop current topology, queue next one. */ + session_clear_presentation(session); + } + else + status = S_FALSE; + topo_status = MF_TOPOSTATUS_READY; + queued_topology = &session->presentation.current_topology; } - else - param.vt = VT_EMPTY; - - IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionTopologySet, &GUID_NULL, - status, &param); - if (topo_status != MF_TOPOSTATUS_INVALID) + else if (queued_topology) { - IMFMediaEvent *event; - - if (SUCCEEDED(MFCreateMediaEvent(MESessionTopologyStatus, &GUID_NULL, status, &param, &event))) + if (flags & MFSESSION_SETTOPOLOGY_IMMEDIATE) { - IMFMediaEvent_SetUINT32(event, &MF_EVENT_TOPOLOGY_STATUS, topo_status); - IMFMediaEventQueue_QueueEvent(session->event_queue, event); - IMFMediaEvent_Release(event); + session_clear_topologies(session); + session_clear_presentation(session); } + + list_add_tail(&session->topologies, &queued_topology->entry); } + session_raise_topology_set(session, topology, status); + session_set_topo_status(session, queued_topology, status, topo_status); + + LeaveCriticalSection(&session->cs); + break; } case SESSION_CMD_START:

1 0

Nikolay Sivov : mf: Set presentation clock for sinks, subscribe to sink events.
by Alexandre Julliard Oct. 4, 2019

Oct. 4, 2019

Module: wine Branch: master Commit: 3bd1e1edf7d8187f1e1902cd3900a22086bd6bbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bd1e1edf7d8187f1e1902cd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 4 14:42:48 2019 +0300 mf: Set presentation clock for sinks, subscribe to sink events. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index fa8d58ad9d..bf1e48aaf7 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -99,6 +99,12 @@ struct media_source struct list streams; }; +struct media_sink +{ + struct list entry; + IMFMediaSink *sink; +}; + struct media_session { IMFMediaSession IMFMediaSession_iface; @@ -117,6 +123,7 @@ struct media_session { struct queued_topology current_topology; struct list sources; + struct list sinks; } presentation; struct list topologies; enum session_state state; @@ -467,6 +474,7 @@ static void session_clear_presentation(struct media_session *session) { struct media_source *source, *source2; struct media_stream *stream, *stream2; + struct media_sink *sink, *sink2; if (session->presentation.current_topology.topology) { @@ -490,6 +498,15 @@ static void session_clear_presentation(struct media_session *session) IMFMediaSource_Release(source->source); heap_free(source); } + + LIST_FOR_EACH_ENTRY_SAFE(sink, sink2, &session->presentation.sinks, struct media_sink, entry) + { + list_remove(&sink->entry); + + if (sink->sink) + IMFMediaSink_Release(sink->sink); + heap_free(sink); + } } static void session_start(struct media_session *session, const GUID *time_format, const PROPVARIANT *start_position) @@ -1142,6 +1159,71 @@ static BOOL session_set_source_state(struct media_session *session, IMFMediaSour return ret; } +static HRESULT session_set_sinks_clock(struct media_session *session) +{ + IMFTopology *topology = session->presentation.current_topology.topology; + IMFTopologyNode *node; + IMFCollection *nodes; + DWORD count, i; + HRESULT hr; + + if (!list_empty(&session->presentation.sinks)) + return S_OK; + + if (FAILED(hr = IMFTopology_GetOutputNodeCollection(topology, &nodes))) + return hr; + + if (FAILED(hr = IMFCollection_GetElementCount(nodes, &count))) + { + IMFCollection_Release(nodes); + return hr; + } + + for (i = 0; i < count; ++i) + { + IMFStreamSink *stream_sink = NULL; + struct media_sink *sink; + + if (FAILED(hr = IMFCollection_GetElement(nodes, i, (IUnknown **)&node))) + break; + + if (!(sink = heap_alloc_zero(sizeof(*sink)))) + hr = E_OUTOFMEMORY; + + if (SUCCEEDED(hr)) + hr = IMFTopologyNode_GetObject(node, (IUnknown **)&stream_sink); + + if (SUCCEEDED(hr)) + hr = IMFStreamSink_GetMediaSink(stream_sink, &sink->sink); + + if (SUCCEEDED(hr)) + hr = IMFMediaSink_SetPresentationClock(sink->sink, session->clock); + + if (SUCCEEDED(hr)) + hr = IMFStreamSink_BeginGetEvent(stream_sink, &session->events_callback, (IUnknown *)stream_sink); + + if (stream_sink) + IMFStreamSink_Release(stream_sink); + + if (SUCCEEDED(hr)) + { + list_add_tail(&session->presentation.sinks, &sink->entry); + } + else if (sink) + { + if (sink->sink) + IMFMediaSink_Release(sink->sink); + heap_free(sink); + } + + IMFTopologyNode_Release(node); + } + + IMFCollection_Release(nodes); + + return hr; +} + static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct media_session *session = impl_from_events_callback_IMFAsyncCallback(iface); @@ -1194,9 +1276,19 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM ret = session_set_source_state(session, (IMFMediaSource *)event_source, source_state); if (ret && event_type == MESourceStarted) + { session_set_topo_status(session, &session->presentation.current_topology, S_OK, MF_TOPOSTATUS_STARTED_SOURCE); + if (session->state == SESSION_STATE_STARTING) + { + if (SUCCEEDED(session_set_sinks_clock(session))) + { + session->state = SESSION_STATE_RUNNING; + } + } + } + LeaveCriticalSection(&session->cs); break; case MENewStream: @@ -1371,6 +1463,7 @@ HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **ses object->refcount = 1; list_init(&object->topologies); list_init(&object->presentation.sources); + list_init(&object->presentation.sinks); InitializeCriticalSection(&object->cs); if (FAILED(hr = MFCreateEventQueue(&object->event_queue)))

1 0

Hans Leidekker : secur32/tests: Fix test failures.
by Alexandre Julliard Oct. 4, 2019

Oct. 4, 2019

Module: wine Branch: master Commit: 1de8e293d85527a023991262c5da3ea1b05cab2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1de8e293d85527a023991262… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 4 14:47:13 2019 +0200 secur32/tests: Fix test failures. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/negotiate.c | 4 +++- dlls/secur32/tests/ntlm.c | 4 +++- dlls/secur32/tests/schannel.c | 18 +++++++++++------- include/sspi.h | 1 + 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/secur32/tests/negotiate.c b/dlls/secur32/tests/negotiate.c index 095aee6cb5..5e5beed7f7 100644 --- a/dlls/secur32/tests/negotiate.c +++ b/dlls/secur32/tests/negotiate.c @@ -297,7 +297,9 @@ static void test_authentication(void) ok( pi->fCapabilities == NTLM_BASE_CAPS || pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_READONLY_WITH_CHECKSUM) || pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS) || - pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS| + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS|SECPKG_FLAG_APPCONTAINER_CHECKS) || + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS|SECPKG_FLAG_APPLY_LOOPBACK) || + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS|SECPKG_FLAG_APPLY_LOOPBACK| SECPKG_FLAG_APPCONTAINER_CHECKS), "got %08x\n", pi->fCapabilities ); ok( pi->wVersion == 1, "got %u\n", pi->wVersion ); diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 6b1249d201..930a49e451 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -929,7 +929,9 @@ static void testAuth(ULONG data_rep, BOOL fake) ok(pi->fCapabilities == NTLM_BASE_CAPS || pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_READONLY_WITH_CHECKSUM) || pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS) || - pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS| + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS|SECPKG_FLAG_APPCONTAINER_CHECKS) || + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS|SECPKG_FLAG_APPLY_LOOPBACK) || + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS|SECPKG_FLAG_APPLY_LOOPBACK| SECPKG_FLAG_APPCONTAINER_CHECKS), "got %08x\n", pi->fCapabilities); ok(pi->wVersion == 1, "got %u\n", pi->wVersion); diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 426bf66014..217dbe8dfa 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -435,11 +435,13 @@ static void testAcquireSecurityContext(void) ok(ret, "CertSetCertificateContextProperty failed: %08x\n", GetLastError()); st = AcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, &schanCred, NULL, NULL, &cred, NULL); - ok(st == SEC_E_UNKNOWN_CREDENTIALS || st == SEC_E_INTERNAL_ERROR /* WinNT */, + ok(st == SEC_E_UNKNOWN_CREDENTIALS || st == SEC_E_INTERNAL_ERROR /* WinNT */ || + st == SEC_E_INSUFFICIENT_MEMORY /* win10 */, "Expected SEC_E_UNKNOWN_CREDENTIALS or SEC_E_INTERNAL_ERROR, got %08x\n", st); st = AcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, NULL, &schanCred, NULL, NULL, &cred, NULL); - ok(st == SEC_E_UNKNOWN_CREDENTIALS || st == SEC_E_INTERNAL_ERROR /* WinNT */, + ok(st == SEC_E_UNKNOWN_CREDENTIALS || st == SEC_E_INTERNAL_ERROR /* WinNT */ || + st == SEC_E_INSUFFICIENT_MEMORY /* win10 */, "Expected SEC_E_UNKNOWN_CREDENTIALS or SEC_E_INTERNAL_ERROR, got %08x\n", st); ret = CryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, @@ -489,12 +491,13 @@ static void testAcquireSecurityContext(void) schanCred.dwVersion = SCH_CRED_V3; st = AcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, &schanCred, NULL, NULL, &cred, NULL); - ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st); + ok(st == SEC_E_OK || st == SEC_E_INSUFFICIENT_MEMORY /* win10 */, + "AcquireCredentialsHandleA failed: %08x\n", st); FreeCredentialsHandle(&cred); st = AcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, NULL, &schanCred, NULL, NULL, &cred, NULL); - ok(st == SEC_E_OK || - st == SEC_E_UNKNOWN_CREDENTIALS, /* win2k3 */ + ok(st == SEC_E_OK || st == SEC_E_UNKNOWN_CREDENTIALS /* win2k3 */ || + st == SEC_E_INSUFFICIENT_MEMORY /* win10 */, "AcquireCredentialsHandleA failed: %08x\n", st); FreeCredentialsHandle(&cred); schanCred.dwVersion = SCHANNEL_CRED_VERSION; @@ -533,7 +536,7 @@ static void testAcquireSecurityContext(void) st == SEC_E_INVALID_TOKEN /* WinNT */, "st = %08x\n", st); st = AcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, NULL, &schanCred, NULL, NULL, &cred, NULL); - ok(st == SEC_E_UNKNOWN_CREDENTIALS, + ok(st == SEC_E_UNKNOWN_CREDENTIALS || st == SEC_E_NO_CREDENTIALS, "Expected SEC_E_UNKNOWN_CREDENTIALS, got %08x\n", st); /* FIXME: what about two valid certs? */ @@ -866,7 +869,8 @@ todo_wine } ok(buffers[0].pBuffers[0].cbBuffer == 0, "Output buffer size was not set to 0.\n"); - ok(status == SEC_E_OK, "InitializeSecurityContext failed: %08x\n", status); + ok(status == SEC_E_OK || broken(status == SEC_E_ILLEGAL_MESSAGE) /* winxp */, + "InitializeSecurityContext failed: %08x\n", status); if(status != SEC_E_OK) { skip("Handshake failed\n"); return; diff --git a/include/sspi.h b/include/sspi.h index ad423eed90..036d2cf2f8 100644 --- a/include/sspi.h +++ b/include/sspi.h @@ -174,6 +174,7 @@ SECURITY_STATUS WINAPI AddSecurityPackageW(LPWSTR,SECURITY_PACKAGE_OPTIONS*); #define SECPKG_FLAG_APPCONTAINER_PASSTHROUGH 0x00400000 #define SECPKG_FLAG_APPCONTAINER_CHECKS 0x00800000 #define SECPKG_FLAG_CREDENTIAL_ISOLATION_ENABLED 0x01000000 +#define SECPKG_FLAG_APPLY_LOOPBACK 0x02000000 #define SECPKG_ID_NONE 0xffff

1 0

Jacek Caban : vbscript: Move OnEnterScript/OnLeaveScript calls to exec_script.
by Alexandre Julliard Oct. 4, 2019

Oct. 4, 2019

Module: wine Branch: master Commit: e050ff5eb80592774adc56681a16cccf149e3959 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e050ff5eb80592774adc5668… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 4 16:30:20 2019 +0200 vbscript: Move OnEnterScript/OnLeaveScript calls to exec_script. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 10 ++++++++-- dlls/vbscript/vbdisp.c | 23 +++++++---------------- dlls/vbscript/vbscript.c | 9 +-------- dlls/vbscript/vbscript.h | 2 +- 4 files changed, 17 insertions(+), 27 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 0fb628c59a..82a9f79e8d 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -588,7 +588,7 @@ static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res) break; case REF_FUNC: vbstack_to_dp(ctx, arg_cnt, FALSE, &dp); - hres = exec_script(ctx->script, ref.u.f, NULL, &dp, res); + hres = exec_script(ctx->script, FALSE, ref.u.f, NULL, &dp, res); if(FAILED(hres)) return hres; break; @@ -2086,7 +2086,7 @@ static void release_exec(exec_ctx_t *ctx) heap_free(ctx->stack); } -HRESULT exec_script(script_ctx_t *ctx, function_t *func, vbdisp_t *vbthis, DISPPARAMS *dp, VARIANT *res) +HRESULT exec_script(script_ctx_t *ctx, BOOL extern_caller, function_t *func, vbdisp_t *vbthis, DISPPARAMS *dp, VARIANT *res) { exec_ctx_t exec = {func->code_ctx}; vbsop_t op; @@ -2148,6 +2148,9 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func, vbdisp_t *vbthis, DISPP return E_OUTOFMEMORY; } + if(extern_caller) + IActiveScriptSite_OnEnterScript(ctx->site); + if(vbthis) { exec.this_obj = (IDispatch*)&vbthis->IDispatchEx_iface; exec.vbthis = vbthis; @@ -2220,6 +2223,9 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func, vbdisp_t *vbthis, DISPP assert(!exec.top); + if(extern_caller) + IActiveScriptSite_OnLeaveScript(ctx->site); + if(SUCCEEDED(hres) && res) { *res = exec.ret_val; V_VT(&exec.ret_val) = VT_EMPTY; diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 0f6209f43e..fb646e7187 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -260,7 +260,7 @@ static BOOL run_terminator(vbdisp_t *This) return TRUE; This->ref++; - exec_script(This->desc->ctx, This->desc->funcs[This->desc->class_terminate_id].entries[VBDISP_CALLGET], + exec_script(This->desc->ctx, FALSE, This->desc->funcs[This->desc->class_terminate_id].entries[VBDISP_CALLGET], This, &dp, NULL); return !--This->ref; } @@ -426,7 +426,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc return DISP_E_MEMBERNOTFOUND; } - return exec_script(This->desc->ctx, func, This, pdp, pvarRes); + return exec_script(This->desc->ctx, FALSE, func, This, pdp, pvarRes); case DISPATCH_METHOD: case DISPATCH_METHOD|DISPATCH_PROPERTYGET: @@ -436,7 +436,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc return DISP_E_MEMBERNOTFOUND; } - return exec_script(This->desc->ctx, func, This, pdp, pvarRes); + return exec_script(This->desc->ctx, FALSE, func, This, pdp, pvarRes); case DISPATCH_PROPERTYPUT: case DISPATCH_PROPERTYPUTREF: case DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF: { @@ -461,7 +461,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc return DISP_E_MEMBERNOTFOUND; } - hres = exec_script(This->desc->ctx, func, This, &dp, NULL); + hres = exec_script(This->desc->ctx, FALSE, func, This, &dp, NULL); if(needs_release) VariantClear(&put_val); return hres; @@ -605,7 +605,7 @@ HRESULT create_vbdisp(const class_desc_t *desc, vbdisp_t **ret) if(SUCCEEDED(hres) && desc->class_initialize_id) { DISPPARAMS dp = {0}; - hres = exec_script(desc->ctx, desc->funcs[desc->class_initialize_id].entries[VBDISP_CALLGET], + hres = exec_script(desc->ctx, FALSE, desc->funcs[desc->class_initialize_id].entries[VBDISP_CALLGET], vbdisp, &dp, NULL); } @@ -621,15 +621,8 @@ HRESULT create_vbdisp(const class_desc_t *desc, vbdisp_t **ret) static HRESULT Procedure_invoke(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { script_ctx_t *ctx = This->desc->ctx; - HRESULT hres; - TRACE("\n"); - - IActiveScriptSite_OnEnterScript(ctx->site); - hres = exec_script(ctx, This->desc->value_func, NULL, NULL, res); - IActiveScriptSite_OnLeaveScript(ctx->site); - - return hres; + return exec_script(ctx, TRUE, This->desc->value_func, NULL, NULL, res); } static const builtin_prop_t procedure_props[] = { @@ -884,9 +877,7 @@ static HRESULT WINAPI ScriptDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc switch(wFlags) { case DISPATCH_METHOD: case DISPATCH_METHOD|DISPATCH_PROPERTYGET: - IActiveScriptSite_OnEnterScript(This->ctx->site); - hres = exec_script(This->ctx, ident->u.func, NULL, pdp, pvarRes); - IActiveScriptSite_OnLeaveScript(This->ctx->site); + hres = exec_script(This->ctx, TRUE, ident->u.func, NULL, pdp, pvarRes); break; default: FIXME("Unsupported flags %x\n", wFlags); diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 69dc1a151b..790e61e3f0 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -78,15 +78,8 @@ static inline BOOL is_started(VBScript *This) static HRESULT exec_global_code(script_ctx_t *ctx, vbscode_t *code, VARIANT *res) { - HRESULT hres; - code->pending_exec = FALSE; - - IActiveScriptSite_OnEnterScript(ctx->site); - hres = exec_script(ctx, &code->main_code, NULL, NULL, res); - IActiveScriptSite_OnLeaveScript(ctx->site); - - return hres; + return exec_script(ctx, TRUE, &code->main_code, NULL, NULL, res); } static void exec_queued_code(script_ctx_t *ctx) diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 59285c572b..c9f49594c7 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -356,7 +356,7 @@ struct _vbscode_t { void release_vbscode(vbscode_t*) DECLSPEC_HIDDEN; HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD,vbscode_t**) DECLSPEC_HIDDEN; -HRESULT exec_script(script_ctx_t*,function_t*,vbdisp_t*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; +HRESULT exec_script(script_ctx_t*,BOOL,function_t*,vbdisp_t*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; void release_dynamic_vars(dynamic_var_t*) DECLSPEC_HIDDEN; IDispatch *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDEN; void clear_ei(EXCEPINFO*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : vbscript: Call OnScriptError for runtime errors.
by Alexandre Julliard Oct. 4, 2019

Oct. 4, 2019

Module: wine Branch: master Commit: 681cee4ed6e64da5ee22d4f1962c89b35d45a287 URL: https://source.winehq.org/git/wine.git/?a=commit;h=681cee4ed6e64da5ee22d4f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 4 16:30:31 2019 +0200 vbscript: Call OnScriptError for runtime errors. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 8 +++- dlls/vbscript/tests/run.c | 22 ++++----- dlls/vbscript/vbscript.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 1 + 4 files changed, 137 insertions(+), 12 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 82a9f79e8d..8649164764 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -2223,8 +2223,14 @@ HRESULT exec_script(script_ctx_t *ctx, BOOL extern_caller, function_t *func, vbd assert(!exec.top); - if(extern_caller) + if(extern_caller) { IActiveScriptSite_OnLeaveScript(ctx->site); + if(FAILED(hres)) { + if(!ctx->ei.scode) + ctx->ei.scode = hres; + hres = report_script_error(ctx); + } + } if(SUCCEEDED(hres) && res) { *res = exec.ret_val; diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index ebcc8836c4..7c06d9c0f5 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -2190,7 +2190,7 @@ static void test_msgbox(void) CHECK_CALLED(GetUIBehavior); CHECK_CALLED(GetWindow); CHECK_CALLED(EnableModeless); - todo_wine CHECK_CALLED(OnScriptError); + CHECK_CALLED(OnScriptError); uic_handling = SCRIPTUICHANDLING_NOUIERROR; @@ -2199,7 +2199,7 @@ static void test_msgbox(void) hres = parse_script_ar("MsgBox \"testing...\""); ok(FAILED(hres), "script not failed\n"); CHECK_CALLED(GetUIBehavior); - todo_wine CHECK_CALLED(OnScriptError); + CHECK_CALLED(OnScriptError); } static HRESULT test_global_vars_ref(BOOL use_close) @@ -2619,36 +2619,36 @@ static void run_tests(void) SET_EXPECT(OnScriptError); hres = parse_script_ar("throwInt(&h80080008&)"); ok(hres == 0x80080008, "hres = %08x\n", hres); - todo_wine CHECK_CALLED(OnScriptError); + CHECK_CALLED(OnScriptError); /* DISP_E_BADINDEX */ SET_EXPECT(OnScriptError); hres = parse_script_ar("throwInt(&h8002000b&)"); ok(hres == MAKE_VBSERROR(9), "hres = %08x\n", hres); - todo_wine CHECK_CALLED(OnScriptError); + CHECK_CALLED(OnScriptError); SET_EXPECT(OnScriptError); hres = parse_script_ar("throwInt(&h800a0009&)"); ok(hres == MAKE_VBSERROR(9), "hres = %08x\n", hres); - todo_wine CHECK_CALLED(OnScriptError); + CHECK_CALLED(OnScriptError); onerror_hres = S_OK; SET_EXPECT(OnScriptError); hres = parse_script_ar("throwInt(&h800a0009&)"); - todo_wine ok(hres == SCRIPT_E_REPORTED, "hres = %08x\n", hres); - todo_wine CHECK_CALLED(OnScriptError); + ok(hres == SCRIPT_E_REPORTED, "hres = %08x\n", hres); + CHECK_CALLED(OnScriptError); /* E_NOTIMPL */ SET_EXPECT(OnScriptError); hres = parse_script_ar("throwInt(&h80004001&)"); ok(hres == MAKE_VBSERROR(445), "hres = %08x\n", hres); - todo_wine CHECK_CALLED(OnScriptError); + CHECK_CALLED(OnScriptError); onerror_hres = S_OK; SET_EXPECT(OnScriptError); hres = parse_script_ar("throwInt(&h80004001&)"); - todo_wine ok(hres == SCRIPT_E_REPORTED, "hres = %08x\n", hres); - todo_wine CHECK_CALLED(OnScriptError); + ok(hres == SCRIPT_E_REPORTED, "hres = %08x\n", hres); + CHECK_CALLED(OnScriptError); SET_EXPECT(global_testoptionalarg_i); parse_script_a("call testOptionalArg(1,,2)"); @@ -2686,7 +2686,7 @@ static void run_tests(void) SET_EXPECT(OnScriptError); hres = parse_script_ar("x = y(\"a\")"); ok(FAILED(hres), "script didn't fail\n"); - todo_wine CHECK_CALLED(OnScriptError); + CHECK_CALLED(OnScriptError); SET_EXPECT(global_success_d); SET_EXPECT(global_success_i); diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 790e61e3f0..3d76e5e6b9 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -59,6 +59,12 @@ struct VBScript { LCID lcid; }; +typedef struct { + IActiveScriptError IActiveScriptError_iface; + LONG ref; + EXCEPINFO ei; +} VBScriptError; + static void change_state(VBScript *This, SCRIPTSTATE state) { if(This->state == state) @@ -249,6 +255,118 @@ static void decrease_state(VBScript *This, SCRIPTSTATE state) } } +static inline VBScriptError *impl_from_IActiveScriptError(IActiveScriptError *iface) +{ + return CONTAINING_RECORD(iface, VBScriptError, IActiveScriptError_iface); +} + +static HRESULT WINAPI VBScriptError_QueryInterface(IActiveScriptError *iface, REFIID riid, void **ppv) +{ + VBScriptError *This = impl_from_IActiveScriptError(iface); + + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IActiveScriptError_iface; + }else if(IsEqualGUID(riid, &IID_IActiveScriptError)) { + TRACE("(%p)->(IID_IActiveScriptError %p)\n", This, ppv); + *ppv = &This->IActiveScriptError_iface; + }else { + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI VBScriptError_AddRef(IActiveScriptError *iface) +{ + VBScriptError *This = impl_from_IActiveScriptError(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI VBScriptError_Release(IActiveScriptError *iface) +{ + VBScriptError *This = impl_from_IActiveScriptError(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI VBScriptError_GetExceptionInfo(IActiveScriptError *iface, EXCEPINFO *excepinfo) +{ + VBScriptError *This = impl_from_IActiveScriptError(iface); + + TRACE("(%p)->(%p)\n", This, excepinfo); + + *excepinfo = This->ei; + excepinfo->bstrSource = SysAllocString(This->ei.bstrSource); + excepinfo->bstrDescription = SysAllocString(This->ei.bstrDescription); + excepinfo->bstrHelpFile = SysAllocString(This->ei.bstrHelpFile); + return S_OK; +} + +static HRESULT WINAPI VBScriptError_GetSourcePosition(IActiveScriptError *iface, DWORD *source_context, ULONG *line, LONG *character) +{ + VBScriptError *This = impl_from_IActiveScriptError(iface); + + FIXME("(%p)->(%p %p %p)\n", This, source_context, line, character); + + if(source_context) + *source_context = 0; + if(line) + *line = 0; + if(character) + *character = 0; + return S_OK; +} + +static HRESULT WINAPI VBScriptError_GetSourceLineText(IActiveScriptError *iface, BSTR *source) +{ + VBScriptError *This = impl_from_IActiveScriptError(iface); + FIXME("(%p)->(%p)\n", This, source); + return E_NOTIMPL; +} + +static const IActiveScriptErrorVtbl VBScriptErrorVtbl = { + VBScriptError_QueryInterface, + VBScriptError_AddRef, + VBScriptError_Release, + VBScriptError_GetExceptionInfo, + VBScriptError_GetSourcePosition, + VBScriptError_GetSourceLineText +}; + +HRESULT report_script_error(script_ctx_t *ctx) +{ + VBScriptError *error; + HRESULT hres, result; + + if(!(error = heap_alloc(sizeof(*error)))) + return E_OUTOFMEMORY; + error->IActiveScriptError_iface.lpVtbl = &VBScriptErrorVtbl; + + error->ref = 1; + error->ei = ctx->ei; + memset(&ctx->ei, 0, sizeof(ctx->ei)); + result = error->ei.scode; + + hres = IActiveScriptSite_OnScriptError(ctx->site, &error->IActiveScriptError_iface); + IActiveScriptError_Release(&error->IActiveScriptError_iface); + return hres == S_OK ? SCRIPT_E_REPORTED : result; +} + static inline VBScript *impl_from_IActiveScript(IActiveScript *iface) { return CONTAINING_RECORD(iface, VBScript, IActiveScript_iface); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index c9f49594c7..1d9353ac77 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -360,6 +360,7 @@ HRESULT exec_script(script_ctx_t*,BOOL,function_t*,vbdisp_t*,DISPPARAMS*,VARIANT void release_dynamic_vars(dynamic_var_t*) DECLSPEC_HIDDEN; IDispatch *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDEN; void clear_ei(EXCEPINFO*) DECLSPEC_HIDDEN; +HRESULT report_script_error(script_ctx_t*) DECLSPEC_HIDDEN; typedef struct { UINT16 len;

1 0

Jacek Caban : vbscript: Call OnScriptError for compile errors.
by Alexandre Julliard Oct. 4, 2019

Oct. 4, 2019

Module: wine Branch: master Commit: 34674eff5ba225b89f3323fe88805f778e4434a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34674eff5ba225b89f3323fe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 4 16:30:41 2019 +0200 vbscript: Call OnScriptError for compile errors. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 24 ++++++++++++++++++------ dlls/vbscript/tests/run.c | 17 +++++++++++++---- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index d78e096285..b2be38d71b 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -375,6 +375,18 @@ static inline BOOL emit_catch(compile_ctx_t *ctx, unsigned off) return emit_catch_jmp(ctx, off, ctx->instr_cnt); } +static HRESULT compile_error(script_ctx_t *ctx, HRESULT error) +{ + if(error == SCRIPT_E_REPORTED) + return error; + + clear_ei(&ctx->ei); + ctx->ei.scode = error = map_hres(error); + ctx->ei.bstrSource = get_vbscript_string(VBS_COMPILE_ERROR); + ctx->ei.bstrDescription = get_vbscript_error_string(error); + return report_script_error(ctx); +} + static expression_t *lookup_const_decls(compile_ctx_t *ctx, const WCHAR *name, BOOL lookup_global) { const_decl_t *decl; @@ -1826,11 +1838,11 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli hres = parse_script(&ctx.parser, src, delimiter, flags); if(FAILED(hres)) - return hres; + return compile_error(script, hres); code = ctx.code = alloc_vbscode(&ctx, src); if(!ctx.code) - return E_OUTOFMEMORY; + return compile_error(script, E_OUTOFMEMORY); ctx.funcs = NULL; ctx.func_decls = NULL; @@ -1844,7 +1856,7 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli hres = compile_func(&ctx, ctx.parser.stats, &ctx.code->main_code); if(FAILED(hres)) { release_compiler(&ctx); - return hres; + return compile_error(script, hres); } ctx.global_consts = ctx.const_decls; @@ -1853,7 +1865,7 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli hres = create_function(&ctx, func_decl, &new_func); if(FAILED(hres)) { release_compiler(&ctx); - return hres; + return compile_error(script, hres); } new_func->next = ctx.funcs; @@ -1864,14 +1876,14 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli hres = compile_class(&ctx, class_decl); if(FAILED(hres)) { release_compiler(&ctx); - return hres; + return compile_error(script, hres); } } hres = check_script_collisions(&ctx, script); if(FAILED(hres)) { release_compiler(&ctx); - return hres; + return compile_error(script, hres); } if(ctx.global_vars) { diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 7c06d9c0f5..f50d90d6aa 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -79,6 +79,12 @@ extern const CLSID CLSID_VBScriptRegExp; expect_ ## func = called_ ## func = FALSE; \ }while(0) +#define CHECK_NOT_CALLED(func) \ + do { \ + ok(!called_ ## func, "unexpected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + #define CLEAR_CALLED(func) \ expect_ ## func = called_ ## func = FALSE @@ -2149,7 +2155,7 @@ static void test_parse_errors(void) SET_EXPECT(OnScriptError); hres = parse_script_ar(invalid_scripts[i]); ok(FAILED(hres), "[%u] script did not fail\n", i); - todo_wine CHECK_CALLED(OnScriptError); + CHECK_CALLED(OnScriptError); } } @@ -2309,7 +2315,7 @@ static void test_isexpression(void) SET_EXPECT(OnScriptError); hres = IActiveScriptParse_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &var, NULL); ok(FAILED(hres), "ParseScriptText did not fail: %08x\n", hres); - todo_wine CHECK_CALLED(OnScriptError); + CHECK_CALLED(OnScriptError); VariantClear(&var); SysFreeString(str); @@ -2346,7 +2352,7 @@ static void test_isexpression(void) SET_EXPECT(OnScriptError); hres = IActiveScriptParse_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &var, NULL); ok(FAILED(hres), "ParseScriptText did not fail: %08x\n", hres); - todo_wine CHECK_CALLED(OnScriptError); + CHECK_CALLED(OnScriptError); VariantClear(&var); SysFreeString(str); @@ -2545,9 +2551,12 @@ static void run_tests(void) parse_script_a("Option Explicit\nset test.setobj = testObj"); CHECK_CALLED(global_setobj_i); + SET_EXPECT(OnScriptError); hres = parse_script_ar("dim x\nx = testObj.rem"); todo_wine ok(hres == S_OK, "use of 'rem' as dot identifier failed: %x08\n", hres); + todo_wine + CHECK_NOT_CALLED(OnScriptError); SET_EXPECT(testobj_propget_d); SET_EXPECT(testobj_propget_i); @@ -2593,7 +2602,7 @@ static void run_tests(void) SET_EXPECT(OnScriptError); hres = parse_script_ar("<!--"); ok(FAILED(hres), "script didn't fail\n"); - todo_wine CHECK_CALLED(OnScriptError); + CHECK_CALLED(OnScriptError); SET_EXPECT(global_success_d); SET_EXPECT(global_success_i);

1 0

Jacek Caban : ucrtbase: Use -norelay for __stdio_common_vsprintf.
by Alexandre Julliard Oct. 4, 2019

Oct. 4, 2019

Module: wine Branch: master Commit: b2082df02fa5c3dbd52d2647b644cd188dbfd9d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2082df02fa5c3dbd52d2647… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 4 17:48:25 2019 +0200 ucrtbase: Use -norelay for __stdio_common_vsprintf. Fixes debug traces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 853a43fb23..19c06eaa67 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -11,7 +11,7 @@ @ cdecl __stdio_common_vfwscanf(int64 ptr wstr ptr ptr) ucrtbase.__stdio_common_vfwscanf @ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) ucrtbase.__stdio_common_vsnprintf_s @ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) ucrtbase.__stdio_common_vsnwprintf_s -@ cdecl __stdio_common_vsprintf(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsprintf +@ cdecl -norelay __stdio_common_vsprintf(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsprintf @ cdecl __stdio_common_vsprintf_p(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsprintf_p @ cdecl __stdio_common_vsprintf_s(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsprintf_s @ cdecl __stdio_common_vsscanf(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsscanf diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 3b590ee266..49e21bf162 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -156,7 +156,7 @@ @ cdecl __stdio_common_vfwscanf(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwscanf @ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) MSVCRT__stdio_common_vsnprintf_s @ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) MSVCRT__stdio_common_vsnwprintf_s -@ cdecl __stdio_common_vsprintf(int64 ptr long str ptr ptr) +@ cdecl -norelay __stdio_common_vsprintf(int64 ptr long str ptr ptr) @ cdecl __stdio_common_vsprintf_p(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf_p @ cdecl __stdio_common_vsprintf_s(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf_s @ cdecl __stdio_common_vsscanf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsscanf

1 0

Jacek Caban : vbscript/tests: Add more tests.
by Alexandre Julliard Oct. 4, 2019

Oct. 4, 2019

Module: wine Branch: master Commit: cded9c4565fc08a78126e07bcc5278155865f7ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=cded9c4565fc08a78126e07b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 4 16:30:51 2019 +0200 vbscript/tests: Add more tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/run.c | 250 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 246 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cded9c4565fc08a78126…

1 0

Owen Rudge : wininet/tests: Fix http tests to reflect current state of winehq test server.
by Alexandre Julliard Oct. 4, 2019

Oct. 4, 2019

Module: wine Branch: master Commit: 5b406e1446a7727ccc2a6efeceeb811a3da48ee1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b406e1446a7727ccc2a6efe… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Oct 3 23:00:16 2019 +0100 wininet/tests: Fix http tests to reflect current state of winehq test server. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 90a38dc3af..99ea0ef48f 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -5928,12 +5928,15 @@ static const cert_struct_test_t test_winehq_com_cert = { "Minnesota\r\n" "Saint Paul\r\n" "WineHQ\r\n" + "IT\r\n" "test.winehq.com\r\n" "webmaster(a)winehq.org", "US\r\n" "Minnesota\r\n" + "Saint Paul\r\n" "WineHQ\r\n" + "IT\r\n" "test.winehq.com\r\n" "webmaster(a)winehq.org" }; @@ -6168,7 +6171,7 @@ static void test_security_flags(void) ok(!res && GetLastError() == ERROR_IO_PENDING, "HttpSendRequest failed: %u\n", GetLastError()); WaitForSingleObject(complete_event, INFINITE); - ok(req_error == ERROR_INTERNET_SEC_CERT_REV_FAILED || broken(req_error == ERROR_INTERNET_SEC_CERT_ERRORS), + ok(req_error == ERROR_INTERNET_SEC_CERT_ERRORS, "req_error = %d\n", req_error); size = 0; @@ -6206,7 +6209,7 @@ static void test_security_flags(void) CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); - if(req_error != ERROR_INTERNET_SEC_CERT_REV_FAILED) { + if(req_error != ERROR_INTERNET_SEC_CERT_ERRORS) { win_skip("Unexpected cert errors %u, skipping security flags tests\n", req_error); close_async_handle(ses, 3); @@ -6220,10 +6223,10 @@ static void test_security_flags(void) test_request_flags(req, 8); /* IE11 finds both rev failure and invalid CA. Previous versions required rev failure to be ignored before invalid CA was reported. */ - test_secflags_option(req, _SECURITY_FLAG_CERT_REV_FAILED, _SECURITY_FLAG_CERT_INVALID_CA); + test_secflags_option(req, _SECURITY_FLAG_CERT_INVALID_CA, _SECURITY_FLAG_CERT_REV_FAILED); set_secflags(req, FALSE, SECURITY_FLAG_IGNORE_REVOCATION); - test_secflags_option(req, _SECURITY_FLAG_CERT_REV_FAILED|SECURITY_FLAG_IGNORE_REVOCATION, _SECURITY_FLAG_CERT_INVALID_CA); + test_secflags_option(req, _SECURITY_FLAG_CERT_INVALID_CA|SECURITY_FLAG_IGNORE_REVOCATION, _SECURITY_FLAG_CERT_REV_FAILED); SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); SET_EXPECT(INTERNET_STATUS_CONNECTED_TO_SERVER); @@ -6237,7 +6240,7 @@ static void test_security_flags(void) ok(!res && GetLastError() == ERROR_IO_PENDING, "HttpSendRequest failed: %u\n", GetLastError()); WaitForSingleObject(complete_event, INFINITE); - ok(req_error == ERROR_INTERNET_SEC_CERT_ERRORS, "req_error = %d\n", req_error); + ok(req_error == ERROR_INTERNET_INVALID_CA || req_error == ERROR_INTERNET_SEC_CERT_ERRORS, "req_error = %d\n", req_error); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); @@ -6248,11 +6251,11 @@ static void test_security_flags(void) CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); test_request_flags(req, INTERNET_REQFLAG_NO_HEADERS); - test_secflags_option(req, SECURITY_FLAG_IGNORE_REVOCATION|_SECURITY_FLAG_CERT_REV_FAILED|_SECURITY_FLAG_CERT_INVALID_CA, 0); + test_secflags_option(req, SECURITY_FLAG_IGNORE_REVOCATION|_SECURITY_FLAG_CERT_INVALID_CA, 0); test_security_info("https://test.winehq.com/data/some_file.html?q", ERROR_INTERNET_ITEM_NOT_FOUND, 0); set_secflags(req, FALSE, SECURITY_FLAG_IGNORE_UNKNOWN_CA); - test_secflags_option(req, _SECURITY_FLAG_CERT_INVALID_CA|_SECURITY_FLAG_CERT_REV_FAILED + test_secflags_option(req, _SECURITY_FLAG_CERT_INVALID_CA |SECURITY_FLAG_IGNORE_REVOCATION|SECURITY_FLAG_IGNORE_UNKNOWN_CA, 0); test_http_version(req); @@ -6290,11 +6293,11 @@ static void test_security_flags(void) test_request_flags(req, 0); test_secflags_option(req, SECURITY_FLAG_SECURE|SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_IGNORE_REVOCATION - |SECURITY_FLAG_STRENGTH_STRONG|_SECURITY_FLAG_CERT_REV_FAILED|_SECURITY_FLAG_CERT_INVALID_CA, 0); + |SECURITY_FLAG_STRENGTH_STRONG|_SECURITY_FLAG_CERT_INVALID_CA, 0); test_cert_struct(req, &test_winehq_com_cert); test_security_info("https://test.winehq.com/data/some_file.html?q", 0, - _SECURITY_FLAG_CERT_INVALID_CA|_SECURITY_FLAG_CERT_REV_FAILED); + _SECURITY_FLAG_CERT_INVALID_CA); res = InternetReadFile(req, buf, sizeof(buf), &size); ok(res, "InternetReadFile failed: %u\n", GetLastError()); @@ -6327,7 +6330,7 @@ static void test_security_flags(void) CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); test_secflags_option(req, SECURITY_FLAG_SECURE|SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_STRENGTH_STRONG - |SECURITY_FLAG_IGNORE_REVOCATION|_SECURITY_FLAG_CERT_REV_FAILED|_SECURITY_FLAG_CERT_INVALID_CA, 0); + |SECURITY_FLAG_IGNORE_REVOCATION|_SECURITY_FLAG_CERT_INVALID_CA, 0); test_http_version(req); SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); @@ -6362,7 +6365,7 @@ static void test_security_flags(void) test_request_flags(req, 0); test_secflags_option(req, SECURITY_FLAG_SECURE|SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_STRENGTH_STRONG - |SECURITY_FLAG_IGNORE_REVOCATION|_SECURITY_FLAG_CERT_REV_FAILED|_SECURITY_FLAG_CERT_INVALID_CA, 0); + |SECURITY_FLAG_IGNORE_REVOCATION|_SECURITY_FLAG_CERT_INVALID_CA, 0); res = InternetReadFile(req, buf, sizeof(buf), &size); ok(res, "InternetReadFile failed: %u\n", GetLastError());

1 0