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

Rémi Bernon : kernel32: Use RtlGetUserInfoHeap in GlobalHandle.
by Alexandre Julliard June 10, 2022

June 10, 2022

Module: wine Branch: master Commit: 5e32cad36c0e9ef5c6d3b2fc33651b2c5e0a7a72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e32cad36c0e9ef5c6d3b2fc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 30 22:51:50 2022 +0200 kernel32: Use RtlGetUserInfoHeap in GlobalHandle. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/heap.c | 10 ++++++++-- dlls/kernel32/tests/heap.c | 8 ++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index df094c94257..c1074e70e2e 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -47,6 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(globalmem); static HANDLE systemHeap; /* globally shared heap */ +BOOLEAN WINAPI RtlGetUserInfoHeap( HANDLE handle, ULONG flags, void *ptr, void **user_value, ULONG *user_flags ); /*********************************************************************** * HEAP_CreateSystemHeap @@ -171,7 +172,6 @@ C_ASSERT(sizeof(struct mem_entry) == 2 * sizeof(void *)); struct kernelbase_global_data *kernelbase_global_data; -#define POINTER_TO_HANDLE( p ) (*(((const HGLOBAL *)( p )) - 2)) /* align the storage needed for the HLOCAL on an 8-byte boundary thus * LocalAlloc/LocalReAlloc'ing with LMEM_MOVEABLE of memory with * size = 8*k, where k=1,2,3,... allocs exactly the given size. @@ -255,6 +255,7 @@ HGLOBAL WINAPI GlobalHandle( const void *ptr ) struct mem_entry *mem; HGLOBAL handle; LPCVOID test; + ULONG flags; TRACE_(globalmem)( "ptr %p\n", ptr ); @@ -279,7 +280,12 @@ HGLOBAL WINAPI GlobalHandle( const void *ptr ) handle = (HGLOBAL)ptr; /* valid fixed block */ break; } - handle = POINTER_TO_HANDLE( ptr ); + if (!RtlGetUserInfoHeap( GetProcessHeap(), HEAP_NO_SERIALIZE, (char *)ptr - HLOCAL_STORAGE, &handle, &flags )) + { + SetLastError( ERROR_INVALID_HANDLE ); + handle = 0; + } + break; } else handle = (HGLOBAL)ptr; diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 339921b83c3..ec2fe7479ca 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1494,6 +1494,8 @@ static void test_GlobalAlloc(void) ptr = GlobalLock( mem ); ok( !!ptr, "GlobalLock failed, error %lu\n", GetLastError() ); ok( ptr != mem, "got unexpected ptr %p\n", ptr ); + tmp_mem = GlobalHandle( ptr ); + ok( tmp_mem == mem, "GlobalHandle returned unexpected handle\n" ); flags = GlobalFlags( mem ); ok( flags == 1, "GlobalFlags returned %#x, error %lu\n", flags, GetLastError() ); tmp_ptr = GlobalLock( mem ); @@ -1698,6 +1700,8 @@ static void test_GlobalAlloc(void) ok( !!mem, "GlobalAlloc failed, error %lu\n", GetLastError() ); ret = GlobalUnlock( mem ); ok( ret, "GlobalUnlock failed, error %lu\n", GetLastError() ); + tmp_mem = GlobalHandle( mem ); + ok( tmp_mem == mem, "GlobalHandle returned unexpected handle\n" ); mem = GlobalFree( mem ); ok( !mem, "GlobalFree failed, error %lu\n", GetLastError() ); @@ -1867,6 +1871,8 @@ static void test_LocalAlloc(void) ptr = LocalLock( mem ); ok( !!ptr, "LocalLock failed, error %lu\n", GetLastError() ); ok( ptr != mem, "got unexpected ptr %p\n", ptr ); + tmp_mem = LocalHandle( ptr ); + ok( tmp_mem == mem, "LocalHandle returned unexpected handle\n" ); flags = LocalFlags( mem ); ok( flags == 1, "LocalFlags returned %#x, error %lu\n", flags, GetLastError() ); tmp_ptr = LocalLock( mem ); @@ -2030,6 +2036,8 @@ static void test_LocalAlloc(void) ret = LocalUnlock( mem ); ok( !ret, "LocalUnlock succeeded\n" ); ok( GetLastError() == ERROR_NOT_LOCKED, "got error %lu\n", GetLastError() ); + tmp_mem = LocalHandle( mem ); + ok( tmp_mem == mem, "LocalHandle returned unexpected handle\n" ); mem = LocalFree( mem ); ok( !mem, "LocalFree failed, error %lu\n", GetLastError() );

