Wine-Devel

By thread

wine-devel@list.winehq.org

June 2019

73 participants
1462 messages

[PATCH] dinput/linuxinput: Remap wheel axes to X, Y, and Z.

by Tim Schumacher

Signed-off-by: Tim Schumacher <timschumi(a)gmx.de> --- dlls/dinput/joystick_linuxinput.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 8d80b34812..fdfbc7f372 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -502,14 +502,18 @@ static JoystickImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput, unsig /* Count number of available axes - supported Axis & POVs */ for (i = 0; i < ABS_MAX; i++) { - if (i < WINE_JOYSTICK_MAX_AXES && + if (idx < WINE_JOYSTICK_MAX_AXES && + i < ABS_HAT0X && test_bit(newDevice->joydev->absbits, i)) { newDevice->generic.device_axis_count++; newDevice->dev_axes_to_di[i] = idx; newDevice->generic.props[idx].lDevMin = newDevice->joydev->axes[i].minimum; newDevice->generic.props[idx].lDevMax = newDevice->joydev->axes[i].maximum; - default_axis_map[idx] = i; + if (i >= 8 && i <= 10) /* If it's a wheel axis... */ + default_axis_map[idx] = i - 8; /* ... remap to X/Y/Z */ + else + default_axis_map[idx] = i; idx++; } else -- 2.21.0

June 1, 2019

Re: [PATCH v6 1/7] ntdll/tests: Move NtAllocateVirtualMemory tests that were in kernel32

by Dmitry Timoshkov

Zebediah Figura <z.figura12(a)gmail.com> wrote: > On 5/31/19 12:03 PM, Dmitry Timoshkov wrote: > > Zebediah Figura <z.figura12(a)gmail.com> wrote: > > > >> On 5/31/19 4:17 AM, Dmitry Timoshkov wrote: > >>> Alexandre Julliard <julliard(a)winehq.org> wrote: > >>> > >>>> Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > >>>> > >>>>> Huw Davies <huw(a)codeweavers.com> wrote: > >>>>> > >>>>>> On Fri, May 31, 2019 at 10:31:10AM +0200, Rémi Bernon wrote: > >>>>>>> Is there a particular reason the tested functions are dynamically > >>>>>>> loaded in some test executables? > >>>>>> > >>>>>> The typical reason would be that the functions are not available on > >>>>>> all of the Windows versions that we test. > >>>>>> > >>>>>> As we retire testing on older Windows versions this can leave us > >>>>>> dynamically loading functions that we need not any more. > >>>>> > >>>>> Another reason is that sometimes PSDK doesn't have an appropriate import > >>>>> library. Alphough it tends to get added in newer PSDK versions, but that's > >>>>> not a good reason to break compilation with older PSDK versions by removing > >>>>> dynamic API loading (some people abuse this very badly recently). > >>>> > >>>> It's not unreasonable to require a recent PSDK, if that makes the code > >>>> simpler. > >>> > >>> Some of my test WMs running Widows XP, some Windows 7, it's pretty questionable > >>> to require installing a Windows 10 SDK there (if it will ever install under XP). > >>> On the other hand a test compiled under Windows 7 won't run under XP. Personally, > >>> I find testing under XP and Windows 7 very valueable, please don't ruin that > >>> ability. > >>> > >> > >> mingw-w64 works quite well for compiling tests to run under XP. > > > > Probably, but using native tools is always preferrable. > > > > Why? As usually: to avoid bugs and incomplete headers/imports. -- Dmitry.

June 1, 2019

Jump to page: