- Wine-Devel - list.winehq.org

[PATCH v5 00/10] Avoid performance degradation due to vDSO unmapping (#52313)
by Jinoh Kang March 5, 2022

March 5, 2022

Commit f558741fabc116534fa598aa890ffed683a7153b removes vDSO if it conflicts with reserved ranges: Remove the AT_SYSINFO and AT_SYSINFO_EHDR values if the sysinfo page is in one of our reserved ranges. However, missing vDSO leads to performance issues on some syscalls (e.g. clock_gettime, gettimeofday) and may even lead to crash when run with some ancient C libraries that does not supply a custom signal restorer. vDSO pages can clash with reserved ranges especially in a 32-bit address space with address space layout randomization (ASLR) turned on. Recent versions of the Linux kernel introduced support for mremap()-ping vDSO pages, partly in an effort to support checkpoint restore in userspace (CRIU). Special programs that require specific memory layout constraints (such as Wine preloader) can take advantage of this support to modify the address space to meet its requirements. Changelog: - v3 -> v4: - address review comments - add more comments and documentation - v4 -> v5: - rebase onto latest master The following test script has been used to test each changes (use with git rebase --exec=...): set -e make -C ../wine64-build -j5 make -C ../wine32-build -j5 cd ../wine64-build export WINEPRELOADREMAPSTACK export WINEPRELOADREMAPVDSO for WINEPRELOADREMAPSTACK in skip never always force auto on-demand '' do for WINEPRELOADREMAPVDSO in skip never always force auto on-demand '' do ./loader/wine64 wineboot ./loader/wine wineboot done done Jinoh Kang (10): loader: Refactor argv/envp/auxv management. loader: Refactor number parsing to own function. loader: Generalise is_addr_reserved to find overlapping address ranges. loader: Explicitly munmap() the preloader's ELF EHDR. loader: Don't clobber existing memory mappings when reserving addresses. loader: Fix return type of get_auxiliary(). loader: Relocate vDSO on conflict with reserved ranges. loader: Relocate sigpage on conflict with reserved ranges in ARM. loader: Switch stack if the old stack address is in reserved range. loader: Enable all remap logic by default. loader/preloader.c | 1523 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 1407 insertions(+), 116 deletions(-) -- 2.34.1

1 10

[PATCH vkd3d v3 7/8] vkd3d-shader/hlsl: Remove redundant type check in declare_vars().
by Francisco Casas March 5, 2022

March 5, 2022

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v3: - New in v3. Split of vkd3d-shader/hlsl: Reroute initialization towards a generic variable initializer. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 547a2ff4..c98e73f7 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1522,23 +1522,17 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t continue; } - if (type->type == HLSL_CLASS_STRUCT) - { - struct_var_initializer(ctx, statements_list, var, &v->initializer); - vkd3d_free(v); - continue; - } - if (type->type > HLSL_CLASS_LAST_NUMERIC) + if (type->type > HLSL_CLASS_LAST_NUMERIC && type->type != HLSL_CLASS_STRUCT) { FIXME("Initializers for non scalar/struct variables not supported yet.\n"); free_parse_initializer(&v->initializer); vkd3d_free(v); continue; } - if (v->arrays.count) + + if (type->type == HLSL_CLASS_STRUCT) { - hlsl_fixme(ctx, &v->loc, "Array initializer."); - free_parse_initializer(&v->initializer); + struct_var_initializer(ctx, statements_list, var, &v->initializer); vkd3d_free(v); continue; } -- 2.25.1

2 1

[PATCH vkd3d v3 5/8] vkd3d-shader/hlsl: Properly free parse_variable_def memory.
by Francisco Casas March 5, 2022

