October 2019 - Wine-commits

Zebediah Figura : quartz/videorenderer: Get rid of hEvent.
by Alexandre Julliard 23 Oct '19

23 Oct '19

Module: wine Branch: master Commit: eca7b245f0951a5204f35f4c12749d4164cba7c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eca7b245f0951a5204f35f4c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 22 18:30:04 2019 -0500 quartz/videorenderer: Get rid of hEvent. This event was at various times used for several different purposes. The only current use is apparently to prevent stale samples from being rendered after IPin::EndFlush() completes, but in practice there's actually no foolproof way to prevent this race in the video renderer. On the other hand, as long as the filter driving the graph can ensure this, there's no need to do so. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index a11c2047a6..be66d52c42 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -46,7 +46,6 @@ typedef struct VideoRendererImpl BOOL init; - HANDLE hEvent; RECT SourceRect; RECT DestRect; RECT WindowPos; @@ -218,11 +217,9 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(BaseRenderer* iface, IMediaSa } #endif - SetEvent(This->hEvent); if (This->renderer.filter.state == State_Paused) { VideoRenderer_SendSampleData(This, pbSrcStream, cbSrcStream); - SetEvent(This->hEvent); if (This->renderer.filter.state == State_Paused) { /* Flushing */ @@ -287,34 +284,12 @@ static HRESULT WINAPI VideoRenderer_CheckMediaType(BaseRenderer *iface, const AM return S_FALSE; } -static HRESULT WINAPI VideoRenderer_EndFlush(BaseRenderer* iface) -{ - VideoRendererImpl *This = impl_from_BaseRenderer(iface); - - TRACE("(%p)->()\n", iface); - - if (This->renderer.pMediaSample) { - ResetEvent(This->hEvent); - LeaveCriticalSection(&iface->filter.csFilter); - LeaveCriticalSection(&iface->csRenderLock); - WaitForSingleObject(This->hEvent, INFINITE); - EnterCriticalSection(&iface->csRenderLock); - EnterCriticalSection(&iface->filter.csFilter); - } - if (This->renderer.filter.state == State_Paused) { - ResetEvent(This->hEvent); - } - - return BaseRendererImpl_EndFlush(iface); -} - static void video_renderer_destroy(BaseRenderer *iface) { VideoRendererImpl *filter = impl_from_BaseRenderer(iface); BaseControlWindow_Destroy(&filter->baseControlWindow); BaseControlVideo_Destroy(&filter->baseControlVideo); - CloseHandle(filter->hEvent); strmbase_renderer_cleanup(&filter->renderer); CoTaskMemFree(filter); @@ -354,7 +329,6 @@ static void video_renderer_stop_stream(BaseRenderer *iface) TRACE("(%p)->()\n", This); - SetEvent(This->hEvent); if (This->baseControlWindow.AutoShow) /* Black it out */ RedrawWindow(This->baseControlWindow.baseWindow.hWnd, NULL, NULL, RDW_INVALIDATE|RDW_ERASE); @@ -370,10 +344,7 @@ static void video_renderer_start_stream(BaseRenderer *iface) && (This->renderer.filter.state == State_Stopped || !This->renderer.sink.end_of_stream)) { if (This->renderer.filter.state == State_Stopped) - { - ResetEvent(This->hEvent); VideoRenderer_AutoShowWindow(This); - } } } @@ -409,7 +380,6 @@ static const BaseRendererFuncTable BaseFuncTable = .renderer_start_stream = video_renderer_start_stream, .renderer_stop_stream = video_renderer_stop_stream, .pfnShouldDrawSampleNow = VideoRenderer_ShouldDrawSampleNow, - .pfnEndFlush = VideoRenderer_EndFlush, .renderer_destroy = video_renderer_destroy, .renderer_query_interface = video_renderer_query_interface, .renderer_pin_query_interface = video_renderer_pin_query_interface, @@ -594,7 +564,6 @@ static HRESULT WINAPI VideoRenderer_Pause(IBaseFilter * iface) if (This->renderer.filter.state == State_Stopped) { This->renderer.sink.end_of_stream = 0; - ResetEvent(This->hEvent); VideoRenderer_AutoShowWindow(This); } @@ -858,13 +827,8 @@ HRESULT VideoRenderer_create(IUnknown *outer, void **out) if (FAILED(hr)) goto fail; - pVideoRenderer->hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - if (FAILED(hr = BaseWindowImpl_PrepareWindow(&pVideoRenderer->baseControlWindow.baseWindow))) - { - CloseHandle(pVideoRenderer->hEvent); goto fail; - } *out = &pVideoRenderer->renderer.filter.IUnknown_inner; return S_OK;

