March 2024 - Wine-Commits - list.winehq.org

Zebediah Figura : wined3d/nvrc: Move FFP bumpenv constant loading to nvrc_apply_draw_state().
by Alexandre Julliard March 5, 2024

March 5, 2024

Module: wine Branch: master Commit: e65679f4555947eebc53e5722b3d8cab3f7eff99 URL: https://gitlab.winehq.org/wine/wine/-/commit/e65679f4555947eebc53e5722b3d8c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Nov 12 20:12:43 2023 -0600 wined3d/nvrc: Move FFP bumpenv constant loading to nvrc_apply_draw_state(). --- dlls/wined3d/nvidia_texture_shader.c | 82 ++++++++++++------------------------ dlls/wined3d/wined3d_private.h | 12 ++++++ 2 files changed, 40 insertions(+), 54 deletions(-)

1 0

Martin Storsjö : arm64: Expose information about more modern CPU extensions.
by Alexandre Julliard March 5, 2024

March 5, 2024

Module: wine Branch: master Commit: aa78b46e9c88f1bf645c74103e6a46d9a4360ed7 URL: https://gitlab.winehq.org/wine/wine/-/commit/aa78b46e9c88f1bf645c74103e6a46… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Mar 5 14:21:52 2024 +0200 arm64: Expose information about more modern CPU extensions. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/ntdll/unix/system.c | 8 ++++++-- include/winternl.h | 12 ++++++++---- programs/wineboot/wineboot.c | 4 ++++ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 72bdd6b31a5..4c6c4cd23e2 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -574,8 +574,12 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) } if (!strcmp( line, "Features" )) { - if (strstr(value, "crc32")) features |= CPU_FEATURE_ARM_V8_CRC32; - if (strstr(value, "aes")) features |= CPU_FEATURE_ARM_V8_CRYPTO; + if (strstr(value, "crc32")) features |= CPU_FEATURE_ARM_V8_CRC32; + if (strstr(value, "aes")) features |= CPU_FEATURE_ARM_V8_CRYPTO; + if (strstr(value, "atomics")) features |= CPU_FEATURE_ARM_V81_ATOMIC; + if (strstr(value, "asimddp")) features |= CPU_FEATURE_ARM_V82_DP; + if (strstr(value, "jscvt")) features |= CPU_FEATURE_ARM_V83_JSCVT; + if (strstr(value, "lrcpc")) features |= CPU_FEATURE_ARM_V83_LRCPC; continue; } } diff --git a/include/winternl.h b/include/winternl.h index f027ef47e2f..6b4009b913e 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2693,10 +2693,14 @@ typedef struct _SYSTEM_CPU_INFORMATION { #define CPU_FEATURE_PAE 0x00200000 #define CPU_FEATURE_DAZ 0x00400000 -#define CPU_FEATURE_ARM_VFP_32 0x00000001 -#define CPU_FEATURE_ARM_NEON 0x00000002 -#define CPU_FEATURE_ARM_V8_CRC32 0x00000004 -#define CPU_FEATURE_ARM_V8_CRYPTO 0x00000008 +#define CPU_FEATURE_ARM_VFP_32 0x00000001 +#define CPU_FEATURE_ARM_NEON 0x00000002 +#define CPU_FEATURE_ARM_V8_CRC32 0x00000004 +#define CPU_FEATURE_ARM_V8_CRYPTO 0x00000008 +#define CPU_FEATURE_ARM_V81_ATOMIC 0x00000010 +#define CPU_FEATURE_ARM_V82_DP 0x00000020 +#define CPU_FEATURE_ARM_V83_JSCVT 0x00000040 +#define CPU_FEATURE_ARM_V83_LRCPC 0x00000080 typedef struct _SYSTEM_PROCESSOR_FEATURES_INFORMATION { diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index c16446cf289..1c1ad858fa4 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -440,6 +440,10 @@ static void create_user_shared_data(void) features[PF_ARM_V8_INSTRUCTIONS_AVAILABLE] = TRUE; features[PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE] = !!(sci.ProcessorFeatureBits & CPU_FEATURE_ARM_V8_CRC32); features[PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE] = !!(sci.ProcessorFeatureBits & CPU_FEATURE_ARM_V8_CRYPTO); + features[PF_ARM_V81_ATOMIC_INSTRUCTIONS_AVAILABLE]= !!(sci.ProcessorFeatureBits & CPU_FEATURE_ARM_V81_ATOMIC); + features[PF_ARM_V82_DP_INSTRUCTIONS_AVAILABLE] = !!(sci.ProcessorFeatureBits & CPU_FEATURE_ARM_V82_DP); + features[PF_ARM_V83_JSCVT_INSTRUCTIONS_AVAILABLE] = !!(sci.ProcessorFeatureBits & CPU_FEATURE_ARM_V83_JSCVT); + features[PF_ARM_V83_LRCPC_INSTRUCTIONS_AVAILABLE] = !!(sci.ProcessorFeatureBits & CPU_FEATURE_ARM_V83_LRCPC); features[PF_COMPARE_EXCHANGE_DOUBLE] = TRUE; features[PF_NX_ENABLED] = TRUE; features[PF_FASTFAIL_AVAILABLE] = TRUE;

