wine-commits November 2022

wine-commits@winehq.org

1 participants
1171 discussions

Matthew Tran : winebus.sys: Fix incorrect HID STRING_INDEX tag value.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: 1e812da4daec4a5846c3d2e3b03d38517361ba6f URL: https://gitlab.winehq.org/wine/wine/-/commit/1e812da4daec4a5846c3d2e3b03d38… Author: Matthew Tran <0e4ef622(a)gmail.com> Date: Sun Nov 20 01:10:59 2022 -0600 winebus.sys: Fix incorrect HID STRING_INDEX tag value. --- dlls/winebus.sys/psh_hid_macros.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winebus.sys/psh_hid_macros.h b/dlls/winebus.sys/psh_hid_macros.h index 4623af20598..8e0a2a9dd6b 100644 --- a/dlls/winebus.sys/psh_hid_macros.h +++ b/dlls/winebus.sys/psh_hid_macros.h @@ -79,7 +79,7 @@ #define DESIGNATOR_INDEX(n,data) SHORT_ITEM_##n(0x3,2,data) #define DESIGNATOR_MINIMUM(n,data) SHORT_ITEM_##n(0x4,2,data) #define DESIGNATOR_MAXIMUM(n,data) SHORT_ITEM_##n(0x5,2,data) -#define STRING_INDEX(n,data) SHORT_ITEM_##n(0x6,2,data) -#define STRING_MINIMUM(n,data) SHORT_ITEM_##n(0x7,2,data) -#define STRING_MAXIMUM(n,data) SHORT_ITEM_##n(0x8,2,data) -#define DELIMITER(n,data) SHORT_ITEM_##n(0x9,2,data) +#define STRING_INDEX(n,data) SHORT_ITEM_##n(0x7,2,data) +#define STRING_MINIMUM(n,data) SHORT_ITEM_##n(0x8,2,data) +#define STRING_MAXIMUM(n,data) SHORT_ITEM_##n(0x9,2,data) +#define DELIMITER(n,data) SHORT_ITEM_##n(0xa,2,data)

1 0

Matthew Tran : ntoskrnl.exe/tests: Fix incorrect HID STRING_INDEX tag value.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: c712e571d26e07eb94a0eb5e610f5dc595c3768e URL: https://gitlab.winehq.org/wine/wine/-/commit/c712e571d26e07eb94a0eb5e610f5d… Author: Matthew Tran <0e4ef622(a)gmail.com> Date: Sun Nov 20 01:10:59 2022 -0600 ntoskrnl.exe/tests: Fix incorrect HID STRING_INDEX tag value. --- dlls/ntoskrnl.exe/tests/psh_hid_macros.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/psh_hid_macros.h b/dlls/ntoskrnl.exe/tests/psh_hid_macros.h index 4623af20598..8e0a2a9dd6b 100644 --- a/dlls/ntoskrnl.exe/tests/psh_hid_macros.h +++ b/dlls/ntoskrnl.exe/tests/psh_hid_macros.h @@ -79,7 +79,7 @@ #define DESIGNATOR_INDEX(n,data) SHORT_ITEM_##n(0x3,2,data) #define DESIGNATOR_MINIMUM(n,data) SHORT_ITEM_##n(0x4,2,data) #define DESIGNATOR_MAXIMUM(n,data) SHORT_ITEM_##n(0x5,2,data) -#define STRING_INDEX(n,data) SHORT_ITEM_##n(0x6,2,data) -#define STRING_MINIMUM(n,data) SHORT_ITEM_##n(0x7,2,data) -#define STRING_MAXIMUM(n,data) SHORT_ITEM_##n(0x8,2,data) -#define DELIMITER(n,data) SHORT_ITEM_##n(0x9,2,data) +#define STRING_INDEX(n,data) SHORT_ITEM_##n(0x7,2,data) +#define STRING_MINIMUM(n,data) SHORT_ITEM_##n(0x8,2,data) +#define STRING_MAXIMUM(n,data) SHORT_ITEM_##n(0x9,2,data) +#define DELIMITER(n,data) SHORT_ITEM_##n(0xa,2,data)

1 0

