June 2023 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Use the sysv ABI for setjmp/longjmp on the Unix side.
by Alexandre Julliard June 2, 2023

June 2, 2023

Module: wine Branch: master Commit: 48537f4e1edaf14404e4567cbaedf21bc06a3767 URL: https://gitlab.winehq.org/wine/wine/-/commit/48537f4e1edaf14404e4567cbaedf2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 2 09:35:10 2023 +0200 ntdll: Use the sysv ABI for setjmp/longjmp on the Unix side. --- dlls/ntdll/unix/signal_x86_64.c | 72 ++++++++++++++--------------------------- include/wine/unixlib.h | 4 +-- 2 files changed, 26 insertions(+), 50 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 87ecec252e7..a1ee73fe5fb 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1853,8 +1853,8 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, if (ntdll_get_thread_data()->jmp_buf) { TRACE_(seh)( "returning to handler\n" ); - RCX_sig(sigcontext) = (ULONG_PTR)ntdll_get_thread_data()->jmp_buf; - RDX_sig(sigcontext) = 1; + RDI_sig(sigcontext) = (ULONG_PTR)ntdll_get_thread_data()->jmp_buf; + RSI_sig(sigcontext) = 1; RIP_sig(sigcontext) = (ULONG_PTR)__wine_longjmp; ntdll_get_thread_data()->jmp_buf = NULL; } @@ -2921,31 +2921,19 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, * __wine_setjmpex */ __ASM_GLOBAL_FUNC( __wine_setjmpex, - "movq %rdx,(%rcx)\n\t" /* jmp_buf->Frame */ - "movq %rbx,0x8(%rcx)\n\t" /* jmp_buf->Rbx */ + "movq %rsi,(%rdi)\n\t" /* jmp_buf->Frame */ + "movq %rbx,0x8(%rdi)\n\t" /* jmp_buf->Rbx */ "leaq 0x8(%rsp),%rax\n\t" - "movq %rax,0x10(%rcx)\n\t" /* jmp_buf->Rsp */ - "movq %rbp,0x18(%rcx)\n\t" /* jmp_buf->Rbp */ - "movq %rsi,0x20(%rcx)\n\t" /* jmp_buf->Rsi */ - "movq %rdi,0x28(%rcx)\n\t" /* jmp_buf->Rdi */ - "movq %r12,0x30(%rcx)\n\t" /* jmp_buf->R12 */ - "movq %r13,0x38(%rcx)\n\t" /* jmp_buf->R13 */ - "movq %r14,0x40(%rcx)\n\t" /* jmp_buf->R14 */ - "movq %r15,0x48(%rcx)\n\t" /* jmp_buf->R15 */ + "movq %rax,0x10(%rdi)\n\t" /* jmp_buf->Rsp */ + "movq %rbp,0x18(%rdi)\n\t" /* jmp_buf->Rbp */ + "movq %r12,0x30(%rdi)\n\t" /* jmp_buf->R12 */ + "movq %r13,0x38(%rdi)\n\t" /* jmp_buf->R13 */ + "movq %r14,0x40(%rdi)\n\t" /* jmp_buf->R14 */ + "movq %r15,0x48(%rdi)\n\t" /* jmp_buf->R15 */ "movq (%rsp),%rax\n\t" - "movq %rax,0x50(%rcx)\n\t" /* jmp_buf->Rip */ - "stmxcsr 0x58(%rcx)\n\t" /* jmp_buf->MxCsr */ - "fnstcw 0x5c(%rcx)\n\t" /* jmp_buf->FpCsr */ - "movdqa %xmm6,0x60(%rcx)\n\t" /* jmp_buf->Xmm6 */ - "movdqa %xmm7,0x70(%rcx)\n\t" /* jmp_buf->Xmm7 */ - "movdqa %xmm8,0x80(%rcx)\n\t" /* jmp_buf->Xmm8 */ - "movdqa %xmm9,0x90(%rcx)\n\t" /* jmp_buf->Xmm9 */ - "movdqa %xmm10,0xa0(%rcx)\n\t" /* jmp_buf->Xmm10 */ - "movdqa %xmm11,0xb0(%rcx)\n\t" /* jmp_buf->Xmm11 */ - "movdqa %xmm12,0xc0(%rcx)\n\t" /* jmp_buf->Xmm12 */ - "movdqa %xmm13,0xd0(%rcx)\n\t" /* jmp_buf->Xmm13 */ - "movdqa %xmm14,0xe0(%rcx)\n\t" /* jmp_buf->Xmm14 */ - "movdqa %xmm15,0xf0(%rcx)\n\t" /* jmp_buf->Xmm15 */ + "movq %rax,0x50(%rdi)\n\t" /* jmp_buf->Rip */ + "stmxcsr 0x58(%rdi)\n\t" /* jmp_buf->MxCsr */ + "fnstcw 0x5c(%rdi)\n\t" /* jmp_buf->FpCsr */ "xorq %rax,%rax\n\t" "retq" ) @@ -2954,30 +2942,18 @@ __ASM_GLOBAL_FUNC( __wine_setjmpex, * __wine_longjmp */ __ASM_GLOBAL_FUNC( __wine_longjmp, - "movq %rdx,%rax\n\t" /* retval */ - "movq 0x8(%rcx),%rbx\n\t" /* jmp_buf->Rbx */ - "movq 0x18(%rcx),%rbp\n\t" /* jmp_buf->Rbp */ - "movq 0x20(%rcx),%rsi\n\t" /* jmp_buf->Rsi */ - "movq 0x28(%rcx),%rdi\n\t" /* jmp_buf->Rdi */ - "movq 0x30(%rcx),%r12\n\t" /* jmp_buf->R12 */ - "movq 0x38(%rcx),%r13\n\t" /* jmp_buf->R13 */ - "movq 0x40(%rcx),%r14\n\t" /* jmp_buf->R14 */ - "movq 0x48(%rcx),%r15\n\t" /* jmp_buf->R15 */ - "ldmxcsr 0x58(%rcx)\n\t" /* jmp_buf->MxCsr */ + "movq %rsi,%rax\n\t" /* retval */ + "movq 0x8(%rdi),%rbx\n\t" /* jmp_buf->Rbx */ + "movq 0x18(%rdi),%rbp\n\t" /* jmp_buf->Rbp */ + "movq 0x30(%rdi),%r12\n\t" /* jmp_buf->R12 */ + "movq 0x38(%rdi),%r13\n\t" /* jmp_buf->R13 */ + "movq 0x40(%rdi),%r14\n\t" /* jmp_buf->R14 */ + "movq 0x48(%rdi),%r15\n\t" /* jmp_buf->R15 */ + "ldmxcsr 0x58(%rdi)\n\t" /* jmp_buf->MxCsr */ "fnclex\n\t" - "fldcw 0x5c(%rcx)\n\t" /* jmp_buf->FpCsr */ - "movdqa 0x60(%rcx),%xmm6\n\t" /* jmp_buf->Xmm6 */ - "movdqa 0x70(%rcx),%xmm7\n\t" /* jmp_buf->Xmm7 */ - "movdqa 0x80(%rcx),%xmm8\n\t" /* jmp_buf->Xmm8 */ - "movdqa 0x90(%rcx),%xmm9\n\t" /* jmp_buf->Xmm9 */ - "movdqa 0xa0(%rcx),%xmm10\n\t" /* jmp_buf->Xmm10 */ - "movdqa 0xb0(%rcx),%xmm11\n\t" /* jmp_buf->Xmm11 */ - "movdqa 0xc0(%rcx),%xmm12\n\t" /* jmp_buf->Xmm12 */ - "movdqa 0xd0(%rcx),%xmm13\n\t" /* jmp_buf->Xmm13 */ - "movdqa 0xe0(%rcx),%xmm14\n\t" /* jmp_buf->Xmm14 */ - "movdqa 0xf0(%rcx),%xmm15\n\t" /* jmp_buf->Xmm15 */ - "movq 0x50(%rcx),%rdx\n\t" /* jmp_buf->Rip */ - "movq 0x10(%rcx),%rsp\n\t" /* jmp_buf->Rsp */ + "fldcw 0x5c(%rdi)\n\t" /* jmp_buf->FpCsr */ + "movq 0x50(%rdi),%rdx\n\t" /* jmp_buf->Rip */ + "movq 0x10(%rdi),%rsp\n\t" /* jmp_buf->Rsp */ "jmp *%rdx" ) #endif /* __x86_64__ */ diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index aa97e7d0843..f853f1c6a31 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -52,9 +52,9 @@ typedef struct { __int64 reg[24]; } __wine_jmp_buf; typedef struct { int reg; } __wine_jmp_buf; #endif -extern int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) __wine_setjmpex( __wine_jmp_buf *buf, +extern int __attribute__ ((__nothrow__,__returns_twice__)) __wine_setjmpex( __wine_jmp_buf *buf, EXCEPTION_REGISTRATION_RECORD *frame ); -extern void DECLSPEC_NORETURN __cdecl __wine_longjmp( __wine_jmp_buf *buf, int retval ); +extern void DECLSPEC_NORETURN __wine_longjmp( __wine_jmp_buf *buf, int retval ); extern void ntdll_set_exception_jmp_buf( __wine_jmp_buf *jmp ); #define __TRY \