1 0

Zebediah Figura : strmbase: Return S_FALSE from IBaseFilter::Pause() when performing asynchronous state change.
by Alexandre Julliard 23 Oct '19

23 Oct '19

Module: wine Branch: master Commit: 132ce049e6febf01b0231b5db2fb44263617c170 URL: https://source.winehq.org/git/wine.git/?a=commit;h=132ce049e6febf01b0231b5d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 22 18:30:03 2019 -0500 strmbase: Return S_FALSE from IBaseFilter::Pause() when performing asynchronous state change. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 3a5fa19ace..9908e693e7 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -461,6 +461,7 @@ out: HRESULT WINAPI BaseRendererImpl_Pause(IBaseFilter * iface) { BaseRenderer *This = impl_from_IBaseFilter(iface); + HRESULT hr = S_OK; TRACE("(%p)->()\n", This); @@ -471,7 +472,10 @@ HRESULT WINAPI BaseRendererImpl_Pause(IBaseFilter * iface) if (This->filter.state == State_Stopped) { if (This->sink.pin.peer) + { ResetEvent(This->state_event); + hr = S_FALSE; + } This->sink.end_of_stream = FALSE; } else if (This->sink.pin.peer && This->pFuncsTable->renderer_stop_stream) @@ -485,7 +489,7 @@ HRESULT WINAPI BaseRendererImpl_Pause(IBaseFilter * iface) } LeaveCriticalSection(&This->csRenderLock); - return S_OK; + return hr; } HRESULT WINAPI BaseRendererImpl_SetSyncSource(IBaseFilter *iface, IReferenceClock *clock)

1 0

Zebediah Figura : strmbase: Introduce renderer_init_stream().
by Alexandre Julliard 23 Oct '19

23 Oct '19

