November 2022 - Wine-commits

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

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 : 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 : 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 : winexinput.sys: Fix incorrect HID STRING_INDEX tag value.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: 84f44de79fa9af56ac7f22e0d7d6e8786ec1d102 URL: https://gitlab.winehq.org/wine/wine/-/commit/84f44de79fa9af56ac7f22e0d7d6e8… Author: Matthew Tran <0e4ef622(a)gmail.com> Date: Sun Nov 20 01:10:59 2022 -0600 winexinput.sys: Fix incorrect HID STRING_INDEX tag value. --- dlls/winexinput.sys/psh_hid_macros.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winexinput.sys/psh_hid_macros.h b/dlls/winexinput.sys/psh_hid_macros.h index 4623af20598..8e0a2a9dd6b 100644 --- a/dlls/winexinput.sys/psh_hid_macros.h +++ b/dlls/winexinput.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

Rémi Bernon : hid: Move (get|set)_usage_value around and use it for scaled values.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: 7f6e8387dd5cabaae759d39bf54a8ca2bcc72853 URL: https://gitlab.winehq.org/wine/wine/-/commit/7f6e8387dd5cabaae759d39bf54a8c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 21 12:43:23 2022 +0100 hid: Move (get|set)_usage_value around and use it for scaled values. --- dlls/hid/hidp.c | 80 +++++++++++++++++++++++++++------------------------------ 1 file changed, 38 insertions(+), 42 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index a1c5805c19f..bf5a6259484 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -236,18 +236,33 @@ static LONG sign_extend( ULONG value, const struct hid_value_caps *caps ) return value - ((value & sign) << 1); } -static NTSTATUS get_scaled_usage_value( const struct hid_value_caps *caps, void *user ) +static NTSTATUS get_usage_value( const struct hid_value_caps *caps, void *user ) { struct usage_value_params *params = user; - ULONG unsigned_value = 0, bit_count = caps->bit_size * caps->report_count; - LONG signed_value, *value = params->value_buf; + ULONG bit_count = caps->bit_size * caps->report_count; unsigned char *report_buf; - if ((bit_count + 7) / 8 > sizeof(unsigned_value)) return HIDP_STATUS_BUFFER_TOO_SMALL; - if (sizeof(LONG) > params->value_len) return HIDP_STATUS_BUFFER_TOO_SMALL; + if ((bit_count + 7) / 8 > params->value_len) return HIDP_STATUS_BUFFER_TOO_SMALL; + memset( params->value_buf, 0, params->value_len ); report_buf = (unsigned char *)params->report_buf + caps->start_byte; - copy_bits( (unsigned char *)&unsigned_value, report_buf, bit_count, -caps->start_bit ); + copy_bits( params->value_buf, report_buf, bit_count, -caps->start_bit ); + + return HIDP_STATUS_NULL; +} + +static NTSTATUS get_scaled_usage_value( const struct hid_value_caps *caps, void *user ) +{ + struct usage_value_params *params = user; + LONG signed_value, *value = params->value_buf; + ULONG unsigned_value = 0; + NTSTATUS status; + + params->value_buf = &unsigned_value; + params->value_len = sizeof(unsigned_value); + if ((status = get_usage_value( caps, params )) != HIDP_STATUS_NULL) return status; + + if (sizeof(LONG) > params->value_len) return HIDP_STATUS_BUFFER_TOO_SMALL; signed_value = sign_extend( unsigned_value, caps ); if (caps->logical_min > caps->logical_max || caps->physical_min > caps->physical_max) @@ -280,21 +295,6 @@ NTSTATUS WINAPI HidP_GetScaledUsageValue( HIDP_REPORT_TYPE report_type, USAGE us return enum_value_caps( preparsed, report_type, report_len, &filter, get_scaled_usage_value, &params, &count ); } -static NTSTATUS get_usage_value( const struct hid_value_caps *caps, void *user ) -{ - struct usage_value_params *params = user; - ULONG bit_count = caps->bit_size * caps->report_count; - unsigned char *report_buf; - - if ((bit_count + 7) / 8 > params->value_len) return HIDP_STATUS_BUFFER_TOO_SMALL; - memset( params->value_buf, 0, params->value_len ); - - report_buf = (unsigned char *)params->report_buf + caps->start_byte; - copy_bits( params->value_buf, report_buf, bit_count, -caps->start_bit ); - - return HIDP_STATUS_NULL; -} - NTSTATUS WINAPI HidP_GetUsageValue( HIDP_REPORT_TYPE report_type, USAGE usage_page, USHORT collection, USAGE usage, ULONG *value, PHIDP_PREPARSED_DATA preparsed_data, char *report_buf, ULONG report_len ) { @@ -446,17 +446,28 @@ ULONG WINAPI HidP_MaxUsageListLength( HIDP_REPORT_TYPE report_type, USAGE usage_ return count; } -static NTSTATUS set_scaled_usage_value( const struct hid_value_caps *caps, void *user ) +static NTSTATUS set_usage_value( const struct hid_value_caps *caps, void *user ) { - ULONG bit_count = caps->bit_size * caps->report_count; struct usage_value_params *params = user; + ULONG bit_count = caps->bit_size * caps->report_count; unsigned char *report_buf; + + if ((bit_count + 7) / 8 > params->value_len) return HIDP_STATUS_BUFFER_TOO_SMALL; + + report_buf = (unsigned char *)params->report_buf + caps->start_byte; + copy_bits( report_buf, params->value_buf, bit_count, caps->start_bit ); + + return HIDP_STATUS_NULL; +} + +static NTSTATUS set_scaled_usage_value( const struct hid_value_caps *caps, void *user ) +{ + struct usage_value_params *params = user; LONG value, log_range, phy_range; if (caps->logical_min > caps->logical_max) return HIDP_STATUS_BAD_LOG_PHY_VALUES; if (caps->physical_min > caps->physical_max) return HIDP_STATUS_BAD_LOG_PHY_VALUES; - if ((bit_count + 7) / 8 > sizeof(value)) return HIDP_STATUS_BUFFER_TOO_SMALL; if (sizeof(LONG) > params->value_len) return HIDP_STATUS_BUFFER_TOO_SMALL; value = *(LONG *)params->value_buf; @@ -471,10 +482,9 @@ static NTSTATUS set_scaled_usage_value( const struct hid_value_caps *caps, void value = caps->logical_min + value; } - report_buf = (unsigned char *)params->report_buf + caps->start_byte; - copy_bits( report_buf, (unsigned char *)&value, bit_count, caps->start_bit ); - - return HIDP_STATUS_NULL; + params->value_buf = &value; + params->value_len = sizeof(value); + return set_usage_value( caps, params ); } NTSTATUS WINAPI HidP_SetScaledUsageValue( HIDP_REPORT_TYPE report_type, USAGE usage_page, USHORT collection, @@ -495,20 +505,6 @@ NTSTATUS WINAPI HidP_SetScaledUsageValue( HIDP_REPORT_TYPE report_type, USAGE us return enum_value_caps( preparsed, report_type, report_len, &filter, set_scaled_usage_value, &params, &count ); } -static NTSTATUS set_usage_value( const struct hid_value_caps *caps, void *user ) -{ - struct usage_value_params *params = user; - ULONG bit_count = caps->bit_size * caps->report_count; - unsigned char *report_buf; - - if ((bit_count + 7) / 8 > params->value_len) return HIDP_STATUS_BUFFER_TOO_SMALL; - - report_buf = (unsigned char *)params->report_buf + caps->start_byte; - copy_bits( report_buf, params->value_buf, bit_count, caps->start_bit ); - - return HIDP_STATUS_NULL; -} - NTSTATUS WINAPI HidP_SetUsageValue( HIDP_REPORT_TYPE report_type, USAGE usage_page, USHORT collection, USAGE usage, ULONG value, PHIDP_PREPARSED_DATA preparsed_data, char *report_buf, ULONG report_len ) {

