November 2022 - Wine-Commits

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

Nov. 21, 2022

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: Fix incorrect HID STRING_INDEX tag value.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

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

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

Nov. 21, 2022

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

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

Nov. 21, 2022

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 : winebus.sys: Fix incorrect HID STRING_INDEX tag value.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

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 Nov. 21, 2022

Nov. 21, 2022

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

Alexandre Julliard : ntdll: Build the Unix side without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 9f363a69055182c3cba47f664098e9f1bfa98294 URL: https://gitlab.winehq.org/wine/wine/-/commit/9f363a69055182c3cba47f664098e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 21 16:34:52 2022 +0100 ntdll: Build the Unix side without -DWINE_NO_LONG_TYPES. --- dlls/ntdll/unix/cdrom.c | 13 +++++---- dlls/ntdll/unix/debug.c | 11 ++++---- dlls/ntdll/unix/env.c | 5 ++-- dlls/ntdll/unix/file.c | 57 ++++++++++++++++++++------------------- dlls/ntdll/unix/loader.c | 3 +-- dlls/ntdll/unix/process.c | 17 ++++++------ dlls/ntdll/unix/registry.c | 37 +++++++++++++------------- dlls/ntdll/unix/security.c | 30 ++++++++++----------- dlls/ntdll/unix/serial.c | 5 ++-- dlls/ntdll/unix/server.c | 5 ++-- dlls/ntdll/unix/signal_arm.c | 34 +++++++++++------------- dlls/ntdll/unix/signal_i386.c | 22 +++++++-------- dlls/ntdll/unix/sync.c | 42 ++++++++++++++--------------- dlls/ntdll/unix/system.c | 52 ++++++++++++++++++------------------ dlls/ntdll/unix/tape.c | 25 +++++++++-------- dlls/ntdll/unix/thread.c | 18 ++++++------- dlls/ntdll/unix/virtual.c | 62 +++++++++++++++++++++---------------------- 17 files changed, 212 insertions(+), 226 deletions(-)

1 0

Alexandre Julliard : ntdll: Build the PE side without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 0adec25f92219b5626b8ee3c1c13396d36e56ed3 URL: https://gitlab.winehq.org/wine/wine/-/commit/0adec25f92219b5626b8ee3c1c1339… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 21 16:27:08 2022 +0100 ntdll: Build the PE side without -DWINE_NO_LONG_TYPES. --- dlls/ntdll/Makefile.in | 2 +- dlls/ntdll/actctx.c | 44 +++++++++++++++---------------- dlls/ntdll/atom.c | 2 +- dlls/ntdll/debugbuffer.c | 42 ++++++++++++++--------------- dlls/ntdll/error.c | 2 +- dlls/ntdll/exception.c | 24 ++++++++--------- dlls/ntdll/handletable.c | 4 +-- dlls/ntdll/heap.c | 36 ++++++++++++------------- dlls/ntdll/loader.c | 57 ++++++++++++++++++++-------------------- dlls/ntdll/locale.c | 28 ++++++++++---------- dlls/ntdll/misc.c | 20 +++++++------- dlls/ntdll/path.c | 4 +-- dlls/ntdll/reg.c | 10 +++---- dlls/ntdll/relay.c | 34 ++++++++++++------------ dlls/ntdll/resource.c | 4 +-- dlls/ntdll/rtl.c | 26 +++++++++--------- dlls/ntdll/rtlbitmap.c | 32 +++++++++++------------ dlls/ntdll/rtlstr.c | 2 +- dlls/ntdll/sec.c | 40 ++++++++++++++-------------- dlls/ntdll/signal_arm.c | 61 +++++++++++++++++++++---------------------- dlls/ntdll/signal_arm64.c | 33 ++++++++++++----------- dlls/ntdll/signal_i386.c | 31 +++++++++++----------- dlls/ntdll/signal_x86_64.c | 31 +++++++++++----------- dlls/ntdll/sync.c | 8 +++--- dlls/ntdll/thread.c | 12 ++++----- dlls/ntdll/threadpool.c | 26 +++++++++--------- dlls/ntdll/unix/cdrom.c | 1 + dlls/ntdll/unix/debug.c | 1 + dlls/ntdll/unix/env.c | 1 + dlls/ntdll/unix/file.c | 1 + dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unix/process.c | 1 + dlls/ntdll/unix/registry.c | 1 + dlls/ntdll/unix/security.c | 1 + dlls/ntdll/unix/serial.c | 1 + dlls/ntdll/unix/server.c | 1 + dlls/ntdll/unix/signal_arm.c | 1 + dlls/ntdll/unix/signal_i386.c | 1 + dlls/ntdll/unix/sync.c | 1 + dlls/ntdll/unix/system.c | 1 + dlls/ntdll/unix/tape.c | 1 + dlls/ntdll/unix/thread.c | 1 + dlls/ntdll/unix/virtual.c | 1 + dlls/ntdll/version.c | 6 ++--- 44 files changed, 325 insertions(+), 313 deletions(-)