1 0

Alexandre Julliard : ntdll: Use the sysv ABI for the %fs allocation function.
by Alexandre Julliard June 2, 2023

June 2, 2023

Module: wine Branch: master Commit: e2fac05854736e1d2b2a353af0f1382b7eda4fad URL: https://gitlab.winehq.org/wine/wine/-/commit/e2fac05854736e1d2b2a353af0f138… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 2 09:32:59 2023 +0200 ntdll: Use the sysv ABI for the %fs allocation function. --- dlls/ntdll/unix/signal_x86_64.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 508a3a5b323..87ecec252e7 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -88,17 +88,17 @@ WINE_DECLARE_DEBUG_CHANNEL(seh); #include <asm/prctl.h> static inline int arch_prctl( int func, void *ptr ) { return syscall( __NR_arch_prctl, func, ptr ); } -extern int CDECL alloc_fs_sel( int sel, void *base ) DECLSPEC_HIDDEN; +extern int alloc_fs_sel( int sel, void *base ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( alloc_fs_sel, /* switch to 32-bit stack */ "pushq %rbx\n\t" - "pushq %rdi\n\t" - "movq %rsp,%rdi\n\t" - "movl 0x4(%rdx),%esp\n\t" /* Tib.StackBase */ + "pushq %r12\n\t" + "movq %rsp,%r12\n\t" + "movl 0x4(%rsi),%esp\n\t" /* Tib.StackBase */ "subl $0x20,%esp\n\t" /* setup modify_ldt struct on 32-bit stack */ - "movl %ecx,(%rsp)\n\t" /* entry_number */ - "movl %edx,4(%rsp)\n\t" /* base */ + "movl %edi,(%rsp)\n\t" /* entry_number */ + "movl %esi,4(%rsp)\n\t" /* base */ "movl $~0,8(%rsp)\n\t" /* limit */ "movl $0x41,12(%rsp)\n\t" /* seg_32bit | usable */ /* invoke 32-bit syscall */ @@ -107,8 +107,8 @@ __ASM_GLOBAL_FUNC( alloc_fs_sel, "int $0x80\n\t" /* restore stack */ "movl (%rsp),%eax\n\t" /* entry_number */ - "movq %rdi,%rsp\n\t" - "popq %rdi\n\t" + "movq %r12,%rsp\n\t" + "popq %r12\n\t" "popq %rbx\n\t" "ret" );

