November 2021 - Wine-commits

Alexandre Julliard : makefiles: Don't add msvcrt import in dlls built as part of the tests.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: 8c68894f048a3fc490fa8459d4bd7328a3342a9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c68894f048a3fc490fa8459… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 17 14:30:05 2021 +0100 makefiles: Don't add msvcrt import in dlls built as part of the tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 9ea46aed8d8..1455d90d897 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2161,14 +2161,10 @@ static struct strarray add_default_imports( const struct makefile *make, struct * add_import_libs */ static struct strarray add_import_libs( const struct makefile *make, struct strarray *deps, - struct strarray imports, int delay, int is_unix ) + struct strarray imports, int delay, int is_cross ) { struct strarray ret = empty_strarray; unsigned int i, j; - int is_cross = make->is_cross && !is_unix; - - if (!delay && !is_unix && !strarray_exists( &make->extradllflags, "-nodefaultlibs" )) - imports = add_default_imports( make, imports ); for (i = 0; i < imports.count; i++) { @@ -2966,9 +2962,10 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, const char *debug_file; if (!imports.count) imports = make->imports; - if (!dll_flags.count) dll_flags = make->extradllflags; - all_libs = add_import_libs( make, &dep_libs, imports, 0, 0 ); + if (!strarray_exists( &dll_flags, "-nodefaultlibs" )) imports = add_default_imports( make, imports ); + + all_libs = add_import_libs( make, &dep_libs, imports, 0, make->is_cross ); dll_name = strmake( "%s.dll%s", obj, make->is_cross ? "" : dll_ext ); obj_name = strmake( "%s%s", obj_dir_path( make, obj ), make->is_cross ? ".cross.o" : ".o" ); output_file = obj_dir_path( make, dll_name ); @@ -3188,14 +3185,18 @@ static void output_module( struct makefile *make ) { struct strarray all_libs = empty_strarray; struct strarray dep_libs = empty_strarray; + struct strarray imports = make->imports; char *module_path = obj_dir_path( make, make->module ); const char *debug_file = NULL; char *spec_file = NULL; unsigned int i; if (!make->is_exe) spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); - strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, 1, 0 )); - strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->imports, 0, 0 )); + if (!strarray_exists( &make->extradllflags, "-nodefaultlibs" )) + imports = add_default_imports( make, imports ); + + strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, 1, make->is_cross )); + strarray_addall( &all_libs, add_import_libs( make, &dep_libs, imports, 0, make->is_cross )); if (make->is_cross) { @@ -3271,7 +3272,7 @@ static void output_module( struct makefile *make ) strarray_add( &unix_imports, "winecrt0" ); if (spec_file) strarray_add( &unix_deps, spec_file ); - strarray_addall( &unix_libs, add_import_libs( make, &unix_deps, unix_imports, 0, 1 )); + strarray_addall( &unix_libs, add_import_libs( make, &unix_deps, unix_imports, 0, 0 )); } strarray_addall( &unix_libs, add_unix_libraries( make, &unix_deps )); @@ -3453,7 +3454,8 @@ static void output_test_module( struct makefile *make ) char *stripped = replace_extension( make->testdll, ".dll", "_test-stripped.exe" ); char *testres = replace_extension( make->testdll, ".dll", "_test.res" ); struct strarray dep_libs = empty_strarray; - struct strarray all_libs = add_import_libs( make, &dep_libs, make->imports, 0, 0 ); + struct strarray all_libs = add_import_libs( make, &dep_libs, add_default_imports( make, make->imports ), + 0, make->is_cross ); struct makefile *parent = get_parent_makefile( make ); const char *ext = make->is_cross ? "" : dll_ext; const char *debug_file;

1 0

Alexandre Julliard : capi2032: Build as a pure Unix library.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: a60160dc6d52ebcc2f843021fae99e870b3eb948 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a60160dc6d52ebcc2f843021… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 17 14:15:51 2021 +0100 capi2032: Build as a pure Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/capi2032/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/capi2032/Makefile.in b/dlls/capi2032/Makefile.in index ac45a8d394f..9e9ba285498 100644 --- a/dlls/capi2032/Makefile.in +++ b/dlls/capi2032/Makefile.in @@ -1,4 +1,5 @@ MODULE = capi2032.dll +UNIXLIB = capi2032.so IMPORTLIB = capi2032 EXTRALIBS = $(CAPI20_LIBS) EXTRAINCL = $(CAPI20_CFLAGS)

