wine-commits November 2022

wine-commits@winehq.org

1 participants
1171 discussions

Paul Gofman : server: Support SO_EXCLUSIVEADDRUSE socket option.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: a9ae1e041c078fda48a5a0de7c7ccf95dd90a73a URL: https://gitlab.winehq.org/wine/wine/-/commit/a9ae1e041c078fda48a5a0de7c7ccf… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 31 12:20:10 2022 -0600 server: Support SO_EXCLUSIVEADDRUSE socket option. --- dlls/ws2_32/tests/sock.c | 22 +++++++++------------- server/sock.c | 33 ++++++++++++++++++++++++++------- 2 files changed, 35 insertions(+), 20 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 44a1691950a..9b39ecff3c5 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2043,19 +2043,18 @@ static void test_reuseaddr(void) } s[2]; int error; - BOOL todo; } tests_exclusive[] = { { {{ AF_INET, (struct sockaddr *)&saddr_in_any, sizeof(saddr_in_any), TRUE, }, { AF_INET, (struct sockaddr *)&saddr_in_loopback, sizeof(saddr_in_loopback), FALSE, }}, - WSAEACCES, TRUE, + WSAEACCES, }, { {{ AF_INET6, (struct sockaddr *)&saddr_in6_any, sizeof(saddr_in6_any), TRUE, }, { AF_INET, (struct sockaddr *)&saddr_in_loopback, sizeof(saddr_in_loopback), FALSE, }}, - WSAEACCES, TRUE, + WSAEACCES, }, { {{ AF_INET, (struct sockaddr *)&saddr_in_any, sizeof(saddr_in_any), FALSE, }, @@ -2065,7 +2064,7 @@ static void test_reuseaddr(void) { {{ AF_INET, (struct sockaddr *)&saddr_in_any, sizeof(saddr_in_any), TRUE, }, { AF_INET, (struct sockaddr *)&saddr_in_loopback, sizeof(saddr_in_loopback), TRUE, }}, - WSAEACCES, TRUE, + WSAEACCES, }, { {{ AF_INET, (struct sockaddr *)&saddr_in_loopback, sizeof(saddr_in_loopback), TRUE, }, @@ -2075,12 +2074,12 @@ static void test_reuseaddr(void) { {{ AF_INET, (struct sockaddr *)&saddr_in_loopback, sizeof(saddr_in_loopback), FALSE, }, { AF_INET, (struct sockaddr *)&saddr_in_any, sizeof(saddr_in_any), TRUE, }}, - WSAEADDRINUSE, TRUE, + WSAEADDRINUSE, }, { {{ AF_INET, (struct sockaddr *)&saddr_in_loopback, sizeof(saddr_in_loopback), FALSE, }, { AF_INET6, (struct sockaddr *)&saddr_in6_any, sizeof(saddr_in6_any), TRUE, }}, - WSAEADDRINUSE, TRUE, + WSAEADDRINUSE, }, { {{ AF_INET6, (struct sockaddr *)&saddr_in6_loopback, sizeof(saddr_in6_loopback), FALSE, }, @@ -2095,17 +2094,17 @@ static void test_reuseaddr(void) { {{ AF_INET6, (struct sockaddr *)&saddr_in6_loopback_v4mapped, sizeof(saddr_in6_loopback_v4mapped), FALSE, }, { AF_INET, (struct sockaddr *)&saddr_in_any, sizeof(saddr_in_any), TRUE, }}, - WSAEADDRINUSE, TRUE, + WSAEADDRINUSE, }, { {{ AF_INET6, (struct sockaddr *)&saddr_in6_any, sizeof(saddr_in6_any), TRUE, }, { AF_INET, (struct sockaddr *)&saddr_in_any, sizeof(saddr_in_any), FALSE, }}, - WSAEACCES, TRUE, + WSAEACCES, }, { {{ AF_INET6, (struct sockaddr *)&saddr_in6_any, sizeof(saddr_in6_any), FALSE, }, { AF_INET, (struct sockaddr *)&saddr_in_any, sizeof(saddr_in_any), TRUE, }}, - NOERROR, TRUE, + NOERROR, }, { {{ AF_INET, (struct sockaddr *)&saddr_in_any, sizeof(saddr_in_any), FALSE, }, @@ -2120,7 +2119,7 @@ static void test_reuseaddr(void) { {{ AF_INET6, (struct sockaddr *)&saddr_in6_any, sizeof(saddr_in6_any), FALSE, }, { AF_INET, (struct sockaddr *)&saddr_in_any, sizeof(saddr_in_any), FALSE, }}, - NOERROR, TRUE, + NOERROR, }, { {{ AF_INET6, (struct sockaddr *)&saddr_in6_any_v4mapped, sizeof(saddr_in6_any_v4mapped), FALSE, }, @@ -2398,14 +2397,11 @@ static void test_reuseaddr(void) rc = bind(s[1], tests_exclusive[i].s[1].addr, tests_exclusive[i].s[1].addrlen); - todo_wine_if(tests_exclusive[i].todo) - { if (tests_exclusive[i].error) ok(rc == SOCKET_ERROR && WSAGetLastError() == tests_exclusive[i].error, "got rc %d, error %d, expected error %d.\n", rc, WSAGetLastError(), tests_exclusive[i].error); else ok(!rc, "got error %d.\n", WSAGetLastError()); - } closesocket(s[0]); closesocket(s[1]); diff --git a/server/sock.c b/server/sock.c index d1c63dc47c3..c130821b7f4 100644 --- a/server/sock.c +++ b/server/sock.c @@ -187,6 +187,7 @@ struct bound_addr { struct rb_entry entry; union unix_sockaddr addr; + int match_any_addr; int reuse_count; }; @@ -276,7 +277,8 @@ static int addr_compare( const void *key, const struct wine_rb_entry *entry ) { if (addr->addr.in.sin_port != bound_addr->addr.in.sin_port) return addr->addr.in.sin_port < bound_addr->addr.in.sin_port ? -1 : 1; - if (addr->addr.in.sin_addr.s_addr == bound_addr->addr.in.sin_addr.s_addr) + if (bound_addr->match_any_addr || addr->match_any_addr + || addr->addr.in.sin_addr.s_addr == bound_addr->addr.in.sin_addr.s_addr) return 0; return addr->addr.in.sin_addr.s_addr < bound_addr->addr.in.sin_addr.s_addr ? -1 : 1; } @@ -284,14 +286,16 @@ static int addr_compare( const void *key, const struct wine_rb_entry *entry ) assert( addr->addr.addr.sa_family == AF_INET6 ); if (addr->addr.in6.sin6_port != bound_addr->addr.in6.sin6_port) return addr->addr.in6.sin6_port < bound_addr->addr.in6.sin6_port ? -1 : 1; + if (bound_addr->match_any_addr || addr->match_any_addr) return 0; return memcmp( &addr->addr.in6.sin6_addr, &bound_addr->addr.in6.sin6_addr, sizeof(addr->addr.in6.sin6_addr) ); } -static int ipv4addr_from_v6( union unix_sockaddr *v4addr, const struct sockaddr_in6 *in6 ) +static int ipv4addr_from_v6( union unix_sockaddr *v4addr, const struct sockaddr_in6 *in6, int map_unspecified ) { v4addr->in.sin_family = AF_INET; v4addr->in.sin_port = in6->sin6_port; - if (IN6_IS_ADDR_UNSPECIFIED(&in6->sin6_addr)) + + if (map_unspecified && IN6_IS_ADDR_UNSPECIFIED(&in6->sin6_addr)) { v4addr->in.sin_addr.s_addr = htonl( INADDR_ANY ); return 1; @@ -318,6 +322,15 @@ static int should_track_conflicts_for_addr( struct sock *sock, const union unix_ return 0; } +static int is_any_addr( const union unix_sockaddr *addr ) +{ + if (addr->addr.sa_family == AF_INET && addr->in.sin_addr.s_addr == htonl( INADDR_ANY )) + return 1; + if (addr->addr.sa_family == AF_INET6 && IN6_IS_ADDR_UNSPECIFIED(&addr->in6.sin6_addr)) + return 1; + return 0; +} + static int check_addr_usage( struct sock *sock, const union unix_sockaddr *addr, int v6only ) { struct bound_addr *bound_addr, search_addr; @@ -326,26 +339,30 @@ static int check_addr_usage( struct sock *sock, const union unix_sockaddr *addr, if (!should_track_conflicts_for_addr( sock, addr )) return 0; search_addr.addr = *addr; + search_addr.match_any_addr = sock->exclusiveaddruse && is_any_addr( addr ); if ((entry = rb_get( &bound_addresses_tree, &search_addr ))) { bound_addr = WINE_RB_ENTRY_VALUE(entry, struct bound_addr, entry); if (bound_addr->reuse_count == -1 || !sock->reuseaddr) { - set_error( sock->reuseaddr ? STATUS_ACCESS_DENIED : STATUS_SHARING_VIOLATION ); + set_error( sock->reuseaddr || bound_addr->match_any_addr + ? STATUS_ACCESS_DENIED : STATUS_SHARING_VIOLATION ); return 1; } } if (sock->family != WS_AF_INET6 || v6only) return 0; - if (!ipv4addr_from_v6( &search_addr.addr, &addr->in6 )) return 0; + if (!ipv4addr_from_v6( &search_addr.addr, &addr->in6, sock->exclusiveaddruse )) return 0; + search_addr.match_any_addr = sock->exclusiveaddruse && is_any_addr( &search_addr.addr ); if ((entry = rb_get( &bound_addresses_tree, &search_addr ))) { bound_addr = WINE_RB_ENTRY_VALUE(entry, struct bound_addr, entry); if (bound_addr->reuse_count == -1 || !sock->reuseaddr) { - set_error( sock->reuseaddr ? STATUS_ACCESS_DENIED : STATUS_SHARING_VIOLATION ); + set_error( sock->reuseaddr || bound_addr->match_any_addr + ? STATUS_ACCESS_DENIED : STATUS_SHARING_VIOLATION ); return 1; } } @@ -360,6 +377,7 @@ static struct bound_addr *register_bound_address( struct sock *sock, const union return NULL; bound_addr->addr = *addr; + bound_addr->match_any_addr = sock->exclusiveaddruse && is_any_addr( addr ); if (rb_put( &bound_addresses_tree, bound_addr, &bound_addr->entry )) { @@ -392,7 +410,8 @@ static void update_addr_usage( struct sock *sock, const union unix_sockaddr *add sock->bound_addr[0] = register_bound_address( sock, addr ); if (sock->family != WS_AF_INET6 || v6only) return; - if (!ipv4addr_from_v6( &v4addr, &addr->in6 )) return; + + if (!ipv4addr_from_v6( &v4addr, &addr->in6, sock->exclusiveaddruse )) return; sock->bound_addr[1] = register_bound_address( sock, &v4addr ); }

