February 2022 - Wine-commits

Michael Stefaniuc : dmscript/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 11 Feb '22

11 Feb '22

Module: wine Branch: master Commit: be2553768fe0f1c2dcec026bec4ea812b98690ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=be2553768fe0f1c2dcec026b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 10 22:32:19 2022 +0100 dmscript/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmscript/tests/Makefile.in | 1 - dlls/dmscript/tests/dmscript.c | 109 ++++++++++++++++++++-------------------- 2 files changed, 54 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=be2553768fe0f1c2dcec…

1 0

Michael Stefaniuc : dmstyle/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 11 Feb '22

11 Feb '22

Module: wine Branch: master Commit: 1a9e8c1a2e1e32ab5a146973ef43bc7a7c5e1b1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a9e8c1a2e1e32ab5a146973… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 10 22:32:20 2022 +0100 dmstyle/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/tests/Makefile.in | 1 - dlls/dmstyle/tests/dmstyle.c | 152 ++++++++++++++++++++--------------------- 2 files changed, 76 insertions(+), 77 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1a9e8c1a2e1e32ab5a14…

1 0

Zebediah Figura : ws2_32/tests: Use winetest_push_context() in test_WSAStringToAddress().
by Alexandre Julliard 11 Feb '22

11 Feb '22

Module: wine Branch: master Commit: 8648ab248cab465c9df7239866df40bc08ba3575 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8648ab248cab465c9df72398… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 10 21:29:42 2022 -0600 ws2_32/tests: Use winetest_push_context() in test_WSAStringToAddress(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/protocol.c | 86 +++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 53 deletions(-) diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 1ff335f7fe2..d902d399c00 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -1403,12 +1403,11 @@ static void test_WSAStringToAddress(void) { "", { 0, 0, 0, 0, 0, 0, 0, 0 }, 0, WSAEINVAL }, }; + int len, ret, expected_len; WCHAR inputW[64]; - INT len, ret, expected_len, expected_ret; - short expected_family; SOCKADDR_IN sockaddr; SOCKADDR_IN6 sockaddr6; - int i, j; + unsigned int i, j; len = 0; WSASetLastError( 0 ); @@ -1420,12 +1419,16 @@ static void test_WSAStringToAddress(void) for (i = 0; i < 2; i++) { + winetest_push_context( i ? "unicode" : "ascii" ); + for (j = 0; j < ARRAY_SIZE(ipv4_tests); j++) { len = sizeof(sockaddr) + 10; expected_len = ipv4_tests[j].error ? len : sizeof(sockaddr); memset( &sockaddr, 0xab, sizeof(sockaddr) ); + winetest_push_context( "addr %s", debugstr_a(ipv4_tests[j].input) ); + WSASetLastError( 0 ); if (i == 0) { @@ -1436,26 +1439,16 @@ static void test_WSAStringToAddress(void) MultiByteToWideChar( CP_ACP, 0, ipv4_tests[j].input, -1, inputW, ARRAY_SIZE(inputW) ); ret = WSAStringToAddressW( inputW, AF_INET, NULL, (SOCKADDR *)&sockaddr, &len ); } - expected_ret = ipv4_tests[j].error ? SOCKET_ERROR : 0; - expected_family = ipv4_tests[j].error ? 0 : AF_INET; - ok( ret == expected_ret, - "WSAStringToAddress(%s) returned %d, expected %d\n", - wine_dbgstr_a( ipv4_tests[j].input ), ret, expected_ret ); - ok( WSAGetLastError() == ipv4_tests[j].error, - "WSAStringToAddress(%s) gave error %d, expected %d\n", - wine_dbgstr_a( ipv4_tests[j].input ), WSAGetLastError(), ipv4_tests[j].error ); - ok( sockaddr.sin_family == expected_family, - "WSAStringToAddress(%s) gave family %d, expected %d\n", - wine_dbgstr_a( ipv4_tests[j].input ), sockaddr.sin_family, expected_family ); + ok( ret == (ipv4_tests[j].error ? SOCKET_ERROR : 0), "got %d\n", ret ); + ok( WSAGetLastError() == ipv4_tests[j].error, "got error %d\n", WSAGetLastError() ); + ok( sockaddr.sin_family == (ipv4_tests[j].error ? 0 : AF_INET), + "got family %#x\n", sockaddr.sin_family ); ok( sockaddr.sin_addr.s_addr == htonl( ipv4_tests[j].address ), - "WSAStringToAddress(%s) gave address %08x, expected %08x\n", - wine_dbgstr_a( ipv4_tests[j].input ), sockaddr.sin_addr.s_addr, htonl( ipv4_tests[j].address) ); - ok( sockaddr.sin_port == htons( ipv4_tests[j].port ), - "WSAStringToAddress(%s) gave port %04x, expected %04x\n", - wine_dbgstr_a( ipv4_tests[j].input ), sockaddr.sin_port, htons( ipv4_tests[j].port ) ); - ok( len == expected_len, - "WSAStringToAddress(%s) gave length %d, expected %d\n", - wine_dbgstr_a( ipv4_tests[j].input ), len, expected_len ); + "got addr %08x\n", sockaddr.sin_addr.s_addr ); + ok( sockaddr.sin_port == htons( ipv4_tests[j].port ), "got port %u\n", sockaddr.sin_port ); + ok( len == expected_len, "got len %d\n", len ); + + winetest_pop_context(); } for (j = 0; j < ARRAY_SIZE(ipv6_tests); j++) @@ -1479,41 +1472,28 @@ static void test_WSAStringToAddress(void) win_skip("IPv6 not supported\n"); break; } - expected_ret = ipv6_tests[j].error ? SOCKET_ERROR : 0; - expected_family = ipv6_tests[j].error ? 0 : AF_INET6; - ok( ret == expected_ret, - "WSAStringToAddress(%s) returned %d, expected %d\n", - wine_dbgstr_a( ipv6_tests[j].input ), ret, expected_ret ); - ok( WSAGetLastError() == ipv6_tests[j].error, - "WSAStringToAddress(%s) gave error %d, expected %d\n", - wine_dbgstr_a( ipv6_tests[j].input ), WSAGetLastError(), ipv6_tests[j].error ); - ok( sockaddr6.sin6_family == expected_family, - "WSAStringToAddress(%s) gave family %d, expected %d\n", - wine_dbgstr_a( ipv4_tests[j].input ), sockaddr6.sin6_family, expected_family ); - ok( memcmp(&sockaddr6.sin6_addr, ipv6_tests[j].address, sizeof(sockaddr6.sin6_addr)) == 0, - "WSAStringToAddress(%s) gave address %x:%x:%x:%x:%x:%x:%x:%x, expected %x:%x:%x:%x:%x:%x:%x:%x\n", - wine_dbgstr_a( ipv6_tests[j].input ), + + winetest_push_context( "addr %s", debugstr_a(ipv6_tests[j].input) ); + + ok( ret == (ipv6_tests[j].error ? SOCKET_ERROR : 0), "got %d\n", ret ); + ok( WSAGetLastError() == ipv6_tests[j].error, "got error %d\n", WSAGetLastError() ); + ok( sockaddr6.sin6_family == (ipv6_tests[j].error ? 0 : AF_INET6), + "got family %#x\n", sockaddr6.sin6_family ); + ok( !memcmp( &sockaddr6.sin6_addr, ipv6_tests[j].address, sizeof(sockaddr6.sin6_addr) ), + "got addr %x:%x:%x:%x:%x:%x:%x:%x\n", sockaddr6.sin6_addr.s6_words[0], sockaddr6.sin6_addr.s6_words[1], sockaddr6.sin6_addr.s6_words[2], sockaddr6.sin6_addr.s6_words[3], sockaddr6.sin6_addr.s6_words[4], sockaddr6.sin6_addr.s6_words[5], - sockaddr6.sin6_addr.s6_words[6], sockaddr6.sin6_addr.s6_words[7], - ipv6_tests[j].address[0], ipv6_tests[j].address[1], - ipv6_tests[j].address[2], ipv6_tests[j].address[3], - ipv6_tests[j].address[4], ipv6_tests[j].address[5], - ipv6_tests[j].address[6], ipv6_tests[j].address[7] ); - ok( sockaddr6.sin6_scope_id == 0, - "WSAStringToAddress(%s) gave scope %d, expected 0\n", - wine_dbgstr_a( ipv6_tests[j].input ), sockaddr6.sin6_scope_id ); - ok( sockaddr6.sin6_port == ipv6_tests[j].port, - "WSAStringToAddress(%s) gave port %04x, expected %04x\n", - wine_dbgstr_a( ipv6_tests[j].input ), sockaddr6.sin6_port, ipv6_tests[j].port ); - ok( sockaddr6.sin6_flowinfo == 0, - "WSAStringToAddress(%s) gave flowinfo %d, expected 0\n", - wine_dbgstr_a( ipv6_tests[j].input ), sockaddr6.sin6_flowinfo ); - ok( len == expected_len, - "WSAStringToAddress(%s) gave length %d, expected %d\n", - wine_dbgstr_a( ipv6_tests[j].input ), len, expected_len ); + sockaddr6.sin6_addr.s6_words[6], sockaddr6.sin6_addr.s6_words[7] ); + ok( !sockaddr6.sin6_scope_id, "got scope id %u\n", sockaddr6.sin6_scope_id ); + ok( sockaddr6.sin6_port == ipv6_tests[j].port, "got port %u\n", sockaddr6.sin6_port ); + ok( !sockaddr6.sin6_flowinfo, "got flowinfo %u\n", sockaddr6.sin6_flowinfo ); + ok( len == expected_len, "got len %d\n", len ); + + winetest_pop_context(); } + + winetest_pop_context(); } }