1 0

Paul Gofman : ws2_32: Make wait in connect() alertable.
by Alexandre Julliard June 2, 2023

June 2, 2023

Module: wine Branch: master Commit: 36d7bf9507360fddc3ac86cc9e827ccb2076cd59 URL: https://gitlab.winehq.org/wine/wine/-/commit/36d7bf9507360fddc3ac86cc9e827c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 26 20:35:57 2023 -0600 ws2_32: Make wait in connect() alertable. --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 930a4000b4e..267830cc88c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1240,7 +1240,7 @@ int WINAPI connect( SOCKET s, const struct sockaddr *addr, int len ) free( params ); if (status == STATUS_PENDING) { - if (WaitForSingleObject( sync_event, INFINITE ) == WAIT_FAILED) return -1; + if (wait_event_alertable( sync_event ) == WAIT_FAILED) return -1; status = io.u.Status; } if (status) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 60c029d3580..31e9baf31c8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8443,6 +8443,28 @@ static void test_connect(void) WSACloseEvent(overlapped.hEvent); closesocket(connector); + if (0) + { + /* Wait in connect() is alertable. This may take a very long time before connection fails, + * so disable the test. Testing with localhost is unreliable as that may avoid waiting in + * accept(). */ + connector = socket(AF_INET, SOCK_STREAM, 0); + ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); + address.sin_addr.s_addr = inet_addr("8.8.8.8"); + address.sin_port = htons(255); + + apc_count = 0; + SleepEx(0, TRUE); + ok(apc_count == 0, "got apc_count %d.\n", apc_count); + bret = QueueUserAPC(apc_func, GetCurrentThread(), (ULONG_PTR)&apc_count); + ok(bret, "QueueUserAPC returned %d\n", bret); + iret = connect(connector, (struct sockaddr *)&address, sizeof(address)); + ok(apc_count == 1, "got apc_count %d.\n", apc_count); + ok(iret == -1 && (WSAGetLastError() == WSAECONNREFUSED || WSAGetLastError() == WSAETIMEDOUT), + "unexpected iret %d, error %d.\n", iret, WSAGetLastError()); + closesocket(connector); + } + /* Test connect after previous connect attempt failure. */ connector = socket(AF_INET, SOCK_STREAM, 0); ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError());