1 0

Paul Gofman : server: Do not translate loopback addr in ipv4addr_from_v6().
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: 003ee6202bddc808d1de4f75ab99454e92884809 URL: https://gitlab.winehq.org/wine/wine/-/commit/003ee6202bddc808d1de4f75ab9945… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 31 15:40:55 2022 -0600 server: Do not translate loopback addr in ipv4addr_from_v6(). --- server/sock.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/server/sock.c b/server/sock.c index e9e4640b3b8..d1c63dc47c3 100644 --- a/server/sock.c +++ b/server/sock.c @@ -296,11 +296,6 @@ static int ipv4addr_from_v6( union unix_sockaddr *v4addr, const struct sockaddr_ v4addr->in.sin_addr.s_addr = htonl( INADDR_ANY ); return 1; } - if (IN6_IS_ADDR_LOOPBACK(&in6->sin6_addr)) - { - v4addr->in.sin_addr.s_addr = INADDR_LOOPBACK; - return 1; - } if (IN6_IS_ADDR_V4COMPAT(&in6->sin6_addr) || IN6_IS_ADDR_V4MAPPED(&in6->sin6_addr)) { memcpy( &v4addr->in.sin_addr.s_addr, &in6->sin6_addr.s6_addr[12], sizeof(v4addr->in.sin_addr.s_addr) );