1 0

Rémi Bernon : dinput/tests: Run mouse info tests for every dinput version.
by Alexandre Julliard June 10, 2022

June 10, 2022

Module: wine Branch: master Commit: fd46b4bb48a603ad13fd8a82d198d575141d2c71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd46b4bb48a603ad13fd8a82… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 2 10:37:31 2022 +0200 dinput/tests: Run mouse info tests for every dinput version. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/device8.c | 82 ++++++++++++++++++++++++++++++++--------- dlls/dinput/tests/mouse.c | 90 --------------------------------------------- 2 files changed, 65 insertions(+), 107 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fd46b4bb48a603ad13fd…

1 0

Zebediah Figura : user32: Use registry APIs to enumerate raw input devices.
by Alexandre Julliard June 10, 2022

June 10, 2022

Module: wine Branch: master Commit: b0731f6e7e281620fe6e6b809ea84be72ea77b9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0731f6e7e281620fe6e6b80… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 15 12:31:09 2022 -0500 user32: Use registry APIs to enumerate raw input devices. --- dlls/user32/rawinput.c | 119 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 84 insertions(+), 35 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 3750332c0cf..ab542956f11 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -30,18 +30,13 @@ #include "winnls.h" #include "winreg.h" #include "winuser.h" -#include "setupapi.h" +#include "ddk/hidclass.h" #include "wine/debug.h" #include "wine/server.h" #include "wine/hid.h" #include "user_private.h" -#include "initguid.h" -#include "ddk/hidclass.h" -#include "ntddmou.h" -#include "ntddkbd.h" - WINE_DEFAULT_DEBUG_CHANNEL(rawinput); struct device @@ -92,40 +87,47 @@ static BOOL array_reserve(void **elements, unsigned int *capacity, unsigned int return TRUE; } -static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, DWORD type ) +static ULONG query_reg_value( HKEY hkey, const WCHAR *name, + KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size ) { + unsigned int name_size = name ? lstrlenW( name ) * sizeof(WCHAR) : 0; + UNICODE_STRING nameW = { name_size, name_size, (WCHAR *)name }; + + if (NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, + info, size, &size )) + return 0; + + return size - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); +} + +static struct device *add_device( HKEY key, DWORD type ) +{ + static const WCHAR symbolic_linkW[] = {'S','y','m','b','o','l','i','c','L','i','n','k',0}; + char value_buffer[4096]; + KEY_VALUE_PARTIAL_INFORMATION *value = (KEY_VALUE_PARTIAL_INFORMATION *)value_buffer; static const RID_DEVICE_INFO_KEYBOARD keyboard_info = {0, 0, 1, 12, 3, 101}; static const RID_DEVICE_INFO_MOUSE mouse_info = {1, 5, 0, FALSE}; - SP_DEVINFO_DATA device_data = {sizeof(device_data)}; struct hid_preparsed_data *preparsed = NULL; - SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail; HID_COLLECTION_INFORMATION hid_info; struct device *device = NULL; RID_DEVICE_INFO info; IO_STATUS_BLOCK io; WCHAR *path, *pos; NTSTATUS status; + unsigned int i; UINT32 handle; - DWORD i, size; HANDLE file; - SetupDiGetDeviceInterfaceDetailW(set, iface, NULL, 0, &size, &device_data); - if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + if (!query_reg_value( key, symbolic_linkW, value, sizeof(value_buffer) )) { - ERR("Failed to get device path, error %#lx.\n", GetLastError()); - return FALSE; + ERR( "failed to get symbolic link value\n" ); + return NULL; } - if (!(detail = malloc(size))) - { - ERR("Failed to allocate memory.\n"); - return FALSE; - } - detail->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W); - SetupDiGetDeviceInterfaceDetailW(set, iface, detail, size, NULL, NULL); - path = wcsdup( detail->DevicePath ); - free( detail ); - if (!path) return NULL; + if (!(path = malloc( value->DataLength + sizeof(WCHAR) ))) + return NULL; + memcpy( path, value->Data, value->DataLength ); + path[value->DataLength / sizeof(WCHAR)] = 0; /* upper case everything but the GUID */ for (pos = path; *pos && *pos != '{'; pos++) *pos = towupper(*pos); @@ -234,18 +236,65 @@ fail: return NULL; } -static void enumerate_devices( DWORD type, const GUID *guid ) +static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) { - SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; - HDEVINFO set; - DWORD idx; + UNICODE_STRING nameW = { name_len, name_len, (WCHAR *)name }; + OBJECT_ATTRIBUTES attr; + HANDLE ret; + + attr.Length = sizeof(attr); + attr.RootDirectory = root; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + if (NtOpenKeyEx( &ret, MAXIMUM_ALLOWED, &attr, 0 )) return 0; + return ret; +} - set = SetupDiGetClassDevsW( guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT ); +static const WCHAR device_classesW[] = L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\DeviceClasses\\"; +static const WCHAR guid_devinterface_hidW[] = L"{4d1e55b2-f16f-11cf-88cb-001111000030}"; +static const WCHAR guid_devinterface_keyboardW[] = L"{884b96c3-56ef-11d1-bc8c-00a0c91405dd}"; +static const WCHAR guid_devinterface_mouseW[] = L"{378de44c-56ef-11d1-bc8c-00a0c91405dd}"; - for (idx = 0; SetupDiEnumDeviceInterfaces( set, NULL, &GUID_DEVINTERFACE_HID, idx, &iface); ++idx ) - add_device( set, &iface, type ); +static void enumerate_devices( DWORD type, const WCHAR *class ) +{ + WCHAR buffer[1024]; + KEY_NODE_INFORMATION *subkey_info = (void *)buffer; + HKEY class_key, device_key, iface_key; + unsigned int i, j; + DWORD size; + + wcscpy( buffer, device_classesW ); + wcscat( buffer, class ); + if (!(class_key = reg_open_key( NULL, buffer, wcslen( buffer ) * sizeof(WCHAR) ))) + return; + + for (i = 0; !NtEnumerateKey( class_key, i, KeyNodeInformation, buffer, sizeof(buffer), &size ); ++i) + { + if (!(device_key = reg_open_key( class_key, subkey_info->Name, subkey_info->NameLength ))) + { + ERR( "failed to open %s\n", debugstr_wn(subkey_info->Name, subkey_info->NameLength / sizeof(WCHAR)) ); + continue; + } + + for (j = 0; !NtEnumerateKey( device_key, j, KeyNodeInformation, buffer, sizeof(buffer), &size ); ++j) + { + if (!(iface_key = reg_open_key( device_key, subkey_info->Name, subkey_info->NameLength ))) + { + ERR( "failed to open %s\n", debugstr_wn(subkey_info->Name, subkey_info->NameLength / sizeof(WCHAR)) ); + continue; + } + + add_device( iface_key, type ); + NtClose( iface_key ); + } + + NtClose( device_key ); + } - SetupDiDestroyDeviceInfoList( set ); + NtClose( class_key ); } void rawinput_update_device_list(void) @@ -265,9 +314,9 @@ void rawinput_update_device_list(void) } rawinput_devices_count = 0; - enumerate_devices( RIM_TYPEHID, &GUID_DEVINTERFACE_HID ); - enumerate_devices( RIM_TYPEMOUSE, &GUID_DEVINTERFACE_MOUSE ); - enumerate_devices( RIM_TYPEKEYBOARD, &GUID_DEVINTERFACE_KEYBOARD ); + enumerate_devices( RIM_TYPEHID, guid_devinterface_hidW ); + enumerate_devices( RIM_TYPEMOUSE, guid_devinterface_mouseW ); + enumerate_devices( RIM_TYPEKEYBOARD, guid_devinterface_keyboardW ); LeaveCriticalSection(&rawinput_devices_cs); }

