February 2022 - Wine-Commits

Rémi Bernon : winebus.sys: Only call SDL_HapticRumbleInit if supported, as a fallback.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: ba0ce3c7b5b2e8a4963be1ad8549cbc292ad55fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba0ce3c7b5b2e8a4963be1ad… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 14 17:26:16 2022 +0100 winebus.sys: Only call SDL_HapticRumbleInit if supported, as a fallback. The SDL_HAPTIC_LEFTRIGHT effect should be preferred when available. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index eba8a959cb4..d036ec2b98e 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -187,11 +187,10 @@ static BOOL descriptor_add_haptic(struct sdl_device *impl) else { impl->effect_support = pSDL_HapticQuery(impl->sdl_haptic); - if (pSDL_HapticRumbleSupported(impl->sdl_haptic)) + if (!(impl->effect_support & EFFECT_SUPPORT_HAPTICS) && + pSDL_HapticRumbleSupported(impl->sdl_haptic) && + pSDL_HapticRumbleInit(impl->sdl_haptic) == 0) impl->effect_support |= WINE_SDL_HAPTIC_RUMBLE; - - pSDL_HapticStopAll(impl->sdl_haptic); - pSDL_HapticRumbleInit(impl->sdl_haptic); } if (!(impl->effect_support & EFFECT_SUPPORT_HAPTICS) && pSDL_JoystickRumble &&

1 0

Jacek Caban : win32u: Move NtUserSetCursorPos implementation from user32.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: 5d308b1606ebd748c67b6e706671e869eec0a9ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d308b1606ebd748c67b6e70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 14 14:07:53 2022 +0100 win32u: Move NtUserSetCursorPos implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 31 ------------------------------- dlls/user32/sysparams.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/winpos.c | 4 ++-- dlls/win32u/driver.c | 6 ++++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 34 ++++++++++++++++++++++++++++++++++ dlls/win32u/sysparams.c | 20 ++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 3 +++ dlls/win32u/wrappers.c | 6 ++++++ include/ntuser.h | 1 + 12 files changed, 76 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5d308b1606ebd748c67b…

1 0

Jacek Caban : win32u: Move MessageBeep implementation from user32.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: 8c5befe49bfcbfb2a4fb9684c1447837256f20ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c5befe49bfcbfb2a4fb9684… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 14 14:08:05 2022 +0100 win32u: Move MessageBeep implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 12 +----------- dlls/user32/message.c | 5 +---- dlls/win32u/driver.c | 19 ++++++++++++++++--- dlls/win32u/sysparams.c | 10 ++++++++++ include/ntuser.h | 1 + 5 files changed, 29 insertions(+), 18 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 73f4ee67257..247093bfc17 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -119,10 +119,6 @@ void USER_unload_driver(void) * These are fallbacks for entry points that are not implemented in the real driver. */ -static void CDECL nulldrv_Beep(void) -{ -} - static BOOL CDECL nulldrv_RegisterHotKey( HWND hwnd, UINT modifiers, UINT vk ) { return TRUE; @@ -287,11 +283,6 @@ static void CDECL nulldrv_ThreadDetach( void ) * Each entry point simply loads the real driver and chains to it. */ -static void CDECL loaderdrv_Beep(void) -{ - load_driver()->pBeep(); -} - static BOOL CDECL loaderdrv_RegisterHotKey( HWND hwnd, UINT modifiers, UINT vk ) { return load_driver()->pRegisterHotKey( hwnd, modifiers, vk ); @@ -369,7 +360,7 @@ static struct user_driver_funcs lazy_load_driver = { NULL }, /* keyboard functions */ NULL, - loaderdrv_Beep, + NULL, NULL, NULL, NULL, @@ -436,7 +427,6 @@ void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT v #define SET_USER_FUNC(name) \ do { if (!driver->p##name) driver->p##name = nulldrv_##name; } while(0) - SET_USER_FUNC(Beep); SET_USER_FUNC(RegisterHotKey); SET_USER_FUNC(UnregisterHotKey); SET_USER_FUNC(DestroyCursorIcon); diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 44b08da79dd..1c60244623a 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -4432,10 +4432,7 @@ BOOL WINAPI SetMessageQueue( INT size ) */ BOOL WINAPI MessageBeep( UINT i ) { - BOOL active = TRUE; - SystemParametersInfoA( SPI_GETBEEP, 0, &active, FALSE ); - if (active) USER_Driver->pBeep(); - return TRUE; + return NtUserCallOneParam( i, NtUserMessageBeep ); } diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 2caacd2b2a6..24815922bbb 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -958,6 +958,11 @@ static BOOL CDECL loaderdrv_ActivateKeyboardLayout( HKL layout, UINT flags ) return load_driver()->pActivateKeyboardLayout( layout, flags ); } +static void CDECL loaderdrv_Beep(void) +{ + load_driver()->pBeep(); +} + static INT CDECL loaderdrv_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) { return load_driver()->pGetKeyNameText( lparam, buffer, size ); @@ -1033,22 +1038,30 @@ static const struct vulkan_funcs * CDECL loaderdrv_wine_get_vulkan_driver( UINT static const struct user_driver_funcs lazy_load_driver = { + /* keyboard functions */ .pActivateKeyboardLayout = loaderdrv_ActivateKeyboardLayout, + .pBeep = loaderdrv_Beep, .pGetKeyNameText = loaderdrv_GetKeyNameText, .pGetKeyboardLayoutList = loaderdrv_GetKeyboardLayoutList, .pMapVirtualKeyEx = loaderdrv_MapVirtualKeyEx, .pToUnicodeEx = loaderdrv_ToUnicodeEx, .pUnregisterHotKey = loaderdrv_UnregisterHotKey, .pVkKeyScanEx = loaderdrv_VkKeyScanEx, - .pChangeDisplaySettingsEx = loaderdrv_ChangeDisplaySettingsEx, - .pEnumDisplaySettingsEx = loaderdrv_EnumDisplaySettingsEx, - .pUpdateDisplayDevices = loaderdrv_UpdateDisplayDevices, + /* cursor/icon functions */ .pSetCursor = loaderdrv_SetCursor, .pSetCursorPos = loaderdrv_SetCursorPos, .pClipCursor = loaderdrv_ClipCursor, + /* clipboard functions */ .pUpdateClipboard = loaderdrv_UpdateClipboard, + /* display modes */ + .pChangeDisplaySettingsEx = loaderdrv_ChangeDisplaySettingsEx, + .pEnumDisplaySettingsEx = loaderdrv_EnumDisplaySettingsEx, + .pUpdateDisplayDevices = loaderdrv_UpdateDisplayDevices, + /* windowing functions */ .pScrollDC = nulldrv_ScrollDC, + /* system parameters */ .pSystemParametersInfo = nulldrv_SystemParametersInfo, + /* vulkan support */ .pwine_get_vulkan_driver = loaderdrv_wine_get_vulkan_driver, }; diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index e29a05661dc..603c16acd41 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4475,6 +4475,14 @@ ULONG WINAPI NtUserGetProcessDpiAwarenessContext( HANDLE process ) return dpi_awareness; } +static BOOL message_beep( UINT i ) +{ + BOOL active = TRUE; + NtUserSystemParametersInfo( SPI_GETBEEP, 0, &active, FALSE ); + if (active) user_driver->pBeep(); + return TRUE; +} + /*********************************************************************** * NtUserCallOneParam (win32u.@) */ @@ -4496,6 +4504,8 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) return get_system_metrics( arg ); case NtUserGetDeskPattern: return get_entry( &entry_DESKPATTERN, 256, (WCHAR *)arg ); + case NtUserMessageBeep: + return message_beep( arg ); default: FIXME( "invalid code %u\n", code ); return 0; diff --git a/include/ntuser.h b/include/ntuser.h index 929d773cc97..92173300a35 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -57,6 +57,7 @@ enum NtUserGetSysColorBrush, NtUserGetSysColorPen, NtUserGetSystemMetrics, + NtUserMessageBeep, NtUserRealizePalette, /* temporary exports */ NtUserGetDeskPattern,

1 0

Jacek Caban : win32u: Move GetCursorPos implementation from user.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: b5b9126c7364adf551ab440548d234238151571c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5b9126c7364adf551ab4405… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 14 14:08:27 2022 +0100 win32u: Move GetCursorPos implementation from user. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 13 +------------ dlls/user32/input.c | 28 +--------------------------- dlls/win32u/driver.c | 6 ++++++ dlls/win32u/input.c | 32 ++++++++++++++++++++++++++++++++ dlls/win32u/sysparams.c | 2 ++ dlls/win32u/win32u_private.h | 3 +++ include/ntuser.h | 1 + 7 files changed, 46 insertions(+), 39 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 247093bfc17..6dbc07d318a 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -136,11 +136,6 @@ static void CDECL nulldrv_SetCursor( HCURSOR cursor ) { } -static BOOL CDECL nulldrv_GetCursorPos( LPPOINT pt ) -{ - return TRUE; -} - static BOOL CDECL nulldrv_SetCursorPos( INT x, INT y ) { return TRUE; @@ -298,11 +293,6 @@ static void CDECL loaderdrv_SetCursor( HCURSOR cursor ) load_driver()->pSetCursor( cursor ); } -static BOOL CDECL loaderdrv_GetCursorPos( LPPOINT pt ) -{ - return load_driver()->pGetCursorPos( pt ); -} - static BOOL CDECL loaderdrv_SetCursorPos( INT x, INT y ) { return load_driver()->pSetCursorPos( x, y ); @@ -371,7 +361,7 @@ static struct user_driver_funcs lazy_load_driver = /* cursor/icon functions */ nulldrv_DestroyCursorIcon, loaderdrv_SetCursor, - loaderdrv_GetCursorPos, + NULL, loaderdrv_SetCursorPos, loaderdrv_ClipCursor, /* clipboard functions */ @@ -431,7 +421,6 @@ void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT v SET_USER_FUNC(UnregisterHotKey); SET_USER_FUNC(DestroyCursorIcon); SET_USER_FUNC(SetCursor); - SET_USER_FUNC(GetCursorPos); SET_USER_FUNC(SetCursorPos); SET_USER_FUNC(ClipCursor); SET_USER_FUNC(UpdateClipboard); diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 210cc368527..b3329eb3c07 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -305,33 +305,7 @@ void WINAPI mouse_event( DWORD dwFlags, DWORD dx, DWORD dy, */ BOOL WINAPI DECLSPEC_HOTPATCH GetCursorPos( POINT *pt ) { - BOOL ret; - DWORD last_change; - UINT dpi; - - if (!pt) return FALSE; - - SERVER_START_REQ( set_cursor ) - { - if ((ret = !wine_server_call( req ))) - { - pt->x = reply->new_x; - pt->y = reply->new_y; - last_change = reply->last_change; - } - } - SERVER_END_REQ; - - /* query new position from graphics driver if we haven't updated recently */ - if (ret && GetTickCount() - last_change > 100) ret = USER_Driver->pGetCursorPos( pt ); - if (ret && (dpi = get_thread_dpi())) - { - DPI_AWARENESS_CONTEXT context; - context = SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); - *pt = map_dpi_point( *pt, get_monitor_dpi( MonitorFromPoint( *pt, MONITOR_DEFAULTTOPRIMARY )), dpi ); - SetThreadDpiAwarenessContext( context ); - } - return ret; + return NtUserCallOneParam( (UINT_PTR)pt, NtUserGetCursorPos ); } diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 24815922bbb..ea8d32d62f9 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -1010,6 +1010,11 @@ static void CDECL loaderdrv_SetCursor( HCURSOR cursor ) load_driver()->pSetCursor( cursor ); } +static BOOL CDECL loaderdrv_GetCursorPos( POINT *pt ) +{ + return load_driver()->pGetCursorPos( pt ); +} + static BOOL CDECL loaderdrv_SetCursorPos( INT x, INT y ) { return load_driver()->pSetCursorPos( x, y ); @@ -1049,6 +1054,7 @@ static const struct user_driver_funcs lazy_load_driver = .pVkKeyScanEx = loaderdrv_VkKeyScanEx, /* cursor/icon functions */ .pSetCursor = loaderdrv_SetCursor, + .pGetCursorPos = loaderdrv_GetCursorPos, .pSetCursorPos = loaderdrv_SetCursorPos, .pClipCursor = loaderdrv_ClipCursor, /* clipboard functions */ diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 493efcd605b..328546c9f77 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -96,6 +96,38 @@ BOOL WINAPI NtUserSetCursorPos( INT x, INT y ) return ret; } +/*********************************************************************** + * get_cursor_pos + */ +BOOL get_cursor_pos( POINT *pt ) +{ + BOOL ret; + DWORD last_change; + UINT dpi; + + if (!pt) return FALSE; + + SERVER_START_REQ( set_cursor ) + { + if ((ret = !wine_server_call( req ))) + { + pt->x = reply->new_x; + pt->y = reply->new_y; + last_change = reply->last_change; + } + } + SERVER_END_REQ; + + /* query new position from graphics driver if we haven't updated recently */ + if (ret && NtGetTickCount() - last_change > 100) ret = user_driver->pGetCursorPos( pt ); + if (ret && (dpi = get_thread_dpi())) + { + HMONITOR monitor = monitor_from_point( *pt, MONITOR_DEFAULTTOPRIMARY, 0 ); + *pt = map_dpi_point( *pt, get_monitor_dpi( monitor ), dpi ); + } + return ret; +} + /*********************************************************************** * get_locale_kbd_layout */ diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 603c16acd41..ae9b4f73cfb 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4492,6 +4492,8 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) { case NtUserGetClipCursor: return get_clip_cursor( (RECT *)arg ); + case NtUserGetCursorPos: + return get_cursor_pos( (POINT *)arg ); case NtUserGetSysColor: return get_sys_color( arg ); case NtUserRealizePalette: diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 0a5f6ce10b8..cd50b48feec 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -245,6 +245,9 @@ struct unix_funcs /* cursoricon.c */ extern BOOL get_clip_cursor( RECT *rect ) DECLSPEC_HIDDEN; +/* input.c */ +extern BOOL get_cursor_pos( POINT *pt ) DECLSPEC_HIDDEN; + /* sysparams.c */ extern RECT get_display_rect( const WCHAR *display ) DECLSPEC_HIDDEN; extern UINT get_monitor_dpi( HMONITOR monitor ) DECLSPEC_HIDDEN; diff --git a/include/ntuser.h b/include/ntuser.h index 92173300a35..a115f7c9259 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -53,6 +53,7 @@ struct enum_display_monitor_params enum { NtUserGetClipCursor, + NtUserGetCursorPos, NtUserGetSysColor, NtUserGetSysColorBrush, NtUserGetSysColorPen,

1 0

Piotr Caban : msvcirt/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: dfbfe0ee44a5b86970f7348dfca8d641ed26242f URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfbfe0ee44a5b86970f7348d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 14 15:33:00 2022 +0100 msvcirt/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/tests/Makefile.in | 1 - dlls/msvcirt/tests/msvcirt.c | 84 +++++++++++++++++++++--------------------- 2 files changed, 42 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dfbfe0ee44a5b86970f7…

1 0

Piotr Caban : msvcirt/tests: Fix uninitialized variable warning.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: 47f79c4d17ae31857ad3c755ce4745d97613165b URL: https://source.winehq.org/git/wine.git/?a=commit;h=47f79c4d17ae31857ad3c755… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 14 15:32:49 2022 +0100 msvcirt/tests: Fix uninitialized variable warning. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/tests/msvcirt.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 43ffb277ed4..924d38339ac 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -505,12 +505,12 @@ struct thiscall_thunk #include "poppack.h" static void * (WINAPI *call_thiscall_func1)( void *func, void *this ); -static void * (WINAPI *call_thiscall_func2)( void *func, void *this, const void *a ); -static void * (WINAPI *call_thiscall_func3)( void *func, void *this, const void *a, const void *b ); -static void * (WINAPI *call_thiscall_func4)( void *func, void *this, const void *a, const void *b, - const void *c ); -static void * (WINAPI *call_thiscall_func5)( void *func, void *this, const void *a, const void *b, - const void *c, const void *d ); +static void * (WINAPI *call_thiscall_func2)( void *func, void *this, void *a ); +static void * (WINAPI *call_thiscall_func3)( void *func, void *this, void *a, void *b ); +static void * (WINAPI *call_thiscall_func4)( void *func, void *this, void *a, void *b, + void *c ); +static void * (WINAPI *call_thiscall_func5)( void *func, void *this, void *a, void *b, + void *c, void *d ); static void * (WINAPI *call_thiscall_func2_ptr_dbl)( void *func, void *this, double a ); static void * (WINAPI *call_thiscall_func2_ptr_flt)( void *func, void *this, float a ); @@ -533,12 +533,12 @@ static void init_thiscall_thunk(void) } #define call_func1(func,_this) call_thiscall_func1(func,_this) -#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)(a)) -#define call_func3(func,_this,a,b) call_thiscall_func3(func,_this,(const void*)(a),(const void*)(b)) -#define call_func4(func,_this,a,b,c) call_thiscall_func4(func,_this,(const void*)(a),(const void*)(b), \ - (const void*)(c)) -#define call_func5(func,_this,a,b,c,d) call_thiscall_func5(func,_this,(const void*)(a),(const void*)(b), \ - (const void*)(c), (const void *)(d)) +#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(void*)(a)) +#define call_func3(func,_this,a,b) call_thiscall_func3(func,_this,(void*)(a),(void*)(b)) +#define call_func4(func,_this,a,b,c) call_thiscall_func4(func,_this,(void*)(a),(void*)(b), \ + (void*)(c)) +#define call_func5(func,_this,a,b,c,d) call_thiscall_func5(func,_this,(void*)(a),(void*)(b), \ + (void*)(c), (void *)(d)) #define call_func2_ptr_dbl(func,_this,a) call_thiscall_func2_ptr_dbl(func,_this,a) #define call_func2_ptr_flt(func,_this,a) call_thiscall_func2_ptr_flt(func,_this,a)

1 0

Rémi Bernon : winebus.sys: Stop haptics effects using the right function.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: db456c946b2e49addf7c63f31b0c0f9a865006d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db456c946b2e49addf7c63f3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 14 17:26:18 2022 +0100 winebus.sys: Stop haptics effects using the right function. Depending on the API the device supports, in preferred order. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index eda37e42c2c..7fc95b54f95 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -100,6 +100,7 @@ MAKE_FUNCPTR(SDL_HapticPause); MAKE_FUNCPTR(SDL_HapticQuery); MAKE_FUNCPTR(SDL_HapticRumbleInit); MAKE_FUNCPTR(SDL_HapticRumblePlay); +MAKE_FUNCPTR(SDL_HapticRumbleStop); MAKE_FUNCPTR(SDL_HapticRumbleSupported); MAKE_FUNCPTR(SDL_HapticRunEffect); MAKE_FUNCPTR(SDL_HapticSetGain); @@ -418,10 +419,12 @@ NTSTATUS sdl_device_haptics_start(struct unix_device *iface, UINT duration_ms, if (!effect.leftright.large_magnitude && !effect.leftright.small_magnitude) { - if (impl->effect_support & WINE_SDL_JOYSTICK_RUMBLE) - pSDL_JoystickRumble(impl->sdl_joystick, 0, 0, 0); - else if (impl->sdl_haptic) + if (impl->effect_support & SDL_HAPTIC_LEFTRIGHT) pSDL_HapticStopAll(impl->sdl_haptic); + else if (impl->effect_support & WINE_SDL_HAPTIC_RUMBLE) + pSDL_HapticRumbleStop(impl->sdl_haptic); + else if (impl->effect_support & WINE_SDL_JOYSTICK_RUMBLE) + pSDL_JoystickRumble(impl->sdl_joystick, 0, 0, 0); return STATUS_SUCCESS; } @@ -998,6 +1001,7 @@ NTSTATUS sdl_bus_init(void *args) LOAD_FUNCPTR(SDL_HapticQuery); LOAD_FUNCPTR(SDL_HapticRumbleInit); LOAD_FUNCPTR(SDL_HapticRumblePlay); + LOAD_FUNCPTR(SDL_HapticRumbleStop); LOAD_FUNCPTR(SDL_HapticRumbleSupported); LOAD_FUNCPTR(SDL_HapticRunEffect); LOAD_FUNCPTR(SDL_HapticSetGain);

1 0

Francois Gouget : dinput/tests: Remove spaces before linefeeds.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: c76b617119e0c9d6ed6425814e19fa6e7597330c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c76b617119e0c9d6ed642581… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 14 13:57:43 2022 +0100 dinput/tests: Remove spaces before linefeeds. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/keyboard.c | 2 +- dlls/dinput/tests/mouse.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index a5dfe5edafc..251a12073df 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -499,7 +499,7 @@ static void test_GetDeviceInfo(IDirectInputA *pDI) hr = IDirectInputDevice_GetDeviceInfo(pKey, (DIDEVICEINSTANCEA *)&inst3A); ok(SUCCEEDED(hr), "got %#lx\n", hr); - ok(instA.dwSize != inst3A.dwSize, "got %ld, %ld \n", instA.dwSize, inst3A.dwSize); + ok(instA.dwSize != inst3A.dwSize, "got %ld, %ld\n", instA.dwSize, inst3A.dwSize); ok(IsEqualGUID(&instA.guidInstance, &inst3A.guidInstance), "got %s, %s\n", wine_dbgstr_guid(&instA.guidInstance), wine_dbgstr_guid(&inst3A.guidInstance) ); ok(IsEqualGUID(&instA.guidProduct, &inst3A.guidProduct), "got %s, %s\n", diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index dc11f4d8ae9..8be808e5da6 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -246,7 +246,7 @@ static void test_GetDeviceInfo(IDirectInputA *pDI) hr = IDirectInputDevice_GetDeviceInfo(pMouse, (DIDEVICEINSTANCEA *)&inst3A); ok(SUCCEEDED(hr), "got %#lx\n", hr); - ok(instA.dwSize != inst3A.dwSize, "got %lu, %lu \n", instA.dwSize, inst3A.dwSize); + ok(instA.dwSize != inst3A.dwSize, "got %lu, %lu\n", instA.dwSize, inst3A.dwSize); ok(IsEqualGUID(&instA.guidInstance, &inst3A.guidInstance), "got %s, %s\n", wine_dbgstr_guid(&instA.guidInstance), wine_dbgstr_guid(&inst3A.guidInstance) ); ok(IsEqualGUID(&instA.guidProduct, &inst3A.guidProduct), "got %s, %s\n",

1 0

Francois Gouget : d2d1/tests: Fix the spelling of an ok() message.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: 0cdbbd291302b2e3d8d32f97cd2d32cbb6c4df64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cdbbd291302b2e3d8d32f97… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 14 13:58:01 2022 +0100 d2d1/tests: Fix the spelling of an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index b3691d91173..a425395e64a 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -5134,7 +5134,7 @@ static void test_create_target(BOOL d3d11) desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT; hr = ID2D1Factory_CreateDxgiSurfaceRenderTarget(factory, ctx.surface, &desc, &rt); - ok(hr == create_dpi_tests[i].hr, "Test %u: Got unexpect hr %#lx, expected %#lx.\n", + ok(hr == create_dpi_tests[i].hr, "Test %u: Got unexpected hr %#lx, expected %#lx.\n", i, hr, create_dpi_tests[i].hr); if (FAILED(hr))

1 0

Francois Gouget : d3d11/tests: Fix the spelling of a couple of comments.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: 6c25edfe24138b7eef00f541b0edbb3b01f8b7bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c25edfe24138b7eef00f541… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 14 13:58:17 2022 +0100 d3d11/tests: Fix the spelling of a couple of comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 52c8816b689..236fa85a257 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5960,7 +5960,7 @@ static void test_pipeline_statistics_query(void) get_query_data(context, query, &data, sizeof(data)); /* WARP devices randomly return all-zeroed structures as if the draw did not happen. Flushing and - * sleeping a second before ending the query reduces the likelyhood of hitting the bug a lot, but + * sleeping a second before ending the query reduces the likelihood of hitting the bug a lot, but * does not eliminate it entirely. To make things work reliably ignore such broken results. */ if (is_warp_device(device) && !memcmp(&data, &zero_data, sizeof(data))) { @@ -7453,8 +7453,8 @@ static void test_device_context_state(void) * * The tests below suggest that a ContextState object stores its own state * for every device it is used with. This isn't entirely true, e.g. the - * primitive topology can be transfered between devices, but will cause odd - * refcounting behavior afterwards (IAGetPrimitiveTopology will leak 54 + * primitive topology can be transferred between devices, but will cause + * odd refcounting behavior afterwards (IAGetPrimitiveTopology will leak 54 * references on the context's device for example). */ if (0) {

1 0