- Wine-Commits - list.winehq.org

Hans Leidekker : odbc32: Move replication of ODBC settings to the Unix lib.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: 713bd7928d009028931249255e7afa8a6575abcb URL: https://gitlab.winehq.org/wine/wine/-/commit/713bd7928d009028931249255e7afa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 3 18:50:14 2024 +0200 odbc32: Move replication of ODBC settings to the Unix lib. --- dlls/odbc32/proxyodbc.c | 295 +----------------------------------------------- dlls/odbc32/unixlib.c | 284 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/odbc32/unixlib.h | 2 + 3 files changed, 288 insertions(+), 293 deletions(-)

1 0

Hans Leidekker : odbc32: Add Wow64 thunks.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: 46f47bd53ae62034285f37e0a2cdd1c5ac4b0e38 URL: https://gitlab.winehq.org/wine/wine/-/commit/46f47bd53ae62034285f37e0a2cdd1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 3 18:53:06 2024 +0200 odbc32: Add Wow64 thunks. --- dlls/odbc32/unixlib.c | 2405 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2405 insertions(+)

1 0

Hans Leidekker : include: Add missing Unicode SQL function declarations.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: d206e3ab3374910c4b5f6bb583f53041a4974c89 URL: https://gitlab.winehq.org/wine/wine/-/commit/d206e3ab3374910c4b5f6bb583f530… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 10 11:13:05 2024 +0200 include: Add missing Unicode SQL function declarations. --- include/sqlucode.h | 126 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 85 insertions(+), 41 deletions(-) diff --git a/include/sqlucode.h b/include/sqlucode.h index a4721b04208..01e0458986a 100644 --- a/include/sqlucode.h +++ b/include/sqlucode.h @@ -32,47 +32,91 @@ extern "C" { #define SQL_WVARCHAR (-9) #define SQL_WLONGVARCHAR (-10) -SQLRETURN WINAPI SQLColAttributesW(SQLHSTMT hstmt, SQLUSMALLINT icol, SQLUSMALLINT fDescType, - SQLPOINTER rgbDesc, SQLSMALLINT cbDescMax, SQLSMALLINT *pcbDesc, SQLLEN *pfDesc); - -SQLRETURN WINAPI SQLConnectW(SQLHDBC ConnectionHandle, - SQLWCHAR *ServerName, SQLSMALLINT NameLength1, - SQLWCHAR *UserName, SQLSMALLINT NameLength2, - SQLWCHAR *Authentication, SQLSMALLINT NameLength3); - -SQLRETURN WINAPI SQLDescribeColW(SQLHSTMT StatementHandle, - SQLUSMALLINT ColumnNumber, SQLWCHAR *ColumnName, - SQLSMALLINT BufferLength, SQLSMALLINT *NameLength, - SQLSMALLINT *DataType, SQLULEN *ColumnSize, - SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable); - -SQLRETURN WINAPI SQLDriverConnectW(SQLHDBC ConnectionHandle, - SQLHWND WindowHandle, WCHAR *InConnectionString, - SQLSMALLINT Length, WCHAR *OutConnectionString, SQLSMALLINT BufferLength, - SQLSMALLINT *Length2, SQLUSMALLINT DriverCompletion); - -SQLRETURN WINAPI SQLExecDirectW(SQLHSTMT StatementHandle, - SQLWCHAR *StatementText, SQLINTEGER TextLength); - -SQLRETURN WINAPI SQLGetDiagRecW(SQLSMALLINT HandleType, SQLHANDLE Handle, - SQLSMALLINT RecNumber, SQLWCHAR *Sqlstate, - SQLINTEGER *NativeError, SQLWCHAR *MessageText, - SQLSMALLINT BufferLength, SQLSMALLINT *TextLength); - -SQLRETURN WINAPI SQLGetInfoW(SQLHDBC ConnectionHandle, - SQLUSMALLINT InfoType, SQLPOINTER InfoValue, - SQLSMALLINT BufferLength, SQLSMALLINT *StringLength); - -SQLRETURN WINAPI SQLPrepareW(SQLHSTMT StatementHandle, - SQLWCHAR *StatementText, SQLINTEGER TextLength); - -SQLRETURN WINAPI SQLSetStmtAttrW(SQLHSTMT StatementHandle, - SQLINTEGER Attribute, SQLPOINTER Value, - SQLINTEGER StringLength); - -SQLRETURN WINAPI SQLGetDiagFieldW(SQLSMALLINT type, SQLHANDLE handle, - SQLSMALLINT record, SQLSMALLINT field, SQLPOINTER info, - SQLSMALLINT info_len, SQLSMALLINT *ret_len); +SQLRETURN WINAPI SQLBrowseConnectW(SQLHDBC,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLSMALLINT*); + +SQLRETURN WINAPI SQLColAttributeW(SQLHSTMT,SQLUSMALLINT,SQLUSMALLINT,SQLPOINTER,SQLSMALLINT,SQLSMALLINT*,SQLLEN*); + +SQLRETURN WINAPI SQLColAttributesW(SQLHSTMT,SQLUSMALLINT,SQLUSMALLINT,SQLPOINTER,SQLSMALLINT,SQLSMALLINT*,SQLLEN*); + +SQLRETURN WINAPI SQLColumnPrivilegesW(SQLHSTMT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT, + SQLWCHAR*,SQLSMALLINT); + +SQLRETURN WINAPI SQLColumnsW(SQLHSTMT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*, + SQLSMALLINT); + +SQLRETURN WINAPI SQLConnectW(SQLHDBC,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT); + +SQLRETURN WINAPI SQLDataSourcesW(SQLHENV,SQLUSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLWCHAR*,SQLSMALLINT, + SQLSMALLINT*); + +SQLRETURN WINAPI SQLDescribeColW(SQLHSTMT,SQLUSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLSMALLINT*,SQLULEN*, + SQLSMALLINT*,SQLSMALLINT*); + +SQLRETURN WINAPI SQLDriverConnectW(SQLHDBC,SQLHWND,WCHAR*,SQLSMALLINT,WCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLUSMALLINT); + +SQLRETURN WINAPI SQLDriversW(SQLHENV,SQLUSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLWCHAR*,SQLSMALLINT, + SQLSMALLINT*); + +SQLRETURN WINAPI SQLErrorW(SQLHENV,SQLHDBC,SQLHSTMT,SQLWCHAR*,SQLINTEGER*,SQLWCHAR*,SQLSMALLINT,SQLSMALLINT*); + +SQLRETURN WINAPI SQLExecDirectW(SQLHSTMT,SQLWCHAR*,SQLINTEGER); + +SQLRETURN WINAPI SQLForeignKeysW(SQLHSTMT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*, + SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT); + +SQLRETURN WINAPI SQLGetConnectAttrW(SQLHDBC,SQLINTEGER,SQLPOINTER,SQLINTEGER,SQLINTEGER*); + +SQLRETURN WINAPI SQLGetConnectOptionW(SQLHDBC,SQLUSMALLINT,SQLPOINTER); + +SQLRETURN WINAPI SQLGetCursorNameW(SQLHSTMT,SQLWCHAR*,SQLSMALLINT,SQLSMALLINT*); + +SQLRETURN WINAPI SQLGetDescFieldW(SQLHDESC,SQLSMALLINT,SQLSMALLINT,SQLPOINTER,SQLINTEGER,SQLINTEGER*); + +SQLRETURN WINAPI SQLGetDescRecW(SQLHDESC,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLSMALLINT*,SQLSMALLINT*, + SQLLEN*,SQLSMALLINT*,SQLSMALLINT*,SQLSMALLINT*); + +SQLRETURN WINAPI SQLGetDiagFieldW(SQLSMALLINT,SQLHANDLE,SQLSMALLINT,SQLSMALLINT,SQLPOINTER,SQLSMALLINT,SQLSMALLINT*); + +SQLRETURN WINAPI SQLGetDiagRecW(SQLSMALLINT,SQLHANDLE,SQLSMALLINT,SQLWCHAR*,SQLINTEGER*,SQLWCHAR*,SQLSMALLINT, + SQLSMALLINT*); + +SQLRETURN WINAPI SQLGetInfoW(SQLHDBC,SQLUSMALLINT,SQLPOINTER,SQLSMALLINT,SQLSMALLINT*); + +SQLRETURN WINAPI SQLGetStmtAttrW(SQLHSTMT,SQLINTEGER,SQLPOINTER,SQLINTEGER,SQLINTEGER*); + +SQLRETURN WINAPI SQLGetTypeInfoW(SQLHSTMT,SQLSMALLINT); + +SQLRETURN WINAPI SQLNativeSqlW(SQLHDBC,SQLWCHAR*,SQLINTEGER,SQLWCHAR*,SQLINTEGER,SQLINTEGER*); + +SQLRETURN WINAPI SQLPrepareW(SQLHSTMT,SQLWCHAR*,SQLINTEGER); + +SQLRETURN WINAPI SQLPrimaryKeysW(SQLHSTMT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT); + +SQLRETURN WINAPI SQLProcedureColumnsW(SQLHSTMT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT, + SQLWCHAR*,SQLSMALLINT); + +SQLRETURN WINAPI SQLProceduresW(SQLHSTMT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT); + +SQLRETURN WINAPI SQLSetConnectAttrW(SQLHDBC,SQLINTEGER,SQLPOINTER,SQLINTEGER); + +SQLRETURN WINAPI SQLSetConnectOptionW(SQLHDBC,SQLUSMALLINT,SQLULEN); + +SQLRETURN WINAPI SQLSetCursorNameW(SQLHSTMT,SQLWCHAR*,SQLSMALLINT); + +SQLRETURN WINAPI SQLSetDescFieldW(SQLHDESC,SQLSMALLINT,SQLSMALLINT,SQLPOINTER,SQLINTEGER); + +SQLRETURN WINAPI SQLSetStmtAttrW(SQLHSTMT,SQLINTEGER,SQLPOINTER,SQLINTEGER); + +SQLRETURN WINAPI SQLSpecialColumnsW(SQLHSTMT,SQLUSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*, + SQLSMALLINT,SQLUSMALLINT,SQLUSMALLINT); + +SQLRETURN WINAPI SQLStatisticsW(SQLHSTMT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT, + SQLUSMALLINT,SQLUSMALLINT); + +SQLRETURN WINAPI SQLTablePrivilegesW(SQLHSTMT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT); + +SQLRETURN WINAPI SQLTablesW(SQLHSTMT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*, + SQLSMALLINT); #ifdef __cplusplus }

