June 2022 - Wine-Devel - list.winehq.org

[PATCH 0/4] MR183: kernelbase: Implement VirtualAlloc2FromApp().

by Nikolay Sivov (＠nsivov)

Also add some tests for three different ways of splitting the region. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/183

June 3, 2022

Re: [PATCH 0/9] MR180: misc: Fixes and workarounds for UAF warnings. (GCC12)

by Hans Leidekker (＠hans)

Hans Leidekker (@hans) commented about dlls/mshtml/tests/misc.c: > hres = IHTMLStorage_getItem(storage, key, &var); > ok(hres == S_OK, "getItem failed: %08lx\n", hres); > ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); > - SysFreeString(key); > + pSysFreeString(key); This SysFreeString() call can be removed instead. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/180#note_1556

June 3, 2022

Re: [PATCH 0/9] MR180: misc: Fixes and workarounds for UAF warnings. (GCC12) - approved

by Andrew Eikum (＠aeikum)

This merge request was approved by Andrew Eikum. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/180

June 3, 2022

Re: [PATCH v3] d2d1: Make ID2D1Device::CreateImageBrush() accept only bitmap as a source image.

by Dmitry Timoshkov

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > On 5/26/22 17:36, Dmitry Timoshkov wrote: > > Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > > > >> On 5/26/22 17:15, Dmitry Timoshkov wrote: > >>> Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > >>> > >>>> On 5/26/22 14:34, Dmitry Timoshkov wrote: > >>>>> Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > >>>>> > >>>>>> On 5/25/22 18:58, Dmitry Timoshkov wrote: > >>>>>>> Dmitry Timoshkov <dmitry(a)baikal.ru> wrote: > >>>>>>> > >>>>>>>> ID2D1Bitmap derives from ID2D1Image, which in turn derives from ID2D1Resource. > >>>>>>>> That means that ID2D1Device::CreateImageBrush() can't be really passed anything > >>>>>>>> but a ID2D1Bitmap* represented as a ID2D1Image*. > >>>>>>>> > >>>>>>>> I've added QueryInterface+FIXME just in case, probably it could be dropped. > >>>>>>>> > >>>>>>>> v2: Fix test crashes with image == NULL. > >>>>>>>> v3: Add a QueryInterface() check to SetImage(). > >>>>>>> Is there anything that could be improved in this patch to make it acceptable? > >>>>>>> Probably I should add once again, that this patch allows a bitmap work as an > >>>>>>> image brush (unlike current broken state) and actually makes work the app that > >>>>>>> have here. > >>>>>>> > >>>>>> Same thing I mention last time - it's backwards. Bitmap brush could > >>>>>> probably be implemented as image brush, but not the other way. I don't > >>>>>> think you'll need any shader changes for that. > >>>>> Do you mean something like the attached patch, or do I miss something? > >>>>> With the attached patch (on top of just sent ::Map()/::Unmap() patches) > >>>>> I get areas filled with black in the application that I'm working on, > >>>>> unlike with the proposed patch where I get correctly filled areas with > >>>>> a proper brush. > >>>>> > >>>> I suspect black color is from this in sample_brush(): > >>>> > >>>> return float4(0.0, 0.0, 0.0, brush.opacity); > >>>> > >>>> Which means you didn't set brush type correctly in the constant buffer. > >>> I also think that's the source of the problem. However that's the shader > >>> code, and you mentioned above that I don't need them to make image brush > >>> work. Or did I misunderstand something? Do you have a suggestion for that? > >>> > >> Brush type is set in d2d_brush_fill_cb(), trying setting it "correctly" > >> to bitmap brush type. > > Thank you very much, setting cb->type to TYPE_BITMAP in the TYPE_IMAGE case > > has fixed painting in my application. Do you think that the patch I attached > > in my previous reply with this fix is an acceptable solution, or there are > > other things you'd like to see addressed? > > > I think we should avoid duplication of bind_bitmap() function, since > it's exactly the same. Probably passing image brush description there, > which could be filled from bitmap brush description, expect for source > rectangle. Thanks for the helpful pointers. Does the attached patch match your suggestions? The patch works prety well with the application that I have here. -- Dmitry.

