October 2021 - Wine-Commits

Rémi Bernon : dinput: Move mouse (Un)Acquire functions around.
by Alexandre Julliard Oct. 13, 2021

Oct. 13, 2021

Module: wine Branch: master Commit: 7908d25f235a968ff968f7187586d2fa3a8a143c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7908d25f235a968ff968f718… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 13 09:21:16 2021 +0200 dinput: Move mouse (Un)Acquire functions around. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/mouse.c | 152 +++++++++++++++++++++++++--------------------------- 1 file changed, 74 insertions(+), 78 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index e94cd4e7c50..c1992a8557f 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -463,84 +463,6 @@ static void warp_check( SysMouseImpl* This, BOOL force ) } -/****************************************************************************** - * Acquire : gets exclusive control of the mouse - */ -static HRESULT WINAPI SysMouseWImpl_Acquire(LPDIRECTINPUTDEVICE8W iface) -{ - SysMouseImpl *This = impl_from_IDirectInputDevice8W(iface); - POINT point; - HRESULT res; - - TRACE("(this=%p)\n",This); - - if ((res = IDirectInputDevice2WImpl_Acquire(iface)) != DI_OK) return res; - - /* Init the mouse state */ - GetCursorPos( &point ); - if (This->base.data_format.user_df->dwFlags & DIDF_ABSAXIS) - { - This->m_state.lX = point.x; - This->m_state.lY = point.y; - } else { - This->m_state.lX = 0; - This->m_state.lY = 0; - This->org_coords = point; - } - This->m_state.lZ = 0; - This->m_state.rgbButtons[0] = GetKeyState(VK_LBUTTON) & 0x80; - This->m_state.rgbButtons[1] = GetKeyState(VK_RBUTTON) & 0x80; - This->m_state.rgbButtons[2] = GetKeyState(VK_MBUTTON) & 0x80; - - if (This->base.dwCoopLevel & DISCL_EXCLUSIVE) - { - ShowCursor(FALSE); /* hide cursor */ - warp_check( This, TRUE ); - } - else if (This->warp_override == WARP_FORCE_ON) - { - /* Need a window to warp mouse in. */ - if (!This->base.win) This->base.win = GetDesktopWindow(); - warp_check( This, TRUE ); - } - else if (This->clipped) - { - ClipCursor( NULL ); - This->clipped = FALSE; - } - - return DI_OK; -} - -/****************************************************************************** - * Unacquire : frees the mouse - */ -static HRESULT WINAPI SysMouseWImpl_Unacquire(LPDIRECTINPUTDEVICE8W iface) -{ - SysMouseImpl *This = impl_from_IDirectInputDevice8W(iface); - HRESULT res; - - TRACE("(this=%p)\n",This); - - if ((res = IDirectInputDevice2WImpl_Unacquire(iface)) != DI_OK) return res; - - if (This->base.dwCoopLevel & DISCL_EXCLUSIVE) - { - ClipCursor(NULL); - ShowCursor(TRUE); /* show cursor */ - This->clipped = FALSE; - } - - /* And put the mouse cursor back where it was at acquire time */ - if (This->base.dwCoopLevel & DISCL_EXCLUSIVE || This->warp_override == WARP_FORCE_ON) - { - TRACE("warping mouse back to %s\n", wine_dbgstr_point(&This->org_coords)); - SetCursorPos(This->org_coords.x, This->org_coords.y); - } - - return DI_OK; -} - /****************************************************************************** * GetDeviceState : returns the "state" of the mouse. * @@ -676,6 +598,80 @@ static HRESULT WINAPI SysMouseWImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface, return res; } +static HRESULT WINAPI SysMouseWImpl_Acquire( IDirectInputDevice8W *iface ) +{ + SysMouseImpl *impl = impl_from_IDirectInputDevice8W( iface ); + POINT point; + HRESULT res; + + TRACE( "iface %p\n", iface ); + + if ((res = IDirectInputDevice2WImpl_Acquire( iface )) != DI_OK) return res; + + /* Init the mouse state */ + GetCursorPos( &point ); + if (impl->base.data_format.user_df->dwFlags & DIDF_ABSAXIS) + { + impl->m_state.lX = point.x; + impl->m_state.lY = point.y; + } + else + { + impl->m_state.lX = 0; + impl->m_state.lY = 0; + impl->org_coords = point; + } + impl->m_state.lZ = 0; + impl->m_state.rgbButtons[0] = GetKeyState( VK_LBUTTON ) & 0x80; + impl->m_state.rgbButtons[1] = GetKeyState( VK_RBUTTON ) & 0x80; + impl->m_state.rgbButtons[2] = GetKeyState( VK_MBUTTON ) & 0x80; + + if (impl->base.dwCoopLevel & DISCL_EXCLUSIVE) + { + ShowCursor( FALSE ); /* hide cursor */ + warp_check( impl, TRUE ); + } + else if (impl->warp_override == WARP_FORCE_ON) + { + /* Need a window to warp mouse in. */ + if (!impl->base.win) impl->base.win = GetDesktopWindow(); + warp_check( impl, TRUE ); + } + else if (impl->clipped) + { + ClipCursor( NULL ); + impl->clipped = FALSE; + } + + return DI_OK; +} + +static HRESULT WINAPI SysMouseWImpl_Unacquire( IDirectInputDevice8W *iface ) +{ + SysMouseImpl *impl = impl_from_IDirectInputDevice8W( iface ); + HRESULT res; + + TRACE( "iface %p\n", iface ); + + if ((res = IDirectInputDevice2WImpl_Unacquire( iface )) != DI_OK) return res; + + if (impl->base.dwCoopLevel & DISCL_EXCLUSIVE) + { + ClipCursor( NULL ); + ShowCursor( TRUE ); /* show cursor */ + impl->clipped = FALSE; + } + + /* And put the mouse cursor back where it was at acquire time */ + if (impl->base.dwCoopLevel & DISCL_EXCLUSIVE || impl->warp_override == WARP_FORCE_ON) + { + TRACE( "warping mouse back to %s\n", wine_dbgstr_point( &impl->org_coords ) ); + SetCursorPos( impl->org_coords.x, impl->org_coords.y ); + } + + return DI_OK; +} + static const IDirectInputDevice8WVtbl SysMouseWvt = { IDirectInputDevice2WImpl_QueryInterface,

1 0

Zebediah Figura : server: Zero-initialize rawinput_message structures before passing them to queue_rawinput_message() (Valgrind).
by Alexandre Julliard Oct. 13, 2021

Oct. 13, 2021

Module: wine Branch: master Commit: f393ab2636a15acd64621d90c08dc0d5bfbbcc57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f393ab2636a15acd64621d90… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Oct 12 19:36:54 2021 -0500 server: Zero-initialize rawinput_message structures before passing them to queue_rawinput_message() (Valgrind). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/queue.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/server/queue.c b/server/queue.c index f38c7e9fb17..fe5a3f2d5be 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1793,12 +1793,12 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons if ((foreground = get_foreground_thread( desktop, win ))) { + memset( &raw_msg, 0, sizeof(raw_msg) ); raw_msg.foreground = foreground; raw_msg.desktop = desktop; raw_msg.source = source; raw_msg.time = time; raw_msg.message = WM_INPUT; - raw_msg.hid_report = NULL; msg_data = &raw_msg.data; msg_data->info = input->mouse.info; @@ -1930,12 +1930,12 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c if ((foreground = get_foreground_thread( desktop, win ))) { + memset( &raw_msg, 0, sizeof(raw_msg) ); raw_msg.foreground = foreground; raw_msg.desktop = desktop; raw_msg.source = source; raw_msg.time = time; raw_msg.message = WM_INPUT; - raw_msg.hid_report = NULL; msg_data = &raw_msg.data; msg_data->info = input->kbd.info; @@ -2001,12 +2001,10 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_ { case WM_INPUT: case WM_INPUT_DEVICE_CHANGE: - raw_msg.foreground = NULL; - raw_msg.desktop = NULL; + memset( &raw_msg, 0, sizeof(raw_msg) ); raw_msg.source = source; raw_msg.time = get_tick_count(); raw_msg.message = input->hw.msg; - raw_msg.hid_report = NULL; if (input->hw.rawinput.type == RIM_TYPEHID) { @@ -2021,9 +2019,7 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_ } msg_data = &raw_msg.data; - msg_data->info = 0; msg_data->size = sizeof(*msg_data) + report_size; - msg_data->flags = 0; msg_data->rawinput = input->hw.rawinput; enum_processes( queue_rawinput_message, &raw_msg );

1 0

Zebediah Figura : server: Avoid touching the poll_req structure after calling async_request_complete() (Valgrind).
by Alexandre Julliard Oct. 13, 2021

Oct. 13, 2021

Module: wine Branch: master Commit: e6009c5b55200b614e328c4b38549bf8693e764b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6009c5b55200b614e328c4b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Oct 12 19:36:55 2021 -0500 server: Avoid touching the poll_req structure after calling async_request_complete() (Valgrind). Fixes: 567beb6b2edba07051a75d45a9b2f1516568c0e7 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/sock.c b/server/sock.c index 03716cba90f..43a7c707740 100644 --- a/server/sock.c +++ b/server/sock.c @@ -838,6 +838,7 @@ static int get_poll_flags( struct sock *sock, int event ) static void complete_async_poll( struct poll_req *req, unsigned int status ) { + struct poll_socket_output *output = req->output; unsigned int i; for (i = 0; i < req->count; ++i) @@ -849,8 +850,8 @@ static void complete_async_poll( struct poll_req *req, unsigned int status ) } /* pass 0 as result; client will set actual result size */ - async_request_complete( req->async, status, 0, req->count * sizeof(*req->output), req->output ); req->output = NULL; + async_request_complete( req->async, status, 0, req->count * sizeof(*output), output ); } static void complete_async_polls( struct sock *sock, int event, int error )

1 0

Rémi Bernon : dinput: Factor all GetCapabilities implementations together.
by Alexandre Julliard Oct. 13, 2021

Oct. 13, 2021

Module: wine Branch: master Commit: daed18a816cef3a10f3087afcfa229ea75053347 URL: https://source.winehq.org/git/wine.git/?a=commit;h=daed18a816cef3a10f3087af… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 13 09:21:13 2021 +0200 dinput: Factor all GetCapabilities implementations together. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 21 +++++++++++++++++ dlls/dinput/device_private.h | 2 ++ dlls/dinput/joystick_hid.c | 54 ++++++++++++++++---------------------------- dlls/dinput/keyboard.c | 42 ++++------------------------------ dlls/dinput/mouse.c | 42 +++++----------------------------- dlls/dinput8/tests/hid.c | 1 - 6 files changed, 53 insertions(+), 109 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=daed18a816cef3a10f30…

1 0

Rémi Bernon : dinput: Factor all GetDeviceInfo implementations together.
by Alexandre Julliard Oct. 13, 2021

Oct. 13, 2021

Module: wine Branch: master Commit: fc7f430afbbf7f6c9fc1c2bbef02287b261bed3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc7f430afbbf7f6c9fc1c2bb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 13 09:21:12 2021 +0200 dinput: Factor all GetDeviceInfo implementations together. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 20 ++++++++++++++++++++ dlls/dinput/device_private.h | 3 +++ dlls/dinput/joystick_hid.c | 27 +++++---------------------- dlls/dinput/keyboard.c | 39 ++++++++++++--------------------------- dlls/dinput/mouse.c | 21 ++------------------- 5 files changed, 42 insertions(+), 68 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fc7f430afbbf7f6c9fc1…

1 0

Rémi Bernon : dinput: Factor all BuildActionMap wrappers together.
by Alexandre Julliard Oct. 13, 2021

Oct. 13, 2021

Module: wine Branch: master Commit: 30ea1876dba8f219d9c0167bc997944a7ab4c21d URL: https://source.winehq.org/git/wine.git/?a=commit;h=30ea1876dba8f219d9c0167b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 13 09:21:14 2021 +0200 dinput: Factor all BuildActionMap wrappers together. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 160 +++++++++++++++++++++++-------------------- dlls/dinput/device_private.h | 1 - dlls/dinput/joystick_hid.c | 12 +--- dlls/dinput/keyboard.c | 13 +--- dlls/dinput/mouse.c | 12 +--- 5 files changed, 87 insertions(+), 111 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=30ea1876dba8f219d9c0…

1 0

Rémi Bernon : dinput: Factor all SetActionMap wrappers together.
by Alexandre Julliard Oct. 13, 2021

Oct. 13, 2021

Module: wine Branch: master Commit: 18981330c5d4d5089cbb9fc25a499075f8335ad4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18981330c5d4d5089cbb9fc2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 13 09:21:15 2021 +0200 dinput: Factor all SetActionMap wrappers together. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 228 +++++++++++++++++++++++-------------------- dlls/dinput/device_private.h | 4 +- dlls/dinput/joystick_hid.c | 14 +-- dlls/dinput/keyboard.c | 13 +-- dlls/dinput/mouse.c | 13 +-- 5 files changed, 128 insertions(+), 144 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=18981330c5d4d5089cbb…

1 0

Conor McCarthy : vkd3d: Reject empty descriptor ranges.
by Alexandre Julliard Oct. 13, 2021

Oct. 13, 2021

Module: vkd3d Branch: master Commit: 8239064826f5ebdb256c7095e92bd2c4b4d931c1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8239064826f5ebdb256c709… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Oct 12 23:50:24 2021 +1000 vkd3d: Reject empty descriptor ranges. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 6 ++++++ tests/d3d12.c | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 701af89..3acf042 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -344,6 +344,12 @@ static HRESULT d3d12_root_signature_info_count_descriptors(struct d3d12_root_sig const D3D12_DESCRIPTOR_RANGE *range = &table->pDescriptorRanges[i]; unsigned int binding_count; + if (!range->NumDescriptors) + { + WARN("A descriptor range is empty.\n"); + return E_INVALIDARG; + } + if (unbounded && range->OffsetInDescriptorsFromTableStart == D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND) { WARN("An unbounded range with offset D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND occurs after " diff --git a/tests/d3d12.c b/tests/d3d12.c index 1b52aa2..6ae9df3 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2707,10 +2707,7 @@ static void test_create_root_signature(void) descriptor_ranges[0].NumDescriptors = 0; root_parameters[0].DescriptorTable.NumDescriptorRanges = 1; hr = create_root_signature(device, &root_signature_desc, &root_signature); - todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ID3D12RootSignature_Release(root_signature); /* descriptor range overflow * Windows results vary for overflowing to zero, but anything beyond that is invalid. */

1 0

Conor McCarthy : vkd3d: Reject overflowing descriptor ranges.
by Alexandre Julliard Oct. 13, 2021

Oct. 13, 2021

Module: vkd3d Branch: master Commit: 832e74024816f4494f9c240b5354ae73fea292b4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=832e74024816f4494f9c240… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Oct 12 23:50:25 2021 +1000 vkd3d: Reject overflowing descriptor ranges. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 7 +++++++ tests/d3d12.c | 3 --- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 3acf042..277afe4 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -350,6 +350,13 @@ static HRESULT d3d12_root_signature_info_count_descriptors(struct d3d12_root_sig return E_INVALIDARG; } + if (range->NumDescriptors != UINT_MAX && !vkd3d_bound_range(range->BaseShaderRegister, + range->NumDescriptors, UINT_MAX)) + { + WARN("A descriptor range overflows.\n"); + return E_INVALIDARG; + } + if (unbounded && range->OffsetInDescriptorsFromTableStart == D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND) { WARN("An unbounded range with offset D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND occurs after " diff --git a/tests/d3d12.c b/tests/d3d12.c index 6ae9df3..4e908d4 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2715,10 +2715,7 @@ static void test_create_root_signature(void) descriptor_ranges[0].BaseShaderRegister = 0xfffff001; root_parameters[0].DescriptorTable.NumDescriptorRanges = 1; hr = create_root_signature(device, &root_signature_desc, &root_signature); - todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ID3D12RootSignature_Release(root_signature); /* empty root signature */ root_signature_desc.NumParameters = 0;

1 0

Conor McCarthy : tests: Add more tests for invalid descriptor tables.
by Alexandre Julliard Oct. 13, 2021

Oct. 13, 2021

Module: vkd3d Branch: master Commit: 36f6af1570fea155f519c05d074ae269a631bf29 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=36f6af1570fea155f519c05… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Oct 12 23:50:23 2021 +1000 tests: Add more tests for invalid descriptor tables. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 5593393..1b52aa2 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2703,6 +2703,26 @@ static void test_create_root_signature(void) hr = create_root_signature(device, &root_signature_desc, &root_signature); ok(hr == E_INVALIDARG, "Failed to create root signature, hr %#x.\n", hr); + /* empty descriptor table */ + descriptor_ranges[0].NumDescriptors = 0; + root_parameters[0].DescriptorTable.NumDescriptorRanges = 1; + hr = create_root_signature(device, &root_signature_desc, &root_signature); + todo + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D12RootSignature_Release(root_signature); + + /* descriptor range overflow + * Windows results vary for overflowing to zero, but anything beyond that is invalid. */ + descriptor_ranges[0].NumDescriptors = 0x1000; + descriptor_ranges[0].BaseShaderRegister = 0xfffff001; + root_parameters[0].DescriptorTable.NumDescriptorRanges = 1; + hr = create_root_signature(device, &root_signature_desc, &root_signature); + todo + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D12RootSignature_Release(root_signature); + /* empty root signature */ root_signature_desc.NumParameters = 0; root_signature_desc.pParameters = NULL;

1 0