1 0

Hans Leidekker : odbc32: Load_odbc() returns NTSTATUS.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: f332822cd0d7878714f388564b0310fe203f2e97 URL: https://gitlab.winehq.org/wine/wine/-/commit/f332822cd0d7878714f388564b0310… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 3 18:46:00 2024 +0200 odbc32: Load_odbc() returns NTSTATUS. --- dlls/odbc32/unixlib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/odbc32/unixlib.c b/dlls/odbc32/unixlib.c index 3b94180c5bc..b9386a9d2a3 100644 --- a/dlls/odbc32/unixlib.c +++ b/dlls/odbc32/unixlib.c @@ -173,7 +173,7 @@ static NTSTATUS load_odbc(void); static NTSTATUS odbc_process_attach( void *args ) { - if (!load_odbc()) return STATUS_DLL_NOT_FOUND; + if (load_odbc()) return STATUS_DLL_NOT_FOUND; return STATUS_SUCCESS; }

1 0

Hans Leidekker : odbc32: Forward SQLDataSourcesA() to SQLDataSources() and GetDiagRecA() to GetDiagRec().
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: 7c1408fcc75a73415585d5cc21a98e33c222db95 URL: https://gitlab.winehq.org/wine/wine/-/commit/7c1408fcc75a73415585d5cc21a98e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 2 10:19:43 2024 +0200 odbc32: Forward SQLDataSourcesA() to SQLDataSources() and GetDiagRecA() to GetDiagRec(). --- dlls/odbc32/proxyodbc.c | 38 +++++--------------------------------- dlls/odbc32/unixlib.c | 26 -------------------------- dlls/odbc32/unixlib.h | 4 ---- 3 files changed, 5 insertions(+), 63 deletions(-)