1 0

Paul Gofman : ws2_32: Make wait in WSAPoll() alertable.
by Alexandre Julliard June 2, 2023

June 2, 2023

Module: wine Branch: master Commit: 98cdd828b64ba0b30eddba3950a1005d3468544b URL: https://gitlab.winehq.org/wine/wine/-/commit/98cdd828b64ba0b30eddba3950a100… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 26 20:36:53 2023 -0600 ws2_32: Make wait in WSAPoll() alertable. --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 267830cc88c..710ec8cbb26 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2994,7 +2994,7 @@ int WINAPI WSAPoll( WSAPOLLFD *fds, ULONG count, int timeout ) params, params_size, params, params_size ); if (status == STATUS_PENDING) { - if (WaitForSingleObject( sync_event, INFINITE ) == WAIT_FAILED) + if (wait_event_alertable( sync_event ) == WAIT_FAILED) { free( params ); return -1; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 31e9baf31c8..b47922c645a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8122,7 +8122,11 @@ static void test_WSAPoll(void) fds[0].fd = client; fds[0].events = POLLRDNORM | POLLRDBAND; fds[0].revents = 0xdead; + apc_count = 0; + ret = QueueUserAPC(apc_func, GetCurrentThread(), (ULONG_PTR)&apc_count); + ok(ret, "QueueUserAPC returned %d\n", ret); ret = pWSAPoll(fds, 1, 2000); + ok(apc_count == 1, "APC was called %u times\n", apc_count); ok(ret == 1, "got %d\n", ret); ok(fds[0].revents == POLLNVAL, "got events %#x\n", fds[0].revents); ret = WaitForSingleObject(thread_handle, 1000);

1 0

Paul Gofman : ws2_32: Make wait in accept() alertable.
by Alexandre Julliard June 2, 2023

June 2, 2023