March 5, 2022

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v3: - Simplified, only calling vkd3d_free(v->arrays.sizes) after the data type is created. - I also spotted some leaks in gen_struct_fields() and add_typedef() so memory is also freed there. - For that reason I had to move free_parse_variable_def() before these functions. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 6a59134e..e702c234 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -668,6 +668,15 @@ static struct hlsl_type *apply_type_modifiers(struct hlsl_ctx *ctx, struct hlsl_ return new_type; } +static void free_parse_variable_def(struct parse_variable_def *v) +{ + free_parse_initializer(&v->initializer); + vkd3d_free(v->arrays.sizes); + vkd3d_free(v->name); + vkd3d_free((void *)v->semantic.name); + vkd3d_free(v); +} + static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *type, struct list *fields) { struct parse_variable_def *v, *v_next; @@ -685,13 +694,14 @@ static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *ty if (!(field = hlsl_alloc(ctx, sizeof(*field)))) { - vkd3d_free(v); + free_parse_variable_def(v); return list; } field->type = type; for (i = 0; i < v->arrays.count; ++i) field->type = hlsl_new_array_type(ctx, field->type, v->arrays.sizes[i]); + vkd3d_free(v->arrays.sizes); field->loc = v->loc; field->name = v->name; field->semantic = v->semantic; @@ -719,7 +729,10 @@ static bool add_typedef(struct hlsl_ctx *ctx, DWORD modifiers, struct hlsl_type if (!v->arrays.count) { if (!(type = hlsl_type_clone(ctx, orig_type, 0, modifiers))) + { + free_parse_variable_def(v); return false; + } } else { @@ -729,8 +742,12 @@ static bool add_typedef(struct hlsl_ctx *ctx, DWORD modifiers, struct hlsl_type for (i = 0; i < v->arrays.count; ++i) { if (!(type = hlsl_new_array_type(ctx, type, v->arrays.sizes[i]))) + { + free_parse_variable_def(v); return false; + } } + vkd3d_free(v->arrays.sizes); vkd3d_free((void *)type->name); type->name = v->name; @@ -747,6 +764,7 @@ static bool add_typedef(struct hlsl_ctx *ctx, DWORD modifiers, struct hlsl_type if (!ret) hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, "Type '%s' is already defined.", v->name); + free_parse_initializer(&v->initializer); vkd3d_free(v); } vkd3d_free(list); @@ -1369,15 +1387,6 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, stru vkd3d_free(initializer->args); } -static void free_parse_variable_def(struct parse_variable_def *v) -{ - free_parse_initializer(&v->initializer); - vkd3d_free(v->arrays.sizes); - vkd3d_free(v->name); - vkd3d_free((void *)v->semantic.name); - vkd3d_free(v); -} - static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_type, DWORD modifiers, struct list *var_list) { @@ -1409,6 +1418,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t type = basic_type; for (i = 0; i < v->arrays.count; ++i) type = hlsl_new_array_type(ctx, type, v->arrays.sizes[i]); + vkd3d_free(v->arrays.sizes); if (type->type != HLSL_CLASS_MATRIX) check_invalid_matrix_modifiers(ctx, modifiers, v->loc); @@ -1468,6 +1478,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_INITIALIZER, "Const variable \"%s\" is missing an initializer.", var->name); hlsl_free_var(var); + free_parse_initializer(&v->initializer); vkd3d_free(v); continue; } @@ -1480,6 +1491,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t "Variable \"%s\" was already declared in this scope.", var->name); hlsl_note(ctx, &old->loc, VKD3D_SHADER_LOG_ERROR, "\"%s\" was previously declared here.", old->name); hlsl_free_var(var); + free_parse_initializer(&v->initializer); vkd3d_free(v); continue; } -- 2.25.1

2 1

[PATCH vkd3d v3 3/8] vkd3d-shader/hlsl: Concatenate nested initializers.
by Francisco Casas March 5, 2022

March 5, 2022

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v3: - It seemed right to bring this patch forward before applying the braces flag. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 459ad03b..7678cf3c 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2310,6 +2310,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl %type <function> func_prototype %type <initializer> complex_initializer +%type <initializer> complex_initializer_list %type <initializer> func_arguments %type <initializer> initializer_expr_list @@ -3114,15 +3115,28 @@ complex_initializer: $$.args[0] = node_from_list($1); $$.instrs = $1; } - | '{' initializer_expr_list '}' + | '{' complex_initializer_list '}' { $$ = $2; } - | '{' initializer_expr_list ',' '}' + | '{' complex_initializer_list ',' '}' { $$ = $2; } +complex_initializer_list: + complex_initializer + | complex_initializer_list ',' complex_initializer + { + $$ = $1; + if (!($$.args = hlsl_realloc(ctx, $$.args, ($$.args_count + $3.args_count) * sizeof(*$$.args)))) + YYABORT; + for (unsigned int i = 0; i < $3.args_count; i++) + $$.args[$$.args_count++] = $3.args[i]; + list_move_tail($$.instrs, $3.instrs); + free_parse_initializer(&$3); + } + initializer_expr: assignment_expr -- 2.25.1