Module: wine Branch: master Commit: 675af1eb337492faec745f8032c1782e7bfed6c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=675af1eb337492faec745f80… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 22 18:30:05 2019 -0500 strmbase: Introduce renderer_init_stream(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 5 +++++ include/wine/strmbase.h | 1 + 2 files changed, 6 insertions(+) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 9908e693e7..0f714c2a88 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -438,6 +438,9 @@ HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart) if (This->filter.state == State_Running) goto out; + if (This->filter.state == State_Stopped && This->pFuncsTable->renderer_init_stream) + This->pFuncsTable->renderer_init_stream(This); + SetEvent(This->state_event); if (This->sink.pin.peer) @@ -477,6 +480,8 @@ HRESULT WINAPI BaseRendererImpl_Pause(IBaseFilter * iface) hr = S_FALSE; } This->sink.end_of_stream = FALSE; + if (This->pFuncsTable->renderer_init_stream) + This->pFuncsTable->renderer_init_stream(This); } else if (This->sink.pin.peer && This->pFuncsTable->renderer_stop_stream) This->pFuncsTable->renderer_stop_stream(This); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 74c8f4721b..f9136fadff 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -550,6 +550,7 @@ typedef HRESULT (WINAPI *BaseRenderer_CompleteConnect) (BaseRenderer *This, IPin typedef struct BaseRendererFuncTable { BaseRenderer_CheckMediaType pfnCheckMediaType; BaseRenderer_DoRenderSample pfnDoRenderSample; + void (*renderer_init_stream)(BaseRenderer *iface); void (*renderer_start_stream)(BaseRenderer *iface); void (*renderer_stop_stream)(BaseRenderer *iface); BaseRenderer_ShouldDrawSampleNow pfnShouldDrawSampleNow;

1 0

Zebediah Figura : quartz/videorenderer: Use the renderer_init_stream() callback.
by Alexandre Julliard 23 Oct '19

23 Oct '19

Module: wine Branch: master Commit: 601142bda69c8f8851a900af27c47179febbd019 URL: https://source.winehq.org/git/wine.git/?a=commit;h=601142bda69c8f8851a900af… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 22 18:30:06 2019 -0500 quartz/videorenderer: Use the renderer_init_stream() callback. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 42 +++++------------------------------------- 1 file changed, 5 insertions(+), 37 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index be66d52c42..24b76e6e47 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -334,18 +334,11 @@ static void video_renderer_stop_stream(BaseRenderer *iface) RedrawWindow(This->baseControlWindow.baseWindow.hWnd, NULL, NULL, RDW_INVALIDATE|RDW_ERASE); } -static void video_renderer_start_stream(BaseRenderer *iface) +static void video_renderer_init_stream(BaseRenderer *iface) { - VideoRendererImpl *This = impl_from_BaseRenderer(iface); - - TRACE("(%p)\n", This); + VideoRendererImpl *filter = impl_from_BaseRenderer(iface); - if (This->renderer.sink.pin.peer - && (This->renderer.filter.state == State_Stopped || !This->renderer.sink.end_of_stream)) - { - if (This->renderer.filter.state == State_Stopped) - VideoRenderer_AutoShowWindow(This); - } + VideoRenderer_AutoShowWindow(filter); } static RECT WINAPI VideoRenderer_GetDefaultRect(BaseWindow *iface) @@ -377,7 +370,7 @@ static const BaseRendererFuncTable BaseFuncTable = { .pfnCheckMediaType = VideoRenderer_CheckMediaType, .pfnDoRenderSample = VideoRenderer_DoRenderSample, - .renderer_start_stream = video_renderer_start_stream, + .renderer_init_stream = video_renderer_init_stream, .renderer_stop_stream = video_renderer_stop_stream, .pfnShouldDrawSampleNow = VideoRenderer_ShouldDrawSampleNow, .renderer_destroy = video_renderer_destroy, @@ -550,31 +543,6 @@ static const BaseControlVideoFuncTable renderer_BaseControlVideoFuncTable = { VideoRenderer_SetTargetRect }; -/** IMediaFilter methods **/ - -static HRESULT WINAPI VideoRenderer_Pause(IBaseFilter * iface) -{ - VideoRendererImpl *This = impl_from_IBaseFilter(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - EnterCriticalSection(&This->renderer.csRenderLock); - if (This->renderer.filter.state != State_Paused) - { - if (This->renderer.filter.state == State_Stopped) - { - This->renderer.sink.end_of_stream = 0; - VideoRenderer_AutoShowWindow(This); - } - - ResetEvent(This->renderer.flush_event); - This->renderer.filter.state = State_Paused; - } - LeaveCriticalSection(&This->renderer.csRenderLock); - - return S_OK; -} - static const IBaseFilterVtbl VideoRenderer_Vtbl = { BaseFilterImpl_QueryInterface, @@ -582,7 +550,7 @@ static const IBaseFilterVtbl VideoRenderer_Vtbl = BaseFilterImpl_Release, BaseFilterImpl_GetClassID, BaseRendererImpl_Stop, - VideoRenderer_Pause, + BaseRendererImpl_Pause, BaseRendererImpl_Run, BaseRendererImpl_GetState, BaseRendererImpl_SetSyncSource,

1 0

Zebediah Figura : strmbase: Get rid of the "vtbl" parameter to strmbase_renderer_init().
by Alexandre Julliard 23 Oct '19

23 Oct '19

Module: wine Branch: master Commit: 48aa8326f92dcc30e428acda278f280987f5c277 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48aa8326f92dcc30e428acda… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 22 18:30:07 2019 -0500 strmbase: Get rid of the "vtbl" parameter to strmbase_renderer_init(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.c | 21 +-------------------- dlls/qedit/nullrenderer.c | 21 +-------------------- dlls/quartz/dsoundrender.c | 22 +--------------------- dlls/quartz/videorenderer.c | 23 ++--------------------- dlls/quartz/vmr9.c | 21 +-------------------- dlls/strmbase/renderer.c | 37 ++++++++++++++++++++++++++++--------- include/wine/strmbase.h | 10 ++-------- 7 files changed, 36 insertions(+), 119 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=48aa8326f92dcc30e428…

1 0

Nikolay Sivov : kernel32/tests: Fix some test failures on Win10.
by Alexandre Julliard 23 Oct '19

23 Oct '19

Module: wine Branch: master Commit: dbd765e2bd820b5da71fd9db43e8b0820a2fedc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbd765e2bd820b5da71fd9db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 23 10:38:49 2019 +0300 kernel32/tests: Fix some test failures on Win10. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/format_msg.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 9214e3e454..780ec0abf1 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -1502,21 +1502,27 @@ static void test_message_from_hmodule(void) MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, ARRAY_SIZE(out), NULL); error = GetLastError(); ok(ret == 0, "FormatMessageA returned %u instead of 0\n", ret); - ok(error == ERROR_MR_MID_NOT_FOUND || error == ERROR_MUI_FILE_NOT_FOUND, "last error %u\n", error); + ok(error == ERROR_MR_MID_NOT_FOUND || + error == ERROR_MUI_FILE_NOT_FOUND || + error == ERROR_RESOURCE_TYPE_NOT_FOUND, "Unexpected last error %u.\n", error); SetLastError(0xdeadbeef); ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, 3044, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), out, ARRAY_SIZE(out), NULL); error = GetLastError(); ok(ret == 0, "FormatMessageA returned %u instead of 0\n", ret); - ok(error == ERROR_MR_MID_NOT_FOUND || error == ERROR_MUI_FILE_NOT_LOADED, "last error %u\n", error); + ok(error == ERROR_MR_MID_NOT_FOUND || + error == ERROR_MUI_FILE_NOT_LOADED || + error == ERROR_RESOURCE_TYPE_NOT_FOUND, "Unexpected last error %u.\n", error); SetLastError(0xdeadbeef); ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, 3044, MAKELANGID(LANG_NEUTRAL, SUBLANG_SYS_DEFAULT), out, ARRAY_SIZE(out), NULL); error = GetLastError(); ok(ret == 0, "FormatMessageA returned %u instead of 0\n", ret); - ok(error == ERROR_MR_MID_NOT_FOUND || error == ERROR_MUI_FILE_NOT_LOADED, "last error %u\n", error); + ok(error == ERROR_MR_MID_NOT_FOUND || + error == ERROR_MUI_FILE_NOT_LOADED || + error == ERROR_RESOURCE_TYPE_NOT_FOUND, "Unexpected last error %u.\n", error); SetLastError(0xdeadbeef); ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, 3044,

