August 2018 - Wine-commits - list.winehq.org

Chip Davis : ntdll: When an exception happens in DllMain(), print the code.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: e6c6874ec323c9d657bfa9b69e04cb2a8cc1a522 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6c6874ec323c9d657bfa9b6… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Mon Aug 20 13:42:54 2018 -0500 ntdll: When an exception happens in DllMain(), print the code. Also print exceptions from TLS callbacks. Useful for debugging exceptions that prevent DLLs from loading. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 8d18af8..26b2431 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1175,8 +1175,8 @@ static void call_tls_callbacks( HMODULE module, UINT reason ) } __EXCEPT_ALL { - TRACE_(relay)("\1exception in TLS callback (proc=%p,module=%p,reason=%s,reserved=0)\n", - callback, module, reason_names[reason] ); + TRACE_(relay)("\1exception %08x in TLS callback (proc=%p,module=%p,reason=%s,reserved=0)\n", + GetExceptionCode(), callback, module, reason_names[reason] ); return; } __ENDTRY @@ -1222,9 +1222,9 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved } __EXCEPT_ALL { - TRACE_(relay)("\1exception in PE entry point (proc=%p,module=%p,reason=%s,res=%p)\n", - entry, module, reason_names[reason], lpReserved ); status = GetExceptionCode(); + TRACE_(relay)("\1exception %08x in PE entry point (proc=%p,module=%p,reason=%s,res=%p)\n", + status, entry, module, reason_names[reason], lpReserved ); } __ENDTRY

1 0

Michael Stefaniuc : cmd: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: 04413abcc72f5e04c153a0a1c5f82cdb3c351963 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04413abcc72f5e04c153a0a1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Aug 20 21:15:42 2018 +0200 cmd: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/batch.c | 2 +- programs/cmd/builtins.c | 150 ++++++++++++++++++++--------------------------- programs/cmd/directory.c | 12 ++-- programs/cmd/wcmdmain.c | 66 ++++++++++----------- 4 files changed, 102 insertions(+), 128 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=04413abcc72f5e04c153…

1 0