1 0

Rémi Bernon : win32u: Add support for sending and receiving WM_POINTER* messages.
by Alexandre Julliard March 5, 2024

March 5, 2024

Module: wine Branch: master Commit: c9ffab4602efa791ccbd568b18c0a94ab78c7f80 URL: https://gitlab.winehq.org/wine/wine/-/commit/c9ffab4602efa791ccbd568b18c0a9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 4 20:57:55 2021 +0200 win32u: Add support for sending and receiving WM_POINTER* messages. --- dlls/dinput/tests/device8.c | 17 ++--------------- dlls/win32u/message.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c index 41e560a7e62..8b2a72f5976 100644 --- a/dlls/dinput/tests/device8.c +++ b/dlls/dinput/tests/device8.c @@ -2000,7 +2000,6 @@ static void test_hid_touch_screen(void) ok( !res, "MsgWaitForMultipleObjects returned %#lx\n", res ); res = msg_wait_for_events( 1, &touchdown_event, 10 ); - todo_wine ok( res == 0, "WaitForSingleObject returned %#lx\n", res ); res = msg_wait_for_events( 1, &touchleave_event, 500 ); todo_wine @@ -2139,7 +2138,6 @@ static void test_hid_touch_screen(void) bus_send_hid_input( file, &desc, &touch_single, sizeof(touch_single) ); res = msg_wait_for_events( 1, &touchdown_event, 1000 ); - todo_wine ok( res == 0, "WaitForSingleObject returned %#lx\n", res ); res = msg_wait_for_events( 1, &touchleave_event, 10 ); ok( res == WAIT_TIMEOUT, "WaitForSingleObject returned %#lx\n", res ); @@ -2174,18 +2172,15 @@ static void test_hid_touch_screen(void) res = msg_wait_for_events( 1, &touchdown_event, 10 ); ok( res == WAIT_TIMEOUT, "WaitForSingleObject returned %#lx\n", res ); ok( pointer_enter_count == 0, "got pointer_enter_count %u\n", pointer_enter_count ); - todo_wine ok( pointer_up_count == 1, "got pointer_up_count %u\n", pointer_up_count ); expect_flags = POINTER_MESSAGE_FLAG_PRIMARY | POINTER_MESSAGE_FLAG_CONFIDENCE; - todo_wine ok( HIWORD( pointer_wparam[0] ) == expect_flags || broken(HIWORD( pointer_wparam[0] ) == (expect_flags & ~POINTER_MESSAGE_FLAG_CONFIDENCE)), /* Win8 32bit */ "got wparam %#Ix\n", pointer_wparam[0] ); - ok( LOWORD( pointer_wparam[0] ) == id, "got wparam %#Ix\n", pointer_wparam[0] ); todo_wine + ok( LOWORD( pointer_wparam[0] ) == id, "got wparam %#Ix\n", pointer_wparam[0] ); ok( LOWORD( pointer_lparam[0] ) * 128 / width == 0x08, "got lparam %#Ix\n", pointer_lparam[0] ); - todo_wine ok( HIWORD( pointer_lparam[0] ) * 128 / height == 0x10, "got lparam %#Ix\n", pointer_lparam[0] ); ok( pointer_wparam[1] == 0, "got wparam %#Ix\n", pointer_wparam[1] ); ok( pointer_lparam[1] == 0, "got lparam %#Ix\n", pointer_lparam[1] ); @@ -2197,10 +2192,8 @@ static void test_hid_touch_screen(void) bus_send_hid_input( file, &desc, &touch_multiple, sizeof(touch_multiple) ); res = msg_wait_for_events( 1, &touchdown_event, 1000 ); - todo_wine ok( res == 0, "WaitForSingleObject returned %#lx\n", res ); res = msg_wait_for_events( 1, &touchdown_event, 1000 ); - todo_wine ok( res == 0, "WaitForSingleObject returned %#lx\n", res ); res = msg_wait_for_events( 1, &touchleave_event, 10 ); ok( res == WAIT_TIMEOUT, "WaitForSingleObject returned %#lx\n", res ); @@ -2249,30 +2242,24 @@ static void test_hid_touch_screen(void) res = msg_wait_for_events( 1, &touchdown_event, 10 ); ok( res == WAIT_TIMEOUT, "WaitForSingleObject returned %#lx\n", res ); ok( pointer_enter_count == 0, "got pointer_enter_count %u\n", pointer_enter_count ); - todo_wine ok( pointer_up_count == 2, "got pointer_up_count %u\n", pointer_up_count ); expect_flags = POINTER_MESSAGE_FLAG_PRIMARY | POINTER_MESSAGE_FLAG_CONFIDENCE; - todo_wine ok( HIWORD( pointer_wparam[0] ) == expect_flags || broken(HIWORD( pointer_wparam[0] ) == (expect_flags & ~POINTER_MESSAGE_FLAG_CONFIDENCE)), /* Win8 32bit */ "got wparam %#Ix\n", pointer_wparam[0] ); - ok( LOWORD( pointer_wparam[0] ) == id, "got wparam %#Ix\n", pointer_wparam[0] ); todo_wine + ok( LOWORD( pointer_wparam[0] ) == id, "got wparam %#Ix\n", pointer_wparam[0] ); ok( LOWORD( pointer_lparam[0] ) * 128 / width == 0x08, "got lparam %#Ix\n", pointer_lparam[0] ); - todo_wine ok( HIWORD( pointer_lparam[0] ) * 128 / height == 0x10, "got lparam %#Ix\n", pointer_lparam[0] ); expect_flags = POINTER_MESSAGE_FLAG_CONFIDENCE; - todo_wine ok( HIWORD( pointer_wparam[1] ) == expect_flags || broken(HIWORD( pointer_wparam[1] ) == (expect_flags & ~POINTER_MESSAGE_FLAG_CONFIDENCE)), /* Win8 32bit */ "got wparam %#Ix\n", pointer_wparam[1] ); todo_wine ok( LOWORD( pointer_wparam[1] ) == id + 1, "got wparam %#Ix\n", pointer_wparam[1] ); - todo_wine ok( LOWORD( pointer_lparam[1] ) * 128 / width == 0x18, "got lparam %#Ix\n", pointer_lparam[1] ); - todo_wine ok( HIWORD( pointer_lparam[1] ) * 128 / height == 0x20, "got lparam %#Ix\n", pointer_lparam[1] ); diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 79390a7fdc5..f7f751ef883 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2319,6 +2319,16 @@ static void handle_keyboard_repeat_message( HWND hwnd ) NtUserPostMessage( hwnd, msg->message, msg->wParam, msg->lParam ); } +/*********************************************************************** + * process_pointer_message + * + * returns TRUE if the contents of 'msg' should be passed to the application + */ +static BOOL process_pointer_message( MSG *msg, UINT hw_id, const struct hardware_msg_data *msg_data ) +{ + msg->pt = point_phys_to_win_dpi( msg->hwnd, msg->pt ); + return TRUE; +} /*********************************************************************** * process_keyboard_message @@ -2669,6 +2679,8 @@ static BOOL process_hardware_message( MSG *msg, UINT hw_id, const struct hardwar ret = process_keyboard_message( msg, hw_id, hwnd_filter, first, last, remove ); else if (is_mouse_message( msg->message )) ret = process_mouse_message( msg, hw_id, msg_data->info, hwnd_filter, first, last, remove ); + else if (msg->message >= WM_POINTERUPDATE && msg->message <= WM_POINTERLEAVE) + ret = process_pointer_message( msg, hw_id, msg_data ); else if (msg->message == WM_WINE_CLIPCURSOR) process_wine_clipcursor( msg->hwnd, msg->wParam, msg->lParam ); else if (msg->message == WM_WINE_SETCURSOR)

