October 2019 - Wine-Commits

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

Oct. 23, 2019

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: Introduce renderer_init_stream().
by Alexandre Julliard Oct. 23, 2019

Oct. 23, 2019

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 : strmbase: Get rid of the "vtbl" parameter to strmbase_renderer_init().
by Alexandre Julliard Oct. 23, 2019

Oct. 23, 2019

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 : wscript/tests: Fix test failures on Win10.
by Alexandre Julliard Oct. 23, 2019

Oct. 23, 2019

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

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

Oct. 23, 2019

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: Return S_FALSE from IBaseFilter::Pause() when performing asynchronous state change.
by Alexandre Julliard Oct. 23, 2019

Oct. 23, 2019

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

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

Oct. 23, 2019

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

Henri Verbeet : ntdll: Properly handle 0 returns from unw_step().
by Alexandre Julliard Oct. 22, 2019

Oct. 22, 2019

Module: wine Branch: master Commit: d82f06c07556408e9584d2a1f8b275df39c93d74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d82f06c07556408e9584d2a1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 18 19:17:45 2019 +0330 ntdll: Properly handle 0 returns from unw_step(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 6 +++++- dlls/ntdll/signal_x86_64.c | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 43e5969229..d6d5f15c87 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -523,7 +523,11 @@ static NTSTATUS libunwind_virtual_unwind( ULONG_PTR ip, ULONG_PTR *frame, CONTEX ip, (unsigned long)info.start_ip, (unsigned long)info.end_ip, (unsigned long)info.handler, (unsigned long)info.lsda, (unsigned long)info.unwind_info ); - rc = unw_step( &cursor ); + if (!(rc = unw_step( &cursor ))) + { + WARN( "last frame\n" ); + return STATUS_SUCCESS; + } if (rc < 0) { WARN( "failed to unwind: %d\n", rc ); diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 6508654e77..9645c5266c 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1524,7 +1524,12 @@ static NTSTATUS libunwind_virtual_unwind( ULONG64 ip, BOOL* got_info, ULONG64 *f ip, (unsigned long)info.start_ip, (unsigned long)info.end_ip, (unsigned long)info.handler, (unsigned long)info.lsda, (unsigned long)info.unwind_info ); - rc = unw_step(&cursor); + if (!(rc = unw_step( &cursor ))) + { + WARN( "last frame\n" ); + *got_info = FALSE; + return STATUS_SUCCESS; + } if (rc < 0) { WARN( "failed to unwind: %d\n", rc );

1 0

Andrew Eikum : xinput: Get rid of redundant connected boolean.
by Alexandre Julliard Oct. 22, 2019

Oct. 22, 2019

Module: wine Branch: master Commit: aa482426dc4d6f291e6d1dd75be4701636cab31d URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa482426dc4d6f291e6d1dd7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Oct 22 15:00:51 2019 -0500 xinput: Get rid of redundant connected boolean. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/hid.c | 8 +++----- dlls/xinput1_3/xinput_main.c | 12 ++++++------ dlls/xinput1_3/xinput_private.h | 3 +-- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index c186c116f4..bb719ed56c 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -199,7 +199,6 @@ static BOOL init_controller(xinput_controller *controller, PHIDP_PREPARSED_DATA memset(&controller->vibration, 0, sizeof(controller->vibration)); controller->platform_private = private; - controller->connected = TRUE; return TRUE; } @@ -256,7 +255,7 @@ void HID_find_gamepads(xinput_controller *devices) for (i = 0; i < XUSER_MAX_COUNT; i++) { struct hid_platform_private *private = devices[i].platform_private; - if (devices[i].connected) + if (devices[i].platform_private) { if (!wcscmp(data->DevicePath, private->device_path)) break; @@ -302,18 +301,17 @@ static void remove_gamepad(xinput_controller *device) { EnterCriticalSection(&device->crit); - if (device->connected) + if (device->platform_private) { struct hid_platform_private *private = device->platform_private; - device->connected = FALSE; + device->platform_private = NULL; CloseHandle(private->device); HeapFree(GetProcessHeap(), 0, private->reports[0]); HeapFree(GetProcessHeap(), 0, private->reports[1]); HeapFree(GetProcessHeap(), 0, private->device_path); HidD_FreePreparsedData(private->ppd); - device->platform_private = NULL; HeapFree(GetProcessHeap(), 0, private); } diff --git a/dlls/xinput1_3/xinput_main.c b/dlls/xinput1_3/xinput_main.c index 5c83e87fb1..5485ae8d2d 100644 --- a/dlls/xinput1_3/xinput_main.c +++ b/dlls/xinput1_3/xinput_main.c @@ -76,12 +76,12 @@ xinput_controller controllers[XUSER_MAX_COUNT] = { static BOOL verify_and_lock_device(xinput_controller *device) { - if (!device->connected) + if (!device->platform_private) return FALSE; EnterCriticalSection(&device->crit); - if (!device->connected) + if (!device->platform_private) { LeaveCriticalSection(&device->crit); return FALSE; @@ -166,7 +166,7 @@ static DWORD xinput_get_state(DWORD index, XINPUT_STATE *state) HID_update_state(&controllers[index], state); - if (!controllers[index].connected) + if (!controllers[index].platform_private) { /* update_state may have disconnected the controller */ unlock_device(&controllers[index]); @@ -211,7 +211,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetKeystroke(DWORD index, DWORD reserved, P if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; - if (!controllers[index].connected) + if (!controllers[index].platform_private) return ERROR_DEVICE_NOT_CONNECTED; return ERROR_NOT_SUPPORTED; @@ -248,7 +248,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetDSoundAudioDeviceGuids(DWORD index, GUID if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; - if (!controllers[index].connected) + if (!controllers[index].platform_private) return ERROR_DEVICE_NOT_CONNECTED; return ERROR_NOT_SUPPORTED; @@ -263,7 +263,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetBatteryInformation(DWORD index, BYTE typ if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; - if (!controllers[index].connected) + if (!controllers[index].platform_private) return ERROR_DEVICE_NOT_CONNECTED; return ERROR_NOT_SUPPORTED; diff --git a/dlls/xinput1_3/xinput_private.h b/dlls/xinput1_3/xinput_private.h index 74cf318a6f..f3456cd8e7 100644 --- a/dlls/xinput1_3/xinput_private.h +++ b/dlls/xinput1_3/xinput_private.h @@ -20,9 +20,8 @@ typedef struct _xinput_controller { CRITICAL_SECTION crit; - BOOL connected; /* only TRUE when device is valid; may be used without holding crit */ XINPUT_CAPABILITIES caps; - void *platform_private; + void *platform_private; /* non-NULL when device is valid; validity may be read without holding crit */ XINPUT_STATE state; XINPUT_VIBRATION vibration; } xinput_controller;

1 0

Andrew Eikum : xinput: Make device hotplugging thread-safe.
by Alexandre Julliard Oct. 22, 2019

Oct. 22, 2019

Module: wine Branch: master Commit: 4d3db6d2d743ea8fc61ed122f27baeddf30ee2ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d3db6d2d743ea8fc61ed122… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Oct 22 15:00:26 2019 -0500 xinput: Make device hotplugging thread-safe. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/hid.c | 239 ++++++++++++++++++++-------------------- dlls/xinput1_3/xinput_main.c | 95 ++++++++++++++-- dlls/xinput1_3/xinput_private.h | 7 +- 3 files changed, 210 insertions(+), 131 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4d3db6d2d743ea8fc61e…

1 0