1 0

Alexandre Julliard : ctapi32: Build as a pure Unix library.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: c474709f9bbf9194ab133232b60f9f2ed741aa42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c474709f9bbf9194ab133232… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 17 14:16:00 2021 +0100 ctapi32: Build as a pure Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ctapi32/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ctapi32/Makefile.in b/dlls/ctapi32/Makefile.in index eec24c64cde..fa13d24540c 100644 --- a/dlls/ctapi32/Makefile.in +++ b/dlls/ctapi32/Makefile.in @@ -1,4 +1,5 @@ MODULE = ctapi32.dll +UNIXLIB = ctapi32.so IMPORTS = advapi32 C_SRCS = \

1 0

Alexandre Julliard : msvcrt: Don't forward string functions to ntdll.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: 68559674e7441d62e8b72503d557bed892b6004f URL: https://source.winehq.org/git/wine.git/?a=commit;h=68559674e7441d62e8b72503… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 17 11:08:38 2021 +0100 msvcrt: Don't forward string functions to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 10 +++++----- dlls/msvcr100/msvcr100.spec | 10 +++++----- dlls/msvcr110/msvcr110.spec | 10 +++++----- dlls/msvcr120/msvcr120.spec | 10 +++++----- dlls/msvcr70/msvcr70.spec | 10 +++++----- dlls/msvcr71/msvcr71.spec | 10 +++++----- dlls/msvcr80/msvcr80.spec | 10 +++++----- dlls/msvcr90/msvcr90.spec | 10 +++++----- dlls/msvcrt/msvcrt.spec | 10 +++++----- dlls/msvcrt/string.c | 22 ++++++++++++++++++++++ dlls/msvcrt/wcs.c | 32 ++++++++++++++++++++++++++++++++ dlls/msvcrtd/msvcrtd.spec | 10 +++++----- dlls/ucrtbase/ucrtbase.spec | 10 +++++----- 13 files changed, 109 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=68559674e7441d62e8b7…

1 0

Alexandre Julliard : msvcrt: Don't forward itoa() functions to ntdll.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: 3ebc80f1480b366347da3b2143e5258e94d34bef URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ebc80f1480b366347da3b21… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 17 12:18:56 2021 +0100 msvcrt: Don't forward itoa() functions to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 8 +- dlls/msvcr100/msvcr100.spec | 18 +-- dlls/msvcr110/msvcr110.spec | 18 +-- dlls/msvcr120/msvcr120.spec | 18 +-- dlls/msvcr70/msvcr70.spec | 18 +-- dlls/msvcr71/msvcr71.spec | 18 +-- dlls/msvcr80/msvcr80.spec | 18 +-- dlls/msvcr90/msvcr90.spec | 18 +-- dlls/msvcrt/msvcrt.spec | 18 +-- dlls/msvcrt/string.c | 265 +++++++++++++++++++++++++++++++++++++++----- dlls/msvcrtd/msvcrtd.spec | 18 +-- dlls/ucrtbase/ucrtbase.spec | 36 +++--- 12 files changed, 340 insertions(+), 131 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3ebc80f1480b366347da…

1 0

Rémi Bernon : dinput8/tests: Add some HID device gain report tests.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: 3f110402f6a503d7c312694092e25fc48737c980 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f110402f6a503d7c3126940… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 17 11:51:48 2021 +0100 dinput8/tests: Add some HID device gain report tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 2 + dlls/dinput8/tests/device.c | 18 +++ dlls/dinput8/tests/driver_hid.c | 83 ++++++++++++++ dlls/dinput8/tests/driver_hid.h | 3 +- dlls/dinput8/tests/hid.c | 244 ++++++++++++++++++++++++++++++---------- 5 files changed, 289 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3f110402f6a503d7c312…

1 0