2 1

[PATCH vkd3d v3 2/8] vkd3d-shader/hlsl: Add default writemask for matrix stores.
by Francisco Casas March 5, 2022

March 5, 2022

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v3: - This patch is new. - While we don't use the default writemask for matrices (yet), I think it is good for consistency, since we are getting rid of the type_is_single_reg() function. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 00a374b4..5152aec4 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -527,9 +527,13 @@ struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char *nam return var; } -static bool type_is_single_reg(const struct hlsl_type *type) +static unsigned int type_default_writemask(const struct hlsl_type *type) { - return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; + if (type->type == HLSL_CLASS_MATRIX && hlsl_type_is_row_major(type)) + return (1 << type->dimy) - 1; + if (type->type <= HLSL_CLASS_LAST_NUMERIC) + return (1 << type->dimx) - 1; + return 0; } struct hlsl_ir_store *hlsl_new_store(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, struct hlsl_ir_node *offset, @@ -537,8 +541,8 @@ struct hlsl_ir_store *hlsl_new_store(struct hlsl_ctx *ctx, struct hlsl_ir_var *v { struct hlsl_ir_store *store; - if (!writemask && type_is_single_reg(rhs->data_type)) - writemask = (1 << rhs->data_type->dimx) - 1; + if (!writemask) + writemask = type_default_writemask(rhs->data_type); if (!(store = hlsl_alloc(ctx, sizeof(*store)))) return NULL; -- 2.25.1

2 1

[PATCH] configure: Fix the check for CAPI support.
by Zebediah Figura March 5, 2022

March 5, 2022