1 0

Zebediah Figura : ws2_32/tests: Do not use a loop to test ASCII and Unicode in test_WSAAddressToString().
by Alexandre Julliard 11 Feb '22

11 Feb '22

Module: wine Branch: master Commit: eba2cd3d335ae686c62700aa46da7c8488073b0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=eba2cd3d335ae686c62700aa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 10 21:29:43 2022 -0600 ws2_32/tests: Do not use a loop to test ASCII and Unicode in test_WSAAddressToString(). They share almost no code. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/protocol.c | 144 +++++++++++++++++++------------------------ 1 file changed, 65 insertions(+), 79 deletions(-) diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index d902d399c00..865fbbd5947 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -1169,10 +1169,10 @@ static void test_WSAAddressToString(void) SOCKADDR_IN6 sockaddr6; char output[64]; WCHAR outputW[64], expected_outputW[64]; + unsigned int i; SOCKET v6; INT ret; DWORD len; - int i, j; len = 0; sockaddr.sin_family = AF_INET; @@ -1201,87 +1201,73 @@ static void test_WSAAddressToString(void) ok( len == 8, "got %u\n", len ); ok( !wcscmp(outputW, L"0.0.0.0"), "got %s\n", wine_dbgstr_w(outputW) ); - for (i = 0; i < 2; i++) + for (i = 0; i < ARRAY_SIZE(ipv4_tests); ++i) { - for (j = 0; j < ARRAY_SIZE(ipv4_tests); j++) - { - sockaddr.sin_family = AF_INET; - sockaddr.sin_addr.s_addr = ipv4_tests[j].address; - sockaddr.sin_port = ipv4_tests[j].port; - - if (i == 0) - { - len = sizeof(output); - memset(output, 0, len); - ret = WSAAddressToStringA( (SOCKADDR *)&sockaddr, sizeof(sockaddr), NULL, output, &len ); - ok( !ret, "ipv4_tests[%d] failed unexpectedly: %d\n", j, WSAGetLastError() ); - ok( !strcmp( output, ipv4_tests[j].output ), - "ipv4_tests[%d]: got address %s, expected %s\n", - j, wine_dbgstr_a(output), wine_dbgstr_a(ipv4_tests[j].output) ); - ok( len == strlen(ipv4_tests[j].output) + 1, - "ipv4_tests[%d]: got length %d, expected %d\n", - j, len, strlen(ipv4_tests[j].output) + 1 ); - } - else - { - len = sizeof(outputW); - memset(outputW, 0, len); - ret = WSAAddressToStringW( (SOCKADDR *)&sockaddr, sizeof(sockaddr), NULL, outputW, &len ); - MultiByteToWideChar( CP_ACP, 0, ipv4_tests[j].output, -1, - expected_outputW, ARRAY_SIZE(expected_outputW) ); - ok( !ret, "ipv4_tests[%d] failed unexpectedly: %d\n", j, WSAGetLastError() ); - ok( !wcscmp( outputW, expected_outputW ), - "ipv4_tests[%d]: got address %s, expected %s\n", - j, wine_dbgstr_w(outputW), wine_dbgstr_w(expected_outputW) ); - ok( len == wcslen(expected_outputW) + 1, - "ipv4_tests[%d]: got length %d, expected %d\n", - j, len, wcslen(expected_outputW) + 1 ); - } - } - - /* check to see if IPv6 is available */ - v6 = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP); - if (v6 == INVALID_SOCKET) { - skip("Could not create IPv6 socket (LastError: %d; %d expected if IPv6 not available).\n", - WSAGetLastError(), WSAEAFNOSUPPORT); - continue; - } - closesocket(v6); + sockaddr.sin_family = AF_INET; + sockaddr.sin_addr.s_addr = ipv4_tests[i].address; + sockaddr.sin_port = ipv4_tests[i].port; + + len = sizeof(output); + memset( output, 0, len ); + ret = WSAAddressToStringA( (SOCKADDR *)&sockaddr, sizeof(sockaddr), NULL, output, &len ); + ok( !ret, "ipv4_tests[%d] failed unexpectedly: %d\n", i, WSAGetLastError() ); + ok( !strcmp( output, ipv4_tests[i].output ), + "ipv4_tests[%d]: got address %s, expected %s\n", + i, debugstr_a(output), debugstr_a(ipv4_tests[i].output) ); + ok( len == strlen(ipv4_tests[i].output) + 1, + "ipv4_tests[%d]: got length %d, expected %d\n", + i, len, strlen(ipv4_tests[i].output) + 1 ); + + len = sizeof(outputW); + memset( outputW, 0, len ); + ret = WSAAddressToStringW( (SOCKADDR *)&sockaddr, sizeof(sockaddr), NULL, outputW, &len ); + MultiByteToWideChar( CP_ACP, 0, ipv4_tests[i].output, -1, + expected_outputW, ARRAY_SIZE(expected_outputW) ); + ok( !ret, "ipv4_tests[%d] failed unexpectedly: %d\n", i, WSAGetLastError() ); + ok( !wcscmp( outputW, expected_outputW ), + "ipv4_tests[%d]: got address %s, expected %s\n", + i, debugstr_w(outputW), debugstr_w(expected_outputW) ); + ok( len == wcslen(expected_outputW) + 1, + "ipv4_tests[%d]: got length %d, expected %d\n", + i, len, wcslen(expected_outputW) + 1 ); + } - for (j = 0; j < ARRAY_SIZE(ipv6_tests); j++) - { - sockaddr6.sin6_family = AF_INET6; - sockaddr6.sin6_scope_id = ipv6_tests[j].scope; - sockaddr6.sin6_port = ipv6_tests[j].port; - memcpy( sockaddr6.sin6_addr.s6_addr, ipv6_tests[j].address, sizeof(ipv6_tests[j].address) ); + v6 = socket( AF_INET6, SOCK_STREAM, IPPROTO_TCP ); + if (v6 == -1 && WSAGetLastError() == WSAEAFNOSUPPORT) + { + skip( "IPv6 is not supported\n" ); + return; + } + closesocket( v6 ); - if (i == 0) - { - len = sizeof(output); - ret = WSAAddressToStringA( (SOCKADDR *)&sockaddr6, sizeof(sockaddr6), NULL, output, &len ); - ok( !ret, "ipv6_tests[%d] failed unexpectedly: %d\n", j, WSAGetLastError() ); - ok( !strcmp( output, ipv6_tests[j].output ), - "ipv6_tests[%d]: gave address %s, expected %s\n", - j, wine_dbgstr_a(output), wine_dbgstr_a(ipv6_tests[j].output) ); - ok( len == strlen(ipv6_tests[j].output) + 1, - "ipv6_tests[%d]: got length %d, expected %d\n", - j, len, strlen(ipv6_tests[j].output) + 1 ); - } - else - { - len = sizeof(outputW); - ret = WSAAddressToStringW( (SOCKADDR *)&sockaddr6, sizeof(sockaddr6), NULL, outputW, &len ); - MultiByteToWideChar( CP_ACP, 0, ipv6_tests[j].output, -1, - expected_outputW, ARRAY_SIZE(expected_outputW) ); - ok( !ret, "ipv6_tests[%d] failed unexpectedly: %d\n", j, WSAGetLastError() ); - ok( !wcscmp( outputW, expected_outputW ), - "ipv6_tests[%d]: got address %s, expected %s\n", - j, wine_dbgstr_w(outputW), wine_dbgstr_w(expected_outputW) ); - ok( len == wcslen(expected_outputW) + 1, - "ipv6_tests[%d]: got length %d, expected %d\n", - j, len, wcslen(expected_outputW) + 1 ); - } - } + for (i = 0; i < ARRAY_SIZE(ipv6_tests); ++i) + { + sockaddr6.sin6_family = AF_INET6; + sockaddr6.sin6_scope_id = ipv6_tests[i].scope; + sockaddr6.sin6_port = ipv6_tests[i].port; + memcpy( sockaddr6.sin6_addr.s6_addr, ipv6_tests[i].address, sizeof(ipv6_tests[i].address) ); + + len = sizeof(output); + ret = WSAAddressToStringA( (SOCKADDR *)&sockaddr6, sizeof(sockaddr6), NULL, output, &len ); + ok( !ret, "ipv6_tests[%d] failed unexpectedly: %d\n", i, WSAGetLastError() ); + ok( !strcmp( output, ipv6_tests[i].output ), + "ipv6_tests[%d]: gave address %s, expected %s\n", + i, debugstr_a(output), debugstr_a(ipv6_tests[i].output) ); + ok( len == strlen(ipv6_tests[i].output) + 1, + "ipv6_tests[%d]: got length %d, expected %d\n", + i, len, strlen(ipv6_tests[i].output) + 1 ); + + len = sizeof(outputW); + ret = WSAAddressToStringW( (SOCKADDR *)&sockaddr6, sizeof(sockaddr6), NULL, outputW, &len ); + MultiByteToWideChar( CP_ACP, 0, ipv6_tests[i].output, -1, + expected_outputW, ARRAY_SIZE(expected_outputW) ); + ok( !ret, "ipv6_tests[%d] failed unexpectedly: %d\n", i, WSAGetLastError() ); + ok( !wcscmp( outputW, expected_outputW ), + "ipv6_tests[%d]: got address %s, expected %s\n", + i, debugstr_w(outputW), debugstr_w(expected_outputW) ); + ok( len == wcslen(expected_outputW) + 1, + "ipv6_tests[%d]: got length %d, expected %d\n", + i, len, wcslen(expected_outputW) + 1 ); } }

