October 2019 - Wine-commits

Jacek Caban : vbscript: Fix array reference handling in do_icall.
by Alexandre Julliard 23 Oct '19

23 Oct '19

Module: wine Branch: master Commit: 9e3c806e53bbf78dffa05b4e86c3332b2de34fa8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e3c806e53bbf78dffa05b4e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 23 15:10:58 2019 +0200 vbscript: Fix array reference handling in do_icall. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 4 ++-- dlls/vbscript/tests/lang.vbs | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index a77f974772..fee3e72959 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -544,10 +544,10 @@ static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res) switch(V_VT(v)) { case VT_ARRAY|VT_BYREF|VT_VARIANT: - array = *V_ARRAYREF(ref.u.v); + array = *V_ARRAYREF(v); break; case VT_ARRAY|VT_VARIANT: - array = V_ARRAY(ref.u.v); + array = V_ARRAY(v); break; case VT_DISPATCH: vbstack_to_dp(ctx, arg_cnt, FALSE, &dp); diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 6ddb2e79f5..ef31004cc4 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1300,8 +1300,7 @@ Call testarrarg(false, "VT_BOOL*") Call testarrarg(Empty, "VT_EMPTY*") Sub modifyarr(arr) - 'Following test crashes on wine - 'Call ok(arr(0) = "not modified", "arr(0) = " & arr(0)) + Call ok(arr(0) = "not modified", "arr(0) = " & arr(0)) arr(0) = "modified" End Sub

1 0

Jacek Caban : vbscript: Add LBound function implementation.
by Alexandre Julliard 23 Oct '19

23 Oct '19

Module: wine Branch: master Commit: 872d33f29cf3fd885c4bb58bd13410a097996f5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=872d33f29cf3fd885c4bb58b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 23 15:11:14 2019 +0200 vbscript: Add LBound function implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 38 +++++++++++++++++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 3 +++ 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 0de1559592..6e0dfc6938 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1082,8 +1082,40 @@ static HRESULT Global_Timer(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, static HRESULT Global_LBound(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + SAFEARRAY *sa; + HRESULT hres; + LONG ubound; + int dim; + + assert(args_cnt == 1 || args_cnt == 2); + + TRACE("%s %s\n", debugstr_variant(arg), args_cnt == 2 ? debugstr_variant(arg + 1) : "1"); + + switch(V_VT(arg)) { + case VT_VARIANT|VT_ARRAY: + sa = V_ARRAY(arg); + break; + case VT_VARIANT|VT_ARRAY|VT_BYREF: + sa = *V_ARRAYREF(arg); + break; + default: + FIXME("arg %s not supported\n", debugstr_variant(arg)); + return E_NOTIMPL; + } + + if(args_cnt == 2) { + hres = to_int(arg + 1, &dim); + if(FAILED(hres)) + return hres; + }else { + dim = 1; + } + + hres = SafeArrayGetLBound(sa, dim, &ubound); + if(FAILED(hres)) + return hres; + + return return_int(res, ubound); } static HRESULT Global_UBound(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) @@ -2597,7 +2629,7 @@ static const builtin_prop_t global_props[] = { {L"IsNumeric", Global_IsNumeric, 0, 1}, {L"IsObject", Global_IsObject, 0, 1}, {L"Join", Global_Join, 0, 1, 2}, - {L"LBound", Global_LBound, 0, 1}, + {L"LBound", Global_LBound, 0, 1, 2}, {L"LCase", Global_LCase, 0, 1}, {L"Left", Global_Left, 0, 2}, {L"LeftB", Global_LeftB, 0, 2}, diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 5c9e219d60..afa0c2bb1f 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -247,6 +247,9 @@ Dim arr2(2, 4) Call ok(UBound(arr2) = 2, "UBound(x) = " & UBound(x)) Call ok(UBound(arr2, 1) = 2, "UBound(x) = " & UBound(x)) Call ok(UBound(arr2, 2) = 4, "UBound(x) = " & UBound(x)) +Call ok(Lbound(arr2) = 0, "Lbound(x) = " & Lbound(x)) +Call ok(Lbound(arr2, 1) = 0, "Lbound(x) = " & Lbound(x)) +Call ok(Lbound(arr2, 2) = 0, "Lbound(x) = " & Lbound(x)) sub testUBoundError() on error resume next

1 0

Zebediah Figura : ddraw: Track the primary stateblock state locally.
by Alexandre Julliard 23 Oct '19

23 Oct '19

Module: wine Branch: master Commit: db9db753c33c10cafe559b1c75d3fa0599db7c83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db9db753c33c10cafe559b1c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 21 21:35:55 2019 -0500 ddraw: Track the primary stateblock state locally. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 9 +++++++++ dlls/ddraw/ddraw_private.h | 4 +++- dlls/ddraw/device.c | 6 +++++- dlls/ddraw/surface.c | 1 + 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 2c7619016e..69ef612cd4 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -422,6 +422,7 @@ static void ddraw_destroy(struct ddraw *This) if (This->wined3d_swapchain) ddraw_destroy_swapchain(This); + wined3d_stateblock_decref(This->state); wined3d_device_decref(This->wined3d_device); wined3d_decref(This->wined3d); @@ -5025,5 +5026,13 @@ HRESULT ddraw_init(struct ddraw *ddraw, DWORD flags, enum wined3d_device_type de list_init(&ddraw->surface_list); + if (FAILED(hr = wined3d_stateblock_create(ddraw->wined3d_device, WINED3D_SBT_PRIMARY, &ddraw->state))) + { + ERR("Failed to create the primary stateblock, hr %#x.\n", hr); + wined3d_device_decref(ddraw->wined3d_device); + wined3d_decref(ddraw->wined3d); + return hr; + } + return DD_OK; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 771b2a44d1..4ecd83d006 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -127,6 +127,8 @@ struct ddraw /* FVF management */ struct FvfToDecl *decls; UINT numConvertedDecls, declArraySize; + + struct wined3d_stateblock *state; }; #define DDRAW_WINDOW_CLASS_NAME "DirectDrawDeviceWnd" @@ -351,7 +353,7 @@ struct d3d_device struct wined3d_vec4 user_clip_planes[D3DMAXUSERCLIPPLANES]; - struct wined3d_stateblock *recording; + struct wined3d_stateblock *recording, *state, *update_state; }; HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface, diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 43e5d0aa92..9ea7cd7caf 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5620,7 +5620,7 @@ static HRESULT d3d_device7_BeginStateBlock(IDirect3DDevice7 *iface) return D3DERR_INBEGINSTATEBLOCK; } if (SUCCEEDED(hr = wined3d_device_begin_stateblock(device->wined3d_device, &stateblock))) - device->recording = stateblock; + device->update_state = device->recording = stateblock; wined3d_mutex_unlock(); return hr_ddraw_from_wined3d(hr); @@ -5688,6 +5688,7 @@ static HRESULT d3d_device7_EndStateBlock(IDirect3DDevice7 *iface, DWORD *statebl } wined3d_sb = device->recording; device->recording = NULL; + device->update_state = device->state; h = ddraw_allocate_handle(&device->handle_table, wined3d_sb, DDRAW_HANDLE_STATEBLOCK); if (h == DDRAW_INVALID_HANDLE) @@ -6978,12 +6979,15 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, /* This is for convenience. */ device->wined3d_device = ddraw->wined3d_device; wined3d_device_incref(ddraw->wined3d_device); + device->update_state = device->state = ddraw->state; + wined3d_stateblock_incref(ddraw->state); /* Render to the back buffer */ if (FAILED(hr = wined3d_device_set_rendertarget_view(ddraw->wined3d_device, 0, ddraw_surface_get_rendertarget_view(target), TRUE))) { ERR("Failed to set render target, hr %#x.\n", hr); + wined3d_stateblock_decref(device->state); ddraw_handle_table_destroy(&device->handle_table); return hr; } diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 6c27d8c26c..769b5a7576 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6081,6 +6081,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ if (ddraw->d3ddevice->recording) wined3d_stateblock_decref(ddraw->d3ddevice->recording); ddraw->d3ddevice->recording = NULL; + ddraw->d3ddevice->update_state = ddraw->d3ddevice->state; } wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_ZENABLE,

1 0

Zebediah Figura : ddraw: Handle stateblocks in d3d_device7_SetRenderState().
by Alexandre Julliard 23 Oct '19

23 Oct '19

Module: wine Branch: master Commit: 16291e52113d4e3cadf9b3e6549dee7aedf5d005 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16291e52113d4e3cadf9b3e6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 21 21:35:56 2019 -0500 ddraw: Handle stateblocks in d3d_device7_SetRenderState(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 9ea7cd7caf..253788c36a 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2486,6 +2486,22 @@ static HRESULT WINAPI d3d_device2_GetRenderState(IDirect3DDevice2 *iface, return IDirect3DDevice3_GetRenderState(&device->IDirect3DDevice3_iface, state, value); } +static void d3d_device_set_render_state(struct d3d_device *device, + enum wined3d_render_state state, DWORD value) +{ + wined3d_stateblock_set_render_state(device->update_state, state, value); + if (!device->recording) + wined3d_device_set_render_state(device->wined3d_device, state, value); +} + +static void d3d_device_set_sampler_state(struct d3d_device *device, + UINT sampler_idx, enum wined3d_sampler_state state, DWORD value) +{ + wined3d_stateblock_set_sampler_state(device->update_state, sampler_idx, state, value); + if (!device->recording) + wined3d_device_set_sampler_state(device->wined3d_device, sampler_idx, state, value); +} + /***************************************************************************** * IDirect3DDevice7::SetRenderState * @@ -2546,7 +2562,7 @@ static HRESULT d3d_device7_SetRenderState(IDirect3DDevice7 *iface, break; } - wined3d_device_set_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_MAG_FILTER, tex_mag); + d3d_device_set_sampler_state(device, 0, WINED3D_SAMP_MAG_FILTER, tex_mag); break; } @@ -2589,24 +2605,19 @@ static HRESULT d3d_device7_SetRenderState(IDirect3DDevice7 *iface, break; } - wined3d_device_set_sampler_state(device->wined3d_device, - 0, WINED3D_SAMP_MIP_FILTER, tex_mip); - wined3d_device_set_sampler_state(device->wined3d_device, - 0, WINED3D_SAMP_MIN_FILTER, tex_min); + d3d_device_set_sampler_state(device, 0, WINED3D_SAMP_MIP_FILTER, tex_mip); + d3d_device_set_sampler_state(device, 0, WINED3D_SAMP_MIN_FILTER, tex_min); break; } case D3DRENDERSTATE_TEXTUREADDRESS: - wined3d_device_set_sampler_state(device->wined3d_device, - 0, WINED3D_SAMP_ADDRESS_V, value); + d3d_device_set_sampler_state(device, 0, WINED3D_SAMP_ADDRESS_V, value); /* Drop through */ case D3DRENDERSTATE_TEXTUREADDRESSU: - wined3d_device_set_sampler_state(device->wined3d_device, - 0, WINED3D_SAMP_ADDRESS_U, value); + d3d_device_set_sampler_state(device, 0, WINED3D_SAMP_ADDRESS_U, value); break; case D3DRENDERSTATE_TEXTUREADDRESSV: - wined3d_device_set_sampler_state(device->wined3d_device, - 0, WINED3D_SAMP_ADDRESS_V, value); + d3d_device_set_sampler_state(device, 0, WINED3D_SAMP_ADDRESS_V, value); break; case D3DRENDERSTATE_BORDERCOLOR: @@ -2623,7 +2634,7 @@ static HRESULT d3d_device7_SetRenderState(IDirect3DDevice7 *iface, break; case D3DRENDERSTATE_ZBIAS: - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, value); + d3d_device_set_render_state(device, WINED3D_RS_DEPTHBIAS, value); break; default: @@ -2635,7 +2646,7 @@ static HRESULT d3d_device7_SetRenderState(IDirect3DDevice7 *iface, break; } - wined3d_device_set_render_state(device->wined3d_device, state, value); + d3d_device_set_render_state(device, state, value); break; } wined3d_mutex_unlock();

1 0

Zebediah Figura : ddraw: Handle stateblocks in d3d_device7_SetTextureStageState().
by Alexandre Julliard 23 Oct '19

23 Oct '19

Module: wine Branch: master Commit: 290f0fd3b004fb4cbc4d6a164f1ce3c4862f2ba5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=290f0fd3b004fb4cbc4d6a16… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 21 21:35:57 2019 -0500 ddraw: Handle stateblocks in d3d_device7_SetTextureStageState(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 253788c36a..3702454bde 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5125,18 +5125,20 @@ static HRESULT d3d_device7_SetTextureStageState(IDirect3DDevice7 *iface, } case D3DTSS_ADDRESS: - wined3d_device_set_sampler_state(device->wined3d_device, stage, WINED3D_SAMP_ADDRESS_V, value); + d3d_device_set_sampler_state(device, stage, WINED3D_SAMP_ADDRESS_V, value); break; default: break; } - wined3d_device_set_sampler_state(device->wined3d_device, stage, l->u.sampler_state, value); + d3d_device_set_sampler_state(device, stage, l->u.sampler_state, value); } else { - wined3d_device_set_texture_stage_state(device->wined3d_device, stage, l->u.texture_state, value); + wined3d_stateblock_set_texture_stage_state(device->update_state, stage, l->u.texture_state, value); + if (!device->recording) + wined3d_device_set_texture_stage_state(device->wined3d_device, stage, l->u.texture_state, value); } wined3d_mutex_unlock();

1 0

Sven Baars : winmm: Pass the device to WINMM_Pause directly.
by Alexandre Julliard 23 Oct '19

23 Oct '19

Module: wine Branch: master Commit: 5ecb8197b65c8a8a7d49e4e2100879ab33781820 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ecb8197b65c8a8a7d49e4e2… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed Oct 23 11:52:49 2019 -0500 winmm: Pass the device to WINMM_Pause directly. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/waveform.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 11a5cad601..b08768577b 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1966,27 +1966,20 @@ static MMRESULT WINMM_BeginPlaying(WINMM_Device *device) return MMSYSERR_NOERROR; } -static LRESULT WINMM_Pause(HWAVE hwave) +static LRESULT WINMM_Pause(WINMM_Device *device) { - WINMM_Device *device = WINMM_GetDeviceFromHWAVE(hwave); HRESULT hr; - TRACE("(%p)\n", hwave); - - if(!WINMM_ValidateAndLock(device)) - return MMSYSERR_INVALHANDLE; + TRACE("(%p)\n", device->handle); hr = IAudioClient_Stop(device->client); if(FAILED(hr)){ - LeaveCriticalSection(&device->lock); WARN("Stop failed: %08x\n", hr); return MMSYSERR_ERROR; } device->stopped = FALSE; - LeaveCriticalSection(&device->lock); - return MMSYSERR_NOERROR; } @@ -2939,9 +2932,21 @@ UINT WINAPI waveOutBreakLoop(HWAVEOUT hWaveOut) */ UINT WINAPI waveOutPause(HWAVEOUT hWaveOut) { + WINMM_Device *device; + MMRESULT mr; + TRACE("(%p)\n", hWaveOut); - return WINMM_Pause((HWAVE)hWaveOut); + device = WINMM_GetDeviceFromHWAVE((HWAVE)hWaveOut); + + if(!WINMM_ValidateAndLock(device)) + return MMSYSERR_INVALHANDLE; + + mr = WINMM_Pause(device); + + LeaveCriticalSection(&device->lock); + + return mr; } /************************************************************************** @@ -3573,7 +3578,7 @@ UINT WINAPI waveInStop(HWAVEIN hWaveIn) if(!WINMM_ValidateAndLock(device)) return MMSYSERR_INVALHANDLE; - hr = WINMM_Pause((HWAVE)hWaveIn); + hr = WINMM_Pause(device); if(FAILED(hr)){ LeaveCriticalSection(&device->lock); return MMSYSERR_ERROR;

1 0

Alexandre Julliard : kernelbase: Fix fault address printing for the PE build.
by Alexandre Julliard 23 Oct '19

23 Oct '19

Module: wine Branch: master Commit: eac5237921b4431dace4437137c16f212b6ceae5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eac5237921b4431dace44371… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 23 21:08:13 2019 +0200 kernelbase: Fix fault address printing for the PE build. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/debug.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index 016c211097..f79be7fa6f 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -462,10 +462,10 @@ static void format_exception_msg( const EXCEPTION_POINTERS *ptr, char *buffer, i break; case EXCEPTION_ACCESS_VIOLATION: if (rec->NumberParameters == 2) - len = snprintf( buffer, size, "Unhandled page fault on %s access to 0x%08lx", + len = snprintf( buffer, size, "Unhandled page fault on %s access to %p", rec->ExceptionInformation[0] == EXCEPTION_WRITE_FAULT ? "write" : rec->ExceptionInformation[0] == EXCEPTION_EXECUTE_FAULT ? "execute" : "read", - rec->ExceptionInformation[1]); + (void *)rec->ExceptionInformation[1]); else len = snprintf( buffer, size, "Unhandled page fault"); break; @@ -476,8 +476,8 @@ static void format_exception_msg( const EXCEPTION_POINTERS *ptr, char *buffer, i len = snprintf( buffer, size, "Unhandled ^C"); break; case STATUS_POSSIBLE_DEADLOCK: - len = snprintf( buffer, size, "Critical section %08lx wait failed", - rec->ExceptionInformation[0]); + len = snprintf( buffer, size, "Critical section %p wait failed", + (void *)rec->ExceptionInformation[0]); break; case EXCEPTION_WINE_STUB: if ((ULONG_PTR)rec->ExceptionInformation[1] >> 16)

1 0

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

22 Oct '19

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

Andrew Eikum : xinput: Consolidate new device setup.
by Alexandre Julliard 22 Oct '19

22 Oct '19

Module: wine Branch: master Commit: 5417c3bfa4e667902835117dc78b9ea629e7bc3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5417c3bfa4e667902835117d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Oct 22 15:00:34 2019 -0500 xinput: Consolidate new device setup. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/hid.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index 477d5304ca..5baf3b2b53 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -171,19 +171,34 @@ static BOOL VerifyGamepad(PHIDP_PREPARSED_DATA ppd, XINPUT_CAPABILITIES *xinput_ return TRUE; } -static void build_private(struct hid_platform_private *private, PHIDP_PREPARSED_DATA ppd, HIDP_CAPS *caps, HANDLE device, WCHAR *path) +static BOOL init_controller(xinput_controller *controller, PHIDP_PREPARSED_DATA ppd, HIDP_CAPS *caps, HANDLE device, WCHAR *device_path) { size_t size; + struct hid_platform_private *private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct hid_platform_private)); + + if (!VerifyGamepad(ppd, &controller->caps, private, caps)) + { + HeapFree(GetProcessHeap(), 0, private); + return FALSE; + } + + TRACE("Found gamepad %s\n", debugstr_w(device_path)); + private->ppd = ppd; private->device = device; private->report_length = caps->InputReportByteLength + 1; private->current_report = 0; private->reports[0] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, private->report_length); private->reports[1] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, private->report_length); - size = (lstrlenW(path) + 1) * sizeof(WCHAR); + size = (lstrlenW(device_path) + 1) * sizeof(WCHAR); private->device_path = HeapAlloc(GetProcessHeap(), 0, size); - memcpy(private->device_path, path, size); + memcpy(private->device_path, device_path, size); private->enabled = TRUE; + + controller->platform_private = private; + controller->connected = TRUE; + + return TRUE; } void HID_find_gamepads(xinput_controller *devices) @@ -263,19 +278,10 @@ void HID_find_gamepads(xinput_controller *devices) Caps.Usage == HID_USAGE_GENERIC_JOYSTICK || Caps.Usage == 0x8 /* Multi-axis Controller */)) { - struct hid_platform_private *private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct hid_platform_private)); - if (VerifyGamepad(ppd, &devices[open_device_idx].caps, private, &Caps)) - { - TRACE("Found gamepad %i %s\n", open_device_idx, debugstr_w(data->DevicePath)); - build_private(private, ppd, &Caps, device, data->DevicePath); - devices[open_device_idx].platform_private = private; - devices[open_device_idx].connected = TRUE; - } - else + if(!init_controller(&devices[open_device_idx], ppd, &Caps, device, data->DevicePath)) { CloseHandle(device); HidD_FreePreparsedData(ppd); - HeapFree(GetProcessHeap(), 0, private); } } else

1 0

Andrew Eikum : xinput: Clear instance data when a controller is hotplugged.
by Alexandre Julliard 22 Oct '19

22 Oct '19

Module: wine Branch: master Commit: b3cc2542cb3e14cc3bd1498e7622519c74d0ea68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3cc2542cb3e14cc3bd1498e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Oct 22 15:00:43 2019 -0500 xinput: Clear instance data when a controller is hotplugged. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/hid.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index 5baf3b2b53..c186c116f4 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -195,6 +195,9 @@ static BOOL init_controller(xinput_controller *controller, PHIDP_PREPARSED_DATA memcpy(private->device_path, device_path, size); private->enabled = TRUE; + memset(&controller->state, 0, sizeof(controller->state)); + memset(&controller->vibration, 0, sizeof(controller->vibration)); + controller->platform_private = private; controller->connected = TRUE;

1 0