AC_CHECK_LIB sets the variable to "no", not an empty string. Hence compilation would fail if headers were present but libraries were missing. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index c668127187b..29e8058a24c 100644 --- a/configure.ac +++ b/configure.ac @@ -1646,7 +1646,7 @@ then AC_CHECK_LIB(capi20,capi20_register,[:],[CAPI20_LIBS=""],[$CAPI20_LIBS]) fi]) fi -WINE_NOTICE_WITH(capi,[test "x$ac_cv_lib_capi20_capi20_register" = "x"], +WINE_NOTICE_WITH(capi,[test "x$ac_cv_lib_capi20_capi20_register" != xyes], [libcapi20 ${notice_platform}development files not found, ISDN won't be supported.], [enable_capi2032]) -- 2.35.1

1 0

[PATCH v2] ws2_32: Base inet_addr() implementation on musl.
by Paul Gofman March 4, 2022

March 4, 2022

The imported algorithm is modified to match the tests. Fixes a regression introduced by commit 671cf16f773e5dafc7edbf7766aed9e52e4e7b56. Windows inet_addr() behaves basically the same as Unix inet_addr() which is different from inet_pton(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - allow any space as terminator and add tests for that; - remove now duplicate inet_addr() tests from test_inet_pton (the main part of those didn't work due to missing brackets for '?' operator). dlls/ws2_32/protocol.c | 52 ++++++++++++++++-- dlls/ws2_32/tests/protocol.c | 103 +++++++++++++++++++++++++++++++---- 2 files changed, 141 insertions(+), 14 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 0f56b1604d8..6e7e8eee18a 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -1834,17 +1834,61 @@ int WINAPI WSAAddressToStringW( struct sockaddr *addr, DWORD addr_len, return 0; } - /*********************************************************************** * inet_addr (ws2_32.11) */ u_long WINAPI inet_addr( const char *str ) { + unsigned long a[4] = { 0 }; + const char *s = str; + unsigned char *d; + unsigned int i; u_long addr; + char *z; + + TRACE( "str %s.\n", debugstr_a(str) ); + + if (!s) + { + SetLastError( WSAEFAULT ); + return INADDR_NONE; + } + + d = (unsigned char *)&addr; + + if (s[0] == ' ' && !s[1]) return 0; - if (inet_pton( AF_INET, str, &addr ) == 1) - return addr; - return INADDR_NONE; + for (i = 0; i < 4; ++i) + { + a[i] = strtoul( s, &z, 0 ); + if (z == s || !isdigit( *s )) return INADDR_NONE; + if (!*z || isspace(*z)) break; + if (*z != '.') return INADDR_NONE; + s = z + 1; + } + + if (i == 4) return INADDR_NONE; + + switch (i) + { + case 0: + a[1] = a[0] & 0xffffff; + a[0] >>= 24; + /* fallthrough */ + case 1: + a[2] = a[1] & 0xffff; + a[1] >>= 16; + /* fallthrough */ + case 2: + a[3] = a[2] & 0xff; + a[2] >>= 8; + } + for (i = 0; i < 4; ++i) + { + if (a[i] > 255) return INADDR_NONE; + d[i] = a[i]; + } + return addr; } diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 374fa01789d..9b3dec39dad 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -674,6 +674,98 @@ static void test_inet_ntoa(void) CloseHandle(thread); } +static void test_inet_addr(void) +{ + static const struct + { + const char *input; + u_long addr; + } + tests[] = + { + {"1.2.3.4", 0x04030201}, + {"1 2 3 4", 0x01000000}, + {"1.2.3. 4", 0xffffffff}, + {"1.2.3 .4", 0x03000201}, + {"1.2.3 \xfe\xff", 0x03000201}, + {"3.4.5.6.7", 0xffffffff}, + {"3.4.5.6. 7", 0xffffffff}, + {"3.4.5.6 7", 0x06050403}, + {" 3.4.5.6", 0xffffffff}, + {"\t3.4.5.6", 0xffffffff}, + {"3.4.5.6 ", 0x06050403}, + {"3.4.5.6 ", 0x06050403}, + {"3. 4.5.6", 0xffffffff}, + {"3 .4.5.6", 0x03000000}, + {"1.2.3", 0x03000201}, + {".1.2.3", 0xffffffff}, + {"0.0.0.0", 0x00000000}, + {"", 0xffffffff}, + {" 0", 0xffffffff}, + {"0xa1a2b3b4 ", 0xb4b3a2a1}, + {".", 0xffffffff}, + {" ", 0x00000000}, + {"\t", 0xffffffff}, + {" ", 0xffffffff}, + {"127.127.127.255", 0xff7f7f7f}, + {"127.127.127.255:123", 0xffffffff}, + {"127.127.127.256", 0xffffffff}, + {"a", 0xffffffff}, + {"1.2.3.0xaA", 0xaa030201}, + {"1.1.1.0x", 0xffffffff}, + {"1.2.3.010", 0x08030201}, + {"1.2.3.00", 0x00030201}, + {"1.2.3.0a", 0xffffffff}, + {"1.1.1.0o10", 0xffffffff}, + {"1.1.1.0b10", 0xffffffff}, + {"1.1.1.-2", 0xffffffff}, + {"1", 0x01000000}, + {"1.2", 0x02000001}, + {"1.2.3", 0x03000201}, + {"203569230", 0x4e38220c}, + {"[0.1.2.3]", 0xffffffff}, + {"0x00010203", 0x03020100}, + {"0x2134", 0x34210000}, + {"1234BEEF", 0xffffffff}, + {"017700000001", 0x0100007f}, + {"0777", 0xff010000}, + {"2607:f0d0:1002:51::4", 0xffffffff}, + {"::177.32.45.20", 0xffffffff}, + {"::1/128", 0xffffffff}, + {"::1", 0xffffffff}, + {":1", 0xffffffff}, + }; + u_long addr, expected; + unsigned int i; + char str[32]; + + WSASetLastError(0xdeadbeef); + addr = inet_addr(NULL); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + ok(addr == 0xffffffff, "got addr %#08x\n", addr); + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + winetest_push_context( "Address %s, i %u", debugstr_a(tests[i].input), i ); + WSASetLastError(0xdeadbeef); + addr = inet_addr(tests[i].input); + ok(WSAGetLastError() == 0xdeadbeef, "got error %u\n", WSAGetLastError()); + ok(addr == tests[i].addr, "got addr %#08x\n", addr); + winetest_pop_context(); + } + + strcpy(str, "1.2.3"); + str[6] = 0; + for (i = 1; i < 256; ++i) + { + if (isdigit(i)) + continue; + str[5] = i; + expected = isspace(i) ? 0x03000201 : 0xffffffff; + addr = inet_addr(str); + ok(addr == expected, "got addr %#08x, expected %#08x, i %u\n", addr, expected, i); + } +} + static void test_inet_pton(void) { static const struct @@ -942,11 +1034,6 @@ static void test_inet_pton(void) ok(ret == -1, "got %d\n", ret); ok(WSAGetLastError() == WSAEAFNOSUPPORT, "got error %u\n", WSAGetLastError()); - WSASetLastError(0xdeadbeef); - ret = inet_addr(NULL); - ok(ret == INADDR_NONE, "got %#x\n", ret); - ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); - for (i = 0; i < ARRAY_SIZE(ipv4_tests); ++i) { WCHAR inputW[32]; @@ -969,11 +1056,6 @@ static void test_inet_pton(void) 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, "got addr %#08x\n", addr); - ok(WSAGetLastError() == 0xdeadbeef, "got error %u\n", WSAGetLastError()); - winetest_pop_context(); } @@ -2871,6 +2953,7 @@ START_TEST( protocol ) test_WSALookupService(); test_inet_ntoa(); + test_inet_addr(); test_inet_pton(); test_addr_to_print(); test_WSAAddressToString(); -- 2.35.1

3 5

[tools] testbot: Fix the indentation of FormPage::SaveProperties().
by Francois Gouget March 4, 2022

March 4, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 03ddea64f2..43b9b59ce5 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -361,8 +361,7 @@ sub SaveProperties($) my $PropertyDescriptor = $self->GetPropertyDescriptorByName($ParameterName); if (defined($PropertyDescriptor)) { - if (! $self->SaveProperty($PropertyDescriptor, - $self->GetParam($ParameterName))) + if (! $self->SaveProperty($PropertyDescriptor, $self->GetParam($ParameterName))) { return !1; } -- 2.30.2

1 0

[PATCH v2 1/6] ws2_32/tests: Add tests for setting and getting socket options with shorter length.
by Paul Gofman March 4, 2022

March 4, 2022

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - also check for nonzero optval where appropriate throughout the patchset. The aim of the patchset is to fix setting and getting 32bit sized socket options when the beaviour is different between Windows and Linux setsockopt() and getsockopt(). That behaviour partially regressed on the move from ws2_32 to ntdll: setsockopt() had the code which would adjust the size for option with the provided length less than 4 bytes (which helped, e. g., SO_REUSEADDR and SO_KEEPALIVE and Killing Floor 2 depended on that). ALthough, as my tests show, that was not universally correct across all the options and the details of getsockopt() were also different. I have another 16 patches on top of this series addressing the other options. There are also a few options (e. g., SO_KEEPALIVE) which should use the first byte only (like that is currently done for TCP_NODELAY minus accessing optval before NULL check). Also a few options behave like boolean values (return value of 1 after setting 0x100. But since fixing up those are orthogonal to what these patches are doing (i. e., the present patches do not change the behaviour for currently supported 4 byte optlen) I am fixing up those in the yet further patches. dlls/ws2_32/tests/sock.c | 86 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 85 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6b6267dc153..0eece82bfb1 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1155,8 +1155,27 @@ static const LINGER linger_testvals[] = { static void test_set_getsockopt(void) { + static struct + { + int af; + int type; + int level; + int optname; + BOOL accepts_short_len; + unsigned int sizes[3]; + DWORD values[3]; + } + test_optsize[] = + { + {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_RCVTIMEO, FALSE, {1, 2, 4}}, + {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_SNDTIMEO, FALSE, {1, 2, 4}}, + {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_LOOP, TRUE, {1, 1, 4}}, + {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_TTL, TRUE, {1, 1, 4}}, + {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_TOS, TRUE, {1, 1, 4}}, + {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_TTL, TRUE, {1, 1, 4}}, + }; SOCKET s, s2; - int i, err, lasterr; + int i, j, err, lasterr; int timeout; LINGER lingval; int size; @@ -1375,6 +1394,71 @@ static void test_set_getsockopt(void) err, WSAGetLastError()); closesocket(s); + + /* Test option short length. */ + for (i = 0; i < ARRAY_SIZE(test_optsize); ++i) + { + s2 = socket( test_optsize[i].af, test_optsize[i].type, 0 ); + ok(s2 != INVALID_SOCKET, "socket() failed error %d\n", WSAGetLastError()); + for (j = 0; j < 3; ++j) + { + DWORD expected_last_error, expected_value, expected_size, save_value; + int expected_err; + + winetest_push_context("i %u, level %d, optname %d, len %u", + i, test_optsize[i].level, test_optsize[i].optname, 1 << j); + + size = sizeof(save_value); + err = getsockopt(s2, test_optsize[i].level, test_optsize[i].optname, (char*)&save_value, &size); + ok(!err, "Unexpected getsockopt result %d.\n", err); + + if (test_optsize[i].accepts_short_len || j == 2) + { + expected_err = 0; + expected_last_error = ERROR_SUCCESS; + expected_size = test_optsize[i].sizes[j] ? test_optsize[i].sizes[j] : 4; + if (test_optsize[i].values[j]) + expected_value = test_optsize[i].values[j]; + else if (expected_size == 4) + expected_value = 1; + else + expected_value = (0xdeadbeef & ~((1 << expected_size * 8) - 1)) | 1; + } + else + { + expected_err = -1; + expected_last_error = WSAEFAULT; + expected_size = test_optsize[i].sizes[j]; + if (test_optsize[i].values[j]) + expected_value = test_optsize[i].values[j]; + else + expected_value = 0xdeadbeef; + } + + value = 1; + SetLastError(0xdeadbeef); + err = setsockopt(s2, test_optsize[i].level, test_optsize[i].optname, (char*)&value, 1 << j); + ok(err == expected_err, "Unexpected setsockopt result %d.\n", err); + ok(WSAGetLastError() == expected_last_error, "Unexpected WSAGetLastError() %u.\n", WSAGetLastError()); + + value = 0xdeadbeef; + SetLastError(0xdeadbeef); + size = 1 << j; + err = getsockopt(s2, test_optsize[i].level, test_optsize[i].optname, (char*)&value, &size); + ok(err == expected_err, "Unexpected getsockopt result %d.\n", err); + ok(WSAGetLastError() == expected_last_error, "Unexpected WSAGetLastError() %u.\n", WSAGetLastError()); + ok(value == expected_value, "Got unexpected value %#x, expected %#x.\n", value, expected_value); + ok(size == expected_size, "Got unexpected size %u, expected %u.\n", size, expected_size); + + err = setsockopt(s2, test_optsize[i].level, test_optsize[i].optname, + (char*)&save_value, sizeof(save_value)); + ok(!err, "Unexpected getsockopt result %d.\n", err); + + winetest_pop_context(); + } + closesocket(s2); + } + /* Test with the closed socket */ SetLastError(0xdeadbeef); size = sizeof(i); -- 2.35.1

3 9

[tools] testbot: Simplify the basic property validation.
by Francois Gouget March 4, 2022

March 4, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/BasicPropertyDescriptor.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm b/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm index 766a342309..b283859b9e 100644 --- a/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm @@ -92,7 +92,7 @@ sub ValidateValue($$$) return $self->GetDisplayName() . ": Too long"; } - if ($self->GetType() eq "N" && ! ($Value =~ /^\s*\d+\s*$/)) + if ($self->GetType() eq "N" && $Value !~ /^\s*\d+\s*$/) { return $self->GetDisplayName() . ": Invalid number"; } -- 2.30.2

1 0