Module: wine Branch: master Commit: 157633229fa7b0bd076c72b8f42dbb7e6ec98912 URL: https://gitlab.winehq.org/wine/wine/-/commit/157633229fa7b0bd076c72b8f42dbb… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 26 20:33:41 2023 -0600 ws2_32: Make wait in accept() alertable. --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5eb926a408b..930a4000b4e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -765,7 +765,7 @@ SOCKET WINAPI accept( SOCKET s, struct sockaddr *addr, int *len ) NULL, 0, &accept_handle, sizeof(accept_handle) ); if (status == STATUS_PENDING) { - if (WaitForSingleObject( sync_event, INFINITE ) == WAIT_FAILED) + if (wait_event_alertable( sync_event ) == WAIT_FAILED) return SOCKET_ERROR; status = io.u.Status; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 17d5f3993e5..60c029d3580 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4643,10 +4643,37 @@ static SOCKET setup_connector_socket(const struct sockaddr_in *addr, int len, BO return connector; } +struct connect_apc_func_param +{ + HANDLE event; + struct sockaddr_in addr; + SOCKET connector; + unsigned int apc_count; +}; + +static DWORD WINAPI test_accept_connect_thread(void *param) +{ + struct connect_apc_func_param *p = (struct connect_apc_func_param *)param; + + WaitForSingleObject(p->event, INFINITE); + p->connector = setup_connector_socket(&p->addr, sizeof(p->addr), FALSE); + ok(p->connector != INVALID_SOCKET, "failed connecting from APC func.\n"); + return 0; +} + +static void WINAPI connect_apc_func(ULONG_PTR param) +{ + struct connect_apc_func_param *p = (struct connect_apc_func_param *)param; + + ++p->apc_count; + SetEvent(p->event); +} + static void test_accept(void) { int ret; SOCKET server_socket, accepted = INVALID_SOCKET, connector; + struct connect_apc_func_param apc_param; struct sockaddr_in address; SOCKADDR_STORAGE ss, ss_empty; int socklen; @@ -4661,6 +4688,23 @@ static void test_accept(void) socklen = sizeof(address); server_socket = setup_server_socket(&address, &socklen); + memset(&apc_param, 0, sizeof(apc_param)); + apc_param.event = CreateEventW(NULL, FALSE, FALSE, NULL); + apc_param.addr = address; + /* Connecting directly from APC function randomly crashes on Windows for some reason, + * so do it from a thread and only signal it from the APC when we are in accept() call. */ + thread_handle = CreateThread(NULL, 0, test_accept_connect_thread, &apc_param, 0, NULL); + ret = QueueUserAPC(connect_apc_func, GetCurrentThread(), (ULONG_PTR)&apc_param); + ok(ret, "QueueUserAPC returned %d\n", ret); + accepted = accept(server_socket, NULL, NULL); + ok(accepted != INVALID_SOCKET, "Failed to accept connection, %d\n", WSAGetLastError()); + ok(apc_param.apc_count == 1, "APC was called %u times\n", apc_param.apc_count); + closesocket(accepted); + closesocket(apc_param.connector); + WaitForSingleObject(thread_handle, INFINITE); + CloseHandle(thread_handle); + CloseHandle(apc_param.event); + connector = setup_connector_socket(&address, socklen, FALSE); if (connector == INVALID_SOCKET) goto done;

1 0

Alex Henrie : bcrypt/tests: Don't allocate inside todo_wine and free outside of it.
by Alexandre Julliard June 2, 2023

June 2, 2023

Module: wine Branch: master Commit: 36cf952664ea1c8e6bc0933180c346e47b51abf6 URL: https://gitlab.winehq.org/wine/wine/-/commit/36cf952664ea1c8e6bc0933180c346… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jun 1 23:02:53 2023 -0600 bcrypt/tests: Don't allocate inside todo_wine and free outside of it. Fixes a warning on GCC 13. --- dlls/bcrypt/tests/bcrypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 19518480ee0..4d7277c3152 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2492,8 +2492,8 @@ static void test_rsa_encrypt(void) decrypted = malloc(decrypted_size); BCryptDecrypt(key, encrypted_a, encrypted_size, &oaep_pad, NULL, 0, decrypted, decrypted_size, &decrypted_size, BCRYPT_PAD_OAEP); ok(!memcmp(decrypted, input, sizeof(input)), "Decrypted output it's not what expected\n"); - } free(decrypted); + } free(encrypted_a); free(encrypted_b);

1 0

Alex Henrie : iphlpapi: Add GetPerTcpConnectionEStats stub.
by Alexandre Julliard June 2, 2023

June 2, 2023