1 0

Paul Gofman : server: Use htonl() with INADDR_ANY in ipv4addr_from_v6().
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: 0328ba93f3e87cc90232fea1176f6a4fe96d404f URL: https://gitlab.winehq.org/wine/wine/-/commit/0328ba93f3e87cc90232fea1176f6a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 31 16:57:59 2022 -0600 server: Use htonl() with INADDR_ANY in ipv4addr_from_v6(). --- server/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/sock.c b/server/sock.c index 3bb04c5925a..e9e4640b3b8 100644 --- a/server/sock.c +++ b/server/sock.c @@ -293,7 +293,7 @@ static int ipv4addr_from_v6( union unix_sockaddr *v4addr, const struct sockaddr_ v4addr->in.sin_port = in6->sin6_port; if (IN6_IS_ADDR_UNSPECIFIED(&in6->sin6_addr)) { - v4addr->in.sin_addr.s_addr = INADDR_ANY; + v4addr->in.sin_addr.s_addr = htonl( INADDR_ANY ); return 1; } if (IN6_IS_ADDR_LOOPBACK(&in6->sin6_addr))

1 0

Paul Gofman : server: Set error in check_addr_usage().
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: 6992f2cba58982f8453c307e3cfcf65b767e82da URL: https://gitlab.winehq.org/wine/wine/-/commit/6992f2cba58982f8453c307e3cfcf6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 31 15:06:47 2022 -0600 server: Set error in check_addr_usage(). --- server/sock.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/server/sock.c b/server/sock.c index 5ed62ae700f..3bb04c5925a 100644 --- a/server/sock.c +++ b/server/sock.c @@ -335,7 +335,11 @@ static int check_addr_usage( struct sock *sock, const union unix_sockaddr *addr, if ((entry = rb_get( &bound_addresses_tree, &search_addr ))) { bound_addr = WINE_RB_ENTRY_VALUE(entry, struct bound_addr, entry); - if (bound_addr->reuse_count == -1 || !sock->reuseaddr) return 1; + if (bound_addr->reuse_count == -1 || !sock->reuseaddr) + { + set_error( sock->reuseaddr ? STATUS_ACCESS_DENIED : STATUS_SHARING_VIOLATION ); + return 1; + } } if (sock->family != WS_AF_INET6 || v6only) return 0; @@ -344,7 +348,11 @@ static int check_addr_usage( struct sock *sock, const union unix_sockaddr *addr, if ((entry = rb_get( &bound_addresses_tree, &search_addr ))) { bound_addr = WINE_RB_ENTRY_VALUE(entry, struct bound_addr, entry); - if (bound_addr->reuse_count == -1 || !sock->reuseaddr) return 1; + if (bound_addr->reuse_count == -1 || !sock->reuseaddr) + { + set_error( sock->reuseaddr ? STATUS_ACCESS_DENIED : STATUS_SHARING_VIOLATION ); + return 1; + } } return 0; } @@ -2895,10 +2903,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) #endif if (check_addr_usage( sock, &bind_addr, v6only )) - { - set_error( sock->reuseaddr ? STATUS_ACCESS_DENIED : STATUS_SHARING_VIOLATION ); return; - } if (bind( unix_fd, &bind_addr.addr, unix_len ) < 0) {

