- Wine-Commits - list.winehq.org

Henri Verbeet : vkd3d-shader/spirv: Pass a struct vsir_program to spirv_compile().
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: vkd3d Branch: master Commit: f94852050447920d227d105442f011bf9e78fc53 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f94852050447920d227d105442f01… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 22:14:18 2024 +0200 vkd3d-shader/spirv: Pass a struct vsir_program to spirv_compile(). --- libs/vkd3d-shader/spirv.c | 5 ++--- libs/vkd3d-shader/vkd3d_shader_main.c | 6 ++++-- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 2b630425..d50288c0 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -10368,17 +10368,16 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, struct return VKD3D_OK; } -int spirv_compile(struct vkd3d_shader_parser *parser, +int spirv_compile(struct vsir_program *program, uint64_t config_flags, const struct vkd3d_shader_scan_descriptor_info1 *scan_descriptor_info, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context) { - struct vsir_program *program = &parser->program; struct spirv_compiler *spirv_compiler; int ret; if (!(spirv_compiler = spirv_compiler_create(program, compile_info, - scan_descriptor_info, message_context, parser->config_flags))) + scan_descriptor_info, message_context, config_flags))) { ERR("Failed to create SPIR-V compiler.\n"); return VKD3D_ERROR; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 0d3bf891..71c04bc1 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1563,6 +1563,7 @@ int vkd3d_shader_parser_compile(struct vkd3d_shader_parser *parser, { struct vkd3d_shader_scan_descriptor_info1 scan_descriptor_info; struct vsir_program *program = &parser->program; + uint64_t config_flags = parser->config_flags; struct vkd3d_shader_compile_info scan_info; int ret; @@ -1577,7 +1578,7 @@ int vkd3d_shader_parser_compile(struct vkd3d_shader_parser *parser, case VKD3D_SHADER_TARGET_GLSL: if ((ret = scan_with_parser(&scan_info, message_context, &scan_descriptor_info, parser)) < 0) return ret; - ret = glsl_compile(program, parser->config_flags, compile_info, out, message_context); + ret = glsl_compile(program, config_flags, compile_info, out, message_context); vkd3d_shader_free_scan_descriptor_info1(&scan_descriptor_info); break; @@ -1585,7 +1586,8 @@ int vkd3d_shader_parser_compile(struct vkd3d_shader_parser *parser, case VKD3D_SHADER_TARGET_SPIRV_TEXT: if ((ret = scan_with_parser(&scan_info, message_context, &scan_descriptor_info, parser)) < 0) return ret; - ret = spirv_compile(parser, &scan_descriptor_info, compile_info, out, message_context); + ret = spirv_compile(program, config_flags, &scan_descriptor_info, + compile_info, out, message_context); vkd3d_shader_free_scan_descriptor_info1(&scan_descriptor_info); break; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index b0e52a33..79a69daf 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1555,7 +1555,7 @@ int glsl_compile(struct vsir_program *program, uint64_t config_flags, #define SPIRV_MAX_SRC_COUNT 6 -int spirv_compile(struct vkd3d_shader_parser *parser, +int spirv_compile(struct vsir_program *program, uint64_t config_flags, const struct vkd3d_shader_scan_descriptor_info1 *scan_descriptor_info, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context);

1 0

Giovanni Mascellani : vkd3d: Simplify control flow for swapchain images.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: vkd3d Branch: master Commit: 5d78eeb6d35b9ab424ab0b8d63aa61c372542b5f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5d78eeb6d35b9ab424ab0b8d63aa6… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed May 1 15:35:08 2024 +0200 vkd3d: Simplify control flow for swapchain images. --- libs/vkd3d/command.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 4a69ff53..95366d34 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2052,20 +2052,15 @@ static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, * state when GPU finishes execution of a command list. */ if (is_swapchain_image) { - if (resource->present_state == D3D12_RESOURCE_STATE_PRESENT) - { - *access_mask = VK_ACCESS_MEMORY_READ_BIT; - *stage_flags = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; - if (image_layout) - *image_layout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR; - return true; - } - else if (resource->present_state != D3D12_RESOURCE_STATE_COMMON) - { - vk_barrier_parameters_from_d3d12_resource_state(resource->present_state, 0, + if (resource->present_state != D3D12_RESOURCE_STATE_PRESENT) + return vk_barrier_parameters_from_d3d12_resource_state(resource->present_state, 0, resource, vk_queue_flags, vk_info, access_mask, stage_flags, image_layout); - return true; - } + + *access_mask = VK_ACCESS_MEMORY_READ_BIT; + *stage_flags = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; + if (image_layout) + *image_layout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR; + return true; } *access_mask = VK_ACCESS_HOST_READ_BIT | VK_ACCESS_HOST_WRITE_BIT;

1 0

Giovanni Mascellani : include: Document structure vkd3d_image_resource_create_info.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: vkd3d Branch: master Commit: 3f43d06f5c67d4753100e0897bc2cc5f7c61f502 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3f43d06f5c67d4753100e0897bc2c… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sun Apr 21 21:58:02 2024 +0200 include: Document structure vkd3d_image_resource_create_info. --- include/vkd3d.h | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 6b44b3c8..7f585aa2 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -313,18 +313,58 @@ struct vkd3d_optional_device_extensions_info uint32_t extension_count; }; -/* vkd3d_image_resource_create_info flags */ +/** + * When specified as a flag of vkd3d_image_resource_create_info, it means that vkd3d will do the + * initial transition operation on the image from VK_IMAGE_LAYOUT_UNDEFINED to its appropriate + * Vulkan layout (depending on its D3D12 resource state). If this flag is not specified the caller + * is responsible for transitioning the Vulkan image to the appropriate layout. + */ #define VKD3D_RESOURCE_INITIAL_STATE_TRANSITION 0x00000001 +/** + * When specified as a flag of vkd3d_image_resource_create_info, it means that field present_state + * is honored. + */ #define VKD3D_RESOURCE_PRESENT_STATE_TRANSITION 0x00000002 +/** + * A chained structure containing the parameters to create a D3D12 resource backed by a Vulkan + * image. + */ struct vkd3d_image_resource_create_info { + /** Must be set to VKD3D_STRUCTURE_TYPE_IMAGE_RESOURCE_CREATE_INFO. */ enum vkd3d_structure_type type; + /** Optional pointer to a structure containing further parameters. */ const void *next; + /** The Vulkan image that backs the resource. */ VkImage vk_image; + /** The resource description. */ D3D12_RESOURCE_DESC desc; + /** + * A combination of zero or more flags. The valid flags are + * VKD3D_RESOURCE_INITIAL_STATE_TRANSITION and VKD3D_RESOURCE_PRESENT_STATE_TRANSITION. + */ unsigned int flags; + /** + * This field specifies how to handle resource state D3D12_RESOURCE_STATE_PRESENT for + * the resource. Notice that on D3D12 there is no difference between + * D3D12_RESOURCE_STATE_COMMON and D3D12_RESOURCE_STATE_PRESENT (they have the same value), + * while on Vulkan two different layouts are used (VK_IMAGE_LAYOUT_GENERAL and + * VK_IMAGE_LAYOUT_PRESENT_SRC_KHR). + * + * * When flag VKD3D_RESOURCE_PRESENT_STATE_TRANSITION is not specified, field + * present_state is ignored and resource state D3D12_RESOURCE_STATE_COMMON/_PRESENT is + * mapped to VK_IMAGE_LAYOUT_GENERAL; this is useful for non-swapchain resources. + * * Otherwise, when present_state is D3D12_RESOURCE_STATE_PRESENT/_COMMON, resource state + * D3D12_RESOURCE_STATE_COMMON/_PRESENT is mapped to VK_IMAGE_LAYOUT_PRESENT_SRC_KHR; + * this is useful for swapchain resources that are directly backed by a Vulkan swapchain + * image. + * * Otherwise, resource state D3D12_RESOURCE_STATE_COMMON/_PRESENT is treated as resource + * state present_state; this is useful for swapchain resources that backed by a Vulkan + * non-swapchain image, which the client will likely consume with a copy or drawing + * operation at presentation time. + */ D3D12_RESOURCE_STATES present_state; };

1 0

Alistair Leslie-Hughes : windowscodecs: Avoid implicit cast changing value.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: 013f54af1f721dce651c85f87a5339ba3cb9d4a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/013f54af1f721dce651c85f87a5339… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 2 09:55:01 2024 +1000 windowscodecs: Avoid implicit cast changing value. This appear to be introduced with commit 12f73ed9d851. When This->stride is negative (bottom up image) it converts the multiplication to an UINT. Thus causing the pointer to be incorrect when y > 0. --- dlls/windowscodecs/bmpdecode.c | 2 +- dlls/windowscodecs/wincodecs_common.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index 9d4867447f0..ae6feda5b50 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -432,7 +432,7 @@ static HRESULT BmpFrameDecode_ReadABGRasBGR(BmpDecoder* This) { for (y = 0; y < height; y++) { - pixel = This->imagedatastart + This->stride * y; + pixel = This->imagedatastart + This->stride * (INT)y; for (x = 0; x < width; x++) { diff --git a/dlls/windowscodecs/wincodecs_common.h b/dlls/windowscodecs/wincodecs_common.h index f56e91e1f54..dcccdc2e5f1 100644 --- a/dlls/windowscodecs/wincodecs_common.h +++ b/dlls/windowscodecs/wincodecs_common.h @@ -201,7 +201,7 @@ void reverse_bgr8(UINT bytesperpixel, LPBYTE bits, UINT width, UINT height, INT for (y=0; y<height; y++) { - pixel = bits + stride * y; + pixel = bits + stride * (INT)y; for (x=0; x<width; x++) {

1 0

Rémi Bernon : win32u: Fix list corruption in vulkan_detach_surfaces.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: ad4f9d73fdfb89b8424b6727554f99a043b18263 URL: https://gitlab.winehq.org/wine/wine/-/commit/ad4f9d73fdfb89b8424b6727554f99… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 2 11:36:04 2024 +0200 win32u: Fix list corruption in vulkan_detach_surfaces. --- dlls/win32u/vulkan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/vulkan.c b/dlls/win32u/vulkan.c index 4fae491b1db..59b9364065e 100644 --- a/dlls/win32u/vulkan.c +++ b/dlls/win32u/vulkan.c @@ -258,9 +258,9 @@ static void vulkan_init(void) void vulkan_detach_surfaces( struct list *surfaces ) { - struct surface *surface; + struct surface *surface, *next; - LIST_FOR_EACH_ENTRY( surface, surfaces, struct surface, entry ) + LIST_FOR_EACH_ENTRY_SAFE( surface, next, surfaces, struct surface, entry ) { driver_funcs->p_vulkan_surface_detach( surface->hwnd, surface->driver_private ); list_remove( &surface->entry );

1 0

Rémi Bernon : win32u: Use find_device_from_handle in process_rawinput_message.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: f333f4cdbe993a3ca6847402fdaf0be3c7cab22a URL: https://gitlab.winehq.org/wine/wine/-/commit/f333f4cdbe993a3ca6847402fdaf0b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 5 16:14:02 2022 +0100 win32u: Use find_device_from_handle in process_rawinput_message. And only refresh the list if the device handle isn't known. --- dlls/win32u/rawinput.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c index c86e28dea8d..c004f296038 100644 --- a/dlls/win32u/rawinput.c +++ b/dlls/win32u/rawinput.c @@ -301,12 +301,13 @@ static void rawinput_update_device_list(void) enumerate_devices( RIM_TYPEHID, guid_devinterface_hidW ); } -static struct device *find_device_from_handle( HANDLE handle ) +static struct device *find_device_from_handle( HANDLE handle, BOOL refresh ) { struct device *device; LIST_FOR_EACH_ENTRY( device, &devices, struct device, entry ) if (device->handle == handle) return device; + if (!refresh) return NULL; rawinput_update_device_list(); @@ -399,7 +400,7 @@ UINT WINAPI NtUserGetRawInputDeviceInfo( HANDLE handle, UINT command, void *data pthread_mutex_lock( &rawinput_mutex ); - if (!(device = find_device_from_handle( handle ))) + if (!(device = find_device_from_handle( handle, TRUE ))) { pthread_mutex_unlock( &rawinput_mutex ); RtlSetLastWin32Error( ERROR_INVALID_HANDLE ); @@ -568,8 +569,20 @@ BOOL process_rawinput_message( MSG *msg, UINT hw_id, const struct hardware_msg_d if (msg->message == WM_INPUT_DEVICE_CHANGE) { + BOOL refresh = msg->wParam == GIDC_ARRIVAL; + struct device *device; + pthread_mutex_lock( &rawinput_mutex ); - rawinput_update_device_list(); + if ((device = find_device_from_handle( UlongToHandle( msg_data->rawinput.device ), refresh ))) + { + if (msg->wParam == GIDC_REMOVAL) + { + list_remove( &device->entry ); + NtClose( device->file ); + free( device->data ); + free( device ); + } + } pthread_mutex_unlock( &rawinput_mutex ); } else

1 0

Rémi Bernon : win32u: Move rawinput device cache ticks check to rawinput_update_device_list.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: 464ce9a0858c4c2b1a2d5a5234a63413ce92bd1b URL: https://gitlab.winehq.org/wine/wine/-/commit/464ce9a0858c4c2b1a2d5a5234a634… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 2 17:54:32 2024 +0200 win32u: Move rawinput device cache ticks check to rawinput_update_device_list. --- dlls/win32u/rawinput.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c index c004f296038..5b1d9d211df 100644 --- a/dlls/win32u/rawinput.c +++ b/dlls/win32u/rawinput.c @@ -282,12 +282,17 @@ static void enumerate_devices( DWORD type, const WCHAR *class ) NtClose( class_key ); } -static void rawinput_update_device_list(void) +static void rawinput_update_device_list( BOOL force ) { + unsigned int ticks = NtGetTickCount(); + static unsigned int last_check; struct device *device, *next; TRACE( "\n" ); + if (ticks - last_check <= 2000 && !force) return; + last_check = ticks; + LIST_FOR_EACH_ENTRY_SAFE( device, next, &devices, struct device, entry ) { list_remove( &device->entry ); @@ -309,7 +314,7 @@ static struct device *find_device_from_handle( HANDLE handle, BOOL refresh ) if (device->handle == handle) return device; if (!refresh) return NULL; - rawinput_update_device_list(); + rawinput_update_device_list( TRUE ); LIST_FOR_EACH_ENTRY( device, &devices, struct device, entry ) if (device->handle == handle) return device; @@ -322,8 +327,7 @@ static struct device *find_device_from_handle( HANDLE handle, BOOL refresh ) */ UINT WINAPI NtUserGetRawInputDeviceList( RAWINPUTDEVICELIST *device_list, UINT *device_count, UINT size ) { - unsigned int count = 0, ticks = NtGetTickCount(); - static unsigned int last_check; + unsigned int count = 0; struct device *device; TRACE( "device_list %p, device_count %p, size %u.\n", device_list, device_count, size ); @@ -342,11 +346,7 @@ UINT WINAPI NtUserGetRawInputDeviceList( RAWINPUTDEVICELIST *device_list, UINT * pthread_mutex_lock( &rawinput_mutex ); - if (ticks - last_check > 2000) - { - last_check = ticks; - rawinput_update_device_list(); - } + rawinput_update_device_list( FALSE ); LIST_FOR_EACH_ENTRY( device, &devices, struct device, entry ) {

1 0

Evan Tang : user32/tests: Check RegisterRawInputDevices RIDDEV_DEVNOTIFY posted messages.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: a3134963e01ec9f17ec2d594e0ae90fffb2bcb29 URL: https://gitlab.winehq.org/wine/wine/-/commit/a3134963e01ec9f17ec2d594e0ae90… Author: Evan Tang <etang(a)codeweavers.com> Date: Thu May 2 17:39:21 2024 +0200 user32/tests: Check RegisterRawInputDevices RIDDEV_DEVNOTIFY posted messages. --- dlls/user32/tests/input.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index b92e59396ac..8b374fae8a3 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1778,6 +1778,7 @@ static void test_RegisterRawInputDevices(void) HWND hwnd; RAWINPUTDEVICE raw_devices[2] = {0}; UINT count, raw_devices_count; + MSG msg; raw_devices[0].usUsagePage = HID_USAGE_PAGE_GENERIC; raw_devices[0].usUsage = HID_USAGE_GENERIC_GAMEPAD; @@ -1849,6 +1850,48 @@ static void test_RegisterRawInputDevices(void) raw_devices[1].hwndTarget = hwnd; ok_ret( 1, RegisterRawInputDevices( raw_devices, ARRAY_SIZE( raw_devices ), sizeof(RAWINPUTDEVICE) ) ); + /* RIDEV_DEVNOTIFY send messages for any pre-existing device */ + raw_devices[0].dwFlags = RIDEV_DEVNOTIFY; + raw_devices[0].hwndTarget = 0; + raw_devices[0].usUsagePage = HID_USAGE_PAGE_GENERIC; + raw_devices[0].usUsage = HID_USAGE_GENERIC_MOUSE; + raw_devices[1].dwFlags = RIDEV_DEVNOTIFY; + raw_devices[1].hwndTarget = 0; + raw_devices[1].usUsagePage = HID_USAGE_PAGE_GENERIC; + raw_devices[1].usUsage = HID_USAGE_GENERIC_KEYBOARD; + + ok_ret( 1, RegisterRawInputDevices( raw_devices, ARRAY_SIZE( raw_devices ), sizeof(RAWINPUTDEVICE) ) ); + while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) + { + ok_ne( WM_INPUT_DEVICE_CHANGE, msg.message, UINT, "%#x" ); + TranslateMessage( &msg ); + DispatchMessageW( &msg ); + } + + /* RIDEV_DEVNOTIFY send messages only to hwndTarget */ + raw_devices[0].hwndTarget = hwnd; + raw_devices[1].hwndTarget = hwnd; + + count = 0; + ok_ret( 1, RegisterRawInputDevices( raw_devices, ARRAY_SIZE( raw_devices ), sizeof(RAWINPUTDEVICE) ) ); + while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) + { + if (msg.message == WM_INPUT_DEVICE_CHANGE) count++; + TranslateMessage( &msg ); + DispatchMessageW( &msg ); + } + todo_wine ok( count >= 2, "got %u messages\n", count ); + + count = 0; + ok_ret( 1, RegisterRawInputDevices( raw_devices, ARRAY_SIZE( raw_devices ), sizeof(RAWINPUTDEVICE) ) ); + while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) + { + if (msg.message == WM_INPUT_DEVICE_CHANGE) count++; + TranslateMessage( &msg ); + DispatchMessageW( &msg ); + } + todo_wine ok( count >= 2, "got %u messages\n", count ); + /* RIDEV_REMOVE requires hwndTarget == NULL */ raw_devices[0].dwFlags = RIDEV_REMOVE; raw_devices[0].hwndTarget = hwnd;

1 0

Rémi Bernon : win32u: Remove now unnecessary rawinput_device_get_usages.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: f0e02e4f981552a595a5aace326241142bc88eec URL: https://gitlab.winehq.org/wine/wine/-/commit/f0e02e4f981552a595a5aace326241… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 29 18:28:40 2024 +0200 win32u: Remove now unnecessary rawinput_device_get_usages. --- dlls/win32u/rawinput.c | 19 ------------------- dlls/win32u/win32u_private.h | 1 - 2 files changed, 20 deletions(-) diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c index 1120ce053aa..c86e28dea8d 100644 --- a/dlls/win32u/rawinput.c +++ b/dlls/win32u/rawinput.c @@ -316,25 +316,6 @@ static struct device *find_device_from_handle( HANDLE handle ) return NULL; } -BOOL rawinput_device_get_usages( HANDLE handle, USAGE *usage_page, USAGE *usage ) -{ - struct device *device; - - pthread_mutex_lock( &rawinput_mutex ); - - if (!(device = find_device_from_handle( handle )) || device->info.dwType != RIM_TYPEHID) - *usage_page = *usage = 0; - else - { - *usage_page = device->info.hid.usUsagePage; - *usage = device->info.hid.usUsage; - } - - pthread_mutex_unlock( &rawinput_mutex ); - - return *usage_page || *usage; -} - /********************************************************************** * NtUserGetRawInputDeviceList (win32u.@) */ diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index ff861db4dd9..24e8b1b498d 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -146,7 +146,6 @@ extern void pack_user_message( void *buffer, size_t size, UINT message, /* rawinput.c */ extern BOOL process_rawinput_message( MSG *msg, UINT hw_id, const struct hardware_msg_data *msg_data ); -extern BOOL rawinput_device_get_usages( HANDLE handle, USHORT *usage_page, USHORT *usage ); /* scroll.c */ extern void draw_nc_scrollbar( HWND hwnd, HDC hdc, BOOL draw_horizontal, BOOL draw_vertical );

1 0

Evan Tang : win32u: Post device arrival messages in NtUserRegisterRawInputDevices.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: 4ae893e2f005e0915be480075feaecc0ccec8d8f URL: https://gitlab.winehq.org/wine/wine/-/commit/4ae893e2f005e0915be480075feaec… Author: Evan Tang <etang(a)codeweavers.com> Date: Thu May 2 17:44:18 2024 +0200 win32u: Post device arrival messages in NtUserRegisterRawInputDevices. --- dlls/user32/tests/input.c | 4 ++-- dlls/win32u/rawinput.c | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 8b374fae8a3..fcaa4229b02 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1880,7 +1880,7 @@ static void test_RegisterRawInputDevices(void) TranslateMessage( &msg ); DispatchMessageW( &msg ); } - todo_wine ok( count >= 2, "got %u messages\n", count ); + ok( count >= 2, "got %u messages\n", count ); count = 0; ok_ret( 1, RegisterRawInputDevices( raw_devices, ARRAY_SIZE( raw_devices ), sizeof(RAWINPUTDEVICE) ) ); @@ -1890,7 +1890,7 @@ static void test_RegisterRawInputDevices(void) TranslateMessage( &msg ); DispatchMessageW( &msg ); } - todo_wine ok( count >= 2, "got %u messages\n", count ); + ok( count >= 2, "got %u messages\n", count ); /* RIDEV_REMOVE requires hwndTarget == NULL */ raw_devices[0].dwFlags = RIDEV_REMOVE; diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c index 5b1d9d211df..1083571802d 100644 --- a/dlls/win32u/rawinput.c +++ b/dlls/win32u/rawinput.c @@ -598,6 +598,30 @@ BOOL process_rawinput_message( MSG *msg, UINT hw_id, const struct hardware_msg_d return TRUE; } +static void post_device_notifications( const RAWINPUTDEVICE *filter ) +{ + ULONG usages = MAKELONG( filter->usUsagePage, filter->usUsage ); + struct device *device; + + LIST_FOR_EACH_ENTRY( device, &devices, struct device, entry ) + { + switch (device->info.dwType) + { + case RIM_TYPEMOUSE: + if (usages != MAKELONG( HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_MOUSE )) continue; + break; + case RIM_TYPEKEYBOARD: + if (usages != MAKELONG( HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_KEYBOARD )) continue; + break; + case RIM_TYPEHID: + if (usages != MAKELONG( device->info.hid.usUsagePage, device->info.hid.usUsage )) continue; + break; + } + + NtUserPostMessage( filter->hwndTarget, WM_INPUT_DEVICE_CHANGE, GIDC_ARRIVAL, (LPARAM)device->handle ); + } +} + static void register_rawinput_device( const RAWINPUTDEVICE *device ) { RAWINPUTDEVICE *pos, *end; @@ -619,6 +643,7 @@ static void register_rawinput_device( const RAWINPUTDEVICE *device ) } else { + if ((device->dwFlags & RIDEV_DEVNOTIFY) && device->hwndTarget) post_device_notifications( device ); if (pos == end || pos->usUsagePage != device->usUsagePage || pos->usUsage != device->usUsage) { memmove( pos + 1, pos, (char *)end - (char *)pos ); @@ -684,6 +709,8 @@ BOOL WINAPI NtUserRegisterRawInputDevices( const RAWINPUTDEVICE *devices, UINT d return FALSE; } + rawinput_update_device_list( TRUE ); + registered_devices = new_registered_devices; for (i = 0; i < device_count; ++i) register_rawinput_device( devices + i );

1 0