1 0

Rémi Bernon : win32u: Use a custom struct hid_input for NtUserSendHardwareInput.
by Alexandre Julliard March 5, 2024

March 5, 2024

Module: wine Branch: master Commit: bb5f0e122f453ecf422ddeb26d31ce1b9d55d152 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb5f0e122f453ecf422ddeb26d31ce… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jan 28 12:11:55 2024 +0100 win32u: Use a custom struct hid_input for NtUserSendHardwareInput. --- dlls/hidclass.sys/device.c | 37 +++++++++++++++++----------------- dlls/hidclass.sys/pnp.c | 23 ++++++++------------- dlls/win32u/message.c | 45 ++++++++---------------------------------- include/ntuser.h | 18 ++++++++++++++++- include/wine/server_protocol.h | 11 +++-------- server/protocol.def | 9 ++------- server/queue.c | 2 +- 7 files changed, 57 insertions(+), 88 deletions(-)

1 0

Rémi Bernon : win32u: Use NtUserCallHwndParam interface for __wine_send_input.
by Alexandre Julliard March 5, 2024

March 5, 2024

Module: wine Branch: master Commit: 66baee8b990140a62fb07535be7a9d8027324de2 URL: https://gitlab.winehq.org/wine/wine/-/commit/66baee8b990140a62fb07535be7a9d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jan 11 18:06:32 2024 +0100 win32u: Use NtUserCallHwndParam interface for __wine_send_input. --- dlls/hidclass.sys/device.c | 2 +- dlls/hidclass.sys/pnp.c | 2 +- dlls/win32u/input.c | 12 +----------- dlls/win32u/main.c | 5 ----- dlls/win32u/message.c | 19 +++++++++++++------ dlls/win32u/win32syscalls.h | 6 ++---- dlls/win32u/win32u.spec | 1 - dlls/win32u/win32u_private.h | 3 +-- dlls/win32u/window.c | 6 ++++++ dlls/wineandroid.drv/keyboard.c | 2 +- dlls/wineandroid.drv/window.c | 4 ++-- dlls/winemac.drv/keyboard.c | 2 +- dlls/winemac.drv/mouse.c | 2 +- dlls/winewayland.drv/wayland_keyboard.c | 6 +++--- dlls/winewayland.drv/wayland_pointer.c | 8 ++++---- dlls/winex11.drv/keyboard.c | 2 +- dlls/winex11.drv/mouse.c | 8 ++++---- dlls/wow64win/user.c | 22 ++++++++++++++++------ include/ntuser.h | 15 +++++++++++++-- 19 files changed, 71 insertions(+), 56 deletions(-)