1 0

Paul Gofman : server: Use struct bound_addr as a key to bound_addresses_tree.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: 9163d3420f40155927ecd6c913c5ffb2109f580c URL: https://gitlab.winehq.org/wine/wine/-/commit/9163d3420f40155927ecd6c913c5ff… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 31 14:59:55 2022 -0600 server: Use struct bound_addr as a key to bound_addresses_tree. --- server/sock.c | 48 ++++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/server/sock.c b/server/sock.c index 141c5ea6d0a..5ed62ae700f 100644 --- a/server/sock.c +++ b/server/sock.c @@ -267,24 +267,24 @@ static int is_tcp_socket( struct sock *sock ) static int addr_compare( const void *key, const struct wine_rb_entry *entry ) { const struct bound_addr *bound_addr = RB_ENTRY_VALUE(entry, struct bound_addr, entry); - const union unix_sockaddr *addr = key; + const struct bound_addr *addr = key; - if (addr->addr.sa_family != bound_addr->addr.addr.sa_family) - return addr->addr.sa_family < bound_addr->addr.addr.sa_family ? -1 : 1; + if (addr->addr.addr.sa_family != bound_addr->addr.addr.sa_family) + return addr->addr.addr.sa_family < bound_addr->addr.addr.sa_family ? -1 : 1; - if (addr->addr.sa_family == AF_INET) + if (addr->addr.addr.sa_family == AF_INET) { - if (addr->in.sin_port != bound_addr->addr.in.sin_port) - return addr->in.sin_port < bound_addr->addr.in.sin_port ? -1 : 1; - if (addr->in.sin_addr.s_addr == bound_addr->addr.in.sin_addr.s_addr) + if (addr->addr.in.sin_port != bound_addr->addr.in.sin_port) + return addr->addr.in.sin_port < bound_addr->addr.in.sin_port ? -1 : 1; + if (addr->addr.in.sin_addr.s_addr == bound_addr->addr.in.sin_addr.s_addr) return 0; - return addr->in.sin_addr.s_addr < bound_addr->addr.in.sin_addr.s_addr ? -1 : 1; + return addr->addr.in.sin_addr.s_addr < bound_addr->addr.in.sin_addr.s_addr ? -1 : 1; } - assert( addr->addr.sa_family == AF_INET6 ); - if (addr->in6.sin6_port != bound_addr->addr.in6.sin6_port) - return addr->in6.sin6_port < bound_addr->addr.in6.sin6_port ? -1 : 1; - return memcmp( &addr->in6.sin6_addr, &bound_addr->addr.in6.sin6_addr, sizeof(addr->in6.sin6_addr) ); + assert( addr->addr.addr.sa_family == AF_INET6 ); + if (addr->addr.in6.sin6_port != bound_addr->addr.in6.sin6_port) + return addr->addr.in6.sin6_port < bound_addr->addr.in6.sin6_port ? -1 : 1; + return memcmp( &addr->addr.in6.sin6_addr, &bound_addr->addr.in6.sin6_addr, sizeof(addr->addr.in6.sin6_addr) ); } static int ipv4addr_from_v6( union unix_sockaddr *v4addr, const struct sockaddr_in6 *in6 ) @@ -325,21 +325,23 @@ static int should_track_conflicts_for_addr( struct sock *sock, const union unix_ static int check_addr_usage( struct sock *sock, const union unix_sockaddr *addr, int v6only ) { - struct bound_addr *bound_addr; - union unix_sockaddr v4addr; + struct bound_addr *bound_addr, search_addr; struct rb_entry *entry; if (!should_track_conflicts_for_addr( sock, addr )) return 0; - if ((entry = rb_get( &bound_addresses_tree, addr ))) + search_addr.addr = *addr; + + if ((entry = rb_get( &bound_addresses_tree, &search_addr ))) { bound_addr = WINE_RB_ENTRY_VALUE(entry, struct bound_addr, entry); if (bound_addr->reuse_count == -1 || !sock->reuseaddr) return 1; } if (sock->family != WS_AF_INET6 || v6only) return 0; - if (!ipv4addr_from_v6( &v4addr, &addr->in6 )) return 0; - if ((entry = rb_get( &bound_addresses_tree, &v4addr ))) + if (!ipv4addr_from_v6( &search_addr.addr, &addr->in6 )) return 0; + + if ((entry = rb_get( &bound_addresses_tree, &search_addr ))) { bound_addr = WINE_RB_ENTRY_VALUE(entry, struct bound_addr, entry); if (bound_addr->reuse_count == -1 || !sock->reuseaddr) return 1; @@ -349,15 +351,18 @@ static int check_addr_usage( struct sock *sock, const union unix_sockaddr *addr, static struct bound_addr *register_bound_address( struct sock *sock, const union unix_sockaddr *addr ) { - struct bound_addr *bound_addr; + struct bound_addr *bound_addr, *temp; if (!(bound_addr = mem_alloc( sizeof(*bound_addr) ))) return NULL; - if (rb_put( &bound_addresses_tree, addr, &bound_addr->entry )) + bound_addr->addr = *addr; + + if (rb_put( &bound_addresses_tree, bound_addr, &bound_addr->entry )) { - free( bound_addr ); - bound_addr = WINE_RB_ENTRY_VALUE(rb_get( &bound_addresses_tree, addr ), struct bound_addr, entry); + temp = bound_addr; + bound_addr = WINE_RB_ENTRY_VALUE(rb_get( &bound_addresses_tree, temp ), struct bound_addr, entry); + free( temp ); if (bound_addr->reuse_count == -1) { if (debug_level) @@ -368,7 +373,6 @@ static struct bound_addr *register_bound_address( struct sock *sock, const union } else { - bound_addr->addr = *addr; bound_addr->reuse_count = sock->reuseaddr ? 1 : -1; } return bound_addr;