1 0

Hans Leidekker : odbc32: Make Unix call parameters Wow64 compatible.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: 706459ddd778317471557d68b10f08186979e58b URL: https://gitlab.winehq.org/wine/wine/-/commit/706459ddd778317471557d68b10f08… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 2 11:23:44 2024 +0200 odbc32: Make Unix call parameters Wow64 compatible. --- dlls/odbc32/proxyodbc.c | 1464 +++++++++++++++++++++++++++++++++-------------- dlls/odbc32/unixlib.c | 472 +++++++-------- dlls/odbc32/unixlib.h | 1229 +++++++++++++++++++++++++++++++++++---- 3 files changed, 2379 insertions(+), 786 deletions(-)

1 0

Alex Henrie : dinput: Don't include every version of DirectInputCreate in every DLL.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: 08dae8afcc0ee8d94ed73b1e9fcc7b6fa1b77be9 URL: https://gitlab.winehq.org/wine/wine/-/commit/08dae8afcc0ee8d94ed73b1e9fcc7b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 13 21:09:25 2024 -0600 dinput: Don't include every version of DirectInputCreate in every DLL. DirectInputCreate(A|W|Ex) is only needed in dinput.dll, and DirectInput8Create is only needed in dinput8.dll. Excluding the unnecessary functions reduces the size of each DLL by about 4 KB. --- dlls/dinput/dinput.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/dinput/dinput.c b/dlls/dinput/dinput.c index 76c60b09db0..e53eea4e292 100644 --- a/dlls/dinput/dinput.c +++ b/dlls/dinput/dinput.c @@ -890,6 +890,8 @@ HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **out ) return CLASS_E_CLASSNOTAVAILABLE; } +#if DIRECTINPUT_VERSION == 0x0700 + HRESULT WINAPI DirectInputCreateEx( HINSTANCE hinst, DWORD version, REFIID iid, void **out, IUnknown *outer ) { IUnknown *unknown; @@ -920,6 +922,18 @@ HRESULT WINAPI DirectInputCreateEx( HINSTANCE hinst, DWORD version, REFIID iid, return DI_OK; } +HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateA( HINSTANCE hinst, DWORD version, IDirectInputA **out, IUnknown *outer ) +{ + return DirectInputCreateEx( hinst, version, &IID_IDirectInput7A, (void **)out, outer ); +} + +HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateW( HINSTANCE hinst, DWORD version, IDirectInputW **out, IUnknown *outer ) +{ + return DirectInputCreateEx( hinst, version, &IID_IDirectInput7W, (void **)out, outer ); +} + +#else + HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create( HINSTANCE hinst, DWORD version, REFIID iid, void **out, IUnknown *outer ) { IUnknown *unknown; @@ -952,12 +966,4 @@ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create( HINSTANCE hinst, DWORD vers return S_OK; } -HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateA( HINSTANCE hinst, DWORD version, IDirectInputA **out, IUnknown *outer ) -{ - return DirectInputCreateEx( hinst, version, &IID_IDirectInput7A, (void **)out, outer ); -} - -HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateW( HINSTANCE hinst, DWORD version, IDirectInputW **out, IUnknown *outer ) -{ - return DirectInputCreateEx( hinst, version, &IID_IDirectInput7W, (void **)out, outer ); -} +#endif