Matthew Tran : hidparse.sys: Fix incorrect HID STRING_INDEX tag value.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: 17329f342e20908812d2d581963cd6b43cde27fa URL: https://gitlab.winehq.org/wine/wine/-/commit/17329f342e20908812d2d581963cd6… Author: Matthew Tran <0e4ef622(a)gmail.com> Date: Sun Nov 20 01:10:59 2022 -0600 hidparse.sys: Fix incorrect HID STRING_INDEX tag value. --- dlls/hidparse.sys/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidparse.sys/main.c b/dlls/hidparse.sys/main.c index 9c753c0f365..7058093e03c 100644 --- a/dlls/hidparse.sys/main.c +++ b/dlls/hidparse.sys/main.c @@ -93,7 +93,7 @@ enum TAG_LOCAL_DESIGNATOR_INDEX, TAG_LOCAL_DESIGNATOR_MINIMUM, TAG_LOCAL_DESIGNATOR_MAXIMUM, - TAG_LOCAL_STRING_INDEX, + TAG_LOCAL_STRING_INDEX = 0x7, TAG_LOCAL_STRING_MINIMUM, TAG_LOCAL_STRING_MAXIMUM, TAG_LOCAL_DELIMITER

1 0

Matthew Tran : dinput/tests: Fix incorrect HID STRING_INDEX tag value.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: b30a37209991bfd3313e61b7c9f2bbb9952ddab7 URL: https://gitlab.winehq.org/wine/wine/-/commit/b30a37209991bfd3313e61b7c9f2bb… Author: Matthew Tran <0e4ef622(a)gmail.com> Date: Sun Nov 20 01:10:59 2022 -0600 dinput/tests: Fix incorrect HID STRING_INDEX tag value. --- dlls/dinput/tests/psh_hid_macros.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/tests/psh_hid_macros.h b/dlls/dinput/tests/psh_hid_macros.h index 4623af20598..8e0a2a9dd6b 100644 --- a/dlls/dinput/tests/psh_hid_macros.h +++ b/dlls/dinput/tests/psh_hid_macros.h @@ -79,7 +79,7 @@ #define DESIGNATOR_INDEX(n,data) SHORT_ITEM_##n(0x3,2,data) #define DESIGNATOR_MINIMUM(n,data) SHORT_ITEM_##n(0x4,2,data) #define DESIGNATOR_MAXIMUM(n,data) SHORT_ITEM_##n(0x5,2,data) -#define STRING_INDEX(n,data) SHORT_ITEM_##n(0x6,2,data) -#define STRING_MINIMUM(n,data) SHORT_ITEM_##n(0x7,2,data) -#define STRING_MAXIMUM(n,data) SHORT_ITEM_##n(0x8,2,data) -#define DELIMITER(n,data) SHORT_ITEM_##n(0x9,2,data) +#define STRING_INDEX(n,data) SHORT_ITEM_##n(0x7,2,data) +#define STRING_MINIMUM(n,data) SHORT_ITEM_##n(0x8,2,data) +#define STRING_MAXIMUM(n,data) SHORT_ITEM_##n(0x9,2,data) +#define DELIMITER(n,data) SHORT_ITEM_##n(0xa,2,data)

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

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