1 0

Paul Gofman : server: Make SO_REUSEADDR and SO_EXCLUSIVEADDRUSE mutually exclusive.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: 12b604926e6c5a87cac6e4375f0718ecb665ecfe URL: https://gitlab.winehq.org/wine/wine/-/commit/12b604926e6c5a87cac6e4375f0718… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 31 12:50:58 2022 -0600 server: Make SO_REUSEADDR and SO_EXCLUSIVEADDRUSE mutually exclusive. --- dlls/ws2_32/tests/sock.c | 4 ++-- server/sock.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 00f4327bb3b..44a1691950a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2353,7 +2353,7 @@ static void test_reuseaddr(void) value = 1; rc = setsockopt(s1, SOL_SOCKET, SO_EXCLUSIVEADDRUSE, (char*)&value, sizeof(value)); - todo_wine ok(rc == SOCKET_ERROR && WSAGetLastError() == WSAEINVAL, "got rc %d, error %d.\n", rc, WSAGetLastError()); + ok(rc == SOCKET_ERROR && WSAGetLastError() == WSAEINVAL, "got rc %d, error %d.\n", rc, WSAGetLastError()); value = 0; rc = setsockopt(s1, SOL_SOCKET, SO_REUSEADDR, (char*)&value, sizeof(value)); @@ -2364,7 +2364,7 @@ static void test_reuseaddr(void) value = 1; rc = setsockopt(s1, SOL_SOCKET, SO_REUSEADDR, (char*)&value, sizeof(value)); - todo_wine ok(rc == SOCKET_ERROR && WSAGetLastError() == WSAEINVAL, "got rc %d, error %d.\n", rc, WSAGetLastError()); + ok(rc == SOCKET_ERROR && WSAGetLastError() == WSAEINVAL, "got rc %d, error %d.\n", rc, WSAGetLastError()); closesocket(s1); diff --git a/server/sock.c b/server/sock.c index 88215650757..141c5ea6d0a 100644 --- a/server/sock.c +++ b/server/sock.c @@ -3091,6 +3091,13 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) } reuse = *(int *)get_req_data(); + + if (reuse && sock->exclusiveaddruse) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + if (is_tcp_socket( sock )) ret = 0; else @@ -3116,6 +3123,11 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) } exclusive = *(int *)get_req_data(); + if (exclusive && sock->reuseaddr) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } sock->exclusiveaddruse = !!exclusive; return; }

1 0