1 0

Nikolay Sivov : wscript/tests: Fix test failures on Win10.
by Alexandre Julliard 23 Oct '19

23 Oct '19

Module: wine Branch: master Commit: bfcf1703c504b07c35ed05da48b1fbfbcd85d4d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfcf1703c504b07c35ed05da… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 23 10:39:00 2019 +0300 wscript/tests: Fix test failures on Win10. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wscript/tests/run.c | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index 16d14ff79f..96ce03044c 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -134,7 +134,6 @@ static HRESULT WINAPI Dispatch_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo) static HRESULT WINAPI Dispatch_GetTypeInfo(IDispatch *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - ok(0, "unexpected call\n"); return E_NOTIMPL; }

1 0

Dmitry Timoshkov : vbscript/tests: Add some tests for IRegExp2::Replace().
by Alexandre Julliard 23 Oct '19

23 Oct '19

Module: wine Branch: master Commit: 1333ea8482311169a6bab3504b42767137df46e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1333ea8482311169a6bab350… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:20:21 2019 +0800 vbscript/tests: Add some tests for IRegExp2::Replace(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/vbscript.c | 60 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index 08edfc1be7..fdbfc4465b 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -1,5 +1,6 @@ /* * Copyright 2011 Jacek Caban for CodeWeavers + * Copyright 2019 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1131,6 +1132,64 @@ static void test_RegExp(void) IRegExp2_Release(regexp); } +static void test_RegExp_Replace(void) +{ + static const struct + { + const char *pattern; + const char *replace; + const char *source; + const char *result; + BOOL global; + } test[] = + { + { "abc", "", "123abc456", "123456", FALSE }, + { "abc", "dcba", "123abc456", "123dcba456", FALSE }, + { "[\r\n\t\f]+", " ", "\nHello\rNew\fWorld\t!", " Hello\rNew\fWorld\t!", FALSE }, + { "[\r\n\t\f]+", " ", "\nHello\rNew\fWorld\t!", " Hello New World !", TRUE }, + }; + HRESULT hr; + IRegExp2 *regexp; + VARIANT var; + BSTR str, ret, result; + int i; + + hr = CoCreateInstance(&CLSID_VBScriptRegExp, NULL, + CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IRegExp2, (void **)&regexp); + if (hr == REGDB_E_CLASSNOTREG) + { + win_skip("VBScriptRegExp is not registered\n"); + return; + } + ok(hr == S_OK, "got %#x\n", hr); + + for (i = 0; i < ARRAY_SIZE(test); i++) + { + hr = IRegExp2_put_Global(regexp, test[i].global ? VARIANT_TRUE : VARIANT_FALSE); + ok(hr == S_OK, "got %#x\n", hr); + + str = a2bstr(test[i].pattern); + hr = IRegExp2_put_Pattern(regexp, str); + ok(hr == S_OK, "got %#x\n", hr); + SysFreeString(str); + + str = a2bstr(test[i].source); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = a2bstr(test[i].replace); + hr = IRegExp2_Replace(regexp, str, var, &ret); + ok(hr == S_OK, "got %#x\n", hr); + result = a2bstr(test[i].result); + ok(!wcscmp(ret, result), "got %s, expected %s\n", wine_dbgstr_w(ret), wine_dbgstr_w(result)); + SysFreeString(result); + SysFreeString(ret); + SysFreeString(V_BSTR(&var)); + SysFreeString(str); + } + + IRegExp2_Release(regexp); +} + static BOOL check_vbscript(void) { IActiveScriptParseProcedure2 *vbscript; @@ -1157,6 +1216,7 @@ START_TEST(vbscript) test_named_items(); test_scriptdisp(); test_RegExp(); + test_RegExp_Replace(); }else { win_skip("VBScript engine not available or too old\n"); }

1 0

Nikolay Sivov : vbscript/tests: Fix tests failures on Win10.
by Alexandre Julliard 23 Oct '19

23 Oct '19

Module: wine Branch: master Commit: a4a2e735ecf34cfeb3754fc0cea27ff8ae78a5a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4a2e735ecf34cfeb3754fc0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 23 11:56:45 2019 +0300 vbscript/tests: Fix tests failures on Win10. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/createobj.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/vbscript/tests/createobj.c b/dlls/vbscript/tests/createobj.c index 1c72ed25c4..b16be88b85 100644 --- a/dlls/vbscript/tests/createobj.c +++ b/dlls/vbscript/tests/createobj.c @@ -229,7 +229,6 @@ static HRESULT WINAPI DispatchEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pcti static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - ok(0, "unexpected call\n"); return E_NOTIMPL; }

1 0

Jacek Caban : vbscript: Improve exec_script debug traces.
by Alexandre Julliard 23 Oct '19

23 Oct '19

Module: wine Branch: master Commit: 410154e280f1af3635cbc28d7b1fcbb3015e09c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=410154e280f1af3635cbc28d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 23 15:10:47 2019 +0200 vbscript: Improve exec_script debug traces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 80ecc41699..a77f974772 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -2098,6 +2098,7 @@ HRESULT exec_script(script_ctx_t *ctx, BOOL extern_caller, function_t *func, vbd heap_pool_init(&exec.heap); + TRACE("%s(", debugstr_w(func->name)); if(func->arg_cnt) { VARIANT *v; unsigned i; @@ -2110,6 +2111,7 @@ HRESULT exec_script(script_ctx_t *ctx, BOOL extern_caller, function_t *func, vbd for(i=0; i < func->arg_cnt; i++) { v = get_arg(dp, i); + TRACE("%s%s", i ? ", " : "", debugstr_variant(v)); if(V_VT(v) == (VT_VARIANT|VT_BYREF)) { if(func->args[i].by_ref) exec.args[i] = *v; @@ -2126,6 +2128,7 @@ HRESULT exec_script(script_ctx_t *ctx, BOOL extern_caller, function_t *func, vbd }else { exec.args = NULL; } + TRACE(")\n"); if(func->var_cnt) { exec.vars = heap_alloc_zero(func->var_cnt * sizeof(VARIANT));

1 0