Module: wine Branch: master Commit: 870a9fcb4cceeae0c9b96e9b2dc3ce43896c229a URL: https://gitlab.winehq.org/wine/wine/-/commit/870a9fcb4cceeae0c9b96e9b2dc3ce… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jun 1 22:09:38 2023 -0600 iphlpapi: Add GetPerTcpConnectionEStats stub. Based on a patch by Austin English. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52868 --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 14 +++++++++++++- include/iphlpapi.h | 9 +++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 76701d686e0..ef2c576947d 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -130,7 +130,7 @@ @ stdcall GetPerAdapterInfo( long ptr ptr ) #@ stub GetPerTcp6ConnectionEStats #@ stub GetPerTcp6ConnectionStats -#@ stub GetPerTcpConnectionEStats +@ stdcall GetPerTcpConnectionEStats( ptr long ptr long long ptr long long ptr long long ) #@ stub GetPerTcpConnectionStats @ stdcall GetRTTAndHopCount( long ptr long ptr ) #@ stub GetSessionCompartmentId diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index c4921d4a5ac..f8ecb89c328 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -32,7 +32,6 @@ #include "fltdefs.h" #include "ifdef.h" #include "netioapi.h" -#include "tcpestats.h" #include "ip2string.h" #include "netiodef.h" #include "icmpapi.h" @@ -4031,6 +4030,19 @@ DWORD WINAPI SetTcpEntry(PMIB_TCPROW pTcpRow) return 0; } +/*********************************************************************** + * GetPerTcpConnectionEStats (IPHLPAPI.@) + */ +ULONG WINAPI GetPerTcpConnectionEStats(MIB_TCPROW *row, TCP_ESTATS_TYPE stats, UCHAR *rw, ULONG rw_version, + ULONG rw_size, UCHAR *ro_static, ULONG ro_static_version, + ULONG ro_static_size, UCHAR *ro_dynamic, ULONG ro_dynamic_version, + ULONG ro_dynamic_size) +{ + FIXME( "(%p, %d, %p, %ld, %ld, %p, %ld, %ld, %p, %ld, %ld): stub\n", row, stats, rw, rw_version, rw_size, + ro_static, ro_static_version, ro_static_size, ro_dynamic, ro_dynamic_version, ro_dynamic_size ); + return ERROR_CALL_NOT_IMPLEMENTED; +} + /****************************************************************** * SetPerTcpConnectionEStats (IPHLPAPI.@) */ diff --git a/include/iphlpapi.h b/include/iphlpapi.h index da5819c8423..35e0f134899 100644 --- a/include/iphlpapi.h +++ b/include/iphlpapi.h @@ -25,6 +25,7 @@ extern "C" { #include <iprtrmib.h> #include <ipexport.h> #include <iptypes.h> +#include <tcpestats.h> #define NET_STRING_IPV4_ADDRESS 0x00000001 #define NET_STRING_IPV4_SERVICE 0x00000002 @@ -85,6 +86,11 @@ DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS pStats); DWORD WINAPI GetTcpStatisticsEx(PMIB_TCPSTATS pStats, DWORD dwFamily); +ULONG WINAPI GetPerTcpConnectionEStats(MIB_TCPROW *row, TCP_ESTATS_TYPE stats, UCHAR *rw, ULONG rw_version, + ULONG rw_size, UCHAR *ro_static, ULONG ro_static_version, + ULONG ro_static_size, UCHAR *ro_dynamic, ULONG ro_dynamic_version, + ULONG ro_dynamic_size); + DWORD WINAPI GetUdpStatistics(PMIB_UDPSTATS pStats); DWORD WINAPI GetUdpStatisticsEx(PMIB_UDPSTATS pStats, DWORD dwFamily); @@ -99,6 +105,9 @@ DWORD WINAPI DeleteIpForwardEntry(PMIB_IPFORWARDROW pRoute); DWORD WINAPI SetIpStatistics(PMIB_IPSTATS pIpStats); +DWORD WINAPI SetPerTcpConnectionEStats(MIB_TCPROW *row, TCP_ESTATS_TYPE state, BYTE *rw, + ULONG version, ULONG size, ULONG offset); + DWORD WINAPI SetIpTTL(UINT nTTL); DWORD WINAPI CreateIpNetEntry(PMIB_IPNETROW pArpEntry);

1 0

Piotr Caban : msvcr100: Fix next writer unblocking in reader_writer_lock::unlock.
by Alexandre Julliard June 1, 2023

June 1, 2023