Paul Gofman : ws2_32: Track SO_EXCLUSIVEADDRUSE option value.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: d656cb2024a5018cce53a40540a0a6d4e566c38e URL: https://gitlab.winehq.org/wine/wine/-/commit/d656cb2024a5018cce53a40540a0a6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 31 12:46:08 2022 -0600 ws2_32: Track SO_EXCLUSIVEADDRUSE option value. --- dlls/ws2_32/socket.c | 20 ++++++++++++++------ dlls/ws2_32/tests/sock.c | 1 + include/wine/afd.h | 2 ++ server/sock.c | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2f115f02e48..9e447f29d8c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1818,6 +1818,11 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl if (!ret && *optlen < sizeof(DWORD)) *optlen = 1; return ret; + case SO_EXCLUSIVEADDRUSE: + ret = server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_EXCLUSIVEADDRUSE, optval, optlen ); + if (!ret && *optlen < sizeof(DWORD)) *optlen = 1; + return ret; + case SO_SNDBUF: if (*optlen < sizeof(DWORD) || !optval) { @@ -3215,6 +3220,15 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int memcpy( &value, optval, min( optlen, sizeof(value) )); return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_REUSEADDR, (char *)&value, sizeof(value) ); + case SO_EXCLUSIVEADDRUSE: + if (!optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + memcpy( &value, optval, min( optlen, sizeof(value) )); + return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_EXCLUSIVEADDRUSE, (char *)&value, sizeof(value) ); + case SO_SNDBUF: if (optlen < 0) optlen = 4; return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_SNDBUF, optval, optlen ); @@ -3240,12 +3254,6 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int SetLastError( ERROR_SUCCESS ); return 0; - /* Stops two sockets from being bound to the same port. Always happens - * on unix systems, so just drop it. */ - case SO_EXCLUSIVEADDRUSE: - TRACE("Ignoring SO_EXCLUSIVEADDRUSE, is always set.\n"); - return 0; - /* After a ConnectEx call succeeds, the socket can't be used with half of the * normal winsock functions on windows. We don't have that problem. */ case SO_UPDATE_CONNECT_CONTEXT: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 852cdd88dc7..00f4327bb3b 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1209,6 +1209,7 @@ static void test_set_getsockopt(void) {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_DONTROUTE, TRUE, {1, 1, 1}, {0}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_RCVTIMEO, FALSE, {1, 2, 4}, {0}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_REUSEADDR, TRUE, {1, 1, 4}, {0, 0xdead0001, 0}, TRUE, TRUE}, + {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_EXCLUSIVEADDRUSE, TRUE, {1, 1, 4}, {0, 0xdead0001, 0}, TRUE, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_SNDBUF, FALSE, {1, 2, 4}, {0xdeadbe00, 0xdead0000}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_SNDTIMEO, FALSE, {1, 2, 4}, {0}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_OPENTYPE, FALSE, {1, 2, 4}, {0}, TRUE}, diff --git a/include/wine/afd.h b/include/wine/afd.h index 993730cacdb..b34a7b7318e 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -283,6 +283,8 @@ C_ASSERT( sizeof(struct afd_get_events_params) == 56 ); #define IOCTL_AFD_WINE_SET_IP_RECVTTL WINE_AFD_IOC(294) #define IOCTL_AFD_WINE_GET_IP_RECVTOS WINE_AFD_IOC(295) #define IOCTL_AFD_WINE_SET_IP_RECVTOS WINE_AFD_IOC(296) +#define IOCTL_AFD_WINE_GET_SO_EXCLUSIVEADDRUSE WINE_AFD_IOC(297) +#define IOCTL_AFD_WINE_SET_SO_EXCLUSIVEADDRUSE WINE_AFD_IOC(298) struct afd_iovec { diff --git a/server/sock.c b/server/sock.c index 2156a1a12c2..88215650757 100644 --- a/server/sock.c +++ b/server/sock.c @@ -256,6 +256,7 @@ struct sock unsigned int bound : 1; /* is the socket bound? */ unsigned int reset : 1; /* did we get a TCP reset? */ unsigned int reuseaddr : 1; /* winsock SO_REUSEADDR option value */ + unsigned int exclusiveaddruse : 1; /* winsock SO_EXCLUSIVEADDRUSE option value */ }; static int is_tcp_socket( struct sock *sock ) @@ -1697,6 +1698,7 @@ static struct sock *create_socket(void) sock->bound = 0; sock->reset = 0; sock->reuseaddr = 0; + sock->exclusiveaddruse = 0; sock->rcvbuf = 0; sock->sndbuf = 0; sock->rcvtimeo = 0; @@ -3103,6 +3105,21 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return; } + case IOCTL_AFD_WINE_SET_SO_EXCLUSIVEADDRUSE: + { + int exclusive; + + if (get_req_data_size() < sizeof(exclusive)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return; + } + + exclusive = *(int *)get_req_data(); + sock->exclusiveaddruse = !!exclusive; + return; + } + case IOCTL_AFD_WINE_GET_SO_SNDBUF: { int sndbuf = sock->sndbuf; @@ -3205,6 +3222,21 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return; } + case IOCTL_AFD_WINE_GET_SO_EXCLUSIVEADDRUSE: + { + int exclusive; + + if (!get_reply_max_size()) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return; + } + + exclusive = sock->exclusiveaddruse; + set_reply_data( &exclusive, min( sizeof(exclusive), get_reply_max_size() )); + return; + } + case IOCTL_AFD_POLL: { if (get_reply_max_size() < get_req_data_size())

1 0

Paul Gofman : ws2_32/tests: Add tests for SO_EXCLUSIVEADDRUSE.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: 1178a9dd3ae1afdba0c2bb309a04b8a33056ef92 URL: https://gitlab.winehq.org/wine/wine/-/commit/1178a9dd3ae1afdba0c2bb309a04b8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 31 12:20:47 2022 -0600 ws2_32/tests: Add tests for SO_EXCLUSIVEADDRUSE. --- dlls/ws2_32/tests/sock.c | 208 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 204 insertions(+), 4 deletions(-)

1 0

Nikolay Sivov : vbscript: Implement PRNG functions.
by Alexandre Julliard 03 Nov '22

03 Nov '22