1 0

Alexandre Julliard : ntdll: Use unsigned int for the return value of server calls.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: af4378d46dbb72e682017485212442bf865c2226 URL: https://gitlab.winehq.org/wine/wine/-/commit/af4378d46dbb72e682017485212442… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 21 16:21:43 2022 +0100 ntdll: Use unsigned int for the return value of server calls. To avoid typecasts in debug traces. --- dlls/ntdll/unix/env.c | 2 +- dlls/ntdll/unix/file.c | 102 +++++++++++++++++++------------------- dlls/ntdll/unix/loader.c | 10 ++-- dlls/ntdll/unix/process.c | 24 ++++----- dlls/ntdll/unix/registry.c | 28 +++++------ dlls/ntdll/unix/security.c | 24 ++++----- dlls/ntdll/unix/serial.c | 4 +- dlls/ntdll/unix/server.c | 10 ++-- dlls/ntdll/unix/signal_i386.c | 2 +- dlls/ntdll/unix/socket.c | 9 ++-- dlls/ntdll/unix/sync.c | 110 ++++++++++++++++++++--------------------- dlls/ntdll/unix/system.c | 8 +-- dlls/ntdll/unix/thread.c | 28 +++++------ dlls/ntdll/unix/unix_private.h | 4 +- dlls/ntdll/unix/virtual.c | 77 ++++++++++++++--------------- 15 files changed, 219 insertions(+), 223 deletions(-)

1 0

Alexandre Julliard : ntdll: Build the PE side without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 21 Nov '22

21 Nov '22

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

Alexandre Julliard : ntdll: Build the Unix side without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 21 Nov '22

21 Nov '22

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

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

21 Nov '22

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