1 0

Zebediah Figura : ws2_32/tests: Use winetest_push_context() in test_WSAAddressToString().
by Alexandre Julliard 11 Feb '22

11 Feb '22

Module: wine Branch: master Commit: c8c9508267d8743f6722ac474f7eab7337d42323 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8c9508267d8743f6722ac47… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 10 21:29:44 2022 -0600 ws2_32/tests: Use winetest_push_context() in test_WSAAddressToString(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/protocol.c | 48 ++++++++++++++++++-------------------------- 1 file changed, 20 insertions(+), 28 deletions(-) diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 865fbbd5947..cdc549cf3a2 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -1203,6 +1203,8 @@ static void test_WSAAddressToString(void) for (i = 0; i < ARRAY_SIZE(ipv4_tests); ++i) { + winetest_push_context( "Test %u", i ); + sockaddr.sin_family = AF_INET; sockaddr.sin_addr.s_addr = ipv4_tests[i].address; sockaddr.sin_port = ipv4_tests[i].port; @@ -1210,26 +1212,20 @@ static void test_WSAAddressToString(void) len = sizeof(output); memset( output, 0, len ); ret = WSAAddressToStringA( (SOCKADDR *)&sockaddr, sizeof(sockaddr), NULL, output, &len ); - ok( !ret, "ipv4_tests[%d] failed unexpectedly: %d\n", i, WSAGetLastError() ); - ok( !strcmp( output, ipv4_tests[i].output ), - "ipv4_tests[%d]: got address %s, expected %s\n", - i, debugstr_a(output), debugstr_a(ipv4_tests[i].output) ); - ok( len == strlen(ipv4_tests[i].output) + 1, - "ipv4_tests[%d]: got length %d, expected %d\n", - i, len, strlen(ipv4_tests[i].output) + 1 ); + ok( !ret, "got error %d\n", WSAGetLastError() ); + ok( !strcmp( output, ipv4_tests[i].output ), "got string %s\n", debugstr_a(output) ); + ok( len == strlen(ipv4_tests[i].output) + 1, "got len %u\n", len ); len = sizeof(outputW); memset( outputW, 0, len ); ret = WSAAddressToStringW( (SOCKADDR *)&sockaddr, sizeof(sockaddr), NULL, outputW, &len ); MultiByteToWideChar( CP_ACP, 0, ipv4_tests[i].output, -1, expected_outputW, ARRAY_SIZE(expected_outputW) ); - ok( !ret, "ipv4_tests[%d] failed unexpectedly: %d\n", i, WSAGetLastError() ); - ok( !wcscmp( outputW, expected_outputW ), - "ipv4_tests[%d]: got address %s, expected %s\n", - i, debugstr_w(outputW), debugstr_w(expected_outputW) ); - ok( len == wcslen(expected_outputW) + 1, - "ipv4_tests[%d]: got length %d, expected %d\n", - i, len, wcslen(expected_outputW) + 1 ); + ok( !ret, "got error %d\n", WSAGetLastError() ); + ok( !wcscmp( outputW, expected_outputW ), "got string %s\n", debugstr_w(outputW) ); + ok( len == wcslen(expected_outputW) + 1, "got len %u\n", len ); + + winetest_pop_context(); } v6 = socket( AF_INET6, SOCK_STREAM, IPPROTO_TCP ); @@ -1242,6 +1238,8 @@ static void test_WSAAddressToString(void) for (i = 0; i < ARRAY_SIZE(ipv6_tests); ++i) { + winetest_push_context( "Test %u", i ); + sockaddr6.sin6_family = AF_INET6; sockaddr6.sin6_scope_id = ipv6_tests[i].scope; sockaddr6.sin6_port = ipv6_tests[i].port; @@ -1249,25 +1247,19 @@ static void test_WSAAddressToString(void) len = sizeof(output); ret = WSAAddressToStringA( (SOCKADDR *)&sockaddr6, sizeof(sockaddr6), NULL, output, &len ); - ok( !ret, "ipv6_tests[%d] failed unexpectedly: %d\n", i, WSAGetLastError() ); - ok( !strcmp( output, ipv6_tests[i].output ), - "ipv6_tests[%d]: gave address %s, expected %s\n", - i, debugstr_a(output), debugstr_a(ipv6_tests[i].output) ); - ok( len == strlen(ipv6_tests[i].output) + 1, - "ipv6_tests[%d]: got length %d, expected %d\n", - i, len, strlen(ipv6_tests[i].output) + 1 ); + ok( !ret, "got error %d\n", WSAGetLastError() ); + ok( !strcmp( output, ipv6_tests[i].output ), "got string %s\n", debugstr_a(output) ); + ok( len == strlen(ipv6_tests[i].output) + 1, "got len %u\n", len ); len = sizeof(outputW); ret = WSAAddressToStringW( (SOCKADDR *)&sockaddr6, sizeof(sockaddr6), NULL, outputW, &len ); MultiByteToWideChar( CP_ACP, 0, ipv6_tests[i].output, -1, expected_outputW, ARRAY_SIZE(expected_outputW) ); - ok( !ret, "ipv6_tests[%d] failed unexpectedly: %d\n", i, WSAGetLastError() ); - ok( !wcscmp( outputW, expected_outputW ), - "ipv6_tests[%d]: got address %s, expected %s\n", - i, debugstr_w(outputW), debugstr_w(expected_outputW) ); - ok( len == wcslen(expected_outputW) + 1, - "ipv6_tests[%d]: got length %d, expected %d\n", - i, len, wcslen(expected_outputW) + 1 ); + ok( !ret, "got error %d\n", WSAGetLastError() ); + ok( !wcscmp( outputW, expected_outputW ), "got string %s\n", debugstr_w(outputW) ); + ok( len == wcslen(expected_outputW) + 1, "got len %u\n", len ); + + winetest_pop_context(); } }