Module: wine Branch: master Commit: d2307e415325227a061718fe89ed2df6d5cdab7f URL: https://gitlab.winehq.org/wine/wine/-/commit/d2307e415325227a061718fe89ed2d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 3 19:09:12 2022 +0300 vbscript: Implement PRNG functions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53676 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/vbscript/global.c | 80 +++++++++++++++++++++++++++++++++++++++++---- dlls/vbscript/tests/api.vbs | 42 ++++++++++++++++++++++++ dlls/vbscript/vbdisp.c | 1 + dlls/vbscript/vbscript.h | 2 ++ 4 files changed, 119 insertions(+), 6 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index f35c4ac2fc4..669eae3b5c4 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -439,6 +439,20 @@ static HRESULT to_double(VARIANT *v, double *ret) return S_OK; } +static HRESULT to_float(VARIANT *v, float *ret) +{ + VARIANT dst; + HRESULT hres; + + V_VT(&dst) = VT_EMPTY; + hres = VariantChangeType(&dst, v, 0, VT_R4); + if(FAILED(hres)) + return hres; + + *ret = V_R4(&dst); + return S_OK; +} + static HRESULT to_string(VARIANT *v, BSTR *ret) { VARIANT dst; @@ -1075,16 +1089,70 @@ static HRESULT Global_Sqr(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VA return return_double(res, sqrt(d)); } +static unsigned int get_next_rnd(int value) +{ + return (value * 0x43fd43fd + 0xc39ec3) & 0xffffff; +} + static HRESULT Global_Randomize(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + union + { + double d; + unsigned int i[2]; + } dtoi; + unsigned int seed; + HRESULT hres; + + assert(args_cnt == 0 || args_cnt == 1); + if (args_cnt == 1) { + hres = to_double(arg, &dtoi.d); + if (FAILED(hres)) + return hres; + } + else + dtoi.d = GetTickCount() * 0.001; + + seed = dtoi.i[1]; + seed ^= (seed >> 16); + seed = ((seed & 0xffff) << 8) | (This->ctx->script_obj->rnd & 0xff); + This->ctx->script_obj->rnd = seed; + + return res ? DISP_E_TYPEMISMATCH : S_OK; } static HRESULT Global_Rnd(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + static const float modulus = 16777216.0f; + unsigned int value; + HRESULT hres; + float f; + + assert(args_cnt == 0 || args_cnt == 1); + + value = This->ctx->script_obj->rnd; + if (args_cnt == 1) + { + hres = to_float(arg, &f); + if (FAILED(hres)) + return hres; + + if (f < 0.0f) + { + value = *(unsigned int *)&f; + This->ctx->script_obj->rnd = value = get_next_rnd(value + (value >> 24)); + } + else if (f == 0.0f) + value = This->ctx->script_obj->rnd; + else + This->ctx->script_obj->rnd = value = get_next_rnd(value); + } + else + { + This->ctx->script_obj->rnd = value = get_next_rnd(value); + } + + return return_float(res, (float)value / modulus); } static HRESULT Global_Timer(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) @@ -3092,12 +3160,12 @@ static const builtin_prop_t global_props[] = { {L"MsgBox", Global_MsgBox, 0, 1, 5}, {L"Now", Global_Now, 0, 0}, {L"Oct", Global_Oct, 0, 1}, - {L"Randomize", Global_Randomize, 0, 1}, + {L"Randomize", Global_Randomize, 0, 0, 1}, {L"Replace", Global_Replace, 0, 3, 6}, {L"RGB", Global_RGB, 0, 3}, {L"Right", Global_Right, 0, 2}, {L"RightB", Global_RightB, 0, 2}, - {L"Rnd", Global_Rnd, 0, 1}, + {L"Rnd", Global_Rnd, 0, 0, 1}, {L"Round", Global_Round, 0, 1, 2}, {L"RTrim", Global_RTrim, 0, 1}, {L"ScriptEngine", Global_ScriptEngine, 0, 0}, diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 000ae1b5167..21834cb8a03 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -2221,4 +2221,46 @@ call testTimeSerial(10, 60, 2, 11, 0, 2, DateSerial(1899, 12, 30)) call testTimeSerial(10, 0, 60, 10, 1, 0, DateSerial(1899, 12, 30)) call testTimeSerialError() +sub testRnd(arg, expresult) + dim x + x = Rnd(arg) + call ok(x = expresult, "result = " & x & " expected " & expresult) + call ok(getVT(x) = "VT_R4*", "getVT = " & getVT(x)) +end sub + +' Initial seed value +call testRnd(0, 327680 / 16777216) +call testRnd(0, 327680 / 16777216) +' Negative argument is a seed, does not use current RNG state +call ok(Rnd(-2) = Rnd(-2), "Expected same result") +call ok(Rnd(-1) <> Rnd(-2), "Expected differing result") + +sub testRandomizeError() + on error resume next + dim x + call Err.clear() + x = Randomize(0) + call ok(Err.number = 13, "Err.number = " & Err.number) + call ok(getVT(x) = "VT_EMPTY*", "getVT = " & getVT(x)) +end sub + +' Randomize uses current RNG value, so it's reset using Rnd(-1) +sub testRandomize() + dim x, y + + Rnd(-1) + Randomize(123) + x = Rnd() + Randomize(123) + y = Rnd() + call ok(x <> y, "Expected differing result") + Rnd(-1) + Randomize(123) + y = Rnd() + call ok(x = y, "Expected same result") +end sub + +call testRandomize() +call testRandomizeError() + Call reportSuccess() diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 74da0a21fb0..21142d5dcaf 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -1516,6 +1516,7 @@ HRESULT create_script_disp(script_ctx_t *ctx, ScriptDisp **ret) script_disp->ref = 1; script_disp->ctx = ctx; heap_pool_init(&script_disp->heap); + script_disp->rnd = 0x50000; *ret = script_disp; return S_OK; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 11564345aa3..d68056788c9 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -136,6 +136,8 @@ typedef struct { script_ctx_t *ctx; heap_pool_t heap; + + unsigned int rnd; } ScriptDisp; typedef struct _builtin_prop_t builtin_prop_t;