Alistair Leslie-Hughes : odbccp32: Implement SQLValidDSN/W.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: 990f08dc73ef2c52d097f628581cd32213d0847e URL: https://source.winehq.org/git/wine.git/?a=commit;h=990f08dc73ef2c52d097f628… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 21 04:00:52 2018 +0000 odbccp32: Implement SQLValidDSN/W. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 25 ++++++++++++++----- dlls/odbccp32/tests/misc.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 6 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index a253035..60254d0 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -29,6 +29,7 @@ #include "winbase.h" #include "winreg.h" #include "winnls.h" +#include "sqlext.h" #include "wine/unicode.h" #include "wine/debug.h" #include "wine/heap.h" @@ -1514,18 +1515,30 @@ BOOL WINAPI SQLSetConfigMode(UWORD wConfigMode) BOOL WINAPI SQLValidDSNW(LPCWSTR lpszDSN) { + static const WCHAR invalid[] = {'[',']','{','}','(',')',',',';','?','*','=','!','@','\\',0}; clear_errors(); - FIXME("%s\n", debugstr_w(lpszDSN)); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + TRACE("%s\n", debugstr_w(lpszDSN)); + + if(strlenW(lpszDSN) > SQL_MAX_DSN_LENGTH || strpbrkW(lpszDSN, invalid) != NULL) + { + return FALSE; + } + + return TRUE; } BOOL WINAPI SQLValidDSN(LPCSTR lpszDSN) { + static const char *invalid = "[]{}(),;?*=!@\\"; clear_errors(); - FIXME("%s\n", debugstr_a(lpszDSN)); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + TRACE("%s\n", debugstr_a(lpszDSN)); + + if(strlen(lpszDSN) > SQL_MAX_DSN_LENGTH || strpbrk(lpszDSN, invalid) != NULL) + { + return FALSE; + } + + return TRUE; } BOOL WINAPI SQLWriteDSNToIniW(LPCWSTR lpszDSN, LPCWSTR lpszDriver) diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index be3873ac..dc65bdf 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -682,6 +682,65 @@ static void test_SQLGetInstalledDrivers(void) SQLRemoveDriver("Wine test", TRUE, NULL); } +static void test_SQLValidDSN(void) +{ + static const char *invalid = "[]{}(),;?*=!@\\"; + char str[10]; + int i; + BOOL ret; + + strcpy(str, "wine10"); + for(i = 0; i < strlen(invalid); i++) + { + str[4] = invalid[i]; + ret = SQLValidDSN(str); + ok(!ret, "got %d\n", ret); + } + + /* Too large */ + ret = SQLValidDSN("Wine123456789012345678901234567890"); + ok(!ret, "got %d\n", ret); + + /* Valid with a space */ + ret = SQLValidDSN("Wine Vinegar"); + ok(ret, "got %d\n", ret); + + /* Max DSN name value */ + ret = SQLValidDSN("12345678901234567890123456789012"); + ok(ret, "got %d\n", ret); +} + +static void test_SQLValidDSNW(void) +{ + static const WCHAR invalid[] = {'[',']','{','}','(',')',',',';','?','*','=','!','@','\\',0}; + static const WCHAR value[] = { 'w','i','n','e','1','0',0}; + static const WCHAR too_large[] = { 'W','i','n','e','1','2','3','4','5','6','7','8','9','0','1','2','3','4','5', + '6','7','8','9','0','1','2','3','4','5','6','7','8','9','0', 0}; + static const WCHAR with_space[] = { 'W','i','n','e',' ','V','i','n','e','g','a','r', 0}; + static const WCHAR max_dsn[] = { '1','2','3','4','5','6','7','8','9','0','1','2','3','4','5','6','7','8','9','0', + '1','2','3','4','5','6','7','8','9','0','1','2', 0}; + WCHAR str[10]; + int i; + BOOL ret; + + lstrcpyW(str, value); + for(i = 0; i < lstrlenW(invalid); i++) + { + str[4] = invalid[i]; + ret = SQLValidDSNW(str); + ok(!ret, "got %d\n", ret); + } + + ret = SQLValidDSNW(too_large); + ok(!ret, "got %d\n", ret); + + ret = SQLValidDSNW(with_space); + ok(ret, "got %d\n", ret); + + ret = SQLValidDSNW(max_dsn); + ok(ret, "got %d\n", ret); +} + START_TEST(misc) { test_SQLConfigMode(); @@ -693,4 +752,6 @@ START_TEST(misc) test_SQLInstallDriverEx(); test_SQLInstallTranslatorEx(); test_SQLGetInstalledDrivers(); + test_SQLValidDSN(); + test_SQLValidDSNW(); }

1 0

Michael Stefaniuc : msi: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: a9cb67bb7ffb5b25469ba6a732f8913ac8778c36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9cb67bb7ffb5b25469ba6a7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Aug 20 21:15:43 2018 +0200 msi: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 12 ++++++------ dlls/msi/appsearch.c | 3 +-- dlls/msi/assembly.c | 2 +- dlls/msi/automation.c | 2 +- dlls/msi/custom.c | 8 ++++---- dlls/msi/database.c | 2 +- dlls/msi/dialog.c | 2 +- dlls/msi/msi.c | 4 ++-- dlls/msi/package.c | 2 +- dlls/msi/patch.c | 2 +- dlls/msi/registry.c | 38 +++++++++++++++++++------------------- dlls/msi/source.c | 2 +- dlls/msi/upgrade.c | 2 +- 13 files changed, 40 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a9cb67bb7ffb5b25469b…

1 0