1 0

Rémi Bernon : server: Add support for sending and receiving WM_POINTER* messages.
by Alexandre Julliard March 5, 2024

March 5, 2024

Module: wine Branch: master Commit: 61d1c18957db9bf4d5d0c2c6f2d7232d00fda0ab URL: https://gitlab.winehq.org/wine/wine/-/commit/61d1c18957db9bf4d5d0c2c6f2d723… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 4 20:57:55 2021 +0200 server: Add support for sending and receiving WM_POINTER* messages. --- dlls/dinput/tests/device8.c | 4 --- server/queue.c | 85 ++++++++++++++++++++++++++++++++++++++++++++- server/user.h | 2 ++ server/winstation.c | 2 ++ 4 files changed, 88 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c index caf85fc370f..41e560a7e62 100644 --- a/dlls/dinput/tests/device8.c +++ b/dlls/dinput/tests/device8.c @@ -1997,7 +1997,6 @@ static void test_hid_touch_screen(void) bus_send_hid_input( file, &desc, &touch_single, sizeof(touch_single) ); res = MsgWaitForMultipleObjects( 0, NULL, FALSE, 500, QS_POINTER ); - todo_wine ok( !res, "MsgWaitForMultipleObjects returned %#lx\n", res ); res = msg_wait_for_events( 1, &touchdown_event, 10 ); @@ -2049,7 +2048,6 @@ static void test_hid_touch_screen(void) bus_wait_hid_input( file, &desc, 5000 ); res = MsgWaitForMultipleObjects( 0, NULL, FALSE, 500, QS_POINTER ); - todo_wine ok( !res, "MsgWaitForMultipleObjects returned %#lx\n", res ); memset( rawbuffer, 0, sizeof(rawbuffer) ); @@ -2088,11 +2086,9 @@ static void test_hid_touch_screen(void) bus_send_hid_input( file, &desc, &touch_multiple, sizeof(touch_multiple) ); res = MsgWaitForMultipleObjects( 0, NULL, FALSE, 500, QS_POINTER ); - todo_wine ok( !res, "MsgWaitForMultipleObjects returned %#lx\n", res ); bus_send_hid_input( file, &desc, &touch_release, sizeof(touch_release) ); res = MsgWaitForMultipleObjects( 0, NULL, FALSE, 500, QS_POINTER ); - todo_wine ok( !res, "MsgWaitForMultipleObjects returned %#lx\n", res ); rawinput = (RAWINPUT *)rawbuffer; diff --git a/server/queue.c b/server/queue.c index ef40d30aedf..0b9430c5f4d 100644 --- a/server/queue.c +++ b/server/queue.c @@ -633,6 +633,7 @@ static inline int filter_contains_hw_range( unsigned int first, unsigned int las /* get the QS_* bit corresponding to a given hardware message */ static inline int get_hardware_msg_bit( unsigned int message ) { + if (message >= WM_POINTERUPDATE && message <= WM_POINTERLEAVE) return QS_POINTER; if (message == WM_INPUT_DEVICE_CHANGE || message == WM_INPUT) return QS_RAWINPUT; if (message == WM_MOUSEMOVE || message == WM_NCMOUSEMOVE) return QS_MOUSEMOVE; if (message >= WM_KEYFIRST && message <= WM_KEYLAST) return QS_KEY; @@ -1614,6 +1615,7 @@ static user_handle_t find_hardware_message_window( struct desktop *desktop, stru *msg_code = msg->msg; switch (get_hardware_msg_bit( msg->msg )) { + case QS_POINTER: case QS_RAWINPUT: if (!(win = msg->win) && input) win = input->focus; break; @@ -2216,12 +2218,72 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c return wait; } +struct pointer +{ + struct list entry; + struct desktop *desktop; + user_handle_t win; + int primary; + hw_input_t input; +}; + +static void queue_pointer_message( struct pointer *pointer ) +{ + struct hw_msg_source source = { IMDT_UNAVAILABLE, IMDT_TOUCH }; + struct desktop *desktop = pointer->desktop; + const hw_input_t *input = &pointer->input; + unsigned int wparam = input->hw.wparam; + user_handle_t win = pointer->win; + rectangle_t top_rect; + struct message *msg; + int x, y; + + get_top_window_rectangle( desktop, &top_rect ); + x = LOWORD(input->hw.lparam) * (top_rect.right - top_rect.left) / 65535; + y = HIWORD(input->hw.lparam) * (top_rect.bottom - top_rect.top) / 65535; + + if (pointer->primary) wparam |= POINTER_MESSAGE_FLAG_PRIMARY << 16; + + if (!(msg = alloc_hardware_message( 0, source, get_tick_count(), 0 ))) return; + + msg->win = get_user_full_handle( win ); + msg->msg = input->hw.msg; + msg->wparam = wparam; + msg->lparam = MAKELONG(x, y); + msg->x = desktop->cursor.x; + msg->y = desktop->cursor.y; + + queue_hardware_message( desktop, msg, 1 ); + + if (input->hw.msg == WM_POINTERUP) + { + list_remove( &pointer->entry ); + free( pointer ); + } +} + +static struct pointer *find_pointer_from_id( struct desktop *desktop, unsigned int id ) +{ + struct pointer *pointer; + + LIST_FOR_EACH_ENTRY( pointer, &desktop->pointers, struct pointer, entry ) + if (LOWORD(pointer->input.hw.wparam) == id) return pointer; + + pointer = mem_alloc( sizeof(struct pointer) ); + pointer->desktop = desktop; + pointer->primary = list_empty( &desktop->pointers ); + list_add_tail( &desktop->pointers, &pointer->entry ); + + return pointer; +} + /* queue a hardware message for a custom type of event */ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_t win, unsigned int origin, const hw_input_t *input ) { struct hw_msg_source source = { IMDT_UNAVAILABLE, origin }; struct thread *foreground; + struct pointer *pointer; struct message *msg; switch (input->hw.msg) @@ -2246,6 +2308,16 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_ return; } + if (input->hw.msg == WM_POINTERDOWN || input->hw.msg == WM_POINTERUP || input->hw.msg == WM_POINTERUPDATE) + { + pointer = find_pointer_from_id( desktop, LOWORD(input->hw.wparam) ); + pointer->input = *input; + pointer->win = win; + + queue_pointer_message( pointer ); + return; + } + if (!(msg = alloc_hardware_message( 0, source, get_tick_count(), 0 ))) return; msg->win = get_user_full_handle( win ); @@ -2394,7 +2466,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user data->hw_id = msg->unique_id; set_reply_data( msg->data, msg->data_size ); - if ((get_hardware_msg_bit( msg->msg ) == QS_RAWINPUT && (flags & PM_REMOVE)) || + if ((get_hardware_msg_bit( msg->msg ) & (QS_RAWINPUT | QS_POINTER) && (flags & PM_REMOVE)) || is_internal_hardware_message( msg->msg )) release_hardware_message( current->queue, data->hw_id ); return 1; @@ -2572,6 +2644,17 @@ void post_win_event( struct thread *thread, unsigned int event, } } +void free_pointers( struct desktop *desktop ) +{ + struct pointer *pointer, *next; + + LIST_FOR_EACH_ENTRY_SAFE( pointer, next, &desktop->pointers, struct pointer, entry ) + { + list_remove( &pointer->entry ); + free( pointer ); + } +} + /* free all hotkeys on a desktop, optionally filtering by window */ void free_hotkeys( struct desktop *desktop, user_handle_t window ) { diff --git a/server/user.h b/server/user.h index b4cf618f87e..309a0966104 100644 --- a/server/user.h +++ b/server/user.h @@ -75,6 +75,7 @@ struct desktop struct window *msg_window; /* HWND_MESSAGE top window */ struct hook_table *global_hooks; /* table of global hooks on this desktop */ struct list hotkeys; /* list of registered hotkeys */ + struct list pointers; /* list of active pointers */ struct timeout_user *close_timeout; /* timeout before closing the desktop */ struct thread_input *foreground_input; /* thread input of foreground thread */ unsigned int users; /* processes and threads using this desktop */ @@ -125,6 +126,7 @@ extern void post_win_event( struct thread *thread, unsigned int event, const WCHAR *module, data_size_t module_size, user_handle_t handle ); extern void free_hotkeys( struct desktop *desktop, user_handle_t window ); +extern void free_pointers( struct desktop *desktop ); extern void set_rawinput_process( struct process *process, int enable ); /* region functions */ diff --git a/server/winstation.c b/server/winstation.c index 373a1f7ba92..4672cf65e56 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -296,6 +296,7 @@ static struct desktop *create_desktop( const struct unicode_str *name, unsigned memset( desktop->keystate, 0, sizeof(desktop->keystate) ); list_add_tail( &winstation->desktops, &desktop->entry ); list_init( &desktop->hotkeys ); + list_init( &desktop->pointers ); } else { @@ -357,6 +358,7 @@ static void desktop_destroy( struct object *obj ) } free_hotkeys( desktop, 0 ); + free_pointers( desktop ); if (desktop->top_window) free_window_handle( desktop->top_window ); if (desktop->msg_window) free_window_handle( desktop->msg_window ); if (desktop->global_hooks) release_object( desktop->global_hooks );