Rémi Bernon : dinput: Stub support for the DIPROP_FFGAIN property.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: e7217a3287d0e6772216b34e8cdae5a96db97b55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7217a3287d0e6772216b34e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 17 11:51:49 2021 +0100 dinput: Stub support for the DIPROP_FFGAIN property. Based on a patch from Ivo Ivanov <logos128(a)gmail.com>. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 15 ++++++++++++++- dlls/dinput/device_private.h | 2 ++ dlls/dinput/joystick_hid.c | 8 ++++++++ dlls/dinput/keyboard.c | 1 + dlls/dinput/mouse.c | 1 + dlls/dinput8/tests/hid.c | 6 ------ 6 files changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 8d65d051a3b..449adaffde2 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1008,7 +1008,7 @@ static HRESULT WINAPI dinput_device_GetProperty( IDirectInputDevice8W *iface, co { DIPROPDWORD *value = (DIPROPDWORD *)header; if (header->dwSize != sizeof(DIPROPDWORD)) return DIERR_INVALIDPARAM; - value->dwData = 10000; + value->dwData = impl->device_gain; return DI_OK; } case (DWORD_PTR)DIPROP_CALIBRATION: @@ -1094,6 +1094,18 @@ static HRESULT WINAPI dinput_device_SetProperty( IDirectInputDevice8W *iface, co LeaveCriticalSection( &impl->crit ); return hr; } + case (DWORD_PTR)DIPROP_FFGAIN: + { + const DIPROPDWORD *value = (const DIPROPDWORD *)header; + if (header->dwSize != sizeof(DIPROPDWORD)) return DIERR_INVALIDPARAM; + if (!impl->vtbl->send_device_gain) return DIERR_UNSUPPORTED; + if (header->dwHow != DIPH_DEVICE) return DIERR_UNSUPPORTED; + if (value->dwData > 10000) return DIERR_INVALIDPARAM; + EnterCriticalSection( &impl->crit ); + impl->device_gain = value->dwData; + LeaveCriticalSection( &impl->crit ); + return hr; + } case (DWORD_PTR)DIPROP_FFLOAD: case (DWORD_PTR)DIPROP_GRANULARITY: case (DWORD_PTR)DIPROP_VIDPID: @@ -1853,6 +1865,7 @@ HRESULT dinput_device_alloc( SIZE_T size, const struct dinput_device_vtbl *vtbl, This->caps.dwSize = sizeof(DIDEVCAPS); This->caps.dwFlags = DIDC_ATTACHED | DIDC_EMULATED; This->device_format = format; + This->device_gain = 10000; InitializeCriticalSection( &This->crit ); This->dinput = dinput; IDirectInput_AddRef( &dinput->IDirectInput7A_iface ); diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 02befc6e869..a2110942583 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -50,6 +50,7 @@ struct dinput_device_vtbl HRESULT (*get_effect_info)( IDirectInputDevice8W *iface, DIEFFECTINFOW *info, const GUID *guid ); HRESULT (*create_effect)( IDirectInputDevice8W *iface, IDirectInputEffect **out ); HRESULT (*send_force_feedback_command)( IDirectInputDevice8W *iface, DWORD command ); + HRESULT (*send_device_gain)( IDirectInputDevice8W *iface, LONG device_gain ); HRESULT (*enum_created_effect_objects)( IDirectInputDevice8W *iface, LPDIENUMCREATEDEFFECTOBJECTSCALLBACK callback, void *context, DWORD flags ); }; @@ -98,6 +99,7 @@ struct dinput_device BYTE device_state[DEVICE_STATE_MAX_SIZE]; BOOL autocenter; + LONG device_gain; }; extern HRESULT dinput_device_alloc( SIZE_T size, const struct dinput_device_vtbl *vtbl, const GUID *guid, diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 57e08025650..b1d19c2b57c 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -786,6 +786,13 @@ static void set_extra_caps_range( struct hid_joystick *impl, const DIDEVICEOBJEC } } +static HRESULT hid_joystick_send_device_gain( IDirectInputDevice8W *iface, LONG device_gain ) +{ + FIXME( "iface %p stub!\n", iface ); + + return DIERR_UNSUPPORTED; +} + static HRESULT hid_joystick_set_property( IDirectInputDevice8W *iface, DWORD property, const DIPROPHEADER *header, const DIDEVICEOBJECTINSTANCEW *instance ) { @@ -1268,6 +1275,7 @@ static const struct dinput_device_vtbl hid_joystick_vtbl = hid_joystick_get_effect_info, hid_joystick_create_effect, hid_joystick_send_force_feedback_command, + hid_joystick_send_device_gain, hid_joystick_enum_created_effect_objects, }; diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index f906e32a59d..916a1d43233 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -294,4 +294,5 @@ static const struct dinput_device_vtbl keyboard_vtbl = NULL, NULL, NULL, + NULL, }; diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 1b45c8d5fd4..313ac070c86 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -596,4 +596,5 @@ static const struct dinput_device_vtbl mouse_vtbl = NULL, NULL, NULL, + NULL, }; diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 26b60fc21c6..ba5a26b3945 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -5015,11 +5015,9 @@ static void test_simple_joystick(void) prop_dword.diph.dwObj = 0; prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_SetProperty( device, DIPROP_FFGAIN, &prop_dword.diph ); - todo_wine ok( hr == DIERR_INVALIDPARAM, "SetProperty DIPROP_FFGAIN returned %#x\n", hr ); prop_dword.dwData = 1000; hr = IDirectInputDevice8_SetProperty( device, DIPROP_FFGAIN, &prop_dword.diph ); - todo_wine ok( hr == DI_OK, "SetProperty DIPROP_FFGAIN returned %#x\n", hr ); prop_dword.dwData = 0xdeadbeef; @@ -7847,11 +7845,9 @@ static void test_force_feedback_joystick( DWORD version ) prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_SetProperty( device, DIPROP_FFGAIN, &prop_dword.diph ); - todo_wine ok( hr == DIERR_INVALIDPARAM, "SetProperty DIPROP_FFGAIN returned %#x\n", hr ); prop_dword.dwData = 1000; hr = IDirectInputDevice8_SetProperty( device, DIPROP_FFGAIN, &prop_dword.diph ); - todo_wine ok( hr == DI_OK, "SetProperty DIPROP_FFGAIN returned %#x\n", hr ); prop_dword.dwData = 0xdeadbeef; @@ -7889,14 +7885,12 @@ static void test_force_feedback_joystick( DWORD version ) set_hid_expect( file, &expect_set_device_gain_2, sizeof(expect_set_device_gain_2) ); prop_dword.dwData = 2000; hr = IDirectInputDevice8_SetProperty( device, DIPROP_FFGAIN, &prop_dword.diph ); - todo_wine ok( hr == DI_OK, "SetProperty DIPROP_FFGAIN returned %#x\n", hr ); wait_hid_expect( file, 100 ); /* device gain reports are written asynchronously */ set_hid_expect( file, &expect_set_device_gain_1, sizeof(expect_set_device_gain_1) ); prop_dword.dwData = 1000; hr = IDirectInputDevice8_SetProperty( device, DIPROP_FFGAIN, &prop_dword.diph ); - todo_wine ok( hr == DI_OK, "SetProperty DIPROP_FFGAIN returned %#x\n", hr ); wait_hid_expect( file, 100 ); /* device gain reports are written asynchronously */