1 0

Zebediah Figura : ws2_32/tests: Use winetest_push_context() in test_inet_pton().
by Alexandre Julliard 11 Feb '22

11 Feb '22

Module: wine Branch: master Commit: 9856049a5b0c22640c6eb15cc036e93bef8a7f9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9856049a5b0c22640c6eb15c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 10 21:29:45 2022 -0600 ws2_32/tests: Use winetest_push_context() in test_inet_pton(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/protocol.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index cdc549cf3a2..374fa01789d 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -952,29 +952,29 @@ static void test_inet_pton(void) WCHAR inputW[32]; DWORD addr; + winetest_push_context( "Address %s", debugstr_a(ipv4_tests[i].input) ); + WSASetLastError(0xdeadbeef); addr = 0xdeadbeef; ret = p_inet_pton(AF_INET, ipv4_tests[i].input, &addr); - ok(ret == ipv4_tests[i].ret, "%s: got %d\n", debugstr_a(ipv4_tests[i].input), ret); - ok(WSAGetLastError() == 0xdeadbeef, "%s: got error %u\n", - debugstr_a(ipv4_tests[i].input), WSAGetLastError()); - ok(addr == ipv4_tests[i].addr, "%s: got addr %#08x\n", debugstr_a(ipv4_tests[i].input), addr); + ok(ret == ipv4_tests[i].ret, "got %d\n", ret); + ok(WSAGetLastError() == 0xdeadbeef, "got error %u\n", WSAGetLastError()); + ok(addr == ipv4_tests[i].addr, "got addr %#08x\n", addr); MultiByteToWideChar(CP_ACP, 0, ipv4_tests[i].input, -1, inputW, ARRAY_SIZE(inputW)); WSASetLastError(0xdeadbeef); addr = 0xdeadbeef; ret = pInetPtonW(AF_INET, inputW, &addr); - ok(ret == ipv4_tests[i].ret, "%s: got %d\n", debugstr_a(ipv4_tests[i].input), ret); - ok(WSAGetLastError() == (ret ? 0xdeadbeef : WSAEINVAL), "%s: got error %u\n", - debugstr_a(ipv4_tests[i].input), WSAGetLastError()); - ok(addr == ipv4_tests[i].addr, "%s: got addr %#08x\n", debugstr_a(ipv4_tests[i].input), addr); + ok(ret == ipv4_tests[i].ret, "got %d\n", ret); + ok(WSAGetLastError() == (ret ? 0xdeadbeef : WSAEINVAL), "got error %u\n", WSAGetLastError()); + ok(addr == ipv4_tests[i].addr, "got addr %#08x\n", addr); WSASetLastError(0xdeadbeef); addr = inet_addr(ipv4_tests[i].input); - ok(addr == ipv4_tests[i].ret ? ipv4_tests[i].addr : INADDR_NONE, - "%s: got addr %#08x\n", debugstr_a(ipv4_tests[i].input), addr); - ok(WSAGetLastError() == 0xdeadbeef, "%s: got error %u\n", - debugstr_a(ipv4_tests[i].input), WSAGetLastError()); + ok(addr == ipv4_tests[i].ret ? ipv4_tests[i].addr : INADDR_NONE, "got addr %#08x\n", addr); + ok(WSAGetLastError() == 0xdeadbeef, "got error %u\n", WSAGetLastError()); + + winetest_pop_context(); } for (i = 0; i < ARRAY_SIZE(ipv6_tests); ++i) @@ -982,24 +982,24 @@ static void test_inet_pton(void) unsigned short addr[8]; WCHAR inputW[64]; + winetest_push_context( "Address %s", debugstr_a(ipv6_tests[i].input) ); + WSASetLastError(0xdeadbeef); memset(addr, 0xab, sizeof(addr)); ret = p_inet_pton(AF_INET6, ipv6_tests[i].input, addr); - ok(ret == ipv6_tests[i].ret, "%s: got %d\n", debugstr_a(ipv6_tests[i].input), ret); - ok(WSAGetLastError() == 0xdeadbeef, "%s: got error %u\n", - debugstr_a(ipv6_tests[i].input), WSAGetLastError()); - ok(!memcmp(addr, ipv6_tests[i].addr, sizeof(addr)), - "%s: address didn't match\n", debugstr_a(ipv6_tests[i].input)); + ok(ret == ipv6_tests[i].ret, "got %d\n", ret); + ok(WSAGetLastError() == 0xdeadbeef, "got error %u\n", WSAGetLastError()); + ok(!memcmp(addr, ipv6_tests[i].addr, sizeof(addr)), "address didn't match\n"); MultiByteToWideChar(CP_ACP, 0, ipv6_tests[i].input, -1, inputW, ARRAY_SIZE(inputW)); WSASetLastError(0xdeadbeef); memset(addr, 0xab, sizeof(addr)); ret = pInetPtonW(AF_INET6, inputW, addr); - ok(ret == ipv6_tests[i].ret, "%s: got %d\n", debugstr_a(ipv6_tests[i].input), ret); - ok(WSAGetLastError() == (ret ? 0xdeadbeef : WSAEINVAL), "%s: got error %u\n", - debugstr_a(ipv6_tests[i].input), WSAGetLastError()); - ok(!memcmp(addr, ipv6_tests[i].addr, sizeof(addr)), - "%s: address didn't match\n", debugstr_a(ipv6_tests[i].input)); + ok(ret == ipv6_tests[i].ret, "got %d\n", ret); + ok(WSAGetLastError() == (ret ? 0xdeadbeef : WSAEINVAL), "got error %u\n", WSAGetLastError()); + ok(!memcmp(addr, ipv6_tests[i].addr, sizeof(addr)), "address didn't match\n"); + + winetest_pop_context(); } }

1 0

Zebediah Figura : include: Define NTSTATUS fields using int in afd.h.
by Alexandre Julliard 11 Feb '22

11 Feb '22

Module: wine Branch: master Commit: 164539e8d29061c066dabb6d12295cf0d6996f50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=164539e8d29061c066dabb6d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 10 21:29:46 2022 -0600 include: Define NTSTATUS fields using int in afd.h. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/afd.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wine/afd.h b/include/wine/afd.h index efd5787e90a..993730cacdb 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -126,7 +126,7 @@ struct afd_poll_params { SOCKET socket; int flags; - NTSTATUS status; + int status; } sockets[1]; }; @@ -140,7 +140,7 @@ struct afd_poll_params_64 { ULONGLONG socket; int flags; - NTSTATUS status; + int status; } sockets[1]; }; @@ -154,7 +154,7 @@ struct afd_poll_params_32 { ULONG socket; int flags; - NTSTATUS status; + int status; } sockets[1]; }; #include <poppack.h> @@ -180,7 +180,7 @@ struct afd_event_select_params_32 struct afd_get_events_params { int flags; - NTSTATUS status[13]; + int status[13]; }; C_ASSERT( sizeof(struct afd_get_events_params) == 56 );

1 0

Zebediah Figura : shlwapi/tests: Remove workarounds from url.c for no longer supported Windows versions.
by Alexandre Julliard 11 Feb '22

11 Feb '22