Module: wine Branch: master Commit: 0336d66ea1926f62dd303e266683fef7de6e9a87 URL: https://gitlab.winehq.org/wine/wine/-/commit/0336d66ea1926f62dd303e266683fe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 31 22:31:12 2023 +0200 msvcr100: Fix next writer unblocking in reader_writer_lock::unlock. Fixes regression introduced by 256c344550fa27d82602232588b32e74a3a9a7f3. --- dlls/msvcrt/concurrency.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index d0f029650ac..84ee0f1817a 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -3302,7 +3302,7 @@ void __thiscall reader_writer_lock_unlock(reader_writer_lock *this) count = InterlockedDecrement(&this->count); if (count != WRITER_WAITING) return; - NtReleaseKeyedEvent(keyed_event, this->writer_head, 0, NULL); + call_Context_Unblock(this->writer_head->ctx); return; }

1 0

Michael Stefaniuc : dbghelp: Remove superfluous casts to self.
by Alexandre Julliard June 1, 2023

June 1, 2023

Module: wine Branch: master Commit: cf3815dc598da52a6efb480143ff73713f1f2000 URL: https://gitlab.winehq.org/wine/wine/-/commit/cf3815dc598da52a6efb480143ff73… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri May 19 19:01:15 2023 +0200 dbghelp: Remove superfluous casts to self. --- dlls/dbghelp/dwarf.c | 2 +- dlls/dbghelp/msc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 46da2968dbb..5ab5cabecdf 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2148,7 +2148,7 @@ static void dwarf2_parse_inlined_subroutine(dwarf2_subprogram_t* subpgm, subpgm->current_block ? &subpgm->current_block->symt : &subpgm->current_func->symt, dwarf2_get_cpp_name(di, name.u.string), &sig_type->symt, num_ranges); - subpgm->current_func = (struct symt_function*)inlined; + subpgm->current_func = inlined; subpgm->current_block = NULL; if (!dwarf2_fill_ranges(di, inlined->ranges, num_ranges)) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 56a47ab7dac..c6dca22883a 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2683,7 +2683,7 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, (const unsigned char*)sym + length); if (inlined) { - curr_func = (struct symt_function*)inlined; + curr_func = inlined; block = NULL; } else @@ -2704,7 +2704,7 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, (const unsigned char*)sym + length); if (inlined) { - curr_func = (struct symt_function*)inlined; + curr_func = inlined; block = NULL; } else

1 0

Michael Stefaniuc : ws2_32/tests: Remove superfluous casts to self.
by Alexandre Julliard June 1, 2023

June 1, 2023