1 0

Jacek Caban : winevulkan: Move get_conversions implementation to VkVariable.
by Alexandre Julliard 03 Nov '22

03 Nov '22

Module: wine Branch: master Commit: a0e34f16b15ffd79a0a3a395545898ba3d358edd URL: https://gitlab.winehq.org/wine/wine/-/commit/a0e34f16b15ffd79a0a3a395545898… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 3 11:30:45 2022 +0100 winevulkan: Move get_conversions implementation to VkVariable. --- dlls/winevulkan/make_vulkan | 103 +++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 63 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index be8717aa02a..dcdf2c4ab10 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1173,6 +1173,46 @@ class VkVariable(object): def needs_host_type(self): return self.is_struct() and self.struct.needs_host_type() + def get_conversions(self, unwrap, parent_const=False): + """ Get a list of conversions required for this parameter if any. + Parameters which are structures may require conversion between win32 + and the host platform. This function returns a list of conversions + required. + """ + + if self.is_struct(): + self.struct.needs_struct_extensions_conversion() + for m in self.struct: + if m.type == self.struct.name: + continue + m.needs_struct_extensions_conversion() + elif not self.is_handle(): + return [] + + conversions = [] + + # Collect any member conversions first, so we can guarantee + # those functions will be defined prior to usage by the + # 'parent' param requiring conversion. + if self.is_struct(): + is_const = self.is_const() if self.is_pointer() else parent_const + for m in self.struct: + if m.type == self.struct.name: + continue + if not m.is_struct(): + continue + + conversions.extend(m.get_conversions(unwrap, is_const)) + + # Conversion requirements for the 'parent' parameter. + for conv in [False, True]: + if self.needs_conversion(conv, unwrap, Direction.INPUT, parent_const): + conversions.append(ConversionFunction(self, Direction.INPUT, conv, unwrap)) + if self.needs_conversion(conv, unwrap, Direction.OUTPUT, parent_const): + conversions.append(ConversionFunction(self, Direction.OUTPUT, conv, unwrap)) + + return conversions + class VkMember(VkVariable): def __init__(self, const=False, struct_fwd_decl=False,_type=None, pointer=None, name=None, array_len=None, @@ -1348,34 +1388,6 @@ class VkMember(VkVariable): return text - def get_conversions(self, unwrap, parent_const): - """ Return any conversion description for this member and its children when conversion is needed. """ - - conversions = [] - - # Collect any conversion for any member structs. - if self.is_struct(): - struct = self.type_info["data"] - for m in struct: - if m.type == struct.name: - continue - - m.needs_struct_extensions_conversion() - conversions.extend(m.get_conversions(parent_const, unwrap)) - - struct.needs_struct_extensions_conversion() - direction = Direction.OUTPUT if struct.returnedonly else Direction.INPUT - elif self.is_handle() or self.is_generic_handle(): - direction = Direction.INPUT - else: - return [] - - for conv in [False, True]: - if self.needs_conversion(conv, unwrap, direction, parent_const): - conversions.append(ConversionFunction(self, direction, conv, unwrap)) - - return conversions - def is_struct_forward_declaration(self): return self.struct_fwd_decl @@ -1595,41 +1607,6 @@ class VkParam(VkVariable): def format_string(self): return self.format_str - def get_conversions(self, unwrap): - """ Get a list of conversions required for this parameter if any. - Parameters which are structures may require conversion between win32 - and the host platform. This function returns a list of conversions - required. - """ - - if self.is_struct(): - self.struct.needs_struct_extensions_conversion() - for m in self.struct: - m.needs_struct_extensions_conversion() - elif not self.is_handle(): - return [] - - conversions = [] - - # Collect any member conversions first, so we can guarantee - # those functions will be defined prior to usage by the - # 'parent' param requiring conversion. - if self.is_struct(): - for m in self.struct: - if not m.is_struct(): - continue - - conversions.extend(m.get_conversions(unwrap, False)) - - # Conversion requirements for the 'parent' parameter. - for conv in [False, True]: - if self.needs_conversion(conv, unwrap, Direction.INPUT): - conversions.append(ConversionFunction(self, Direction.INPUT, conv, unwrap)) - if self.needs_conversion(conv, unwrap, Direction.OUTPUT): - conversions.append(ConversionFunction(self, Direction.OUTPUT, conv, unwrap)) - - return conversions - def is_dispatchable(self): if not self.is_handle(): return False

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2022