Module: wine Branch: master Commit: c4b0c64c8d24866917e04a276a75023d0029b98b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4b0c64c8d24866917e04a27… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 10 23:36:38 2022 -0600 shlwapi/tests: Remove workarounds from url.c for no longer supported Windows versions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/url.c | 66 ++++++++++++++---------------------------------- 1 file changed, 19 insertions(+), 47 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 703bdcd0a55..65fc2cfedd1 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -295,7 +295,6 @@ typedef struct _TEST_URL_ESCAPEW { DWORD flags; const WCHAR expecturl[INTERNET_MAX_URL_LENGTH]; const WCHAR win7url[INTERNET_MAX_URL_LENGTH]; /* <= Win7 */ - const WCHAR vistaurl[INTERNET_MAX_URL_LENGTH]; /* <= Vista/2k8 */ } TEST_URL_ESCAPEW; static const TEST_URL_ESCAPEW TEST_ESCAPEW[] = { @@ -311,12 +310,10 @@ static const TEST_URL_ESCAPEW TEST_ESCAPEW[] = { {'M','a','%','D','F',0}}, /* 0x2070E */ {{0xd841,0xdf0e,0}, URL_ESCAPE_AS_UTF8, {'%','F','0','%','A','0','%','9','C','%','8','E',0}, - {'%','E','F','%','B','F','%','B','D','%','E','F','%','B','F','%','B','D',0}, - {0xd841,0xdf0e,0}}, + {'%','E','F','%','B','F','%','B','D','%','E','F','%','B','F','%','B','D',0}}, /* 0x27A3E */ {{0xd85e,0xde3e,0}, URL_ESCAPE_AS_UTF8, {'%','F','0','%','A','7','%','A','8','%','B','E',0}, - {'%','E','F','%','B','F','%','B','D','%','E','F','%','B','F','%','B','D',0}, - {0xd85e,0xde3e,0}}, + {'%','E','F','%','B','F','%','B','D','%','E','F','%','B','F','%','B','D',0}}, {{0xd85e,0}, URL_ESCAPE_AS_UTF8, {'%','E','F','%','B','F','%','B','D',0}, {0xd85e,0}}, @@ -414,12 +411,7 @@ static const struct { {"c:\\foo/b a%r", "file:///c:/foo/b%20a%25r", S_OK}, {"c:\\foo\\foo bar", "file:///c:/foo/foo%20bar", S_OK}, {"file:///c:/foo/bar", "file:///c:/foo/bar", S_FALSE}, -#if 0 - /* The following test fails on native shlwapi as distributed with Win95/98. - * Wine matches the behaviour of later versions. - */ {"xx:c:\\foo\\bar", "xx:c:\\foo\\bar", S_FALSE} -#endif }; /* ################ */ @@ -614,8 +606,8 @@ static void test_url_part(const char* szUrl, DWORD dwPart, DWORD dwFlags, const dwSize = 1; res = UrlGetPartA(szUrl, szPart, &dwSize, dwPart, dwFlags); ok(res == E_POINTER, "UrlGetPart for \"%s\" gave: 0x%08x\n", szUrl, res); - ok(dwSize == strlen(szExpected)+1 || - (*szExpected == '?' && dwSize == strlen(szExpected)), + todo_wine_if (dwPart == URL_PART_QUERY) + ok(dwSize == strlen(szExpected) + 1, "UrlGetPart for \"%s\" gave size: %u\n", szUrl, dwSize); dwSize = INTERNET_MAX_URL_LENGTH; @@ -638,9 +630,8 @@ static void test_url_part(const char* szUrl, DWORD dwPart, DWORD dwFlags, const FreeWideString(wszConvertedPart); FreeWideString(wszUrl); - /* Note that v6.0 and later don't return '?' with the query */ - ok(strcmp(szPart,szExpected)==0 || - (*szExpected=='?' && !strcmp(szPart,szExpected+1)), + todo_wine_if (dwPart == URL_PART_QUERY) + ok(!strcmp(szPart,szExpected), "Expected %s, but got %s\n", szExpected, szPart); } @@ -707,7 +698,7 @@ static void test_UrlGetPart(void) test_url_part(TEST_URL_3, URL_PART_USERNAME, 0, "foo"); test_url_part(TEST_URL_3, URL_PART_PASSWORD, 0, "bar"); test_url_part(TEST_URL_3, URL_PART_SCHEME, 0, "http"); - test_url_part(TEST_URL_3, URL_PART_QUERY, 0, "?query=x&return=y"); + test_url_part(TEST_URL_3, URL_PART_QUERY, 0, "query=x&return=y"); test_url_part(TEST_URL_4, URL_PART_HOSTNAME, 0, "google.*.com"); @@ -855,10 +846,8 @@ static void test_UrlEscapeA(void) size = 1; empty_string[0] = 127; ret = UrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, &size, URL_ESCAPE_AS_UTF8); - ok(ret == E_NOTIMPL || broken(ret == E_POINTER), /* < Win7/Win2k8 */ - "got %x, expected %x\n", ret, E_NOTIMPL); - ok(size == 1 || broken(size == 34), /* < Win7/Win2k8 */ - "got %d, expected %d\n", size, 1); + ok(ret == E_NOTIMPL, "Got unexpected hr %#x.\n", ret); + ok(size == 1, "Got unexpected size %u.\n", size); ok(empty_string[0] == 127, "String has changed, empty_string[0] = %d\n", empty_string[0]); for (i = 0; i < ARRAY_SIZE(TEST_ESCAPE); i++) { @@ -962,12 +951,10 @@ static void test_UrlEscapeW(void) size = INTERNET_MAX_URL_LENGTH; ret = UrlEscapeW(TEST_ESCAPEW[i].url, ret_url, &size, TEST_ESCAPEW[i].flags); ok(ret == S_OK, "Got unexpected hr %#x for %s.\n", ret, debugstr_w(TEST_ESCAPEW[i].url)); - ok(!lstrcmpW(ret_url, TEST_ESCAPEW[i].expecturl) || - broken(!lstrcmpW(ret_url, TEST_ESCAPEW[i].vistaurl)) || - broken(!lstrcmpW(ret_url, TEST_ESCAPEW[i].win7url)), - "Expected \"%s\" or \"%s\" or \"%s\", but got \"%s\" for \"%s\"\n", - wine_dbgstr_w(TEST_ESCAPEW[i].expecturl), wine_dbgstr_w(TEST_ESCAPEW[i].vistaurl), - wine_dbgstr_w(TEST_ESCAPEW[i].win7url), wine_dbgstr_w(ret_url), wine_dbgstr_w(TEST_ESCAPEW[i].url)); + ok(!wcscmp(ret_url, TEST_ESCAPEW[i].expecturl) + || broken(!wcscmp(ret_url, TEST_ESCAPEW[i].win7url)), + "Expected %s, but got %s for %s.\n", debugstr_w(TEST_ESCAPEW[i].expecturl), + debugstr_w(ret_url), debugstr_w(TEST_ESCAPEW[i].url)); } } @@ -1484,36 +1471,27 @@ static void test_HashData(void) /* Test hashing with identically sized input/output buffers. */ res = HashData(input, 16, output, 16); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); - if(res == S_OK) - ok(!memcmp(output, expected, sizeof(expected)), - "Output buffer did not match expected contents\n"); + ok(!memcmp(output, expected, sizeof(expected)), "data didn't match\n"); /* Test hashing with larger output buffer. */ res = HashData(input, 16, output, 32); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); - if(res == S_OK) - ok(!memcmp(output, expected2, sizeof(expected2)), - "Output buffer did not match expected contents\n"); + ok(!memcmp(output, expected2, sizeof(expected2)), "data didn't match\n"); /* Test hashing with smaller input buffer. */ res = HashData(input, 8, output, 16); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); - if(res == S_OK) - ok(!memcmp(output, expected3, sizeof(expected3)), - "Output buffer did not match expected contents\n"); + ok(!memcmp(output, expected3, sizeof(expected3)), "data didn't match\n"); /* Test passing NULL pointers for input/output parameters. */ res = HashData(NULL, 0, NULL, 0); - ok(res == E_INVALIDARG || broken(res == S_OK), /* Windows 2000 */ - "Expected HashData to return E_INVALIDARG, got 0x%08x\n", res); + ok(res == E_INVALIDARG, "Got unexpected hr %#x.\n", res); res = HashData(input, 0, NULL, 0); - ok(res == E_INVALIDARG || broken(res == S_OK), /* Windows 2000 */ - "Expected HashData to return E_INVALIDARG, got 0x%08x\n", res); + ok(res == E_INVALIDARG, "Got unexpected hr %#x.\n", res); res = HashData(NULL, 0, output, 0); - ok(res == E_INVALIDARG || broken(res == S_OK), /* Windows 2000 */ - "Expected HashData to return E_INVALIDARG, got 0x%08x\n", res); + ok(res == E_INVALIDARG, "Got unexpected hr %#x.\n", res); /* Test passing valid pointers with sizes of zero. */ for (i = 0; i < ARRAY_SIZE(input); i++) @@ -1527,16 +1505,10 @@ static void test_HashData(void) /* The buffers should be unchanged. */ for (i = 0; i < ARRAY_SIZE(input); i++) - { ok(input[i] == 0x00, "Expected the input buffer to be unchanged\n"); - if(input[i] != 0x00) break; - } for (i = 0; i < ARRAY_SIZE(output); i++) - { ok(output[i] == 0xFF, "Expected the output buffer to be unchanged\n"); - if(output[i] != 0xFF) break; - } /* Input/output parameters are not validated. */ res = HashData((BYTE *)0xdeadbeef, 0, (BYTE *)0xdeadbeef, 0);

1 0

Zebediah Figura : shlwapi/tests: Use wide character string literals in url.c.
by Alexandre Julliard 11 Feb '22

11 Feb '22

Module: wine Branch: master Commit: 5775cfd821885f11512a31a33612278dad332cde URL: https://source.winehq.org/git/wine.git/?a=commit;h=5775cfd821885f11512a31a3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 10 23:36:39 2022 -0600 shlwapi/tests: Use wide character string literals in url.c. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/url.c | 77 ++++++++++++++++++------------------------------ 1 file changed, 29 insertions(+), 48 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 65fc2cfedd1..4419a3e7ded 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -34,11 +34,8 @@ static const char* TEST_URL_2 = "http://localhost:8080/tests%2e.html?date=Mon%20 static const char* TEST_URL_3 = "http://foo:bar(a)localhost:21/internal.php?query=x&return=y"; static const char* TEST_URL_4 = "http://foo:bar(a)google.*.com:21/internal.php?query=x&return=y"; -static const WCHAR winehqW[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/',0}; -static const CHAR winehqA[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/',0}; - -/* ################ */ - +static const WCHAR winehqW[] = L"http://www.winehq.org/"; +static const char winehqA[] = "http://www.winehq.org/"; static const CHAR untouchedA[] = "untouched"; #define TEST_APPLY_MAX_LENGTH INTERNET_MAX_URL_LENGTH @@ -298,31 +295,20 @@ typedef struct _TEST_URL_ESCAPEW { } TEST_URL_ESCAPEW; static const TEST_URL_ESCAPEW TEST_ESCAPEW[] = { - {{' ','<','>','"',0}, URL_ESCAPE_AS_UTF8, {'%','2','0','%','3','C','%','3','E','%','2','2',0}}, - {{'{','}','|','\\',0}, URL_ESCAPE_AS_UTF8, {'%','7','B','%','7','D','%','7','C','%','5','C',0}}, - {{'^',']','[','`',0}, URL_ESCAPE_AS_UTF8, {'%','5','E','%','5','D','%','5','B','%','6','0',0}}, - {{'&','/','?','#',0}, URL_ESCAPE_AS_UTF8, {'%','2','6','/','?','#',0}}, - {{'M','a','s','s',0}, URL_ESCAPE_AS_UTF8, {'M','a','s','s',0}}, + {L" <>\"", URL_ESCAPE_AS_UTF8, L"%20%3C%3E%22"}, + {L"{}|\\", URL_ESCAPE_AS_UTF8, L"%7B%7D%7C%5C"}, + {L"^][`", URL_ESCAPE_AS_UTF8, L"%5E%5D%5B%60"}, + {L"&/?#", URL_ESCAPE_AS_UTF8, L"%26/?#"}, + {L"Mass", URL_ESCAPE_AS_UTF8, L"Mass"}, /* broken < Win8/10 */ - - {{'M','a',0xdf,0}, URL_ESCAPE_AS_UTF8, {'M','a','%','C','3','%','9','F',0}, - {'M','a','%','D','F',0}}, - /* 0x2070E */ - {{0xd841,0xdf0e,0}, URL_ESCAPE_AS_UTF8, {'%','F','0','%','A','0','%','9','C','%','8','E',0}, - {'%','E','F','%','B','F','%','B','D','%','E','F','%','B','F','%','B','D',0}}, - /* 0x27A3E */ - {{0xd85e,0xde3e,0}, URL_ESCAPE_AS_UTF8, {'%','F','0','%','A','7','%','A','8','%','B','E',0}, - {'%','E','F','%','B','F','%','B','D','%','E','F','%','B','F','%','B','D',0}}, - - {{0xd85e,0}, URL_ESCAPE_AS_UTF8, {'%','E','F','%','B','F','%','B','D',0}, - {0xd85e,0}}, - {{0xd85e,0x41}, URL_ESCAPE_AS_UTF8, {'%','E','F','%','B','F','%','B','D','A',0}, - {0xd85e,'A',0}}, - {{0xdc00,0}, URL_ESCAPE_AS_UTF8, {'%','E','F','%','B','F','%','B','D',0}, - {0xdc00,0}}, - {{0xffff,0}, URL_ESCAPE_AS_UTF8, {'%','E','F','%','B','F','%','B','F',0}, - {0xffff,0}}, + {L"Ma\xdf", URL_ESCAPE_AS_UTF8, L"Ma%C3%9F", L"Ma%DF"}, + {L"\xd841\xdf0e", URL_ESCAPE_AS_UTF8, L"%F0%A0%9C%8E", L"%EF%BF%BD%EF%BF%BD"}, /* 0x2070E */ + {L"\xd85e\xde3e", URL_ESCAPE_AS_UTF8, L"%F0%A7%A8%BE", L"%EF%BF%BD%EF%BF%BD"}, /* 0x27A3E */ + {L"\xd85e", URL_ESCAPE_AS_UTF8, L"%EF%BF%BD", L"\xd85e"}, + {L"\xd85eQ", URL_ESCAPE_AS_UTF8, L"%EF%BF%BDQ", L"\xd85eQ"}, + {L"\xdc00", URL_ESCAPE_AS_UTF8, L"%EF%BF%BD", L"\xdc00"}, + {L"\xffff", URL_ESCAPE_AS_UTF8, L"%EF%BF%BF", L"\xffff"}, }; /* ################ */ @@ -863,12 +849,8 @@ static void test_UrlEscapeA(void) static void test_UrlEscapeW(void) { - static const WCHAR path_test[] = {'/','t','e','s','t',0}; - static const WCHAR naW[] = {'f','t','p',31,255,250,0x2122,'e','n','d','/',0}; - static const WCHAR naescapedW[] = {'f','t','p','%','1','F','%','F','F','%','F','A',0x2122,'e','n','d','/',0}; - static const WCHAR out[] = {'f','o','o','%','2','0','b','a','r',0}; - WCHAR overwrite[] = {'f','o','o',' ','b','a','r',0,0,0}; WCHAR ret_urlW[INTERNET_MAX_URL_LENGTH]; + WCHAR overwrite[10] = L"foo bar"; WCHAR empty_string[] = {0}; DWORD size; HRESULT ret; @@ -877,35 +859,35 @@ static void test_UrlEscapeW(void) /* Check error paths */ - ret = UrlEscapeW(path_test, NULL, NULL, URL_ESCAPE_SPACES_ONLY); + ret = UrlEscapeW(L"/test", NULL, NULL, URL_ESCAPE_SPACES_ONLY); ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); size = 0; - ret = UrlEscapeW(path_test, NULL, &size, URL_ESCAPE_SPACES_ONLY); + ret = UrlEscapeW(L"/test", NULL, &size, URL_ESCAPE_SPACES_ONLY); ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); ok(size == 0, "got %d, expected %d\n", size, 0); - ret = UrlEscapeW(path_test, empty_string, NULL, URL_ESCAPE_SPACES_ONLY); + ret = UrlEscapeW(L"/test", empty_string, NULL, URL_ESCAPE_SPACES_ONLY); ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); size = 0; - ret = UrlEscapeW(path_test, empty_string, &size, URL_ESCAPE_SPACES_ONLY); + ret = UrlEscapeW(L"/test", empty_string, &size, URL_ESCAPE_SPACES_ONLY); ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); ok(size == 0, "got %d, expected %d\n", size, 0); - ret = UrlEscapeW(path_test, NULL, NULL, URL_ESCAPE_SPACES_ONLY); + ret = UrlEscapeW(L"/test", NULL, NULL, URL_ESCAPE_SPACES_ONLY); ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); size = 1; - ret = UrlEscapeW(path_test, NULL, &size, URL_ESCAPE_SPACES_ONLY); + ret = UrlEscapeW(L"/test", NULL, &size, URL_ESCAPE_SPACES_ONLY); ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); ok(size == 1, "got %d, expected %d\n", size, 1); - ret = UrlEscapeW(path_test, empty_string, NULL, URL_ESCAPE_SPACES_ONLY); + ret = UrlEscapeW(L"/test", empty_string, NULL, URL_ESCAPE_SPACES_ONLY); ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); size = 1; - ret = UrlEscapeW(path_test, empty_string, &size, URL_ESCAPE_SPACES_ONLY); + ret = UrlEscapeW(L"/test", empty_string, &size, URL_ESCAPE_SPACES_ONLY); ok(ret == E_POINTER, "got %x, expected %x\n", ret, E_POINTER); ok(size == 6, "got %d, expected %d\n", size, 6); @@ -915,7 +897,7 @@ static void test_UrlEscapeW(void) ret = UrlEscapeW(overwrite, overwrite, &size, URL_ESCAPE_SPACES_ONLY); ok(ret == S_OK, "got %x, expected S_OK\n", ret); ok(size == 9, "got %d, expected 9\n", size); - ok(!lstrcmpW(overwrite, out), "got %s, expected %s\n", wine_dbgstr_w(overwrite), wine_dbgstr_w(out)); + ok(!wcscmp(overwrite, L"foo%20bar"), "Got unexpected string %s.\n", debugstr_w(overwrite)); size = 1; wc = 127; @@ -926,9 +908,9 @@ static void test_UrlEscapeW(void) /* non-ASCII range */ size = ARRAY_SIZE(ret_urlW); - ret = UrlEscapeW(naW, ret_urlW, &size, 0); + ret = UrlEscapeW(L"ftp\x1f\xff\xfa\x2122q/", ret_urlW, &size, 0); ok(ret == S_OK, "got %x, expected S_OK\n", ret); - ok(!lstrcmpW(naescapedW, ret_urlW), "got %s, expected %s\n", wine_dbgstr_w(ret_urlW), wine_dbgstr_w(naescapedW)); + ok(!wcscmp(ret_urlW, L"ftp%1F%FF%FA\x2122q/"), "Got unexpected string %s.\n", debugstr_w(ret_urlW)); for (i = 0; i < ARRAY_SIZE(TEST_ESCAPE); i++) { @@ -1128,7 +1110,7 @@ static void test_UrlCanonicalizeW(void) BOOL choped; int pos; - MultiByteToWideChar(CP_ACP, 0, "http://www.winehq.org/X", -1, szUrl, ARRAY_SIZE(szUrl)); + wcscpy(szUrl, L"http://www.winehq.org/X"); pos = lstrlenW(szUrl) - 1; szUrl[pos] = i; urllen = INTERNET_MAX_URL_LENGTH; @@ -1310,9 +1292,8 @@ static void test_UrlUnescape(void) static char inplace[] = "file:///C:/Program%20Files"; static char another_inplace[] = "file:///C:/Program%20Files"; static const char expected[] = "file:///C:/Program Files"; - static WCHAR inplaceW[] = {'f','i','l','e',':','/','/','/','C',':','/','P','r','o','g','r','a','m',' ','F','i','l','e','s',0}; - static WCHAR another_inplaceW[] ={'f','i','l','e',':','/','/','/', - 'C',':','/','P','r','o','g','r','a','m','%','2','0','F','i','l','e','s',0}; + static WCHAR inplaceW[] = L"file:///C:/Program Files"; + static WCHAR another_inplaceW[] = L"file:///C:/Program%20Files"; HRESULT res; for (i = 0; i < ARRAY_SIZE(TEST_URL_UNESCAPE); i++) {

1 0

Zebediah Figura : shlwapi/tests: Simplify length calculation in test_UrlApplyScheme().
by Alexandre Julliard 11 Feb '22

11 Feb '22

Module: wine Branch: master Commit: 81f55420b462814299e287e95992ba7616b3fb93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81f55420b462814299e287e9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 10 23:36:40 2022 -0600 shlwapi/tests: Simplify length calculation in test_UrlApplyScheme(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/url.c | 116 ++++++++++++++++++++++++----------------------- 1 file changed, 60 insertions(+), 56 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 4419a3e7ded..b2a1bd609c4 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -38,43 +38,40 @@ static const WCHAR winehqW[] = L"http://www.winehq.org/"; static const char winehqA[] = "http://www.winehq.org/"; static const CHAR untouchedA[] = "untouched"; -#define TEST_APPLY_MAX_LENGTH INTERNET_MAX_URL_LENGTH - typedef struct _TEST_URL_APPLY { const char * url; DWORD flags; HRESULT res; - DWORD newlen; const char * newurl; } TEST_URL_APPLY; static const TEST_URL_APPLY TEST_APPLY[] = { - {"www.winehq.org", URL_APPLY_GUESSSCHEME | URL_APPLY_DEFAULT, S_OK, 21, "http://www.winehq.org"}, - {"www.winehq.org", URL_APPLY_GUESSSCHEME, S_OK, 21, "http://www.winehq.org"}, - {"www.winehq.org", URL_APPLY_DEFAULT, S_OK, 21, "http://www.winehq.org"}, - {"ftp.winehq.org", URL_APPLY_GUESSSCHEME | URL_APPLY_DEFAULT, S_OK, 20, "ftp://ftp.winehq.org"}, - {"ftp.winehq.org", URL_APPLY_GUESSSCHEME, S_OK, 20, "ftp://ftp.winehq.org"}, - {"ftp.winehq.org", URL_APPLY_DEFAULT, S_OK, 21, "http://ftp.winehq.org"}, - {"winehq.org", URL_APPLY_GUESSSCHEME | URL_APPLY_DEFAULT, S_OK, 17, "http://winehq.org"}, - {"winehq.org", URL_APPLY_GUESSSCHEME, S_FALSE, TEST_APPLY_MAX_LENGTH, untouchedA}, - {"winehq.org", URL_APPLY_DEFAULT, S_OK, 17, "http://winehq.org"}, - {"http://www.winehq.org", URL_APPLY_GUESSSCHEME , S_FALSE, TEST_APPLY_MAX_LENGTH, untouchedA}, - {"http://www.winehq.org", URL_APPLY_GUESSSCHEME | URL_APPLY_FORCEAPPLY, S_FALSE, TEST_APPLY_MAX_LENGTH, untouchedA}, - {"http://www.winehq.org", URL_APPLY_GUESSSCHEME | URL_APPLY_FORCEAPPLY | URL_APPLY_DEFAULT, S_OK, 28, "http://http://www.winehq.org"}, - {"http://www.winehq.org", URL_APPLY_GUESSSCHEME | URL_APPLY_DEFAULT, S_FALSE, TEST_APPLY_MAX_LENGTH, untouchedA}, - {"", URL_APPLY_GUESSSCHEME | URL_APPLY_DEFAULT, S_OK, 7, "http://"}, - {"", URL_APPLY_GUESSSCHEME, S_FALSE, TEST_APPLY_MAX_LENGTH, untouchedA}, - {"", URL_APPLY_DEFAULT, S_OK, 7, "http://"}, - {"u:\\windows", URL_APPLY_GUESSFILE | URL_APPLY_DEFAULT, S_OK, 18, "file:///u:/windows"}, - {"u:\\windows", URL_APPLY_GUESSFILE, S_OK, 18, "file:///u:/windows"}, - {"u:\\windows", URL_APPLY_DEFAULT, S_OK, 17, "http://u:\\windows"}, - {"file:///c:/windows", URL_APPLY_GUESSFILE , S_FALSE, TEST_APPLY_MAX_LENGTH, untouchedA}, - {"aa:\\windows", URL_APPLY_GUESSFILE , S_FALSE, TEST_APPLY_MAX_LENGTH, untouchedA}, - {"\\\\server\\share", URL_APPLY_DEFAULT, S_OK, 21, "http://\\\\server\\share"}, - {"\\\\server\\share", URL_APPLY_GUESSFILE, S_OK, 19, "file://server/share"}, - {"\\\\server\\share", URL_APPLY_GUESSSCHEME, S_FALSE, TEST_APPLY_MAX_LENGTH, untouchedA}, - {"file://server/share", URL_APPLY_GUESSFILE, S_FALSE, TEST_APPLY_MAX_LENGTH, untouchedA}, - {"file://server/share", URL_APPLY_GUESSSCHEME, S_FALSE, TEST_APPLY_MAX_LENGTH, untouchedA}, + {"www.winehq.org", URL_APPLY_GUESSSCHEME | URL_APPLY_DEFAULT, S_OK, "http://www.winehq.org"}, + {"www.winehq.org", URL_APPLY_GUESSSCHEME, S_OK, "http://www.winehq.org"}, + {"www.winehq.org", URL_APPLY_DEFAULT, S_OK, "http://www.winehq.org"}, + {"ftp.winehq.org", URL_APPLY_GUESSSCHEME | URL_APPLY_DEFAULT, S_OK, "ftp://ftp.winehq.org"}, + {"ftp.winehq.org", URL_APPLY_GUESSSCHEME, S_OK, "ftp://ftp.winehq.org"}, + {"ftp.winehq.org", URL_APPLY_DEFAULT, S_OK, "http://ftp.winehq.org"}, + {"winehq.org", URL_APPLY_GUESSSCHEME | URL_APPLY_DEFAULT, S_OK, "http://winehq.org"}, + {"winehq.org", URL_APPLY_GUESSSCHEME, S_FALSE}, + {"winehq.org", URL_APPLY_DEFAULT, S_OK, "http://winehq.org"}, + {"http://www.winehq.org", URL_APPLY_GUESSSCHEME, S_FALSE}, + {"http://www.winehq.org", URL_APPLY_GUESSSCHEME | URL_APPLY_FORCEAPPLY, S_FALSE}, + {"http://www.winehq.org", URL_APPLY_GUESSSCHEME | URL_APPLY_FORCEAPPLY | URL_APPLY_DEFAULT, S_OK, "http://http://www.winehq.org"}, + {"http://www.winehq.org", URL_APPLY_GUESSSCHEME | URL_APPLY_DEFAULT, S_FALSE}, + {"", URL_APPLY_GUESSSCHEME | URL_APPLY_DEFAULT, S_OK, "http://"}, + {"", URL_APPLY_GUESSSCHEME, S_FALSE}, + {"", URL_APPLY_DEFAULT, S_OK, "http://"}, + {"u:\\windows", URL_APPLY_GUESSFILE | URL_APPLY_DEFAULT, S_OK, "file:///u:/windows"}, + {"u:\\windows", URL_APPLY_GUESSFILE, S_OK, "file:///u:/windows"}, + {"u:\\windows", URL_APPLY_DEFAULT, S_OK, "http://u:\\windows"}, + {"file:///c:/windows", URL_APPLY_GUESSFILE, S_FALSE}, + {"aa:\\windows", URL_APPLY_GUESSFILE, S_FALSE}, + {"\\\\server\\share", URL_APPLY_DEFAULT, S_OK, "http://\\\\server\\share"}, + {"\\\\server\\share", URL_APPLY_GUESSFILE, S_OK, "file://server/share"}, + {"\\\\server\\share", URL_APPLY_GUESSSCHEME, S_FALSE}, + {"file://server/share", URL_APPLY_GUESSFILE, S_FALSE}, + {"file://server/share", URL_APPLY_GUESSSCHEME, S_FALSE}, }; /* ################ */ @@ -482,43 +479,50 @@ static void FreeWideString(LPWSTR wszString) static void test_UrlApplyScheme(void) { - CHAR newurl[TEST_APPLY_MAX_LENGTH]; - WCHAR urlW[TEST_APPLY_MAX_LENGTH]; - WCHAR newurlW[TEST_APPLY_MAX_LENGTH]; + WCHAR urlW[INTERNET_MAX_URL_LENGTH], newurlW[INTERNET_MAX_URL_LENGTH], expectW[INTERNET_MAX_URL_LENGTH]; + char newurl[INTERNET_MAX_URL_LENGTH]; HRESULT res; DWORD len; DWORD i; for (i = 0; i < ARRAY_SIZE(TEST_APPLY); i++) { - len = TEST_APPLY_MAX_LENGTH; - lstrcpyA(newurl, untouchedA); + len = ARRAY_SIZE(newurl); + strcpy(newurl, "untouched"); res = UrlApplySchemeA(TEST_APPLY[i].url, newurl, &len, TEST_APPLY[i].flags); ok( res == TEST_APPLY[i].res, "#%dA: got HRESULT 0x%x (expected 0x%x)\n", i, res, TEST_APPLY[i].res); - - ok( len == TEST_APPLY[i].newlen, - "#%dA: got len %d (expected %d)\n", i, len, TEST_APPLY[i].newlen); - - ok( !lstrcmpA(newurl, TEST_APPLY[i].newurl), - "#%dA: got '%s' (expected '%s')\n", i, newurl, TEST_APPLY[i].newurl); + if (res == S_OK) + { + ok(len == strlen(newurl), "Test %u: Expected length %u, got %u.\n", i, strlen(newurl), len); + ok(!strcmp(newurl, TEST_APPLY[i].newurl), "Test %u: Expected %s, got %s.\n", + i, debugstr_a(TEST_APPLY[i].newurl), debugstr_a(newurl)); + } + else + { + ok(len == ARRAY_SIZE(newurl), "Test %u: Got length %u.\n", i, len); + ok(!strcmp(newurl, "untouched"), "Test %u: Got %s.\n", i, debugstr_a(newurl)); + } /* returned length is in character */ - len = TEST_APPLY_MAX_LENGTH; - lstrcpyA(newurl, untouchedA); - MultiByteToWideChar(CP_ACP, 0, newurl, -1, newurlW, len); - MultiByteToWideChar(CP_ACP, 0, TEST_APPLY[i].url, -1, urlW, len); + MultiByteToWideChar(CP_ACP, 0, TEST_APPLY[i].url, -1, urlW, ARRAY_SIZE(urlW)); + MultiByteToWideChar(CP_ACP, 0, TEST_APPLY[i].newurl, -1, expectW, ARRAY_SIZE(expectW)); + len = ARRAY_SIZE(newurlW); + wcscpy(newurlW, L"untouched"); res = UrlApplySchemeW(urlW, newurlW, &len, TEST_APPLY[i].flags); - WideCharToMultiByte(CP_ACP, 0, newurlW, -1, newurl, TEST_APPLY_MAX_LENGTH, NULL, NULL); ok( res == TEST_APPLY[i].res, "#%dW: got HRESULT 0x%x (expected 0x%x)\n", i, res, TEST_APPLY[i].res); - - ok( len == TEST_APPLY[i].newlen, - "#%dW: got len %d (expected %d)\n", i, len, TEST_APPLY[i].newlen); - - ok( !lstrcmpA(newurl, TEST_APPLY[i].newurl), - "#%dW: got '%s' (expected '%s')\n", i, newurl, TEST_APPLY[i].newurl); - + if (res == S_OK) + { + ok(len == wcslen(newurlW), "Test %u: Expected length %u, got %u.\n", i, wcslen(newurlW), len); + ok(!wcscmp(newurlW, expectW), "Test %u: Expected %s, got %s.\n", + i, debugstr_w(expectW), debugstr_w(newurlW)); + } + else + { + ok(len == ARRAY_SIZE(newurlW), "Test %u: Got length %u.\n", i, len); + ok(!wcscmp(newurlW, L"untouched"), "Test %u: Got %s.\n", i, debugstr_w(newurlW)); + } } /* buffer too small */ @@ -533,16 +537,16 @@ static void test_UrlApplyScheme(void) /* NULL as parameter. The length and the buffer are not modified */ lstrcpyA(newurl, untouchedA); - len = TEST_APPLY_MAX_LENGTH; + len = ARRAY_SIZE(newurl); res = UrlApplySchemeA(NULL, newurl, &len, TEST_APPLY[0].flags); ok(res == E_INVALIDARG, "got HRESULT 0x%x (expected E_INVALIDARG)\n", res); - ok(len == TEST_APPLY_MAX_LENGTH, "got len %d\n", len); + ok(len == ARRAY_SIZE(newurl), "got len %d\n", len); ok(!lstrcmpA(newurl, untouchedA), "got '%s' (expected '%s')\n", newurl, untouchedA); - len = TEST_APPLY_MAX_LENGTH; + len = ARRAY_SIZE(newurl); res = UrlApplySchemeA(TEST_APPLY[0].url, NULL, &len, TEST_APPLY[0].flags); ok(res == E_INVALIDARG, "got HRESULT 0x%x (expected E_INVALIDARG)\n", res); - ok(len == TEST_APPLY_MAX_LENGTH, "got len %d\n", len); + ok(len == ARRAY_SIZE(newurl), "got len %d\n", len); lstrcpyA(newurl, untouchedA); res = UrlApplySchemeA(TEST_APPLY[0].url, newurl, NULL, TEST_APPLY[0].flags);

1 0