Eric Pouech : dbghelp: Locate alternate debug info files by their build id.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: 4119430e57a8e713cb5143f6e1bac44150145527 URL: https://gitlab.winehq.org/wine/wine/-/commit/4119430e57a8e713cb5143f6e1bac4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 21 16:42:24 2022 +0100 dbghelp: Locate alternate debug info files by their build id. (including debuginfo client cache) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/module.c | 146 ++++++++++++++++++++++++++------------------------ 1 file changed, 77 insertions(+), 69 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 27ed915389a..d590877497d 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -643,6 +643,71 @@ static WCHAR* append_hex(WCHAR* dst, const BYTE* id, const BYTE* end) return dst; } +/****************************************************************** + * image_locate_build_id_target + * + * Try to find the .so file containing the debug info out of the build-id note information + */ +static BOOL image_locate_build_id_target(struct image_file_map* fmap, const BYTE* id, unsigned idlen) +{ + struct image_file_map* fmap_link = NULL; + DWORD sz; + WCHAR* p; + WCHAR* z; + + fmap_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*fmap_link)); + if (!fmap_link) return FALSE; + + p = malloc(sizeof(L"/usr/lib/debug/.build-id/") + + (idlen * 2 + 1) * sizeof(WCHAR) + sizeof(L".debug")); + wcscpy(p, L"/usr/lib/debug/.build-id/"); + z = p + wcslen(p); + if (idlen) + { + z = append_hex(z, id, id + 1); + if (idlen > 1) + { + *z++ = L'/'; + z = append_hex(z, id + 1, id + idlen); + } + } + wcscpy(z, L".debug"); + TRACE("checking %s\n", wine_dbgstr_w(p)); + + if (image_check_debug_link_gnu_id(p, fmap_link, id, idlen)) + { + free(p); + fmap->alternate = fmap_link; + return TRUE; + } + + sz = GetEnvironmentVariableW(L"WINEHOMEDIR", NULL, 0); + if (sz) + { + p = realloc(p, sz * sizeof(WCHAR) + + sizeof(L"\\.cache\\debuginfod_client\\") + + idlen * 2 * sizeof(WCHAR) + sizeof(L"\\debuginfo") + 500); + GetEnvironmentVariableW(L"WINEHOMEDIR", p, sz); + z = p + sz - 1; + wcscpy(z, L"\\.cache\\debuginfod_client\\"); + z += wcslen(z); + z = append_hex(z, id, id + idlen); + wcscpy(z, L"\\debuginfo"); + TRACE("checking %ls\n", p); + if (image_check_debug_link_gnu_id(p, fmap_link, id, idlen)) + { + free(p); + fmap->alternate = fmap_link; + return TRUE; + } + } + + TRACE("not found\n"); + free(p); + HeapFree(GetProcessHeap(), 0, fmap_link); + return FALSE; +} + /****************************************************************** * image_load_debugaltlink * @@ -674,9 +739,12 @@ struct image_file_map* image_load_debugaltlink(struct image_file_map* fmap, stru unsigned sect_len; const BYTE* id; /* The content of the section is: - * + a \0 terminated string + * + a \0 terminated string (filename) * + followed by the build-id - * We try loading the dwz_alternate, either as absolute path, or relative to the embedded build-id + * We try loading the dwz_alternate: + * - from the filename: either as absolute path, or relative to the embedded build-id + * - from the build-id + * In both cases, checking that found .so file matches the requested build-id */ sect_len = image_get_map_size(&debugaltlink_sect); id = memchr(data, '\0', sect_len); @@ -726,8 +794,13 @@ struct image_file_map* image_load_debugaltlink(struct image_file_map* fmap, stru if (!ret) { HeapFree(GetProcessHeap(), 0, fmap_link); - WARN("Couldn't find a match for .gnu_debugaltlink section %s for %s\n", data, debugstr_w(module->modulename)); - fmap_link = NULL; + /* didn't work out with filename, try file lookup based on build-id */ + ret = image_locate_build_id_target(fmap, id, idlen); + if (!ret) + { + WARN("Couldn't find a match for .gnu_debugaltlink section %s for %s\n", data, debugstr_w(module->modulename)); + fmap_link = NULL; + } } } } @@ -737,71 +810,6 @@ struct image_file_map* image_load_debugaltlink(struct image_file_map* fmap, stru return fmap_link; } -/****************************************************************** - * image_locate_build_id_target - * - * Try to find the .so file containing the debug info out of the build-id note information - */ -static BOOL image_locate_build_id_target(struct image_file_map* fmap, const BYTE* id, unsigned idlen) -{ - struct image_file_map* fmap_link = NULL; - DWORD sz; - WCHAR* p; - WCHAR* z; - - fmap_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*fmap_link)); - if (!fmap_link) return FALSE; - - p = malloc(sizeof(L"/usr/lib/debug/.build-id/") + - (idlen * 2 + 1) * sizeof(WCHAR) + sizeof(L".debug")); - wcscpy(p, L"/usr/lib/debug/.build-id/"); - z = p + wcslen(p); - if (idlen) - { - z = append_hex(z, id, id + 1); - if (idlen > 1) - { - *z++ = L'/'; - z = append_hex(z, id + 1, id + idlen); - } - } - wcscpy(z, L".debug"); - TRACE("checking %s\n", wine_dbgstr_w(p)); - - if (image_check_debug_link_gnu_id(p, fmap_link, id, idlen)) - { - free(p); - fmap->alternate = fmap_link; - return TRUE; - } - - sz = GetEnvironmentVariableW(L"WINEHOMEDIR", NULL, 0); - if (sz) - { - p = realloc(p, sz * sizeof(WCHAR) + - sizeof(L"\\.cache\\debuginfod_client\\") + - idlen * 2 * sizeof(WCHAR) + sizeof(L"\\debuginfo") + 500); - GetEnvironmentVariableW(L"WINEHOMEDIR", p, sz); - z = p + sz - 1; - wcscpy(z, L"\\.cache\\debuginfod_client\\"); - z += wcslen(z); - z = append_hex(z, id, id + idlen); - wcscpy(z, L"\\debuginfo"); - TRACE("checking %ls\n", p); - if (image_check_debug_link_gnu_id(p, fmap_link, id, idlen)) - { - free(p); - fmap->alternate = fmap_link; - return TRUE; - } - } - - TRACE("not found\n"); - free(p); - HeapFree(GetProcessHeap(), 0, fmap_link); - return FALSE; -} - /****************************************************************** * image_check_alternate *