1 0

Rémi Bernon : winebus.sys: Add a PID device gain output report.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: fd47d58e8c3ed19be4309b3a1d3da5b9ce4733ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd47d58e8c3ed19be4309b3a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 17 11:51:50 2021 +0100 winebus.sys: Add a PID device gain output report. 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 | 8 ++++++++ dlls/winebus.sys/bus_udev.c | 8 ++++++++ dlls/winebus.sys/hid.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/winebus.sys/unix_private.h | 2 ++ dlls/winebus.sys/unixlib.c | 12 ++++++++++++ 5 files changed, 68 insertions(+) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 49afcbaf67c..48d5ad85a2b 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -480,6 +480,13 @@ static NTSTATUS sdl_device_physical_device_control(struct unix_device *iface, US return STATUS_NOT_SUPPORTED; } +static NTSTATUS sdl_device_physical_device_set_gain(struct unix_device *iface, BYTE value) +{ + FIXME("iface %p, value %#x stub!\n", iface, value); + + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS sdl_device_physical_effect_control(struct unix_device *iface, BYTE index, USAGE control, BYTE iterations) { @@ -664,6 +671,7 @@ static const struct hid_device_vtbl sdl_device_vtbl = sdl_device_stop, sdl_device_haptics_start, sdl_device_physical_device_control, + sdl_device_physical_device_set_gain, sdl_device_physical_effect_control, sdl_device_physical_effect_update, }; diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 5ff1719848d..74cfe486a03 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -924,6 +924,13 @@ static NTSTATUS lnxev_device_physical_device_control(struct unix_device *iface, return STATUS_NOT_SUPPORTED; } +static NTSTATUS lnxev_device_physical_device_set_gain(struct unix_device *iface, BYTE value) +{ + FIXME("iface %p, value %#x stub!\n", iface, value); + + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS lnxev_device_physical_effect_control(struct unix_device *iface, BYTE index, USAGE control, BYTE iterations) { @@ -1095,6 +1102,7 @@ static const struct hid_device_vtbl lnxev_device_vtbl = lnxev_device_start, lnxev_device_stop, lnxev_device_haptics_start, + lnxev_device_physical_device_set_gain, lnxev_device_physical_device_control, lnxev_device_physical_effect_control, lnxev_device_physical_effect_update, diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 893bf1cd7f6..6f22e0e81d8 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -412,6 +412,11 @@ static const USAGE pid_device_control_usages[] = PID_USAGE_DC_DEVICE_CONTINUE, }; +struct pid_device_gain +{ + BYTE value; +}; + struct pid_effect_control { BYTE index; @@ -741,6 +746,25 @@ BOOL hid_device_add_physical(struct unix_device *iface, USAGE *usages, USHORT co END_COLLECTION, }; + const BYTE device_gain_report = ++desc->next_report_id[HidP_Output]; + const BYTE device_gain[] = + { + USAGE_PAGE(1, HID_USAGE_PAGE_PID), + USAGE(1, PID_USAGE_DEVICE_GAIN_REPORT), + COLLECTION(1, Logical), + REPORT_ID(1, device_gain_report), + + USAGE(1, PID_USAGE_DEVICE_GAIN), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(2, 0x00ff), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(2, 0x2710), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), + END_COLLECTION, + }; + const BYTE effect_control_report = ++desc->next_report_id[HidP_Output]; const BYTE effect_control_header[] = { @@ -882,6 +906,9 @@ BOOL hid_device_add_physical(struct unix_device *iface, USAGE *usages, USHORT co if (!hid_report_descriptor_append(desc, device_control_footer, sizeof(device_control_footer))) return FALSE; + if (!hid_report_descriptor_append(desc, device_gain, sizeof(device_gain))) + return FALSE; + if (!hid_report_descriptor_append(desc, effect_control_header, sizeof(effect_control_header))) return FALSE; for (i = 1; i < ARRAY_SIZE(pid_effect_control_usages); ++i) @@ -936,6 +963,7 @@ BOOL hid_device_add_physical(struct unix_device *iface, USAGE *usages, USHORT co memcpy(iface->hid_physical.effect_types + 1, usages, count * sizeof(*usages)); iface->hid_physical.device_control_report = device_control_report; + iface->hid_physical.device_gain_report = device_gain_report; iface->hid_physical.effect_control_report = effect_control_report; iface->hid_physical.effect_update_report = effect_update_report; return TRUE; @@ -1013,6 +1041,16 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC else io->Status = iface->hid_vtbl->physical_device_control(iface, control); } + else if (packet->reportId == physical->device_gain_report) + { + struct pid_device_gain *report = (struct pid_device_gain *)(packet->reportBuffer + 1); + + io->Information = sizeof(*report) + 1; + if (packet->reportBufferLen < io->Information) + io->Status = STATUS_BUFFER_TOO_SMALL; + else + io->Status = iface->hid_vtbl->physical_device_set_gain(iface, report->value); + } else if (packet->reportId == physical->effect_control_report) { struct pid_effect_control *report = (struct pid_effect_control *)(packet->reportBuffer + 1); diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 89a0c9abad9..ef574e48cee 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -109,6 +109,7 @@ struct hid_device_vtbl NTSTATUS (*haptics_start)(struct unix_device *iface, DWORD duration_ms, USHORT rumble_intensity, USHORT buzz_intensity); NTSTATUS (*physical_device_control)(struct unix_device *iface, USAGE control); + NTSTATUS (*physical_device_set_gain)(struct unix_device *iface, BYTE value); NTSTATUS (*physical_effect_control)(struct unix_device *iface, BYTE index, USAGE control, BYTE iterations); NTSTATUS (*physical_effect_update)(struct unix_device *iface, BYTE index, struct effect_params *params); }; @@ -157,6 +158,7 @@ struct hid_physical struct effect_params effect_params[256]; BYTE device_control_report; + BYTE device_gain_report; BYTE effect_control_report; BYTE effect_update_report; BYTE set_periodic_report; diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index 6cf58570c76..9d819bab7e3 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -106,6 +106,11 @@ static NTSTATUS mouse_physical_device_control(struct unix_device *iface, USAGE c return STATUS_NOT_SUPPORTED; } +static NTSTATUS mouse_physical_device_set_gain(struct unix_device *iface, BYTE value) +{ + return STATUS_NOT_SUPPORTED; +} + static NTSTATUS mouse_physical_effect_control(struct unix_device *iface, BYTE index, USAGE control, BYTE iterations) { @@ -125,6 +130,7 @@ static const struct hid_device_vtbl mouse_vtbl = mouse_stop, mouse_haptics_start, mouse_physical_device_control, + mouse_physical_device_set_gain, mouse_physical_effect_control, mouse_physical_effect_update, }; @@ -183,6 +189,11 @@ static NTSTATUS keyboard_physical_device_control(struct unix_device *iface, USAG return STATUS_NOT_SUPPORTED; } +static NTSTATUS keyboard_physical_device_set_gain(struct unix_device *iface, BYTE value) +{ + return STATUS_NOT_SUPPORTED; +} + static NTSTATUS keyboard_physical_effect_control(struct unix_device *iface, BYTE index, USAGE control, BYTE iterations) { @@ -202,6 +213,7 @@ static const struct hid_device_vtbl keyboard_vtbl = keyboard_stop, keyboard_haptics_start, keyboard_physical_device_control, + keyboard_physical_device_set_gain, keyboard_physical_effect_control, keyboard_physical_effect_update, };

1 0

Rémi Bernon : dinput: Look for the PID device gain output report.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: 9dafac9eca39c79b56de7fca3e4322d69779f3fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=9dafac9eca39c79b56de7fca… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 17 11:51:51 2021 +0100 dinput: Look for the PID device gain output report. Based on a patch from Ivo Ivanov <logos128(a)gmail.com>. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index b1d19c2b57c..00e08e2ef40 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -136,6 +136,13 @@ struct pid_set_ramp_force struct hid_value_caps *end_caps; }; +struct pid_device_gain +{ + BYTE id; + ULONG collection; + struct hid_value_caps *device_gain_caps; +}; + struct hid_joystick { struct dinput_device base; @@ -166,6 +173,7 @@ struct hid_joystick struct pid_set_condition pid_set_condition; struct pid_set_constant_force pid_set_constant_force; struct pid_set_ramp_force pid_set_ramp_force; + struct pid_device_gain pid_device_gain; }; static inline struct hid_joystick *impl_from_IDirectInputDevice8W( IDirectInputDevice8W *iface ) @@ -1551,6 +1559,7 @@ static BOOL init_pid_reports( struct hid_joystick *impl, struct hid_value_caps * struct pid_set_condition *set_condition = &impl->pid_set_condition; struct pid_set_periodic *set_periodic = &impl->pid_set_periodic; struct pid_set_envelope *set_envelope = &impl->pid_set_envelope; + struct pid_device_gain *device_gain = &impl->pid_device_gain; #define SET_COLLECTION( rep ) \ do \ @@ -1581,6 +1590,7 @@ static BOOL init_pid_reports( struct hid_joystick *impl, struct hid_value_caps * case PID_USAGE_SET_CONDITION_REPORT: SET_COLLECTION( set_condition ); break; case PID_USAGE_SET_CONSTANT_FORCE_REPORT: SET_COLLECTION( set_constant_force ); break; case PID_USAGE_SET_RAMP_FORCE_REPORT: SET_COLLECTION( set_ramp_force ); break; + case PID_USAGE_DEVICE_GAIN_REPORT: SET_COLLECTION( device_gain ); break; case PID_USAGE_DEVICE_CONTROL: SET_SUB_COLLECTION( device_control, control_coll ); break; case PID_USAGE_EFFECT_OPERATION: SET_SUB_COLLECTION( effect_control, control_coll ); break; @@ -1610,6 +1620,7 @@ static BOOL init_pid_caps( struct hid_joystick *impl, struct hid_value_caps *cap struct pid_set_condition *set_condition = &impl->pid_set_condition; struct pid_set_periodic *set_periodic = &impl->pid_set_periodic; struct pid_set_envelope *set_envelope = &impl->pid_set_envelope; + struct pid_device_gain *device_gain = &impl->pid_device_gain; if (!(instance->dwType & DIDFT_OUTPUT)) return DIENUM_CONTINUE; @@ -1776,6 +1787,16 @@ static BOOL init_pid_caps( struct hid_joystick *impl, struct hid_value_caps *cap set_ramp_force->end_caps = caps; } } + if (instance->wCollectionNumber == device_gain->collection) + { + SET_REPORT_ID( device_gain ); + if (instance->wUsage == PID_USAGE_DEVICE_GAIN) + { + caps->physical_min = 0; + caps->physical_max = 10000; + device_gain->device_gain_caps = caps; + } + } #undef SET_REPORT_ID @@ -1874,6 +1895,7 @@ HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID *guid, TRACE( "set constant force id %u, coll %u\n", impl->pid_set_constant_force.id, impl->pid_set_constant_force.collection ); TRACE( "set ramp force id %u, coll %u\n", impl->pid_set_ramp_force.id, impl->pid_set_ramp_force.collection ); + TRACE( "device gain id %u, coll %u\n", impl->pid_device_gain.id, impl->pid_device_gain.collection ); if (impl->pid_device_control.id) {

1 0

Ivo Ivanov : dinput: Move set_parameter_value helper around.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: 9dc873ab999c5858b97eac5adfacd550d99bad9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9dc873ab999c5858b97eac5a… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Wed Nov 17 11:51:52 2021 +0100 dinput: Move set_parameter_value helper around. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 00e08e2ef40..0502362de2f 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -674,6 +674,29 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, return DIENUM_CONTINUE; } +static void set_parameter_value( struct hid_joystick_effect *impl, char *report_buf, + struct hid_value_caps *caps, LONG value ) +{ + ULONG report_len = impl->joystick->caps.OutputReportByteLength; + PHIDP_PREPARSED_DATA preparsed = impl->joystick->preparsed; + LONG log_min, log_max, phy_min, phy_max; + NTSTATUS status; + + if (!caps) return; + + log_min = caps->logical_min; + log_max = caps->logical_max; + phy_min = caps->physical_min; + phy_max = caps->physical_max; + + if (value > phy_max || value < phy_min) value = -1; + else value = log_min + (value - phy_min) * (log_max - log_min) / (phy_max - phy_min); + status = HidP_SetUsageValue( HidP_Output, caps->usage_page, caps->link_collection, + caps->usage_min, value, preparsed, report_buf, report_len ); + if (status != HIDP_STATUS_SUCCESS) WARN( "HidP_SetUsageValue %04x:%04x returned %#x\n", + caps->usage_page, caps->usage_min, status ); +} + static void hid_joystick_addref( IDirectInputDevice8W *iface ) { struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); @@ -2632,29 +2655,6 @@ static HRESULT WINAPI hid_joystick_effect_GetEffectStatus( IDirectInputEffect *i return DIERR_UNSUPPORTED; } -static void set_parameter_value( struct hid_joystick_effect *impl, char *report_buf, - struct hid_value_caps *caps, LONG value ) -{ - ULONG report_len = impl->joystick->caps.OutputReportByteLength; - PHIDP_PREPARSED_DATA preparsed = impl->joystick->preparsed; - LONG log_min, log_max, phy_min, phy_max; - NTSTATUS status; - - if (!caps) return; - - log_min = caps->logical_min; - log_max = caps->logical_max; - phy_min = caps->physical_min; - phy_max = caps->physical_max; - - if (value > phy_max || value < phy_min) value = -1; - else value = log_min + (value - phy_min) * (log_max - log_min) / (phy_max - phy_min); - status = HidP_SetUsageValue( HidP_Output, caps->usage_page, caps->link_collection, - caps->usage_min, value, preparsed, report_buf, report_len ); - if (status != HIDP_STATUS_SUCCESS) WARN( "HidP_SetUsageValue %04x:%04x returned %#x\n", - caps->usage_page, caps->usage_min, status ); -} - static void set_parameter_value_us( struct hid_joystick_effect *impl, char *report_buf, struct hid_value_caps *caps, LONG value ) {

1 0