1 0

Rémi Bernon : winebus: Move Sony controllers report fixups to PE side.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: c708295ed6de3eca5a5406ed886904fd5c398053 URL: https://gitlab.winehq.org/wine/wine/-/commit/c708295ed6de3eca5a5406ed886904… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 10 16:21:00 2024 +0200 winebus: Move Sony controllers report fixups to PE side. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56602 --- dlls/winebus.sys/bus_udev.c | 87 ------------------------------------------ dlls/winebus.sys/main.c | 92 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+), 87 deletions(-)

1 0

Rémi Bernon : winebus: Report whether devices are connected over bluetooth.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: 4ddee5a0929c8c8193a3d501877068eff52ecded URL: https://gitlab.winehq.org/wine/wine/-/commit/4ddee5a0929c8c8193a3d501877068… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 10 16:21:00 2024 +0200 winebus: Report whether devices are connected over bluetooth. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56602 --- dlls/winebus.sys/bus_iohid.c | 4 ++++ dlls/winebus.sys/bus_udev.c | 1 + dlls/winebus.sys/unixlib.h | 5 +++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 40f4b1f3c2f..45cca15c82a 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -285,6 +285,10 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * desc.version = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDVersionNumberKey))); desc.uid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDLocationIDKey))); + if ((str = IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDTransportKey)))) + desc.is_bluetooth = !CFStringCompare(str, CFSTR(kIOHIDTransportBluetoothValue), 0) || + !CFStringCompare(str, CFSTR(kIOHIDTransportBluetoothLowEnergyValue), 0); + if (desc.usages.UsagePage != HID_USAGE_PAGE_GENERIC || !(desc.usages.Usage == HID_USAGE_GENERIC_JOYSTICK || desc.usages.Usage == HID_USAGE_GENERIC_GAMEPAD)) { diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 3bffc5d56a5..50321055586 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1312,6 +1312,7 @@ static void udev_add_device(struct udev_device *dev, int fd) get_device_subsystem_info(dev, "hid", &desc, &bus); get_device_subsystem_info(dev, "input", &desc, &bus); get_device_subsystem_info(dev, "usb", &desc, &bus); + if (bus == BUS_BLUETOOTH) desc.is_bluetooth = TRUE; subsystem = udev_device_get_subsystem(dev); if (!strcmp(subsystem, "hidraw")) diff --git a/dlls/winebus.sys/unixlib.h b/dlls/winebus.sys/unixlib.h index 753886304db..b38382cda2c 100644 --- a/dlls/winebus.sys/unixlib.h +++ b/dlls/winebus.sys/unixlib.h @@ -41,6 +41,7 @@ struct device_desc USAGE_AND_PAGE usages; BOOL is_gamepad; BOOL is_hidraw; + BOOL is_bluetooth; WCHAR manufacturer[MAX_PATH]; WCHAR product[MAX_PATH]; @@ -150,9 +151,9 @@ enum unix_funcs static inline const char *debugstr_device_desc(struct device_desc *desc) { if (!desc) return "(null)"; - return wine_dbg_sprintf("{vid %04x, pid %04x, version %04x, input %d, uid %08x, usage %04x:%04x, is_gamepad %u, is_hidraw %u}", + return wine_dbg_sprintf("{vid %04x, pid %04x, version %04x, input %d, uid %08x, usage %04x:%04x, is_gamepad %u, is_hidraw %u, is_bluetooth %u}", desc->vid, desc->pid, desc->version, desc->input, desc->uid, desc->usages.UsagePage, desc->usages.Usage, - desc->is_gamepad, desc->is_hidraw); + desc->is_gamepad, desc->is_hidraw, desc->is_bluetooth); } static inline BOOL is_xbox_gamepad(WORD vid, WORD pid)