June 3, 2022

[PATCH 1/1] winex11: Use XKB key names to map key codes to scan codes.

by Timo Zuccarello

From: Timo Zuccarello <timo(a)zuccarello.eu> Use XKB, if available, to map key codes to scan codes using key names instead of using hard coded keyboard layouts. Signed-off-by: Timo Zuccarello <timo(a)zuccarello.eu> --- dlls/winex11.drv/keyboard.c | 311 +++++++++++++++++++++++++++++++++++- 1 file changed, 307 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 7b4ad9acd8d..f70c5c16f2a 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1128,6 +1128,283 @@ static WORD EVENT_event_to_vkey( XIC xic, XKeyEvent *e) return keyc2vkey[e->keycode]; } +/********************************************************************** + * scancode_from_key_name + * + * Maps XKB names to scancodes. + */ +static WORD +scancode_from_key_name( char* keyn ) +{ + /* Comments assume US QWERTY layout. */ + /* These are obtained from the Keyboard Scan Code Specification. */ +#ifdef HAVE_XKB + if (strcmp(keyn, "TLDE") == 0) { /* Tilde */ + return 0x29; + } else if (strcmp(keyn, "AE01") == 0) { /* 1 */ + return 0x02; + } else if (strcmp(keyn, "AE02") == 0) { + return 0x03; + } else if (strcmp(keyn, "AE03") == 0) { + return 0x04; + } else if (strcmp(keyn, "AE04") == 0) { + return 0x05; + } else if (strcmp(keyn, "AE05") == 0) { + return 0x06; + } else if (strcmp(keyn, "AE06") == 0) { + return 0x07; + } else if (strcmp(keyn, "AE07") == 0) { + return 0x08; + } else if (strcmp(keyn, "AE08") == 0) { + return 0x09; + } else if (strcmp(keyn, "AE09") == 0) { /* 9 */ + return 0x0a; + } else if (strcmp(keyn, "AE10") == 0) { /* 0 */ + return 0x0b; + } else if (strcmp(keyn, "AE11") == 0) { /* Minus */ + return 0x0c; + } else if (strcmp(keyn, "AE12") == 0) { /* Equals */ + return 0x0d; + } else if (strcmp(keyn, "BKSP") == 0) { /* Backspace */ + return 0x0e; + } else if (strcmp(keyn, "TAB") == 0) { /* Tab */ + return 0x0f; + } else if (strcmp(keyn, "AD01") == 0) { /* Q */ + return 0x10; + } else if (strcmp(keyn, "AD02") == 0) { + return 0x11; + } else if (strcmp(keyn, "AD03") == 0) { + return 0x12; + } else if (strcmp(keyn, "AD04") == 0) { + return 0x13; + } else if (strcmp(keyn, "AD05") == 0) { + return 0x14; + } else if (strcmp(keyn, "AD06") == 0) { + return 0x15; + } else if (strcmp(keyn, "AD07") == 0) { + return 0x16; + } else if (strcmp(keyn, "AD08") == 0) { + return 0x17; + } else if (strcmp(keyn, "AD09") == 0) { + return 0x18; + } else if (strcmp(keyn, "AD10") == 0) { + return 0x19; + } else if (strcmp(keyn, "AD11") == 0) { /* Left Bracket */ + return 0x1a; + } else if (strcmp(keyn, "AD12") == 0) { /* Right Bracket */ + return 0x1b; + } else if (strcmp(keyn, "BKSL") == 0) { /* Backslash (See key 29 in Scancode Specification.) */ + return 0x2b; + } else if (strcmp(keyn, "CAPS") == 0) { /* Caps Lock */ + return 0x3a; + } else if (strcmp(keyn, "AC01") == 0) { /* A */ + return 0x1e; + } else if (strcmp(keyn, "AC02") == 0) { + return 0x1f; + } else if (strcmp(keyn, "AC03") == 0) { + return 0x20; + } else if (strcmp(keyn, "AC04") == 0) { + return 0x21; + } else if (strcmp(keyn, "AC05") == 0) { + return 0x22; + } else if (strcmp(keyn, "AC06") == 0) { + return 0x23; + } else if (strcmp(keyn, "AC07") == 0) { + return 0x24; + } else if (strcmp(keyn, "AC08") == 0) { + return 0x25; + } else if (strcmp(keyn, "AC09") == 0) { /* L */ + return 0x26; + } else if (strcmp(keyn, "AC10") == 0) { /* Semicolon */ + return 0x27; + } else if (strcmp(keyn, "AC11") == 0) { /* Apostrophe */ + return 0x28; + } else if (strcmp(keyn, "AC12") == 0) { /* Key on international keyboards left of enter. + (See key 42 in Scancode specification.) */ + return 0x2B; + } else if (strcmp(keyn, "RTRN") == 0) { /* Enter */ + return 0x1c; + } else if (strcmp(keyn, "LFSH") == 0) { /* Left Shift */ + return 0x2a; + } else if (strcmp(keyn, "LSGT") == 0) { /* <> key (See key 45 in Scancode specification.) */ + return 0x56; + } else if (strcmp(keyn, "AB01") == 0) { /* Z */ + return 0x2c; + } else if (strcmp(keyn, "AB02") == 0) { /* X */ + return 0x2d; + } else if (strcmp(keyn, "AB03") == 0) { + return 0x2e; + } else if (strcmp(keyn, "AB04") == 0) { + return 0x2f; + } else if (strcmp(keyn, "AB05") == 0) { + return 0x30; + } else if (strcmp(keyn, "AB06") == 0) { + return 0x31; + } else if (strcmp(keyn, "AB07") == 0) { + return 0x32; + } else if (strcmp(keyn, "AB08") == 0) { /* Comma */ + return 0x33; + } else if (strcmp(keyn, "AB09") == 0) { /* Period */ + return 0x34; + } else if (strcmp(keyn, "AB10") == 0) { /* Slash */ + return 0x35; + } else if (strcmp(keyn, "AB11") == 0) { /* Brazilian key (See key 56 in Scancode specification.) */ + return 0x73; + } else if (strcmp(keyn, "RTSH") == 0) { /* Right Shift */ + return 0x36; + } else if (strcmp(keyn, "LCTL") == 0) { /* Left Control */ + return 0x1d; + } else if (strcmp(keyn, "LALT") == 0) { /* Left Alt */ + return 0x38; + } else if (strcmp(keyn, "SPCE") == 0) { /* Space */ + return 0x39; + } else if (strcmp(keyn, "RALT") == 0) { /* Right Alt */ + return 0x138; + } else if (strcmp(keyn, "LVL3") == 0) { /* More names of Right Alt */ + return 0x138; + } else if (strcmp(keyn, "MDSW") == 0) { /* More names of Right Alt */ + return 0x138; + } else if (strcmp(keyn, "ALGR") == 0) { /* More names of Right Alt */ + return 0x138; + } else if (strcmp(keyn, "RCTL") == 0) { /* Right Control */ + return 0x11d; + } else if (strcmp(keyn, "INS") == 0) { /* Insert */ + return 0x152; + } else if (strcmp(keyn, "DELE") == 0) { /* Delete */ + return 0x153; + } else if (strcmp(keyn, "LEFT") == 0) { /* Left Arrow */ + return 0x14b; + } else if (strcmp(keyn, "HOME") == 0) { /* Home */ + return 0x147; + } else if (strcmp(keyn, "END") == 0) { /* End */ + return 0x14f; + } else if (strcmp(keyn, "UP") == 0) { /* Up Arrow */ + return 0x148; + } else if (strcmp(keyn, "DOWN") == 0) { /* Down Arrow */ + return 0x150; + } else if (strcmp(keyn, "PGUP") == 0) { /* Page Up */ + return 0x149; + } else if (strcmp(keyn, "PGDN") == 0) { /* Page Down */ + return 0x151; + } else if (strcmp(keyn, "RGHT") == 0) { /* Right Arrow */ + return 0x14d; + } else if (strcmp(keyn, "NMLK") == 0) { /* Num Lock */ + return 0x45; + } else if (strcmp(keyn, "KP7") == 0) { + return 0x47; + } else if (strcmp(keyn, "KP4") == 0) { + return 0x4b; + } else if (strcmp(keyn, "KP1") == 0) { + return 0x4f; + } else if (strcmp(keyn, "KPDV") == 0) { /* Numeric / */ + return 0x00; + } else if (strcmp(keyn, "KP8") == 0) { + return 0x48; + } else if (strcmp(keyn, "KP5") == 0) { + return 0x4c; + } else if (strcmp(keyn, "KP2") == 0) { + return 0x50; + } else if (strcmp(keyn, "KP0") == 0) { + return 0x52; + } else if (strcmp(keyn, "KPMU") == 0) { /* Numeric * */ + return 0x37; + } else if (strcmp(keyn, "KP9") == 0) { /* Numeric 9 */ + return 0x49; + } else if (strcmp(keyn, "KP6") == 0) { /* Numeric 6 */ + return 0x4d; + } else if (strcmp(keyn, "KP3") == 0) { /* Numeric 3 */ + return 0x51; + } else if (strcmp(keyn, "KPDL") == 0) { /* Numeric . */ + return 0x53; + } else if (strcmp(keyn, "KPCO") == 0) { /* Numeric . */ + return 0x53; + } else if (strcmp(keyn, "KPSU") == 0) { /* Numeric - */ + return 0x4a; + } else if (strcmp(keyn, "KPAD") == 0) { /* Numeric + */ + return 0x4e; + } else if (strcmp(keyn, "KPEQ") == 0) { + return 0x00; + } else if (strcmp(keyn, "KPEN") == 0) { /* Numeric Enter */ + return 0x11c; + } else if (strcmp(keyn, "ESC") == 0) { /* Escape */ + return 0x01; + } else if (strcmp(keyn, "FK01") == 0) { /* F1 */ + return 0x3b; + } else if (strcmp(keyn, "FK02") == 0) { + return 0x3c; + } else if (strcmp(keyn, "FK03") == 0) { + return 0x3d; + } else if (strcmp(keyn, "FK04") == 0) { + return 0x3e; + } else if (strcmp(keyn, "FK05") == 0) { + return 0x3f; + } else if (strcmp(keyn, "FK06") == 0) { + return 0x40; + } else if (strcmp(keyn, "FK07") == 0) { + return 0x41; + } else if (strcmp(keyn, "FK08") == 0) { + return 0x42; + } else if (strcmp(keyn, "FK09") == 0) { + return 0x43; + } else if (strcmp(keyn, "FK10") == 0) { + return 0x44; + } else if (strcmp(keyn, "FK11") == 0) { + return 0x57; + } else if (strcmp(keyn, "FK12") == 0) { /* F12 */ + return 0x58; + } else if (strcmp(keyn, "FK13") == 0) { /* F13 */ + return 0x00; + } else if (strcmp(keyn, "FK14") == 0) { + return 0x00; + } else if (strcmp(keyn, "FK15") == 0) { + return 0x00; + } else if (strcmp(keyn, "FK16") == 0) { + return 0x00; + } else if (strcmp(keyn, "FK17") == 0) { + return 0x00; + } else if (strcmp(keyn, "FK18") == 0) { + return 0x00; + } else if (strcmp(keyn, "FK19") == 0) { + return 0x00; + } else if (strcmp(keyn, "FK20") == 0) { + return 0x00; + } else if (strcmp(keyn, "FK21") == 0) { + return 0x00; + } else if (strcmp(keyn, "FK22") == 0) { + return 0x00; + } else if (strcmp(keyn, "FK23") == 0) { + return 0x00; + } else if (strcmp(keyn, "FK24") == 0) { + return 0x00; + } else if (strcmp(keyn, "FK25") == 0) { /* F25 */ + return 0x00; + } else if (strcmp(keyn, "PRSC") == 0) { + return 0x00; + } else if (strcmp(keyn, "SCLK") == 0) { + return 0x46; + } else if (strcmp(keyn, "PAUS") == 0) { + return 0x45; + } else if (strcmp(keyn, "LWIN") == 0) { + return 0x15b; + } else if (strcmp(keyn, "RWIN") == 0) { + return 0x15c; + } else if (strcmp(keyn, "MENU") == 0) { + return 0x15d; + } else if (strcmp(keyn, "POWR") == 0) { + return 0x15e; + } else if (strcmp(keyn, "KATA") == 0) { /* Katakana */ + return 0x70; + } else if (strcmp(keyn, "XFER") == 0) { /* Convert/Henkan */ + return 0x79; + } else if (strcmp(keyn, "NFER") == 0) { /* Non Convert/Muhenkan */ + return 0x7b; + } else { + return 0x00; + } +#else + return 0x00; +#endif +} /*********************************************************************** * X11DRV_send_keyboard_input @@ -1594,6 +1871,9 @@ void X11DRV_InitKeyboard( Display *display ) { 0, 0 } }; int vkey_range; +#ifdef HAVE_XKB + XkbDescPtr kb_desc; +#endif pthread_mutex_lock( &kbd_mutex ); XDisplayKeycodes(display, &min_keycode, &max_keycode); @@ -1641,6 +1921,14 @@ void X11DRV_InitKeyboard( Display *display ) e2.type = KeyPress; memset(keyc2vkey, 0, sizeof(keyc2vkey)); +#ifdef HAVE_XKB + kb_desc = XkbGetMap(display, 0, XkbUseCoreKbd); + if (use_xkb) + { + /* Allocate and fill the keycode-name map. */ + XkbGetNames(display, XkbKeyNamesMask, kb_desc); + } +#endif for (keyc = min_keycode; keyc <= max_keycode; keyc++) { char buf[30]; @@ -1652,20 +1940,32 @@ void X11DRV_InitKeyboard( Display *display ) vkey = 0; scan = 0; if (keysym) /* otherwise, keycode not used */ { +#ifdef HAVE_XKB + if (use_xkb) + { + /* Returned key name may not be null-terminated, if it is exactly XkbKeyNameLength long, add a null to be sure. */ + char keyn[XkbKeyNameLength+1]; + memset(keyn, 0, XkbKeyNameLength+1); + memcpy(keyn, kb_desc->names->keys[keyc].name, XkbKeyNameLength); + + /* Translate key name to a scan code. */ + scan = scancode_from_key_name(keyn); + } +#endif if ((keysym >> 8) == 0xFF) /* non-character key */ { vkey = nonchar_key_vkey[keysym & 0xff]; - scan = nonchar_key_scan[keysym & 0xff]; + scan = scan ? scan : nonchar_key_scan[keysym & 0xff]; /* set extended bit when necessary */ if (scan & 0x100) vkey |= 0x100; } else if ((keysym >> 8) == 0x1008FF) { /* XFree86 vendor keys */ vkey = xfree86_vendor_key_vkey[keysym & 0xff]; /* All vendor keys are extended with a scan code of 0 per testing on WinXP */ - scan = 0x100; + scan = scan ? scan : 0x100; vkey |= 0x100; } else if (keysym == 0x20) { /* Spacebar */ vkey = VK_SPACE; - scan = 0x39; + scan = scan ? scan : 0x39; } else if (have_chars) { /* we seem to need to search the layout-dependent scancodes */ int maxlen=0,maxval=-1,ok; @@ -1701,7 +2001,7 @@ void X11DRV_InitKeyboard( Display *display ) /* got it */ const WORD (*lscan)[MAIN_LEN] = main_key_tab[kbd_layout].scan; const WORD (*lvkey)[MAIN_LEN] = main_key_tab[kbd_layout].vkey; - scan = (*lscan)[maxval]; + scan = scan ? scan : (*lscan)[maxval]; vkey = (*lvkey)[maxval]; } } @@ -1714,6 +2014,9 @@ void X11DRV_InitKeyboard( Display *display ) vkey_used[(vkey & 0xff)] = 1; } /* for */ +#ifdef HAVE_XKB + XkbFreeClientMap(kb_desc, 0, TRUE); +#endif #define VKEY_IF_NOT_USED(vkey) (vkey_used[(vkey)] ? 0 : (vkey_used[(vkey)] = 1, (vkey))) for (keyc = min_keycode; keyc <= max_keycode; keyc++) { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/182

June 3, 2022

[PATCH 0/1] MR182: winex11: Use XKB key names to map key codes to scan codes.

by Timo Zuccarello (＠timozuccarello)

Resubmitted as MR, the original patch was https://source.winehq.org/patches/data/232032 (not assigned yet). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/182

June 3, 2022

[PATCH 1/1] winebus: Optionally split joysticks with more than 6 axes.

by Timo Zuccarello

From: Timo Zuccarello <timo(a)zuccarello.eu> Add registry option "Split Controllers" and optionally split joysticks with more than 6 axes to improve compatibility with applications that do not support more than 6 axes where on Windows a driver would be installed that splits the device. Signed-off-by: Timo Zuccarello <timo(a)zuccarello.eu> --- dlls/winebus.sys/bus_sdl.c | 88 ++++++++++++++++++++++++++++++++------ dlls/winebus.sys/main.c | 3 ++ dlls/winebus.sys/unixlib.h | 2 + 3 files changed, 81 insertions(+), 12 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index a5621972493..98dfda560ec 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -28,6 +28,7 @@ #include <fcntl.h> #include <stdarg.h> #include <stdlib.h> +#include <stdio.h> #include <unistd.h> #include <sys/types.h> #include <dlfcn.h> @@ -143,6 +144,7 @@ struct sdl_device int effect_ids[256]; int effect_state[256]; LONG effect_flags; + int axis_offset; }; static inline struct sdl_device *impl_from_unix_device(struct unix_device *iface) @@ -155,7 +157,17 @@ static struct sdl_device *find_device_from_id(SDL_JoystickID id) struct sdl_device *impl; LIST_FOR_EACH_ENTRY(impl, &device_list, struct sdl_device, unix_device.entry) - if (impl->id == id) return impl; + if (impl->id == id && impl->axis_offset == 0) return impl; + + return NULL; +} + +static struct sdl_device *find_device_from_id_and_offset(SDL_JoystickID id, unsigned int offset) +{ + struct sdl_device *impl; + + LIST_FOR_EACH_ENTRY(impl, &device_list, struct sdl_device, unix_device.entry) + if (impl->id == id && impl->axis_offset == offset) return impl; return NULL; } @@ -185,7 +197,8 @@ static BOOL descriptor_add_haptic(struct sdl_device *impl) USAGE usages[16]; if (!pSDL_JoystickIsHaptic(impl->sdl_joystick) || - !(impl->sdl_haptic = pSDL_HapticOpenFromJoystick(impl->sdl_joystick))) + !(impl->sdl_haptic = pSDL_HapticOpenFromJoystick(impl->sdl_joystick)) || + impl->axis_offset > 0) impl->effect_support = 0; else { @@ -196,7 +209,7 @@ static BOOL descriptor_add_haptic(struct sdl_device *impl) impl->effect_support |= WINE_SDL_HAPTIC_RUMBLE; } - if (pSDL_JoystickRumble && !pSDL_JoystickRumble(impl->sdl_joystick, 0, 0, 0)) + if (pSDL_JoystickRumble && !pSDL_JoystickRumble(impl->sdl_joystick, 0, 0, 0) && impl->axis_offset == 0) impl->effect_support |= WINE_SDL_JOYSTICK_RUMBLE; if (impl->effect_support & EFFECT_SUPPORT_HAPTICS) @@ -262,6 +275,17 @@ static NTSTATUS build_joystick_report_descriptor(struct unix_device *iface) USAGE_AND_PAGE physical_usage; axis_count = pSDL_JoystickNumAxes(impl->sdl_joystick); + if (options.split_controllers && axis_count > 6) + { + if (impl->axis_offset == axis_count / 6) + { + axis_count = axis_count % 6; + } + else + { + axis_count = 6; + } + } if (axis_count > ARRAY_SIZE(absolute_usages)) { FIXME("More than %zu absolute axes found, ignoring.\n", ARRAY_SIZE(absolute_usages)); @@ -275,8 +299,16 @@ static NTSTATUS build_joystick_report_descriptor(struct unix_device *iface) ball_count = ARRAY_SIZE(relative_usages) / 2; } - hat_count = pSDL_JoystickNumHats(impl->sdl_joystick); - button_count = pSDL_JoystickNumButtons(impl->sdl_joystick); + if (impl->axis_offset == 0) + { + hat_count = pSDL_JoystickNumHats(impl->sdl_joystick); + button_count = pSDL_JoystickNumButtons(impl->sdl_joystick); + } + else + { + hat_count = 0; + button_count = 0; + } if (!pSDL_JoystickGetType) physical_usage = device_usage; else switch (pSDL_JoystickGetType(impl->sdl_joystick)) @@ -904,6 +936,8 @@ static void sdl_add_device(unsigned int index) SDL_GameController *controller = NULL; const char *str; char guid_str[33]; + int i; + int axis_count = 0; if ((joystick = pSDL_JoystickOpen(index)) == NULL) { @@ -939,7 +973,7 @@ static void sdl_add_device(unsigned int index) if (controller) desc.is_gamepad = TRUE; else { - int button_count, axis_count; + int button_count; axis_count = pSDL_JoystickNumAxes(joystick); button_count = pSDL_JoystickNumButtons(joystick); @@ -948,19 +982,41 @@ static void sdl_add_device(unsigned int index) TRACE("%s id %d, desc %s.\n", controller ? "controller" : "joystick", id, debugstr_device_desc(&desc)); - if (!(impl = hid_device_create(&sdl_device_vtbl, sizeof(struct sdl_device)))) return; - list_add_tail(&device_list, &impl->unix_device.entry); - impl->sdl_joystick = joystick; - impl->sdl_controller = controller; - impl->id = id; + i = 0; + do { + if (!(impl = hid_device_create(&sdl_device_vtbl, sizeof(struct sdl_device)))) return; + list_add_tail(&device_list, &impl->unix_device.entry); + impl->sdl_joystick = joystick; + impl->sdl_controller = controller; + impl->id = id; + impl->axis_offset = i; - bus_event_queue_device_created(&event_queue, &impl->unix_device, &desc); + if (i != 0) + { + char offset_name[12]; + int offset_name_length = snprintf(NULL, 0, " %d", i+1); + /* If there is not enough place to append " %d" replace some of the last characters. */ + int offset_name_start = min(strlen(str), ARRAY_SIZE(desc.product) - 1 - offset_name_length); + /* Ensure we only write in desc.product and not past it. + * Otherwise just keep the name as is. */ + if (offset_name_length < 12 && offset_name_start >= 0 && offset_name_start + offset_name_length < ARRAY_SIZE(desc.product)) + { + snprintf(offset_name, 12, " %d", i+1); + ntdll_umbstowcs(offset_name, 12, desc.product + offset_name_start, 12); + } + TRACE("%s id %d, split for axis %d-%d.\n", controller ? "controller" : "joystick", id, 6*i, min(axis_count, 6*(i+1)-1)); + } + + bus_event_queue_device_created(&event_queue, &impl->unix_device, &desc); + ++i; + } while (options.split_controllers && !desc.is_gamepad && 6*i < axis_count); } static void process_device_event(SDL_Event *event) { struct sdl_device *impl; SDL_JoystickID id; + int axis_offset = 0; TRACE("Received action %x\n", event->type); @@ -979,6 +1035,14 @@ static void process_device_event(SDL_Event *event) { id = ((SDL_JoyButtonEvent *)event)->which; impl = find_device_from_id(id); + if (impl && options.split_controllers && event->type == SDL_JOYAXISMOTION) { + axis_offset = ((SDL_JoyAxisEvent *)event)->axis / 6; + if (axis_offset > 0) + { + ((SDL_JoyAxisEvent*)event)->axis = ((SDL_JoyAxisEvent*)event)->axis % 6; + impl = find_device_from_id_and_offset(id, axis_offset); + } + } if (impl) set_report_from_joystick_event(impl, event); else WARN("failed to find device with id %d\n", id); } diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 4588fee1b02..80a6da22496 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -720,6 +720,9 @@ static NTSTATUS sdl_driver_init(void) }; NTSTATUS status; + bus_options.split_controllers = check_bus_option(L"Split Controllers", 0); + if (bus_options.split_controllers) TRACE("SDL controller splitting enabled\n"); + bus_options.map_controllers = check_bus_option(L"Map Controllers", 1); if (!bus_options.map_controllers) TRACE("SDL controller to XInput HID gamepad mapping disabled\n"); sdl_bus_load_mappings(&bus_options); diff --git a/dlls/winebus.sys/unixlib.h b/dlls/winebus.sys/unixlib.h index a84a3331a25..c20d234c9ec 100644 --- a/dlls/winebus.sys/unixlib.h +++ b/dlls/winebus.sys/unixlib.h @@ -38,6 +38,7 @@ struct device_desc UINT input; UINT uid; BOOL is_gamepad; + UINT axis_offset; WCHAR manufacturer[MAX_PATH]; WCHAR product[MAX_PATH]; @@ -47,6 +48,7 @@ struct device_desc struct sdl_bus_options { BOOL map_controllers; + BOOL split_controllers; /* freed after bus_init */ UINT mappings_count; char **mappings; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/181

June 3, 2022

[PATCH 0/1] MR181: winebus: Optionally split joysticks with more than 6 axes.

by Timo Zuccarello (＠timozuccarello)

Add registry option "Split Controllers" and optionally split joysticks with more than 6 axes to improve compatibility with applications that do not support more than 6 axes where on Windows a driver would be installed that splits the device. Signed-off-by: Timo Zuccarello <timo(a)zuccarello.eu> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/181

June 3, 2022

Re: [PATCH 9/9] server: Avoid using pointer value after realloc.

by Rémi Bernon

On 6/3/22 11:39, Dmitry Timoshkov wrote: > Rémi Bernon <wine(a)gitlab.winehq.org> wrote: > >> - char *buf, *cur, *tmp; >> + char *buf, *cur; >> int count = 0, buf_size = 16 * sizeof(struct hardware_msg_data); >> >> if (!req->buffer_size) buf = NULL; >> @@ -3373,13 +3373,13 @@ DECL_HANDLER(get_rawinput_buffer) >> if (cur + data->size > buf + buf_size) >> { >> buf_size += buf_size / 2 + extra_size; >> - if (!(tmp = realloc( buf, buf_size ))) >> + cur = (char *)(cur - buf); >> + if (!(buf = realloc( buf, buf_size ))) >> { >> set_error( STATUS_NO_MEMORY ); >> return; >> } >> - cur = tmp + (cur - buf); >> - buf = tmp; >> + cur = buf + (size_t)cur; >> } > > Reusing 'cur' as an offset doesn't look very elegant to me. Perhaps > a new variable to hold the offset could be more appropriate here? > I actually agree, I considered renaming the variable to "pos", which could maybe do better as both a position or an offset in the buffer, but maybe changing the code to use buf + offset everywhere would be better. It was a bigger diff though, so it made the change less obvious. -- Rémi Bernon <rbernon(a)codeweavers.com>

June 3, 2022

Re: [PATCH 9/9] server: Avoid using pointer value after realloc.

by Dmitry Timoshkov

Rémi Bernon <wine(a)gitlab.winehq.org> wrote: > - char *buf, *cur, *tmp; > + char *buf, *cur; > int count = 0, buf_size = 16 * sizeof(struct hardware_msg_data); > > if (!req->buffer_size) buf = NULL; > @@ -3373,13 +3373,13 @@ DECL_HANDLER(get_rawinput_buffer) > if (cur + data->size > buf + buf_size) > { > buf_size += buf_size / 2 + extra_size; > - if (!(tmp = realloc( buf, buf_size ))) > + cur = (char *)(cur - buf); > + if (!(buf = realloc( buf, buf_size ))) > { > set_error( STATUS_NO_MEMORY ); > return; > } > - cur = tmp + (cur - buf); > - buf = tmp; > + cur = buf + (size_t)cur; > } Reusing 'cur' as an offset doesn't look very elegant to me. Perhaps a new variable to hold the offset could be more appropriate here? -- Dmitry.

June 3, 2022