1 0

Eric Pouech : dbghelp: Return matched information for path_find_symbol_file.
by Alexandre Julliard March 5, 2024

March 5, 2024

Module: wine Branch: master Commit: ad921b3c561c428ce36a2a3e0f44de1369def0c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/ad921b3c561c428ce36a2a3e0f44de… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Feb 24 17:49:23 2024 +0100 dbghelp: Return matched information for path_find_symbol_file. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/dbghelp_private.h | 4 +- dlls/dbghelp/msc.c | 179 ++++++++++++++++++++--------------------- dlls/dbghelp/path.c | 60 ++++++++------ dlls/dbghelp/pe_module.c | 8 +- dlls/dbghelp/tests/path.c | 14 ++-- 5 files changed, 132 insertions(+), 133 deletions(-)

1 0

Rémi Bernon : dinput/tests: Test the WM_POINTER* message parameter values.
by Alexandre Julliard March 5, 2024

March 5, 2024

Module: wine Branch: master Commit: 13f908b9b5503b7225b16e2a3be70e67d52f7c3f URL: https://gitlab.winehq.org/wine/wine/-/commit/13f908b9b5503b7225b16e2a3be70e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 15 11:33:24 2024 +0100 dinput/tests: Test the WM_POINTER* message parameter values. --- dlls/dinput/tests/device8.c | 151 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 141 insertions(+), 10 deletions(-)