1 0

Rémi Bernon : winebus: Don't advertise hidraw devices as XInput compatible.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: 51bdcf8db50c4d7ea124b1211f466e324e683ae5 URL: https://gitlab.winehq.org/wine/wine/-/commit/51bdcf8db50c4d7ea124b1211f466e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 10 16:21:00 2024 +0200 winebus: Don't advertise hidraw devices as XInput compatible. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56602 --- dlls/winebus.sys/bus_iohid.c | 38 -------------------------------------- dlls/winebus.sys/bus_udev.c | 2 +- 2 files changed, 1 insertion(+), 39 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index e7960e185e9..40f4b1f3c2f 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -315,44 +315,6 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * { if (is_xbox_gamepad(desc.vid, desc.pid)) desc.is_gamepad = TRUE; - else - { - int axes=0, buttons=0; - CFArrayRef element_array = IOHIDDeviceCopyMatchingElements( - IOHIDDevice, NULL, kIOHIDOptionsTypeNone); - - if (element_array) { - CFIndex index; - CFIndex count = CFArrayGetCount(element_array); - for (index = 0; index < count; index++) - { - IOHIDElementRef element = (IOHIDElementRef)CFArrayGetValueAtIndex(element_array, index); - if (element) - { - int type = IOHIDElementGetType(element); - if (type == kIOHIDElementTypeInput_Button) buttons++; - if (type == kIOHIDElementTypeInput_Axis) axes++; - if (type == kIOHIDElementTypeInput_Misc) - { - uint32_t usage = IOHIDElementGetUsage(element); - switch (usage) - { - case kHIDUsage_GD_X: - case kHIDUsage_GD_Y: - case kHIDUsage_GD_Z: - case kHIDUsage_GD_Rx: - case kHIDUsage_GD_Ry: - case kHIDUsage_GD_Rz: - case kHIDUsage_GD_Slider: - axes ++; - } - } - } - } - CFRelease(element_array); - } - desc.is_gamepad = (axes == 6 && buttons >= 14); - } } TRACE("dev %p, desc %s.\n", IOHIDDevice, debugstr_device_desc(&desc)); diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 2cd995a4178..3bffc5d56a5 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1367,7 +1367,7 @@ static void udev_add_device(struct udev_device *dev, int fd) if (is_xbox_gamepad(desc.vid, desc.pid)) desc.is_gamepad = TRUE; #ifdef HAS_PROPER_INPUT_HEADER - else + else if (!strcmp(subsystem, "input")) { int axes=0, buttons=0; axes = count_abs_axis(fd);

1 0