1 0

Rémi Bernon : dinput/tests: Merge mouse.c tests into device8.c.
by Alexandre Julliard June 10, 2022

June 10, 2022

Module: wine Branch: master Commit: 74b9bd676725a167454d610823f64595b52d00ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=74b9bd676725a167454d6108… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 2 10:37:31 2022 +0200 dinput/tests: Merge mouse.c tests into device8.c. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/Makefile.in | 3 +- dlls/dinput/tests/device8.c | 182 +++++++++++++++++++++++++++++++ dlls/dinput/tests/mouse.c | 242 ------------------------------------------ 3 files changed, 183 insertions(+), 244 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=74b9bd676725a167454d…

1 0

Connor McAdams : uiautomationcore: Implement get_HostRawElementProvider for MSAA providers.
by Alexandre Julliard June 10, 2022

June 10, 2022

Module: wine Branch: master Commit: 12dfa7425437e5c8f5caab40b7f09beb22d1eab5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12dfa7425437e5c8f5caab40… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon May 23 12:32:53 2022 -0400 uiautomationcore: Implement get_HostRawElementProvider for MSAA providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 479 ++++++++++++++++++++++++++++- dlls/uiautomationcore/uia_provider.c | 190 +++++++++++- 2 files changed, 654 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=12dfa7425437e5c8f5ca…