1 0

Rémi Bernon : mouhid.sys: Send WM_POINTER* messages on contact updates.
by Alexandre Julliard March 5, 2024

March 5, 2024

Module: wine Branch: master Commit: 48f8db6c30b478ceb5317138d0a4d865e02363f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/48f8db6c30b478ceb5317138d0a4d8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 13 11:35:33 2024 +0100 mouhid.sys: Send WM_POINTER* messages on contact updates. --- dlls/mouhid.sys/Makefile.in | 2 +- dlls/mouhid.sys/main.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/mouhid.sys/Makefile.in b/dlls/mouhid.sys/Makefile.in index 331486bc104..79bc38a92b4 100644 --- a/dlls/mouhid.sys/Makefile.in +++ b/dlls/mouhid.sys/Makefile.in @@ -1,5 +1,5 @@ MODULE = mouhid.sys -IMPORTS = ntoskrnl hidparse +IMPORTS = ntoskrnl hidparse win32u EXTRADLLFLAGS = -Wl,--subsystem,native SOURCES = \ diff --git a/dlls/mouhid.sys/main.c b/dlls/mouhid.sys/main.c index c1b4288e1dd..b38299b0fb8 100644 --- a/dlls/mouhid.sys/main.c +++ b/dlls/mouhid.sys/main.c @@ -113,6 +113,8 @@ static NTSTATUS start_device_read( DEVICE_OBJECT *device ) static void add_contact( struct device *impl, struct list *old_contacts, ULONG id, LONG x, LONG y ) { + UINT flags = POINTER_MESSAGE_FLAG_INRANGE | POINTER_MESSAGE_FLAG_INCONTACT | POINTER_MESSAGE_FLAG_CONFIDENCE; + INPUT input = {.type = INPUT_HARDWARE}; struct contact *contact; LIST_FOR_EACH_ENTRY( contact, old_contacts, struct contact, entry ) @@ -120,6 +122,7 @@ static void add_contact( struct device *impl, struct list *old_contacts, ULONG i if (&contact->entry != old_contacts) { + input.hi.uMsg = WM_POINTERUPDATE; list_remove( &contact->entry ); contact->pos.x = x; @@ -128,6 +131,9 @@ static void add_contact( struct device *impl, struct list *old_contacts, ULONG i } else if ((contact = calloc( 1, sizeof(*contact) ))) { + input.hi.uMsg = WM_POINTERDOWN; + flags |= POINTER_MESSAGE_FLAG_NEW; + contact->id = id; contact->pos.x = x; contact->pos.y = y; @@ -139,6 +145,10 @@ static void add_contact( struct device *impl, struct list *old_contacts, ULONG i return; } + input.hi.wParamL = contact->id; + input.hi.wParamH = flags; + NtUserSendHardwareInput( 0, 0, &input, MAKELPARAM(contact->pos.x, contact->pos.y) ); + list_add_tail( &impl->contacts, &contact->entry ); } @@ -148,7 +158,16 @@ static void release_contacts( struct list *contacts ) LIST_FOR_EACH_ENTRY_SAFE( contact, next, contacts, struct contact, entry ) { + INPUT input = {.type = INPUT_HARDWARE}; + ULONG flags = POINTER_MESSAGE_FLAG_CONFIDENCE; + TRACE( "releasing contact %#lx, pos %s\n", contact->id, wine_dbgstr_point( &contact->pos ) ); + + input.hi.uMsg = WM_POINTERUP; + input.hi.wParamL = contact->id; + input.hi.wParamH = flags; + NtUserSendHardwareInput( 0, 0, &input, MAKELPARAM(contact->pos.x, contact->pos.y) ); + list_remove( &contact->entry ); free( contact ); }

1 0

Eric Pouech : dbghelp/tests: Add more tests for SymLoadModule*.
by Alexandre Julliard March 5, 2024

March 5, 2024

Module: wine Branch: master Commit: ec099b8ea34c6417fe3417899c1480ab1521c881 URL: https://gitlab.winehq.org/wine/wine/-/commit/ec099b8ea34c6417fe3417899c1480… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jan 8 13:57:01 2024 +0100 dbghelp/tests: Add more tests for SymLoadModule*. - SymLoadModules flags (SLMFLAG_VIRTUAL and SLMFLAG_NO_SYMBOLS), - handling of load details (SymType, ImageName vs LoadedImageName, various instances of module name). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/tests/path.c | 292 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 292 insertions(+)

1 0