1 0

Eric Pouech : dbghelp: Search debug info files into local cache of debuginfod.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: b718fbc31fb4e28bf05e939652553d4fc6b73c8b URL: https://gitlab.winehq.org/wine/wine/-/commit/b718fbc31fb4e28bf05e939652553d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 21 16:42:23 2022 +0100 dbghelp: Search debug info files into local cache of debuginfod. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/module.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 4840a44f5de..27ed915389a 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -745,6 +745,7 @@ struct image_file_map* image_load_debugaltlink(struct image_file_map* fmap, stru static BOOL image_locate_build_id_target(struct image_file_map* fmap, const BYTE* id, unsigned idlen) { struct image_file_map* fmap_link = NULL; + DWORD sz; WCHAR* p; WCHAR* z; @@ -764,7 +765,7 @@ static BOOL image_locate_build_id_target(struct image_file_map* fmap, const BYTE z = append_hex(z, id + 1, id + idlen); } } - memcpy(z, L".debug", sizeof(L".debug")); + wcscpy(z, L".debug"); TRACE("checking %s\n", wine_dbgstr_w(p)); if (image_check_debug_link_gnu_id(p, fmap_link, id, idlen)) @@ -774,6 +775,27 @@ static BOOL image_locate_build_id_target(struct image_file_map* fmap, const BYTE return TRUE; } + sz = GetEnvironmentVariableW(L"WINEHOMEDIR", NULL, 0); + if (sz) + { + p = realloc(p, sz * sizeof(WCHAR) + + sizeof(L"\\.cache\\debuginfod_client\\") + + idlen * 2 * sizeof(WCHAR) + sizeof(L"\\debuginfo") + 500); + GetEnvironmentVariableW(L"WINEHOMEDIR", p, sz); + z = p + sz - 1; + wcscpy(z, L"\\.cache\\debuginfod_client\\"); + z += wcslen(z); + z = append_hex(z, id, id + idlen); + wcscpy(z, L"\\debuginfo"); + TRACE("checking %ls\n", p); + if (image_check_debug_link_gnu_id(p, fmap_link, id, idlen)) + { + free(p); + fmap->alternate = fmap_link; + return TRUE; + } + } + TRACE("not found\n"); free(p); HeapFree(GetProcessHeap(), 0, fmap_link);

1 0

Eric Pouech : dbghelp: Convert of couple more of string literals.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: 69108af65496021157daa4bcaaaa53ab15e8901a URL: https://gitlab.winehq.org/wine/wine/-/commit/69108af65496021157daa4bcaaaa53… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 21 16:42:21 2022 +0100 dbghelp: Convert of couple more of string literals. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/path.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index 2320c9da5c3..d23a4b5733e 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -741,17 +741,14 @@ BOOL search_dll_path(const struct process *process, const WCHAR *name, BOOL (*ma if ((env = process_getenv(process, L"WINEBUILDDIR"))) { - const WCHAR dllsW[] = { '\\','d','l','l','s','\\' }; - const WCHAR programsW[] = { '\\','p','r','o','g','r','a','m','s','\\' }; - len = lstrlenW(env); - if (!(buf = heap_alloc((len + ARRAY_SIZE(programsW) + machine_dir_len + + if (!(buf = heap_alloc((len + wcslen(L"\\programs\\") + machine_dir_len + 2 * lstrlenW(name) + 1) * sizeof(WCHAR)))) return FALSE; wcscpy(buf, env); end = buf + len; - memcpy(end, dllsW, sizeof(dllsW)); - lstrcpyW(end + ARRAY_SIZE(dllsW), name); + wcscpy(end, L"\\dlls\\"); + wcscat(end, name); if ((p = wcsrchr(end, '.')) && !lstrcmpW(p, L".so")) *p = 0; if ((p = wcsrchr(end, '.')) && !lstrcmpW(p, L".dll")) *p = 0; p = end + lstrlenW(end); @@ -764,9 +761,9 @@ BOOL search_dll_path(const struct process *process, const WCHAR *name, BOOL (*ma lstrcpyW(p, name); if (try_match_file(buf, match, param)) goto found; - memcpy(end, programsW, sizeof(programsW)); - end += ARRAY_SIZE(programsW); - lstrcpyW(end, name); + wcscpy(end, L"\\programs\\"); + end += wcslen(end); + wcscpy(end, name); if ((p = wcsrchr(end, '.')) && !lstrcmpW(p, L".so")) *p = 0; if ((p = wcsrchr(end, '.')) && !lstrcmpW(p, L".exe")) *p = 0; p = end + lstrlenW(end);