1 0

Timo Zuccarello : winebus: Optionally split joysticks with more than 6 axes.
by Alexandre Julliard June 10, 2022

June 10, 2022

Module: wine Branch: master Commit: de280569a1d05905d9bd1abd89526aecf4dd3e81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de280569a1d05905d9bd1abd… Author: Timo Zuccarello <timo(a)zuccarello.eu> Date: Thu Jun 2 23:00:40 2022 +0200 winebus: Optionally split joysticks with more than 6 axes. 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> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 89 +++++++++++++++++++++++++++++++++++----------- dlls/winebus.sys/main.c | 2 ++ dlls/winebus.sys/unixlib.h | 1 + 3 files changed, 71 insertions(+), 21 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index a5621972493..7dc47cdd518 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,21 @@ 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_axis(SDL_JoystickID id, int axis) +{ + struct sdl_device *impl; + + LIST_FOR_EACH_ENTRY(impl, &device_list, struct sdl_device, unix_device.entry) + { + USHORT count = impl->unix_device.hid_device_state.abs_axis_count; + if (impl->id == id && impl->axis_offset <= axis && impl->axis_offset + count > axis) + return impl; + } return NULL; } @@ -184,7 +200,7 @@ static BOOL descriptor_add_haptic(struct sdl_device *impl) USHORT i, count = 0; USAGE usages[16]; - if (!pSDL_JoystickIsHaptic(impl->sdl_joystick) || + if (impl->axis_offset > 0 || !pSDL_JoystickIsHaptic(impl->sdl_joystick) || !(impl->sdl_haptic = pSDL_HapticOpenFromJoystick(impl->sdl_joystick))) impl->effect_support = 0; else @@ -196,7 +212,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 (impl->axis_offset == 0 && pSDL_JoystickRumble && !pSDL_JoystickRumble(impl->sdl_joystick, 0, 0, 0)) impl->effect_support |= WINE_SDL_JOYSTICK_RUMBLE; if (impl->effect_support & EFFECT_SUPPORT_HAPTICS) @@ -262,6 +278,7 @@ 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 = min(6, axis_count - impl->axis_offset); if (axis_count > ARRAY_SIZE(absolute_usages)) { FIXME("More than %zu absolute axes found, ignoring.\n", ARRAY_SIZE(absolute_usages)); @@ -275,8 +292,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)) @@ -902,8 +927,9 @@ static void sdl_add_device(unsigned int index) SDL_JoystickID id; SDL_JoystickGUID guid; SDL_GameController *controller = NULL; - const char *str; - char guid_str[33]; + const char *product; + char guid_str[33], buffer[ARRAY_SIZE(desc.product)]; + int axis_count, axis_offset; if ((joystick = pSDL_JoystickOpen(index)) == NULL) { @@ -914,9 +940,9 @@ static void sdl_add_device(unsigned int index) if (options.map_controllers && pSDL_IsGameController(index)) controller = pSDL_GameControllerOpen(index); - if (controller) str = pSDL_GameControllerName(controller); - else str = pSDL_JoystickName(joystick); - if (str) ntdll_umbstowcs(str, strlen(str) + 1, desc.product, ARRAY_SIZE(desc.product)); + if (controller) product = pSDL_GameControllerName(controller); + else product = pSDL_JoystickName(joystick); + if (!product) product = "Joystick"; id = pSDL_JoystickInstanceID(joystick); @@ -936,25 +962,35 @@ static void sdl_add_device(unsigned int index) pSDL_JoystickGetGUIDString(guid, guid_str, sizeof(guid_str)); ntdll_umbstowcs(guid_str, strlen(guid_str) + 1, desc.serialnumber, ARRAY_SIZE(desc.serialnumber)); - if (controller) desc.is_gamepad = TRUE; + if (controller) + { + desc.is_gamepad = TRUE; + axis_count = 6; + } else { - int button_count, axis_count; - + int button_count = pSDL_JoystickNumButtons(joystick); axis_count = pSDL_JoystickNumAxes(joystick); - button_count = pSDL_JoystickNumButtons(joystick); desc.is_gamepad = (axis_count == 6 && button_count >= 14); } - TRACE("%s id %d, desc %s.\n", controller ? "controller" : "joystick", id, debugstr_device_desc(&desc)); + for (axis_offset = 0; axis_offset < axis_count; axis_offset += (options.split_controllers ? 6 : axis_count)) + { + if (!axis_offset) strcpy(buffer, product); + else snprintf(buffer, ARRAY_SIZE(buffer), "%s %d", product, axis_offset / 6); + ntdll_umbstowcs(buffer, strlen(buffer) + 1, desc.product, ARRAY_SIZE(desc.product)); + + TRACE("%s id %d, axis_offset %u, desc %s.\n", controller ? "controller" : "joystick", id, axis_offset, 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; + 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 = axis_offset; - bus_event_queue_device_created(&event_queue, &impl->unix_device, &desc); + bus_event_queue_device_created(&event_queue, &impl->unix_device, &desc); + } } static void process_device_event(SDL_Event *event) @@ -975,6 +1011,17 @@ static void process_device_event(SDL_Event *event) if (impl) bus_event_queue_device_removed(&event_queue, &impl->unix_device); else WARN("failed to find device with id %d\n", id); } + else if (event->type == SDL_JOYAXISMOTION && options.split_controllers) + { + id = event->jaxis.which; + impl = find_device_from_id_and_axis(id, event->jaxis.axis); + if (!impl) WARN("failed to find device with id %d for axis %d\n", id, event->jaxis.axis); + else + { + event->jaxis.axis -= impl->axis_offset; + set_report_from_joystick_event(impl, event); + } + } else if (event->type >= SDL_JOYAXISMOTION && event->type <= SDL_JOYBUTTONUP) { id = ((SDL_JoyButtonEvent *)event)->which; diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 4588fee1b02..35db8a5fb9a 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -720,6 +720,8 @@ 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..f43cd03c89a 100644 --- a/dlls/winebus.sys/unixlib.h +++ b/dlls/winebus.sys/unixlib.h @@ -46,6 +46,7 @@ struct device_desc struct sdl_bus_options { + BOOL split_controllers; BOOL map_controllers; /* freed after bus_init */ UINT mappings_count;

1 0

Rémi Bernon : dinput/tests: Merge keyboard.c tests into device8.c.
by Alexandre Julliard June 10, 2022

June 10, 2022

Module: wine Branch: master Commit: e1083de9a7153bbdeb2691180074dd2b5c6a828e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1083de9a7153bbdeb269118… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 8 15:45:00 2022 +0200 dinput/tests: Merge keyboard.c tests into device8.c. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/Makefile.in | 3 +- dlls/dinput/tests/device8.c | 298 +++++++++++++++++++++++++++ dlls/dinput/tests/keyboard.c | 458 ------------------------------------------ 3 files changed, 299 insertions(+), 460 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e1083de9a7153bbdeb26…

1 0

Rémi Bernon : ntdll: Implement RtlGetUserValueHeap.
by Alexandre Julliard June 10, 2022

June 10, 2022

Module: wine Branch: master Commit: bffeff3819490976e370529aca5bafe4aed99e6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bffeff3819490976e370529a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 30 16:41:39 2022 +0200 ntdll: Implement RtlGetUserValueHeap. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/heap.c | 2 -- dlls/ntdll/heap.c | 29 +++++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 4221fd39c0f..339921b83c3 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -2320,7 +2320,6 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags tmp_flags = 0; ret = pRtlGetUserInfoHeap( heap, 0, ptr0, (void **)&tmp_ptr, &tmp_flags ); ok( ret, "RtlGetUserInfoHeap failed, error %lu\n", GetLastError() ); - todo_wine ok( tmp_ptr == (void *)0xdeadbeef, "got ptr %p\n", tmp_ptr ); todo_wine ok( tmp_flags == 0xa00 || broken(tmp_flags == 0xc00) /* w1064v1507 */, @@ -2335,7 +2334,6 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags tmp_flags = 0; ret = pRtlGetUserInfoHeap( heap, 0, ptr0, (void **)&tmp_ptr, &tmp_flags ); ok( ret, "RtlGetUserInfoHeap failed, error %lu\n", GetLastError() ); - todo_wine ok( tmp_ptr == (void *)0xdeadbee0, "got ptr %p\n", tmp_ptr ); todo_wine ok( tmp_flags == 0xa00 || broken(tmp_flags == 0xc00) /* w1064v1507 */, diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 64d4f6644af..8ebd561dd1c 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1996,12 +1996,33 @@ NTSTATUS WINAPI RtlSetHeapInformation( HANDLE heap, HEAP_INFORMATION_CLASS info_ /*********************************************************************** * RtlGetUserInfoHeap (NTDLL.@) */ -BOOLEAN WINAPI RtlGetUserInfoHeap( HANDLE heap, ULONG flags, void *ptr, void **user_value, ULONG *user_flags ) +BOOLEAN WINAPI RtlGetUserInfoHeap( HANDLE handle, ULONG flags, void *ptr, void **user_value, ULONG *user_flags ) { - FIXME( "heap %p, flags %#x, ptr %p, user_value %p, user_flags %p semi-stub!\n", - heap, flags, ptr, user_value, user_flags ); - *user_value = NULL; + ARENA_LARGE *large = (ARENA_LARGE *)ptr - 1; + struct block *block; + SUBHEAP *subheap; + HEAP *heap; + char *tmp; + + TRACE( "handle %p, flags %#x, ptr %p, user_value %p, user_flags %p semi-stub!\n", + handle, flags, ptr, user_value, user_flags ); + + *user_value = 0; *user_flags = 0; + + if (!(heap = HEAP_GetPtr( handle ))) return TRUE; + + heap_lock( heap, flags ); + if ((block = unsafe_block_from_ptr( heap, ptr, &subheap )) && !subheap) + *user_value = large->user_value; + else if (block) + { + tmp = (char *)block + block_get_size( block ) - block->tail_size + sizeof(void *); + if ((heap_get_flags( heap, flags ) & HEAP_TAIL_CHECKING_ENABLED) || RUNNING_ON_VALGRIND) tmp += ALIGNMENT; + *user_value = *(void **)tmp; + } + heap_unlock( heap, flags ); + return TRUE; }

1 0

Rémi Bernon : kernelbase: Cleanup and simplify (Global|Local)ReAlloc.
by Alexandre Julliard June 10, 2022

June 10, 2022

Module: wine Branch: master Commit: a4966b6690b31c4884d07a8a745017adb6363834 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4966b6690b31c4884d07a8a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 9 14:13:53 2022 +0200 kernelbase: Cleanup and simplify (Global|Local)ReAlloc. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/heap.c | 22 ++++++++- dlls/kernel32/tests/heap.c | 15 ------- dlls/kernelbase/memory.c | 108 +++++++++++++++------------------------------ 3 files changed, 56 insertions(+), 89 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a4966b6690b31c4884d0…

1 0

Rémi Bernon : kernel32: Cleanup and simplify (Global|Local)Size.
by Alexandre Julliard June 10, 2022

June 10, 2022

Module: wine Branch: master Commit: 866d7d0c073b1ef4abaf6f6f6237c98654479adc URL: https://source.winehq.org/git/wine.git/?a=commit;h=866d7d0c073b1ef4abaf6f6f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 30 23:33:41 2022 +0200 kernel32: Cleanup and simplify (Global|Local)Size. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/heap.c | 88 ++++++++++++++++------------------------------------ 1 file changed, 27 insertions(+), 61 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index e414ad03493..2dac1555d8e 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -313,56 +313,10 @@ HGLOBAL WINAPI GlobalReAlloc( HGLOBAL handle, SIZE_T size, UINT flags ) /*********************************************************************** * GlobalSize (KERNEL32.@) - * - * Get the size of a global memory object. - * - * PARAMS - * handle [I] Handle of the global memory object - * - * RETURNS - * Failure: 0 - * Success: Size in Bytes of the global memory object - * - * NOTES - * When the handle is invalid, last error is set to ERROR_INVALID_HANDLE - * */ SIZE_T WINAPI GlobalSize( HGLOBAL handle ) { - struct mem_entry *mem; - SIZE_T retval; - void *ptr; - - TRACE_(globalmem)( "handle %p\n", handle ); - - if (!((ULONG_PTR)handle >> 16)) - { - SetLastError( ERROR_INVALID_HANDLE ); - return 0; - } - - if ((ptr = unsafe_ptr_from_HLOCAL( handle ))) - retval = HeapSize( GetProcessHeap(), 0, ptr ); - else - { - RtlLockHeap( GetProcessHeap() ); - if ((mem = unsafe_mem_from_HLOCAL( handle ))) - { - if (!mem->ptr) /* handle case of GlobalAlloc( ??,0) */ - retval = 0; - else - retval = HeapSize( GetProcessHeap(), 0, mem->ptr ); - } - else - { - WARN_(globalmem)( "invalid handle %p\n", handle ); - SetLastError( ERROR_INVALID_HANDLE ); - retval = 0; - } - RtlUnlockHeap( GetProcessHeap() ); - } - if (retval == ~(SIZE_T)0) retval = 0; - return retval; + return LocalSize( handle ); } @@ -513,21 +467,33 @@ SIZE_T WINAPI LocalShrink( HGLOBAL handle, UINT newsize ) /*********************************************************************** * LocalSize (KERNEL32.@) - * - * Get the size of a local memory object. - * - * RETURNS - * Size: Success - * 0: Failure - * - * NOTES - * Windows memory management does not provide a separate local heap - * and global heap. */ -SIZE_T WINAPI LocalSize( - HLOCAL handle /* [in] Handle of memory object */ -) { - return GlobalSize( handle ); +SIZE_T WINAPI LocalSize( HLOCAL handle ) +{ + HANDLE heap = GetProcessHeap(); + struct mem_entry *mem; + SIZE_T ret = 0; + void *ptr; + + TRACE_(globalmem)( "handle %p\n", handle ); + + RtlLockHeap( heap ); + if ((ptr = unsafe_ptr_from_HLOCAL( handle ))) + ret = HeapSize( heap, HEAP_NO_SERIALIZE, ptr ); + else if ((mem = unsafe_mem_from_HLOCAL( handle ))) + { + if (!mem->ptr) ret = 0; + else ret = HeapSize( heap, HEAP_NO_SERIALIZE, mem->ptr ); + } + else + { + WARN_(globalmem)( "invalid handle %p\n", handle ); + SetLastError( ERROR_INVALID_HANDLE ); + } + RtlUnlockHeap( heap ); + + if (ret == ~(SIZE_T)0) return 0; + return ret; }

1 0