Zebediah Figura : include: Fix definition of RAWHID.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: c26de97ecc24d5a1edc912c88fd634e6679d58b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c26de97ecc24d5a1edc912c8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 20 15:24:38 2018 -0500 include: Fix definition of RAWHID. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winuser.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winuser.h b/include/winuser.h index 8489d05..d09f8cd 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -486,7 +486,7 @@ typedef struct tagRAWINPUTDEVICELIST typedef struct tagRAWHID { DWORD dwSizeHid; DWORD dwCount; - BYTE bRawData; + BYTE bRawData[1]; } RAWHID, *LPRAWHID; typedef struct tagRAWKEYBOARD {

1 0

Zebediah Figura : user32: Move rawinput functions to rawinput.c.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: 6f3fb8c3f2061743f7f4b3c58bd00063949e51ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f3fb8c3f2061743f7f4b3c5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 20 15:24:39 2018 -0500 user32: Move rawinput functions to rawinput.c. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/Makefile.in | 1 + dlls/user32/input.c | 251 ------------------------------------------ dlls/user32/rawinput.c | 282 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 283 insertions(+), 251 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6f3fb8c3f2061743f7f4…

1 0

Zebediah Figura : user32: Trace command in hexadecimal in GetRawDeviceInfo ().
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: 9e4e594972b0b01beb94e6f143ea46643205bf0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e4e594972b0b01beb94e6f1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 20 15:24:40 2018 -0500 user32: Trace command in hexadecimal in GetRawDeviceInfo(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 5ce42f6..bd5fbf4 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -177,7 +177,7 @@ UINT WINAPI GetRawInputDeviceInfoA(HANDLE device, UINT command, void *data, UINT { UINT ret; - TRACE("device %p, command %u, data %p, data_size %p.\n", + TRACE("device %p, command %#x, data %p, data_size %p.\n", device, command, data, data_size); ret = GetRawInputDeviceInfoW(device, command, data, data_size); @@ -201,7 +201,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT RID_DEVICE_INFO *info; UINT s; - TRACE("device %p, command %u, data %p, data_size %p.\n", + TRACE("device %p, command %#x, data %p, data_size %p.\n", device, command, data, data_size); if (!data_size || (device != WINE_MOUSE_HANDLE && device != WINE_KEYBOARD_HANDLE)) return ~0U;

1 0

Zebediah Figura : user32: Return HID devices in GetRawInputDeviceList().
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: 85d5fc23b4cf6d369115802725e211d0c1195ccf URL: https://source.winehq.org/git/wine.git/?a=commit;h=85d5fc23b4cf6d3691158027… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 20 15:24:41 2018 -0500 user32: Return HID devices in GetRawInputDeviceList(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/Makefile.in | 2 +- dlls/user32/rawinput.c | 138 +++++++++++++++++++++++++++++++++++++++++++-- dlls/user32/user_private.h | 12 ++++ 3 files changed, 147 insertions(+), 5 deletions(-) diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index 81cde06..d420dcb 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -3,7 +3,7 @@ MODULE = user32.dll IMPORTLIB = user32 IMPORTS = gdi32 version advapi32 EXTRAINCL = $(PNG_CFLAGS) -DELAYIMPORTS = imm32 usp10 +DELAYIMPORTS = hid imm32 setupapi usp10 C_SRCS = \ button.c \ diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index bd5fbf4..91dcff4 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -27,7 +27,10 @@ #include "winbase.h" #include "wingdi.h" #include "winnls.h" +#include "winreg.h" #include "winuser.h" +#include "setupapi.h" +#include "ddk/hidsdi.h" #include "wine/debug.h" #include "wine/server.h" @@ -35,11 +38,130 @@ WINE_DEFAULT_DEBUG_CHANNEL(rawinput); +struct hid_device +{ + WCHAR *path; + HANDLE file; +}; + +static struct hid_device *hid_devices; +static unsigned int hid_devices_count, hid_devices_max; + +static CRITICAL_SECTION hid_devices_cs; +static CRITICAL_SECTION_DEBUG hid_devices_cs_debug = +{ + 0, 0, &hid_devices_cs, + { &hid_devices_cs_debug.ProcessLocksList, &hid_devices_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": hid_devices_cs") } +}; +static CRITICAL_SECTION hid_devices_cs = { &hid_devices_cs_debug, -1, 0, 0, 0, 0 }; + +static void find_hid_devices(void) +{ + static ULONGLONG last_check; + + SP_DEVICE_INTERFACE_DATA iface = { sizeof(iface) }; + SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail; + DWORD detail_size, needed; + DWORD idx, didx; + GUID hid_guid; + HDEVINFO set; + HANDLE file; + WCHAR *path; + + if (GetTickCount64() - last_check < 2000) + return; + last_check = GetTickCount64(); + + HidD_GetHidGuid(&hid_guid); + + set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); + + detail_size = sizeof(*detail) + (MAX_PATH * sizeof(WCHAR)); + if (!(detail = heap_alloc(detail_size))) + return; + detail->cbSize = sizeof(*detail); + + EnterCriticalSection(&hid_devices_cs); + + /* destroy previous list */ + for (didx = 0; didx < hid_devices_count; ++didx) + { + CloseHandle(hid_devices[didx].file); + heap_free(hid_devices[didx].path); + } + + didx = 0; + for (idx = 0; SetupDiEnumDeviceInterfaces(set, NULL, &hid_guid, idx, &iface); ++idx) + { + if (!SetupDiGetDeviceInterfaceDetailW(set, &iface, detail, detail_size, &needed, NULL)) + { + if (!(detail = heap_realloc(detail, needed))) + { + ERR("Failed to allocate memory.\n"); + goto done; + } + detail_size = needed; + + SetupDiGetDeviceInterfaceDetailW(set, &iface, detail, detail_size, NULL, NULL); + } + + if (!(path = heap_strdupW(detail->DevicePath))) + { + ERR("Failed to allocate memory.\n"); + goto done; + } + + file = CreateFileW(path, GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); + if (file == INVALID_HANDLE_VALUE) + { + ERR("Failed to open device file %s, error %u.\n", debugstr_w(path), GetLastError()); + heap_free(path); + continue; + } + + if (didx >= hid_devices_max) + { + if (hid_devices) + { + hid_devices_max *= 2; + hid_devices = heap_realloc(hid_devices, + hid_devices_max * sizeof(hid_devices[0])); + } + else + { + hid_devices_max = 8; + hid_devices = heap_alloc(hid_devices_max * sizeof(hid_devices[0])); + } + if (!hid_devices) + { + ERR("Failed to allocate memory.\n"); + goto done; + } + } + + TRACE("Found HID device %s.\n", debugstr_w(path)); + + hid_devices[didx].path = path; + hid_devices[didx].file = file; + + didx++; + } + hid_devices_count = didx; + +done: + LeaveCriticalSection(&hid_devices_cs); + heap_free(detail); +} + /*********************************************************************** * GetRawInputDeviceList (USER32.@) */ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_count, UINT size) { + UINT i; + TRACE("devices %p, device_count %p, size %u.\n", devices, device_count, size); if (size != sizeof(*devices)) @@ -54,16 +176,18 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun return ~0U; } + find_hid_devices(); + if (!devices) { - *device_count = 2; + *device_count = 2 + hid_devices_count; return 0; } - if (*device_count < 2) + if (*device_count < 2 + hid_devices_count) { SetLastError(ERROR_INSUFFICIENT_BUFFER); - *device_count = 2; + *device_count = 2 + hid_devices_count; return ~0U; } @@ -72,7 +196,13 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun devices[1].hDevice = WINE_KEYBOARD_HANDLE; devices[1].dwType = RIM_TYPEKEYBOARD; - return 2; + for (i = 0; i < hid_devices_count; ++i) + { + devices[2 + i].hDevice = &hid_devices[i]; + devices[2 + i].dwType = RIM_TYPEHID; + } + + return 2 + hid_devices_count; } /*********************************************************************** diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 7a70ae9..73a2bad 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -28,6 +28,8 @@ #include "winuser.h" #include "winreg.h" #include "winternl.h" +#include "wine/heap.h" +#include "wine/unicode.h" #define GET_WORD(ptr) (*(const WORD *)(ptr)) #define GET_DWORD(ptr) (*(const DWORD *)(ptr)) @@ -354,4 +356,14 @@ extern BOOL get_icon_size( HICON handle, SIZE *size ) DECLSPEC_HIDDEN; #define assert(expr) ((void)0) #endif +static inline WCHAR *heap_strdupW(const WCHAR *src) +{ + WCHAR *dst; + unsigned len; + if (!src) return NULL; + len = (strlenW(src) + 1) * sizeof(WCHAR); + if ((dst = heap_alloc(len))) memcpy(dst, src, len); + return dst; +} + #endif /* __WINE_USER_PRIVATE_H */

1 0

Zebediah Figura : user32: Return RIDI_DEVICEINFO for HID devices from GetRawInputDeviceInfo().
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: e745a482d187920b4f87ee2ab7ed7f4eb37c268f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e745a482d187920b4f87ee2a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 20 15:24:42 2018 -0500 user32: Return RIDI_DEVICEINFO for HID devices from GetRawInputDeviceInfo(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 91dcff4..12a0e15 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -42,6 +42,8 @@ struct hid_device { WCHAR *path; HANDLE file; + RID_DEVICE_INFO_HID info; + PHIDP_PREPARSED_DATA data; }; static struct hid_device *hid_devices; @@ -63,7 +65,9 @@ static void find_hid_devices(void) SP_DEVICE_INTERFACE_DATA iface = { sizeof(iface) }; SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail; DWORD detail_size, needed; + HIDD_ATTRIBUTES attr; DWORD idx, didx; + HIDP_CAPS caps; GUID hid_guid; HDEVINFO set; HANDLE file; @@ -146,6 +150,22 @@ static void find_hid_devices(void) hid_devices[didx].path = path; hid_devices[didx].file = file; + attr.Size = sizeof(HIDD_ATTRIBUTES); + if (!HidD_GetAttributes(file, &attr)) + WARN_(rawinput)("Failed to get attributes.\n"); + hid_devices[didx].info.dwVendorId = attr.VendorID; + hid_devices[didx].info.dwProductId = attr.ProductID; + hid_devices[didx].info.dwVersionNumber = attr.VersionNumber; + + if (!HidD_GetPreparsedData(file, &hid_devices[didx].data)) + WARN_(rawinput)("Failed to get preparsed data.\n"); + + if (!HidP_GetCaps(hid_devices[didx].data, &caps)) + WARN_(rawinput)("Failed to get caps.\n"); + + hid_devices[didx].info.usUsagePage = caps.UsagePage; + hid_devices[didx].info.usUsage = caps.Usage; + didx++; } hid_devices_count = didx; @@ -327,6 +347,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT static const WCHAR mouse_name[] = {'\\','\\','?','\\','W','I','N','E','_','M','O','U','S','E',0}; 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}; + struct hid_device *hid_device; const WCHAR *name = NULL; RID_DEVICE_INFO *info; UINT s; @@ -334,7 +355,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT TRACE("device %p, command %#x, data %p, data_size %p.\n", device, command, data, data_size); - if (!data_size || (device != WINE_MOUSE_HANDLE && device != WINE_KEYBOARD_HANDLE)) return ~0U; + if (!data_size) return ~0U; switch (command) { @@ -382,11 +403,17 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT info->dwType = RIM_TYPEMOUSE; info->u.mouse = mouse_info; } - else + else if (device == WINE_KEYBOARD_HANDLE) { info->dwType = RIM_TYPEKEYBOARD; info->u.keyboard = keyboard_info; } + else + { + hid_device = device; + info->dwType = RIM_TYPEHID; + info->u.hid = hid_device->info; + } return s; }

1 0

Zebediah Figura : user32: Return RIDI_DEVICENAME for HID devices from GetRawInputDeviceInfo().
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: 44551cfe19f93fffb515b082871a35ae58c09fc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44551cfe19f93fffb515b082… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 20 15:24:43 2018 -0500 user32: Return RIDI_DEVICENAME for HID devices from GetRawInputDeviceInfo(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 12a0e15..cf3028a 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -365,11 +365,17 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT s = sizeof(mouse_name); name = mouse_name; } - else + else if (device == WINE_KEYBOARD_HANDLE) { s = sizeof(keyboard_name); name = keyboard_name; } + else + { + hid_device = device; + s = (strlenW(hid_device->path) + 1) * sizeof(WCHAR); + name = hid_device->path; + } break; case RIDI_DEVICEINFO: s = sizeof(*info);

1 0