November 2022 - Wine-commits

Alex Henrie : hhctrl: Handle memory allocation failure in GetChmString.
by Alexandre Julliard 22 Nov '22

22 Nov '22

Module: wine Branch: master Commit: f41214edaabc35a1b774c12345fac3a4136085e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/f41214edaabc35a1b774c12345fac3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 21 19:17:52 2022 -0700 hhctrl: Handle memory allocation failure in GetChmString. --- dlls/hhctrl.ocx/chm.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 3a9a8fa9e7a..aa04a05fa33 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -32,18 +32,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); static LPCSTR GetChmString(CHMInfo *chm, DWORD offset) { LPCSTR str; + char **new_strings; if(!chm->strings_stream) return NULL; if(chm->strings_size <= (offset >> BLOCK_BITS)) { chm->strings_size = (offset >> BLOCK_BITS)+1; - if(chm->strings) - chm->strings = heap_realloc_zero(chm->strings, + if(chm->strings) { + new_strings = heap_realloc_zero(chm->strings, chm->strings_size*sizeof(char*)); - else + if(!new_strings) + return NULL; + chm->strings = new_strings; + }else { chm->strings = heap_alloc_zero( chm->strings_size*sizeof(char*)); + if(!chm->strings) + return NULL; + } }

1 0

Alex Henrie : windows.media.speech: Put the calling convention inside the function pointer parentheses.
by Alexandre Julliard 22 Nov '22

22 Nov '22

Module: wine Branch: master Commit: abf14cd4bc641b17b3801c141743cbc95e47e580 URL: https://gitlab.winehq.org/wine/wine/-/commit/abf14cd4bc641b17b3801c141743cb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 21 20:56:41 2022 -0700 windows.media.speech: Put the calling convention inside the function pointer parentheses. As required by MSVC. --- dlls/windows.media.speech/tests/speech.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 464faaf819a..445d10923ae 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -57,7 +57,7 @@ #define IAsyncHandler_IInspectable_iface IAsyncOperationCompletedHandler_IInspectable_iface -HRESULT WINAPI (*pDllGetActivationFactory)(HSTRING, IActivationFactory **); +HRESULT (WINAPI *pDllGetActivationFactory)(HSTRING, IActivationFactory **); static BOOL is_win10_1507 = FALSE; static BOOL is_win10_1709 = FALSE;

1 0

Alex Henrie : dinput/tests: Put the calling convention inside the function pointer parentheses.
by Alexandre Julliard 22 Nov '22

22 Nov '22

Module: wine Branch: master Commit: 929de48426eecedcb7730cd7c095f0051cf48551 URL: https://gitlab.winehq.org/wine/wine/-/commit/929de48426eecedcb7730cd7c095f0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 21 19:53:18 2022 -0700 dinput/tests: Put the calling convention inside the function pointer parentheses. --- dlls/dinput/tests/force_feedback.c | 10 +++++----- dlls/dinput/tests/hotplug.c | 8 ++++---- dlls/dinput/tests/joystick8.c | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index ba37320e9f0..a2ccdb08350 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -48,11 +48,11 @@ #include "windows.gaming.input.forcefeedback.h" #undef Size -static HRESULT WINAPI (*pRoGetActivationFactory)( HSTRING, REFIID, void** ); -static HRESULT WINAPI (*pRoInitialize)( RO_INIT_TYPE ); -static HRESULT WINAPI (*pWindowsCreateString)( const WCHAR*, UINT32, HSTRING* ); -static HRESULT WINAPI (*pWindowsDeleteString)( HSTRING str ); -static const WCHAR* WINAPI (*pWindowsGetStringRawBuffer)( HSTRING, UINT32* ); +static HRESULT (WINAPI *pRoGetActivationFactory)( HSTRING, REFIID, void** ); +static HRESULT (WINAPI *pRoInitialize)( RO_INIT_TYPE ); +static HRESULT (WINAPI *pWindowsCreateString)( const WCHAR*, UINT32, HSTRING* ); +static HRESULT (WINAPI *pWindowsDeleteString)( HSTRING str ); +static const WCHAR* (WINAPI *pWindowsGetStringRawBuffer)( HSTRING, UINT32* ); static BOOL load_combase_functions(void) { diff --git a/dlls/dinput/tests/hotplug.c b/dlls/dinput/tests/hotplug.c index e915d04745a..78e38b1e285 100644 --- a/dlls/dinput/tests/hotplug.c +++ b/dlls/dinput/tests/hotplug.c @@ -50,10 +50,10 @@ #include "windows.gaming.input.custom.h" #undef Size -static HRESULT WINAPI (*pRoGetActivationFactory)( HSTRING, REFIID, void** ); -static HRESULT WINAPI (*pRoInitialize)( RO_INIT_TYPE ); -static HRESULT WINAPI (*pWindowsCreateString)( const WCHAR*, UINT32, HSTRING* ); -static HRESULT WINAPI (*pWindowsDeleteString)( HSTRING str ); +static HRESULT (WINAPI *pRoGetActivationFactory)( HSTRING, REFIID, void** ); +static HRESULT (WINAPI *pRoInitialize)( RO_INIT_TYPE ); +static HRESULT (WINAPI *pWindowsCreateString)( const WCHAR*, UINT32, HSTRING* ); +static HRESULT (WINAPI *pWindowsDeleteString)( HSTRING str ); static BOOL load_combase_functions(void) { diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index f568c9298c6..49f7c1a201e 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -47,11 +47,11 @@ #include "windows.gaming.input.h" #undef Size -static HRESULT WINAPI (*pRoGetActivationFactory)( HSTRING, REFIID, void** ); -static HRESULT WINAPI (*pRoInitialize)( RO_INIT_TYPE ); -static HRESULT WINAPI (*pWindowsCreateString)( const WCHAR*, UINT32, HSTRING* ); -static HRESULT WINAPI (*pWindowsDeleteString)( HSTRING str ); -static const WCHAR* WINAPI (*pWindowsGetStringRawBuffer)( HSTRING, UINT32* ); +static HRESULT (WINAPI *pRoGetActivationFactory)( HSTRING, REFIID, void** ); +static HRESULT (WINAPI *pRoInitialize)( RO_INIT_TYPE ); +static HRESULT (WINAPI *pWindowsCreateString)( const WCHAR*, UINT32, HSTRING* ); +static HRESULT (WINAPI *pWindowsDeleteString)( HSTRING str ); +static const WCHAR* (WINAPI *pWindowsGetStringRawBuffer)( HSTRING, UINT32* ); static BOOL load_combase_functions(void) {

1 0

Alex Henrie : kernel32/tests: Avoid using GCC's typeof extension.
by Alexandre Julliard 22 Nov '22

22 Nov '22

Module: wine Branch: master Commit: 318d02723cef8e79e7b559d569808a98629dc88e URL: https://gitlab.winehq.org/wine/wine/-/commit/318d02723cef8e79e7b559d569808a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 21 21:14:47 2022 -0700 kernel32/tests: Avoid using GCC's typeof extension. --- dlls/kernel32/tests/heap.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 3e861f52248..f449f06270d 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -52,13 +52,10 @@ static BOOLEAN (WINAPI *pRtlSetUserFlagsHeap)(HANDLE,ULONG,void*,ULONG,ULONG); static HGLOBAL (WINAPI *pGlobalAlloc)(UINT,SIZE_T); static HGLOBAL (WINAPI *pGlobalFree)(HGLOBAL); static HGLOBAL (WINAPI *pLocalFree)(HLOCAL); - -#define MAKE_FUNC(f) static typeof(f) *p ## f -MAKE_FUNC( HeapQueryInformation ); -MAKE_FUNC( HeapSetInformation ); -MAKE_FUNC( GlobalFlags ); -MAKE_FUNC( RtlGetNtGlobalFlags ); -#undef MAKE_FUNC +static BOOL (WINAPI *pHeapQueryInformation)(HANDLE,HEAP_INFORMATION_CLASS,void*,SIZE_T,SIZE_T*); +static BOOL (WINAPI *pHeapSetInformation)(HANDLE,HEAP_INFORMATION_CLASS,void*,SIZE_T); +static UINT (WINAPI *pGlobalFlags)(HGLOBAL); +static ULONG (WINAPI *pRtlGetNtGlobalFlags)(void); static void load_functions(void) {

1 0

Alex Henrie : explorer: Put the calling convention inside the function pointer parentheses.
by Alexandre Julliard 22 Nov '22

22 Nov '22

Module: wine Branch: master Commit: dab61cdcd1f0ddbe6c096ccfe9344d4d33572f22 URL: https://gitlab.winehq.org/wine/wine/-/commit/dab61cdcd1f0ddbe6c096ccfe9344d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 21 21:06:37 2022 -0700 explorer: Put the calling convention inside the function pointer parentheses. As required by MSVC. --- programs/explorer/startmenu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/explorer/startmenu.c b/programs/explorer/startmenu.c index 3173ae21fc6..b46bd068220 100644 --- a/programs/explorer/startmenu.c +++ b/programs/explorer/startmenu.c @@ -371,8 +371,8 @@ static void fill_menu(struct menu_item* item) static void run_dialog(void) { - void WINAPI (*pRunFileDlg)(HWND hWndOwner, HICON hIcon, LPCSTR lpszDir, - LPCSTR lpszTitle, LPCSTR lpszDesc, DWORD dwFlags); + void (WINAPI *pRunFileDlg)(HWND owner, HICON icon, const char *dir, + const char *title, const char *desc, DWORD flags); HMODULE hShell32; hShell32 = LoadLibraryW(L"shell32");

1 0

Alex Henrie : webservices: Remove unused function heap_realloc_zero.
by Alexandre Julliard 22 Nov '22

22 Nov '22

Module: wine Branch: master Commit: 78e0caa5ef09a4410b5b72d841746079c57e3973 URL: https://gitlab.winehq.org/wine/wine/-/commit/78e0caa5ef09a4410b5b72d8417460… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 21 22:44:25 2022 -0700 webservices: Remove unused function heap_realloc_zero. This function has not been used since commit 105d16774432a6ab206896404ca644d9ee7e2b7e. --- dlls/webservices/webservices_private.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 478f1aa00f3..e488614c2a5 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -406,8 +406,3 @@ static inline BOOL is_valid_parent( const struct node *node ) if (!node) return FALSE; return (node_type( node ) == WS_XML_NODE_TYPE_ELEMENT || node_type( node ) == WS_XML_NODE_TYPE_BOF); } - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); -}

1 0

Matthew Tran : hid: Fix HidP_(Get|Set)(Scaled)UsageValue with usage ranges and arrays.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: a08eb8969a2267f90e1f6948b68b62d0375a1efd URL: https://gitlab.winehq.org/wine/wine/-/commit/a08eb8969a2267f90e1f6948b68b62… Author: Matthew Tran <0e4ef622(a)gmail.com> Date: Mon Nov 21 12:47:34 2022 +0100 hid: Fix HidP_(Get|Set)(Scaled)UsageValue with usage ranges and arrays. --- dlls/dinput/tests/hid.c | 12 ------------ dlls/hid/hidp.c | 36 ++++++++++++++++++++++-------------- 2 files changed, 22 insertions(+), 26 deletions(-)

1 0

Gabriel Ivăncescu : jscript: Use CRT allocation functions.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: ae73e09a8d071eaa33fafe785e8295384b9e64a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/ae73e09a8d071eaa33fafe785e8295… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Nov 21 20:43:43 2022 +0200 jscript: Use CRT allocation functions. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/array.c | 18 +++++++++--------- dlls/jscript/bool.c | 4 ++-- dlls/jscript/compile.c | 40 ++++++++++++++++++++-------------------- dlls/jscript/date.c | 16 ++++++++-------- dlls/jscript/engine.c | 18 +++++++++--------- dlls/jscript/enumerator.c | 6 +++--- dlls/jscript/error.c | 4 ++-- dlls/jscript/function.c | 34 +++++++++++++++++----------------- dlls/jscript/jscript.c | 2 +- dlls/jscript/jscript.h | 1 - dlls/jscript/json.c | 26 +++++++++++++------------- dlls/jscript/jsregexp.c | 18 +++++++++--------- dlls/jscript/jsstr.c | 10 +++++----- dlls/jscript/jsutils.c | 26 +++++++++++++------------- dlls/jscript/lex.c | 8 ++++---- dlls/jscript/math.c | 4 ++-- dlls/jscript/number.c | 4 ++-- dlls/jscript/object.c | 6 +++--- dlls/jscript/parser.y | 4 ++-- dlls/jscript/regexp.c | 30 +++++++++++++++--------------- dlls/jscript/regexp.h | 2 +- dlls/jscript/set.c | 12 ++++++------ dlls/jscript/string.c | 22 +++++++++++----------- dlls/jscript/vbarray.c | 12 ++++++------ 24 files changed, 163 insertions(+), 164 deletions(-)

1 0

Matthew Tran : dinput/tests: Add more tests for HidP_SetUsageValue.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: 4c02d8e7a8def45d364d69601be003f98e31a69c URL: https://gitlab.winehq.org/wine/wine/-/commit/4c02d8e7a8def45d364d69601be003… Author: Matthew Tran <0e4ef622(a)gmail.com> Date: Mon Nov 21 04:39:58 2022 -0600 dinput/tests: Add more tests for HidP_SetUsageValue. --- dlls/dinput/tests/hid.c | 102 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 91 insertions(+), 11 deletions(-) diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index 88565283735..5a8e1565ffd 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -1188,7 +1188,7 @@ static void test_hidp_set_feature( HANDLE file, int report_id, ULONG report_len, .report_buf = { report_id,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0xcd,0xcd,0xcd,0xcd,0xcd,0xcd,0xcd,0xcd,0xcd,0xcd,0xcd, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0xcd,0xcd,0xcd,0xcd,0xcd,0xcd,0xcd,0xcd,0xcd,0xcd,0xcd, }, .ret_length = 3, @@ -1226,7 +1226,8 @@ static void test_hidp_set_feature( HANDLE file, int report_id, ULONG report_len, { 0x5a,0x5a,0x5a,0x5a,0x5a,0x5a,0x5a,0x5a, 0x5a,0x5a,0x5a,0x5a,0x5a,0x5a,0x5a,0x5a, - 0x5a,0x5a,0x5a,0x5a,0x5a, + 0x5a,0x5a,0x5a,0x5a,0x5a,0x5a,0x5a,0x5a, + 0x5a,0x5a,0x5a,0x5a,0x5a,0x5a,0x5a, }, .ret_length = 3, .ret_status = STATUS_SUCCESS, @@ -1558,8 +1559,8 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, .LinkUsagePage = HID_USAGE_PAGE_GENERIC, .CollectionType = 1, - .NumberOfChildren = 7, - .FirstChild = 9, + .NumberOfChildren = 8, + .FirstChild = 10, }, { .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, @@ -1582,6 +1583,7 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle { .DataIndex = 39, .RawValue = 1, }, }; + DWORD waveform_list, collection_count, generic_output_list; OVERLAPPED overlapped = {0}, overlapped2 = {0}; HIDP_LINK_COLLECTION_NODE collections[16]; PHIDP_PREPARSED_DATA preparsed_data; @@ -1589,8 +1591,6 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle HIDP_BUTTON_CAPS button_caps[32]; HIDP_VALUE_CAPS value_caps[16]; char buffer[200], report[200]; - DWORD collection_count; - DWORD waveform_list; HIDP_DATA data[64]; USAGE usages[16]; ULONG off, value; @@ -2038,7 +2038,7 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle value = HidP_MaxDataListLength( HidP_Output, preparsed_data ); ok( value == 0, "HidP_MaxDataListLength(HidP_Output) returned %ld, expected %d\n", value, 0 ); value = HidP_MaxDataListLength( HidP_Feature, preparsed_data ); - ok( value == 14, "HidP_MaxDataListLength(HidP_Feature) returned %ld, expected %d\n", value, 14 ); + ok( value == 24, "HidP_MaxDataListLength(HidP_Feature) returned %ld, expected %d\n", value, 24 ); value = 1; status = HidP_GetData( HidP_Input, data, &value, preparsed_data, report, caps.InputReportByteLength ); @@ -2271,6 +2271,66 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle ok( status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#lx\n", status ); ok( value == 0xfffffd0b, "got value %#lx, expected %#x\n", value, 0xfffffd0b ); + memset( report, 0xcd, sizeof(report) ); + status = HidP_InitializeReportForID( HidP_Feature, report_id, preparsed_data, report, + caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_InitializeReportForID returned %#lx\n", status ); + + memset( buffer, 0xcd, sizeof(buffer) ); + memset( buffer, 0, caps.FeatureReportByteLength ); + buffer[0] = report_id; + ok( !memcmp( buffer, report, sizeof(buffer) ), "unexpected report data\n" ); + + for (i = 0; i < caps.NumberLinkCollectionNodes; ++i) + { + if (collections[i].LinkUsagePage != HID_USAGE_PAGE_GENERIC) continue; + if (collections[i].LinkUsage == HID_USAGE_GENERIC_SYSTEM_CTL) break; + } + ok( i < caps.NumberLinkCollectionNodes, "HID_USAGE_GENERIC_SYSTEM_CTL collection not found\n" ); + generic_output_list = i; + + for (i = 0; i < 5; ++i) + { + status = HidP_SetUsageValue( HidP_Feature, HID_USAGE_PAGE_ORDINAL, generic_output_list, i + 1, + i, preparsed_data, report, caps.FeatureReportByteLength ); + todo_wine + ok( status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValue returned %#lx\n", status ); + + status = HidP_GetUsageValue( HidP_Feature, HID_USAGE_PAGE_ORDINAL, generic_output_list, i + 1, + &value, preparsed_data, report, caps.FeatureReportByteLength ); + todo_wine + ok( status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValue returned %#lx\n", status ); + todo_wine + ok( value == i, "got value %#lx, expected %#x\n", value, i ); + + status = HidP_SetUsageValueArray( HidP_Feature, HID_USAGE_PAGE_ORDINAL, generic_output_list, i + 1, (void *)&value, + sizeof(value), preparsed_data, report, caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_NOT_VALUE_ARRAY, "HidP_SetUsageValue returned %#lx\n", status ); + status = HidP_GetUsageValueArray( HidP_Feature, HID_USAGE_PAGE_ORDINAL, generic_output_list, i + 1, (void *)&value, + sizeof(value), preparsed_data, report, caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_NOT_VALUE_ARRAY, "HidP_SetUsageValue returned %#lx\n", status ); + + buffer[i + 21] = i; + } + for (i = 5; i < 10; ++i) + { + status = HidP_SetScaledUsageValue( HidP_Feature, HID_USAGE_PAGE_ORDINAL, generic_output_list, i + 1, + i * 16, preparsed_data, report, caps.FeatureReportByteLength ); + todo_wine + ok( status == HIDP_STATUS_SUCCESS, "HidP_SetScaledUsageValue returned %#lx\n", status ); + + status = HidP_GetScaledUsageValue( HidP_Feature, HID_USAGE_PAGE_ORDINAL, generic_output_list, i + 1, + (LONG *)&value, preparsed_data, report, caps.FeatureReportByteLength ); + todo_wine + ok( status == HIDP_STATUS_SUCCESS, "HidP_GetScaledUsageValue returned %#lx\n", status ); + todo_wine + ok( value == i * 16, "got value %#lx, expected %#x\n", value, i * 16 ); + + buffer[i + 21] = i; + } + todo_wine + ok( !memcmp( buffer, report, sizeof(buffer) ), "unexpected report data\n" ); + test_hidp_get_input( file, report_id, caps.InputReportByteLength, preparsed_data ); test_hidp_get_feature( file, report_id, caps.FeatureReportByteLength, preparsed_data ); test_hidp_set_feature( file, report_id, caps.FeatureReportByteLength, preparsed_data ); @@ -2864,6 +2924,26 @@ static void test_hid_driver( DWORD report_id, DWORD polled ) FEATURE(1, Data|Var|Abs), END_COLLECTION, + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_SYSTEM_CTL), + COLLECTION(1, Report), + REPORT_ID_OR_USAGE_PAGE(1, report_id, 0), + REPORT_COUNT(1, 10), + REPORT_SIZE(1, 8), + LOGICAL_MINIMUM(2, 0x0000), + LOGICAL_MAXIMUM(2, 0x00ff), + PHYSICAL_MINIMUM(2, 0x0000), + PHYSICAL_MAXIMUM(2, 0x0ff0), + USAGE_PAGE(1, HID_USAGE_PAGE_ORDINAL), + STRING_MINIMUM(1, 6), + STRING_MAXIMUM(1, 16), + USAGE_MINIMUM(1, 1), /* Instance 1 */ + USAGE_MAXIMUM(1, 10), /* Instance 10 */ + FEATURE(1, Data|Var|Abs), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 0), + END_COLLECTION, + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), USAGE(1, HID_USAGE_GENERIC_JOYSTICK), COLLECTION(1, Report), @@ -2911,14 +2991,14 @@ static void test_hid_driver( DWORD report_id, DWORD polled ) .UsagePage = HID_USAGE_PAGE_GENERIC, .InputReportByteLength = report_id ? 32 : 33, .OutputReportByteLength = report_id ? 2 : 3, - .FeatureReportByteLength = report_id ? 21 : 22, - .NumberLinkCollectionNodes = 10, + .FeatureReportByteLength = report_id ? 31 : 32, + .NumberLinkCollectionNodes = 11, .NumberInputButtonCaps = 17, .NumberInputValueCaps = 7, .NumberInputDataIndices = 47, .NumberFeatureButtonCaps = 1, - .NumberFeatureValueCaps = 6, - .NumberFeatureDataIndices = 8, + .NumberFeatureValueCaps = 7, + .NumberFeatureDataIndices = 18, }; const struct hid_expect expect_in = {

1 0

Rémi Bernon : dinput/tests: Add more HidP_(Set|Get)UsageValue tests with array caps.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: 87744a57fa32f2e53ea1caedd172ee3a17331707 URL: https://gitlab.winehq.org/wine/wine/-/commit/87744a57fa32f2e53ea1caedd172ee… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 21 19:31:30 2022 +0100 dinput/tests: Add more HidP_(Set|Get)UsageValue tests with array caps. --- dlls/dinput/tests/hid.c | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index 5a8e1565ffd..b9f0baf510a 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -1543,7 +1543,7 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle .LinkUsagePage = HID_USAGE_PAGE_GENERIC, .LinkCollection = 1, .IsAbsolute = TRUE, - .BitSize = 4, + .BitSize = 24, .ReportCount = 2, .LogicalMin = 1, .LogicalMax = 8, @@ -1792,26 +1792,50 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle status = HidP_SetUsageValueArray( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, buffer, sizeof(buffer), preparsed_data, report, caps.InputReportByteLength ); ok( status == HIDP_STATUS_NOT_VALUE_ARRAY, "HidP_SetUsageValueArray returned %#lx\n", status ); - memset( buffer, 0xcd, sizeof(buffer) ); + memset( buffer, 0xa5, sizeof(buffer) ); status = HidP_SetUsageValueArray( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_HATSWITCH, buffer, 0, preparsed_data, report, caps.InputReportByteLength ); ok( status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_SetUsageValueArray returned %#lx\n", status ); status = HidP_SetUsageValueArray( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_HATSWITCH, buffer, 8, preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValueArray returned %#lx\n", status ); + ok( report[16] == (char)0xa5, "got report value %d\n", report[16] ); + ok( report[17] == (char)0xa5, "got report value %d\n", report[17] ); + + report[16] = 0xa5; + report[17] = 0xa5; + status = HidP_SetUsageValue( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_HATSWITCH, + 8, preparsed_data, report, caps.InputReportByteLength ); + todo_wine + ok( status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValue returned %#lx\n", status ); + todo_wine + ok( report[16] == (char)8, "got value %#x\n", report[16] ); todo_wine - ok( status == HIDP_STATUS_NOT_IMPLEMENTED, "HidP_SetUsageValueArray returned %#lx\n", status ); + ok( report[17] == (char)0, "got value %#x\n", report[17] ); status = HidP_GetUsageValueArray( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, buffer, sizeof(buffer), preparsed_data, report, caps.InputReportByteLength ); ok( status == HIDP_STATUS_NOT_VALUE_ARRAY, "HidP_GetUsageValueArray returned %#lx\n", status ); - memset( buffer, 0xcd, sizeof(buffer) ); + memset( buffer, 0xa5, sizeof(buffer) ); status = HidP_GetUsageValueArray( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_HATSWITCH, buffer, 0, preparsed_data, report, caps.InputReportByteLength ); ok( status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetUsageValueArray returned %#lx\n", status ); + report[16] = 0xcd; + report[17] = 0xcd; status = HidP_GetUsageValueArray( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_HATSWITCH, buffer, 8, preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValueArray returned %#lx\n", status ); + ok( buffer[0] == (char)0xcd, "got report value %#x\n", buffer[0] ); + ok( buffer[1] == (char)0xcd, "got report value %#x\n", buffer[1] ); + + report[16] = 0xff; + report[17] = 0xff; + status = HidP_GetUsageValue( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_HATSWITCH, + &value, preparsed_data, report, caps.InputReportByteLength ); + todo_wine + ok( status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#lx\n", status ); todo_wine - ok( status == HIDP_STATUS_NOT_IMPLEMENTED, "HidP_GetUsageValueArray returned %#lx\n", status ); + ok( value == 0xffff, "got value %ld\n", value ); value = -128; status = HidP_SetUsageValue( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, value, @@ -2787,7 +2811,7 @@ static void test_hid_driver( DWORD report_id, DWORD polled ) USAGE(1, HID_USAGE_GENERIC_HATSWITCH), LOGICAL_MINIMUM(1, 1), LOGICAL_MAXIMUM(1, 8), - REPORT_SIZE(1, 4), + REPORT_SIZE(1, 24), REPORT_COUNT(1, 2), INPUT(1, Data|Var|Abs), @@ -2989,7 +3013,7 @@ static void test_hid_driver( DWORD report_id, DWORD polled ) { .Usage = HID_USAGE_GENERIC_JOYSTICK, .UsagePage = HID_USAGE_PAGE_GENERIC, - .InputReportByteLength = report_id ? 32 : 33, + .InputReportByteLength = report_id ? 37 : 38, .OutputReportByteLength = report_id ? 2 : 3, .FeatureReportByteLength = report_id ? 31 : 32, .NumberLinkCollectionNodes = 11,

1 0