February 2022 - Wine-commits

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

14 Feb '22

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

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

14 Feb '22

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

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

14 Feb '22

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

Rémi Bernon : winebus.sys: Request haptics effect to stop when only when needed.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: bcc113a7fd05bf85d93af6699f6dce4e158ae87b URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcc113a7fd05bf85d93af669… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 14 17:26:17 2022 +0100 winebus.sys: Request haptics effect to stop when only when needed. Instead of stopping them, then re-starting them when a new effect is requested. 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 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index d036ec2b98e..eda37e42c2c 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -416,12 +416,15 @@ NTSTATUS sdl_device_haptics_start(struct unix_device *iface, UINT duration_ms, effect.leftright.large_magnitude = rumble_intensity; effect.leftright.small_magnitude = buzz_intensity; - if (impl->effect_support & WINE_SDL_JOYSTICK_RUMBLE) - pSDL_JoystickRumble(impl->sdl_joystick, 0, 0, 0); - else if (impl->sdl_haptic) - pSDL_HapticStopAll(impl->sdl_haptic); 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) + pSDL_HapticStopAll(impl->sdl_haptic); + return STATUS_SUCCESS; + } if (impl->effect_support & SDL_HAPTIC_LEFTRIGHT) {

1 0

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

14 Feb '22

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

Rémi Bernon : winebus.sys: Fix HID haptics waveform NONE / STOP ordinals.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: baa417a371d03ead4d84053dea01f78469f0b633 URL: https://source.winehq.org/git/wine.git/?a=commit;h=baa417a371d03ead4d84053d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 14 17:26:19 2022 +0100 winebus.sys: Fix HID haptics waveform NONE / STOP ordinals. There's some inconsistencies between the HID 1.22 specification and HID usage names in Windows SDK headers. The headers use STOP for the 0x1001 usage name, and NULL for 0x1002, where the HID spec uses None for the 0x1001 usage name and Stop for 0x1002. Both are implicit waveforms anyway, and the HID usages aren't really used anywhere, but their ordinal matters. The HID spec says that None has ordinal 1, and Stop ordinal 2, and that Stop waveform can be used to stop any previously started waveform. We are going to stick to that and ignore the HID usages, although the names won't match the usages. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/hid.c | 20 ++++++++------------ dlls/winebus.sys/unix_private.h | 24 +++++++++++++++--------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 3be2ca304d5..ec2250fbe80 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -323,26 +323,22 @@ BOOL hid_device_add_haptics(struct unix_device *iface) USAGE(1, HID_USAGE_HAPTICS_WAVEFORM_LIST), COLLECTION(1, NamedArray), - USAGE_PAGE(1, HID_USAGE_PAGE_ORDINAL), - USAGE(1, 3), /* HID_USAGE_HAPTICS_WAVEFORM_RUMBLE */ - USAGE(1, 4), /* HID_USAGE_HAPTICS_WAVEFORM_BUZZ */ + USAGE(4, (HID_USAGE_PAGE_ORDINAL<<16)|HAPTICS_WAVEFORM_RUMBLE_ORDINAL), /* HID_USAGE_HAPTICS_WAVEFORM_RUMBLE */ + USAGE(4, (HID_USAGE_PAGE_ORDINAL<<16)|HAPTICS_WAVEFORM_BUZZ_ORDINAL), /* HID_USAGE_HAPTICS_WAVEFORM_BUZZ */ REPORT_COUNT(1, 2), REPORT_SIZE(1, 16), FEATURE(1, Data|Var|Abs|Null), END_COLLECTION, - USAGE_PAGE(2, HID_USAGE_PAGE_HAPTICS), USAGE(1, HID_USAGE_HAPTICS_DURATION_LIST), COLLECTION(1, NamedArray), - USAGE_PAGE(1, HID_USAGE_PAGE_ORDINAL), - USAGE(1, 3), /* 0 (HID_USAGE_HAPTICS_WAVEFORM_RUMBLE) */ - USAGE(1, 4), /* 0 (HID_USAGE_HAPTICS_WAVEFORM_BUZZ) */ + USAGE(4, (HID_USAGE_PAGE_ORDINAL<<16)|HAPTICS_WAVEFORM_RUMBLE_ORDINAL), /* 0 (HID_USAGE_HAPTICS_WAVEFORM_RUMBLE) */ + USAGE(4, (HID_USAGE_PAGE_ORDINAL<<16)|HAPTICS_WAVEFORM_BUZZ_ORDINAL), /* 0 (HID_USAGE_HAPTICS_WAVEFORM_BUZZ) */ REPORT_COUNT(1, 2), REPORT_SIZE(1, 16), FEATURE(1, Data|Var|Abs|Null), END_COLLECTION, - USAGE_PAGE(2, HID_USAGE_PAGE_HAPTICS), USAGE(1, HID_USAGE_HAPTICS_WAVEFORM_CUTOFF_TIME), UNIT(2, 0x1001), /* seconds */ UNIT_EXPONENT(1, -3), /* 10^-3 */ @@ -1042,18 +1038,18 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC if (packet->reportId == haptics->waveform_report) { struct hid_haptics_waveform *waveform = (struct hid_haptics_waveform *)(packet->reportBuffer + 1); - struct hid_haptics_waveform *rumble = haptics->waveforms + HAPTICS_WAVEFORM_RUMBLE_INDEX; - struct hid_haptics_waveform *buzz = haptics->waveforms + HAPTICS_WAVEFORM_BUZZ_INDEX; + struct hid_haptics_waveform *rumble = haptics->waveforms + HAPTICS_WAVEFORM_RUMBLE_ORDINAL; + struct hid_haptics_waveform *buzz = haptics->waveforms + HAPTICS_WAVEFORM_BUZZ_ORDINAL; ULONG duration_ms; io->Information = sizeof(*waveform) + 1; assert(packet->reportBufferLen == io->Information); - if (waveform->manual_trigger == 0 || waveform->manual_trigger > HAPTICS_WAVEFORM_LAST_INDEX) + if (waveform->manual_trigger == 0 || waveform->manual_trigger > HAPTICS_WAVEFORM_LAST_ORDINAL) io->Status = STATUS_INVALID_PARAMETER; else { - if (waveform->manual_trigger == HAPTICS_WAVEFORM_STOP_INDEX) + if (waveform->manual_trigger == HAPTICS_WAVEFORM_STOP_ORDINAL) memset(haptics->waveforms, 0, sizeof(haptics->waveforms)); else haptics->waveforms[waveform->manual_trigger] = *waveform; diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index ff57e537ffe..74c1f4c092a 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -121,19 +121,25 @@ struct hid_report_descriptor BYTE next_report_id[3]; }; -enum haptics_waveform_index +/* HID spec uses None / Stop names for the first two implicit waveforms, + * where Windows SDK headers use STOP / NULL for the corresponding HID + * usage constants. We're not actually using the usages anyway are we + * stick to the HID spec here. + */ +enum haptics_waveform_ordinal { - HAPTICS_WAVEFORM_STOP_INDEX = 1, - HAPTICS_WAVEFORM_NULL_INDEX = 2, - HAPTICS_WAVEFORM_RUMBLE_INDEX = 3, - HAPTICS_WAVEFORM_BUZZ_INDEX = 4, - HAPTICS_WAVEFORM_LAST_INDEX = HAPTICS_WAVEFORM_BUZZ_INDEX, + HAPTICS_WAVEFORM_NONE_ORDINAL = 1, /* implicit, not included in waveform_list / duration_list */ + HAPTICS_WAVEFORM_STOP_ORDINAL = 2, /* implicit, not included in waveform_list / duration_list */ + HAPTICS_WAVEFORM_RUMBLE_ORDINAL = 3, + HAPTICS_WAVEFORM_BUZZ_ORDINAL = 4, + HAPTICS_WAVEFORM_FIRST_ORDINAL = HAPTICS_WAVEFORM_RUMBLE_ORDINAL, + HAPTICS_WAVEFORM_LAST_ORDINAL = HAPTICS_WAVEFORM_BUZZ_ORDINAL, }; struct hid_haptics_features { - WORD waveform_list[HAPTICS_WAVEFORM_LAST_INDEX - HAPTICS_WAVEFORM_NULL_INDEX]; - WORD duration_list[HAPTICS_WAVEFORM_LAST_INDEX - HAPTICS_WAVEFORM_NULL_INDEX]; + WORD waveform_list[HAPTICS_WAVEFORM_LAST_ORDINAL - HAPTICS_WAVEFORM_FIRST_ORDINAL + 1]; + WORD duration_list[HAPTICS_WAVEFORM_LAST_ORDINAL - HAPTICS_WAVEFORM_FIRST_ORDINAL + 1]; UINT waveform_cutoff_time_ms; }; @@ -146,7 +152,7 @@ struct hid_haptics_waveform struct hid_haptics { struct hid_haptics_features features; - struct hid_haptics_waveform waveforms[HAPTICS_WAVEFORM_LAST_INDEX + 1]; + struct hid_haptics_waveform waveforms[HAPTICS_WAVEFORM_LAST_ORDINAL + 1]; BYTE features_report; BYTE waveform_report; };

1 0

Rémi Bernon : xinput1_3: Use _ordinal rather than _index suffix for haptics waveforms.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 5ce24754c68cd77d5f3a8cbb7fa28cd688ff05a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ce24754c68cd77d5f3a8cbb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 14 17:26:20 2022 +0100 xinput1_3: Use _ordinal rather than _index suffix for haptics waveforms. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/main.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index 7917b9f7af2..e669fa0af71 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -81,8 +81,8 @@ struct xinput_controller char *feature_report_buf; BYTE haptics_report; - BYTE haptics_rumble_index; - BYTE haptics_buzz_index; + BYTE haptics_rumble_ordinal; + BYTE haptics_buzz_ordinal; } hid; }; @@ -244,21 +244,21 @@ static BOOL controller_check_caps(struct xinput_controller *controller, HANDLE d return TRUE; } - controller->hid.haptics_buzz_index = 0; - controller->hid.haptics_rumble_index = 0; + controller->hid.haptics_buzz_ordinal = 0; + controller->hid.haptics_rumble_ordinal = 0; for (i = 3; status == HIDP_STATUS_SUCCESS; ++i) { ULONG waveform = 0; status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, i, &waveform, preparsed, report_buf, report_len); if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetUsageValue returned %#lx\n", status); - else if (waveform == HID_USAGE_HAPTICS_WAVEFORM_BUZZ) controller->hid.haptics_buzz_index = i; - else if (waveform == HID_USAGE_HAPTICS_WAVEFORM_RUMBLE) controller->hid.haptics_rumble_index = i; + else if (waveform == HID_USAGE_HAPTICS_WAVEFORM_BUZZ) controller->hid.haptics_buzz_ordinal = i; + else if (waveform == HID_USAGE_HAPTICS_WAVEFORM_RUMBLE) controller->hid.haptics_rumble_ordinal = i; } - if (!controller->hid.haptics_buzz_index) WARN("haptics buzz not supported\n"); - if (!controller->hid.haptics_rumble_index) WARN("haptics rumble not supported\n"); - if (!controller->hid.haptics_rumble_index && !controller->hid.haptics_buzz_index) return TRUE; + if (!controller->hid.haptics_buzz_ordinal) WARN("haptics buzz not supported\n"); + if (!controller->hid.haptics_rumble_ordinal) WARN("haptics rumble not supported\n"); + if (!controller->hid.haptics_rumble_ordinal && !controller->hid.haptics_buzz_ordinal) return TRUE; caps_count = 1; status = HidP_GetSpecificValueCaps(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_MANUAL_TRIGGER, @@ -298,7 +298,7 @@ static DWORD HID_set_state(struct xinput_controller *controller, XINPUT_VIBRATIO state->wLeftMotorSpeed, preparsed, report_buf, report_len); if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue INTENSITY returned %#lx\n", status); status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_MANUAL_TRIGGER, - controller->hid.haptics_rumble_index, preparsed, report_buf, report_len); + controller->hid.haptics_rumble_ordinal, preparsed, report_buf, report_len); if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue MANUAL_TRIGGER returned %#lx\n", status); if (!HidD_SetOutputReport(controller->device, report_buf, report_len)) { @@ -313,7 +313,7 @@ static DWORD HID_set_state(struct xinput_controller *controller, XINPUT_VIBRATIO state->wRightMotorSpeed, preparsed, report_buf, report_len); if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue INTENSITY returned %#lx\n", status); status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_MANUAL_TRIGGER, - controller->hid.haptics_buzz_index, preparsed, report_buf, report_len); + controller->hid.haptics_buzz_ordinal, preparsed, report_buf, report_len); if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue MANUAL_TRIGGER returned %#lx\n", status); if (!HidD_SetOutputReport(controller->device, report_buf, report_len)) {

1 0

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

14 Feb '22

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 : dinput/tests: Remove an unneeded NULL cast.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 57d342afe50db084a4b812e6db90ad4142dcd3df URL: https://source.winehq.org/git/wine.git/?a=commit;h=57d342afe50db084a4b812e6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 14 13:57:49 2022 +0100 dinput/tests: Remove an unneeded NULL cast. 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/hid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index 71e9f66834c..83635146324 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -3547,7 +3547,7 @@ DWORD WINAPI dinput_test_device_thread( void *stop_event ) ok( !status, "RegSetValueExW returned %#lx\n", status ); status = RegSetValueExW( hkey, L"Caps", 0, REG_BINARY, (void *)&caps, sizeof(caps) ); ok( !status, "RegSetValueExW returned %#lx\n", status ); - status = RegSetValueExW( hkey, L"Expect", 0, REG_BINARY, (void *)NULL, 0 ); + status = RegSetValueExW( hkey, L"Expect", 0, REG_BINARY, NULL, 0 ); ok( !status, "RegSetValueExW returned %#lx\n", status ); status = RegSetValueExW( hkey, L"Input", 0, REG_BINARY, NULL, 0 ); ok( !status, "RegSetValueExW returned %#lx\n", status );

1 0

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

14 Feb '22

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