1 0

Eric Pouech : ucrtbase: Handle undecoration of function's reference qualifiers (C++11).
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: d1eb78a75deb49cea3b273742b05362f227c8d22 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1eb78a75deb49cea3b273742b0536… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 21 11:30:13 2022 +0100 ucrtbase: Handle undecoration of function's reference qualifiers (C++11). Introducing get_function_qualifier(). Feature is not available in msvcrt. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msvcrt/undname.c | 59 +++++++++++++++++++++++++++++------------------ dlls/ucrtbase/tests/cpp.c | 1 - 2 files changed, 37 insertions(+), 23 deletions(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 8db8e8f01b9..5a7283caac7 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -80,6 +80,7 @@ struct parsed_symbol enum datatype_e { DT_NO_LEADING_WS = 0x01, + DT_NO_LRSEP_WS = 0x02, }; /* Type for parsing mangled types */ @@ -407,28 +408,35 @@ static char* get_args(struct parsed_symbol* sym, struct array* pmt_ref, BOOL z_t return args_str; } -static void append_extended_qualifier(struct parsed_symbol *sym, const char **where, const char *str) +static void append_extended_qualifier(struct parsed_symbol *sym, const char **where, + const char *str, BOOL is_ms_keyword) { - if (!(sym->flags & UNDNAME_NO_MS_KEYWORDS)) + if (!is_ms_keyword || !(sym->flags & UNDNAME_NO_MS_KEYWORDS)) { - if (sym->flags & UNDNAME_NO_LEADING_UNDERSCORES) + if (is_ms_keyword && (sym->flags & UNDNAME_NO_LEADING_UNDERSCORES)) str += 2; - *where = *where ? str_printf(sym, "%s %s", *where, str) : str; + *where = *where ? str_printf(sym, "%s%s%s%s", *where, is_ms_keyword ? " " : "", str, is_ms_keyword ? "" : " ") : + str_printf(sym, "%s%s", str, is_ms_keyword ? "" : " "); } } static void get_extended_qualifier(struct parsed_symbol *sym, struct datatype_t *xdt) { + unsigned fl = 0; xdt->left = xdt->right = NULL; xdt->flags = 0; for (;;) { switch (*sym->current) { - case 'E': append_extended_qualifier(sym, &xdt->right, "__ptr64"); break; - case 'F': append_extended_qualifier(sym, &xdt->left, "__unaligned"); break; - case 'I': append_extended_qualifier(sym, &xdt->right, "__restrict"); break; - default: return; + case 'E': append_extended_qualifier(sym, &xdt->right, "__ptr64", TRUE); fl |= 2; break; + case 'F': append_extended_qualifier(sym, &xdt->left, "__unaligned", TRUE); fl |= 2; break; +#ifdef _UCRT + case 'G': append_extended_qualifier(sym, &xdt->right, "&", FALSE); fl |= 1; break; + case 'H': append_extended_qualifier(sym, &xdt->right, "&&", FALSE); fl |= 1; break; +#endif + case 'I': append_extended_qualifier(sym, &xdt->right, "__restrict", TRUE); fl |= 2; break; + default: if (fl == 1 || (fl == 3 && (sym->flags & UNDNAME_NO_MS_KEYWORDS))) xdt->flags = DT_NO_LRSEP_WS; return; } sym->current++; } @@ -457,7 +465,10 @@ static BOOL get_qualifier(struct parsed_symbol *sym, struct datatype_t *xdt, con default: return FALSE; } if (qualif) + { + xdt->flags &= ~DT_NO_LRSEP_WS; xdt->left = xdt->left ? str_printf(sym, "%s %s", qualif, xdt->left) : qualif; + } if (ch >= 'Q' && ch <= 'T') /* pointer to member, fetch class */ { const char* class = get_class_name(sym); @@ -473,6 +484,16 @@ static BOOL get_qualifier(struct parsed_symbol *sym, struct datatype_t *xdt, con return TRUE; } +static BOOL get_function_qualifier(struct parsed_symbol *sym, const char** qualif) +{ + struct datatype_t xdt; + + if (!get_qualifier(sym, &xdt, NULL)) return FALSE; + *qualif = (xdt.left || xdt.right) ? + str_printf(sym, "%s%s%s", xdt.left, (xdt.flags & DT_NO_LRSEP_WS) ? "" : " ", xdt.right) : NULL; + return TRUE; +} + static BOOL get_qualified_type(struct datatype_t *ct, struct parsed_symbol* sym, struct array *pmt_ref, char qualif, enum datatype_flags flags) { @@ -949,24 +970,20 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, { struct function_signature fs; const char* class; - struct datatype_t xdt; + const char* function_qualifier; sym->current++; if (!(class = get_class_name(sym))) goto done; - if (!get_qualifier(sym, &xdt, NULL)) + if (!get_function_qualifier(sym, &function_qualifier)) goto done; if (!get_function_signature(sym, pmt_ref, &fs)) goto done; - if (xdt.left) - xdt.left = str_printf(sym, "%s %s", xdt.left, xdt.right); - else if (xdt.right) - xdt.left = str_printf(sym, " %s", xdt.right); ct->left = str_printf(sym, "%s%s (%s %s::*", fs.return_ct.left, fs.return_ct.right, fs.call_conv, class); - ct->right = str_printf(sym, ")%s%s", fs.arguments, xdt.left); + ct->right = str_printf(sym, ")%s%s", fs.arguments, function_qualifier); } else if (*sym->current == '6') { @@ -1233,7 +1250,7 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) const char* member_type = NULL; struct datatype_t ct_ret; const char* call_conv; - struct datatype_t xdt = {NULL}; + const char* function_qualifier = NULL; const char* exported; const char* args_str = NULL; const char* name = NULL; @@ -1362,9 +1379,7 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) (accmem <= 'X' && (accmem - 'A') % 8 != 2 && (accmem - 'A') % 8 != 3))) { /* Implicit 'this' pointer */ - /* If there is an implicit this pointer, const qualifier follows */ - if (!get_qualifier(sym, &xdt, NULL)) goto done; - if (xdt.left || xdt.right) xdt.left = str_printf(sym, "%s %s", xdt.left, xdt.right); + if (!get_function_qualifier(sym, &function_qualifier)) goto done; } if (!get_calling_convention(*sym->current++, &call_conv, &exported, @@ -1395,8 +1410,8 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) mark = sym->stack.num; if (has_args && !(args_str = get_args(sym, &array_pmt, TRUE, '(', ')'))) goto done; - if (sym->flags & UNDNAME_NAME_ONLY) args_str = xdt.left = NULL; - if (sym->flags & UNDNAME_NO_THISTYPE) xdt.left = NULL; + if (sym->flags & UNDNAME_NAME_ONLY) args_str = function_qualifier = NULL; + if (sym->flags & UNDNAME_NO_THISTYPE) function_qualifier = NULL; sym->stack.num = mark; /* Note: '()' after 'Z' means 'throws', but we don't care here @@ -1406,7 +1421,7 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) access, member_type, ct_ret.left, (ct_ret.left && !ct_ret.right) ? " " : NULL, call_conv, call_conv ? " " : NULL, exported, - name, args_str, xdt.left, ct_ret.right); + name, args_str, function_qualifier, ct_ret.right); ret = TRUE; done: return ret; diff --git a/dlls/ucrtbase/tests/cpp.c b/dlls/ucrtbase/tests/cpp.c index b9b36a1e740..9a66d66d814 100644 --- a/dlls/ucrtbase/tests/cpp.c +++ b/dlls/ucrtbase/tests/cpp.c @@ -219,7 +219,6 @@ static void test___unDName(void) for (i = 0; i < ARRAY_SIZE(und_tests); i++) { char *name = p___unDName(0, und_tests[i].in, 0, malloc, free, und_tests[i].flags); - todo_wine_if(i >= 3) ok(!strcmp(name, und_tests[i].out) || broken(und_tests[i].broken && !strcmp(und_tests[i].broken, name)), "unDName returned %s for #%u\n", wine_dbgstr_a(name), i);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2022