1 0

Eric Pouech : ucrtbase: Extend ucrtbase's undname tests.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 854eb9990f53fab80ac37af4a44d3436ab00da97 URL: https://gitlab.winehq.org/wine/wine/-/commit/854eb9990f53fab80ac37af4a44d34… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 21 11:30:10 2022 +0100 ucrtbase: Extend ucrtbase's undname tests. Renumbering entries' comment to match actual output. Adding ability to pass flags. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ucrtbase/tests/cpp.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/ucrtbase/tests/cpp.c b/dlls/ucrtbase/tests/cpp.c index a22138889cb..b9b36a1e740 100644 --- a/dlls/ucrtbase/tests/cpp.c +++ b/dlls/ucrtbase/tests/cpp.c @@ -192,21 +192,36 @@ static void test___std_type_info(void) static void test___unDName(void) { - static struct {const char *in; const char *out; const char *broken;} und_tests[] = + static struct {const char *in; const char *out; const char *broken; unsigned int flags;} und_tests[] = { -/* 1 */ {"??4QDnsDomainNameRecord@@QAEAAV0@$$QAV0@@Z", +/* 0 */ {"??4QDnsDomainNameRecord@@QAEAAV0@$$QAV0@@Z", "public: class QDnsDomainNameRecord & __thiscall QDnsDomainNameRecord::operator=(class QDnsDomainNameRecord &&)"}, -/* 2 */ {"??4QDnsDomainNameRecord@@QAEAAV0@$$QEAV0@@Z", +/* 1 */ {"??4QDnsDomainNameRecord@@QAEAAV0@$$QEAV0@@Z", "public: class QDnsDomainNameRecord & __thiscall QDnsDomainNameRecord::operator=(class QDnsDomainNameRecord && __ptr64)"}, -/* 3 */ {"??__K_l@@YA?AUCC@@I(a)Z", "struct CC __cdecl operator \"\" _l(unsigned int)", +/* 2 */ {"??__K_l@@YA?AUCC@@I(a)Z", "struct CC __cdecl operator \"\" _l(unsigned int)", "??__K_l@@YA?AUCC@@I(a)Z" /* W10 1507 fails on this :-( */}, +/* 3 */ {"?meth(a)Q@@QEGBA?AV1(a)XZ", + "public: class Q __cdecl Q::meth(void)const __ptr64& ", + "public: ?? :: ?? ::XZ::V1" /* W10 1507 fails on this :-( */}, +/* 4 */ {"?meth(a)Q@@QEHAA?AV1(a)XZ", + "public: class Q __cdecl Q::meth(void) __ptr64&& ", + "public: ?? :: ?? ::XZ::V1" /* W10 1507 fails on this :-( */}, +/* 5 */ {"?meth(a)Q@@QEGBA?AV1(a)XZ", + "public: class Q Q::meth(void)const & ", + "public: ?? :: ?? ::XZ::V1" /* W10 1507 fails on this :-( */, + 0x02 /*UNDNAME_NO_MS_KEYWORDS*/}, +/* 6 */ {"?meth(a)Q@@QEHAA?AV1(a)XZ", + "public: class Q Q::meth(void)&& ", + "public: ?? :: ?? ::XZ::V1" /* W10 1507 fails on this :-( */, + 0x02 /*UNDNAME_NO_MS_KEYWORDS*/}, }; unsigned i; for (i = 0; i < ARRAY_SIZE(und_tests); i++) { - char *name = p___unDName(0, und_tests[i].in, 0, malloc, free, 0); + 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))), + broken(und_tests[i].broken && !strcmp(und_tests[i].broken, name)), "unDName returned %s for #%u\n", wine_dbgstr_a(name), i); free(name); }

1 0

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

Nov. 21, 2022

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