Module: wine Branch: master Commit: 51f8c75cebfbe79bcab30edceb875393ec047c1a URL: https://gitlab.winehq.org/wine/wine/-/commit/51f8c75cebfbe79bcab30edceb8753… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue May 23 19:43:49 2023 +0200 ws2_32/tests: Remove superfluous casts to self. --- dlls/ws2_32/tests/afd.c | 18 +++++++++--------- dlls/ws2_32/tests/sock.c | 7 +------ 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index d0191ba8dbf..1644a9dc4ff 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -1429,7 +1429,7 @@ static void test_recv(void) ret = listen(listener, 1); ok(!ret, "got error %u\n", WSAGetLastError()); len = sizeof(addr); - ret = getsockname(listener, (struct sockaddr *)&addr, &len); + ret = getsockname(listener, &addr, &len); ok(!ret, "got error %u\n", WSAGetLastError()); memset(&io, 0, sizeof(io)); @@ -1439,7 +1439,7 @@ static void test_recv(void) ok(!io.Information, "got information %#Ix\n", io.Information); client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - ret = connect(client, (struct sockaddr *)&addr, sizeof(addr)); + ret = connect(client, &addr, sizeof(addr)); ok(!ret, "got error %u\n", WSAGetLastError()); server = accept(listener, NULL, NULL); ok(server != -1, "got error %u\n", WSAGetLastError()); @@ -1717,7 +1717,7 @@ static void test_recv(void) ret = bind(client, (const struct sockaddr *)&bind_addr, sizeof(bind_addr)); ok(!ret, "got error %u\n", WSAGetLastError()); len = sizeof(addr); - ret = getsockname(client, (struct sockaddr *)&addr, &len); + ret = getsockname(client, &addr, &len); ok(!ret, "got error %u\n", WSAGetLastError()); memset(buffer, 0xcc, sizeof(buffer)); @@ -1725,7 +1725,7 @@ static void test_recv(void) IOCTL_AFD_RECV, &params, sizeof(params), NULL, 0); ok(ret == STATUS_PENDING, "got %#x\n", ret); - ret = sendto(server, "data", 5, 0, (struct sockaddr *)&addr, sizeof(addr)); + ret = sendto(server, "data", 5, 0, &addr, sizeof(addr)); ok(ret == 5, "got %d\n", ret); ret = WaitForSingleObject(event, 200); @@ -1741,7 +1741,7 @@ static void test_recv(void) IOCTL_AFD_RECV, &params, sizeof(params), NULL, 0); ok(ret == STATUS_PENDING, "got %#x\n", ret); - ret = sendto(server, "moredata", 9, 0, (struct sockaddr *)&addr, sizeof(addr)); + ret = sendto(server, "moredata", 9, 0, &addr, sizeof(addr)); ok(ret == 9, "got %d\n", ret); ret = WaitForSingleObject(event, 200); @@ -1750,7 +1750,7 @@ static void test_recv(void) ok(io.Information == 6, "got %#Ix\n", io.Information); ok(!memcmp(buffer, "mo\xccreda\xcc", 7), "got %s\n", debugstr_an(buffer, io.Information)); - ret = sendto(server, "moredata", 9, 0, (struct sockaddr *)&addr, sizeof(addr)); + ret = sendto(server, "moredata", 9, 0, &addr, sizeof(addr)); ok(ret == 9, "got %d\n", ret); /* wait for the data to be available */ @@ -2352,7 +2352,7 @@ static void test_getsockname(void) ok(!io.Status, "got %#lx\n", io.Status); ok(io.Information == sizeof(addr), "got %#Ix\n", io.Information); len = sizeof(addr2); - ret = getsockname(client, (struct sockaddr *)&addr2, &len); + ret = getsockname(client, &addr2, &len); ok(!ret, "got error %u\n", WSAGetLastError()); ok(!memcmp(&addr, &addr2, sizeof(struct sockaddr)), "addresses didn't match\n"); @@ -2364,7 +2364,7 @@ static void test_getsockname(void) ok(!io.Status, "got %#lx\n", io.Status); ok(io.Information == sizeof(addr), "got %#Ix\n", io.Information); len = sizeof(addr2); - ret = getsockname(server, (struct sockaddr *)&addr2, &len); + ret = getsockname(server, &addr2, &len); ok(!ret, "got error %u\n", WSAGetLastError()); ok(!memcmp(&addr, &addr2, sizeof(struct sockaddr)), "addresses didn't match\n"); @@ -2392,7 +2392,7 @@ static void test_getsockname(void) ok(!io.Status, "got %#lx\n", io.Status); ok(io.Information == sizeof(addr), "got %#Ix\n", io.Information); len = sizeof(addr2); - ret = getsockname(client, (struct sockaddr *)&addr2, &len); + ret = getsockname(client, &addr2, &len); ok(!ret, "got error %u\n", WSAGetLastError()); ok(!memcmp(&addr, &addr2, sizeof(struct sockaddr)), "addresses didn't match\n"); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index cddc4c125ff..17d5f3993e5 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -836,12 +836,7 @@ static VOID WINAPI simple_mixed_client ( client_params *par ) ((struct sockaddr_in*)&test)->sin_addr.s_addr = inet_addr("0.0.0.0"); /* Receive data echoed back & check it */ - n_recvd = do_synchronous_recvfrom ( mem->s, - mem->recv_buf, - n_expected, - 0, - (struct sockaddr *)&test, - &fromLen, + n_recvd = do_synchronous_recvfrom ( mem->s, mem->recv_buf, n_expected, 0, &test, &fromLen, par->buflen ); ok ( n_recvd == n_expected, "simple_client (%x): received less data than expected: %d of %d\n", id, n_recvd, n_expected );

1 0