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

Zebediah Figura : ws2_32: Reimplement bind() and getsockname() on top of IOCTL_AFD_BIND and IOCTL_AFD_GETSOCKNAME respectively.
by Alexandre Julliard June 16, 2021

June 16, 2021

Module: wine Branch: master Commit: 5c009c17b3a212c3f5b0034c465077c0c593daae URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c009c17b3a212c3f5b0034c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 15 23:13:32 2021 -0500 ws2_32: Reimplement bind() and getsockname() on top of IOCTL_AFD_BIND and IOCTL_AFD_GETSOCKNAME respectively. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 344 ++++++------------------------------------- dlls/ws2_32/tests/afd.c | 8 +- dlls/ws2_32/tests/sock.c | 2 +- dlls/ws2_32/ws2_32_private.h | 4 - 4 files changed, 54 insertions(+), 304 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5c009c17b3a212c3f5b0…

1 0

Zebediah Figura : server: Implement IOCTL_AFD_GETSOCKNAME.
by Alexandre Julliard June 16, 2021

June 16, 2021

Module: wine Branch: master Commit: 02309b72f72a35f214505359b212df3ec15c37c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02309b72f72a35f214505359… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 15 23:13:28 2021 -0500 server: Implement IOCTL_AFD_GETSOCKNAME. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 6 ++++ include/wine/afd.h | 1 + server/sock.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 87 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 0d77e417148..02700d37d6a 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1167,6 +1167,12 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc break; } + case IOCTL_AFD_GETSOCKNAME: + if (in_size) FIXME( "unexpected input size %u\n", in_size ); + + status = STATUS_BAD_DEVICE_TYPE; + break; + case IOCTL_AFD_LISTEN: { const struct afd_listen_params *params = in_buffer; diff --git a/include/wine/afd.h b/include/wine/afd.h index 87da44ecca7..04468363673 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -36,6 +36,7 @@ #define IOCTL_AFD_LISTEN CTL_CODE(FILE_DEVICE_BEEP, 0x802, METHOD_NEITHER, FILE_ANY_ACCESS) #define IOCTL_AFD_RECV CTL_CODE(FILE_DEVICE_BEEP, 0x805, METHOD_NEITHER, FILE_ANY_ACCESS) #define IOCTL_AFD_POLL CTL_CODE(FILE_DEVICE_BEEP, 0x809, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_GETSOCKNAME CTL_CODE(FILE_DEVICE_BEEP, 0x80b, METHOD_NEITHER, FILE_ANY_ACCESS) #define IOCTL_AFD_EVENT_SELECT CTL_CODE(FILE_DEVICE_BEEP, 0x821, METHOD_NEITHER, FILE_ANY_ACCESS) #define IOCTL_AFD_GET_EVENTS CTL_CODE(FILE_DEVICE_BEEP, 0x822, METHOD_NEITHER, FILE_ANY_ACCESS) diff --git a/server/sock.c b/server/sock.c index 425c07566ac..e5acf585dcc 100644 --- a/server/sock.c +++ b/server/sock.c @@ -109,6 +109,15 @@ #define IP_UNICAST_IF 50 #endif +union win_sockaddr +{ + struct WS_sockaddr addr; + struct WS_sockaddr_in in; + struct WS_sockaddr_in6 in6; + struct WS_sockaddr_ipx ipx; + SOCKADDR_IRDA irda; +}; + static struct list poll_list = LIST_INIT( poll_list ); struct poll_req @@ -194,10 +203,13 @@ struct sock struct list accept_list; /* list of pending accept requests */ struct accept_req *accept_recv_req; /* pending accept-into request which will recv on this socket */ struct connect_req *connect_req; /* pending connection request */ + union win_sockaddr addr; /* socket name */ + int addr_len; /* socket name length */ unsigned int rd_shutdown : 1; /* is the read end shut down? */ unsigned int wr_shutdown : 1; /* is the write end shut down? */ unsigned int wr_shutdown_pending : 1; /* is a write shutdown pending? */ unsigned int nonblocking : 1; /* is the socket nonblocking? */ + unsigned int bound : 1; /* is the socket bound? */ }; static void sock_dump( struct object *obj, int verbose ); @@ -1365,10 +1377,13 @@ static struct sock *create_socket(void) sock->ifchange_obj = NULL; sock->accept_recv_req = NULL; sock->connect_req = NULL; + memset( &sock->addr, 0, sizeof(sock->addr) ); + sock->addr_len = 0; sock->rd_shutdown = 0; sock->wr_shutdown = 0; sock->wr_shutdown_pending = 0; sock->nonblocking = 0; + sock->bound = 0; init_async_queue( &sock->read_q ); init_async_queue( &sock->write_q ); init_async_queue( &sock->ifchange_q ); @@ -1583,6 +1598,9 @@ static struct sock *accept_socket( struct sock *sock ) } else { + union unix_sockaddr unix_addr; + socklen_t unix_len; + if ((acceptfd = accept_new_fd( sock )) == -1) return NULL; if (!(acceptsock = create_socket())) { @@ -1592,6 +1610,7 @@ static struct sock *accept_socket( struct sock *sock ) /* newly created socket gets the same properties of the listening socket */ acceptsock->state = SOCK_CONNECTED; + acceptsock->bound = 1; acceptsock->nonblocking = sock->nonblocking; acceptsock->mask = sock->mask; acceptsock->proto = sock->proto; @@ -1608,6 +1627,9 @@ static struct sock *accept_socket( struct sock *sock ) release_object( acceptsock ); return NULL; } + unix_len = sizeof(unix_addr); + if (!getsockname( acceptfd, &unix_addr.addr, &unix_len )) + acceptsock->addr_len = sockaddr_from_unix( &unix_addr, &acceptsock->addr.addr, sizeof(acceptsock->addr) ); } clear_error(); sock->pending_events &= ~AFD_POLL_ACCEPT; @@ -1618,6 +1640,8 @@ static struct sock *accept_socket( struct sock *sock ) static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) { + union unix_sockaddr unix_addr; + socklen_t unix_len; int acceptfd; struct fd *newfd; @@ -1658,6 +1682,10 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) release_object( acceptsock->fd ); acceptsock->fd = newfd; + unix_len = sizeof(unix_addr); + if (!getsockname( get_unix_fd( newfd ), &unix_addr.addr, &unix_len )) + acceptsock->addr_len = sockaddr_from_unix( &unix_addr, &acceptsock->addr.addr, sizeof(acceptsock->addr) ); + clear_error(); sock->pending_events &= ~AFD_POLL_ACCEPT; sock->reported_events &= ~AFD_POLL_ACCEPT; @@ -2075,8 +2103,10 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) case IOCTL_AFD_WINE_CONNECT: { const struct afd_connect_params *params = get_req_data(); + union unix_sockaddr unix_addr; const struct sockaddr *addr; struct connect_req *req; + socklen_t unix_len; int send_len, ret; if (get_req_data_size() < sizeof(*params) || @@ -2118,6 +2148,11 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) /* a connected or connecting socket can no longer be accepted into */ allow_fd_caching( sock->fd ); + unix_len = sizeof(unix_addr); + if (!sock->bound && !getsockname( unix_fd, &unix_addr.addr, &unix_len )) + sock->addr_len = sockaddr_from_unix( &unix_addr, &sock->addr.addr, sizeof(sock->addr) ); + sock->bound = 1; + if (!ret) { sock->state = SOCK_CONNECTED; @@ -2351,7 +2386,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) case IOCTL_AFD_BIND: { const struct afd_bind_params *params = get_req_data(); - union unix_sockaddr unix_addr; + union unix_sockaddr unix_addr, bind_addr; data_size_t in_size; socklen_t unix_len; @@ -2376,6 +2411,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) set_error( STATUS_INVALID_ADDRESS ); return 0; } + bind_addr = unix_addr; if (unix_addr.addr.sa_family == WS_AF_INET) { @@ -2383,10 +2419,10 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) if (!memcmp( &unix_addr.in.sin_addr, magic_loopback_addr, 4 ) || bind_to_interface( sock, &unix_addr.in )) - unix_addr.in.sin_addr.s_addr = htonl( INADDR_ANY ); + bind_addr.in.sin_addr.s_addr = htonl( INADDR_ANY ); } - if (bind( unix_fd, &unix_addr.addr, unix_len ) < 0) + if (bind( unix_fd, &bind_addr.addr, unix_len ) < 0) { if (errno == EADDRINUSE) { @@ -2398,10 +2434,40 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) } set_error( sock_get_ntstatus( errno ) ); + return 1; } + + sock->bound = 1; + + unix_len = sizeof(bind_addr); + if (!getsockname( unix_fd, &bind_addr.addr, &unix_len )) + { + /* store the interface or magic loopback address instead of the + * actual unix address */ + if (bind_addr.addr.sa_family == AF_INET) + bind_addr.in.sin_addr = unix_addr.in.sin_addr; + sock->addr_len = sockaddr_from_unix( &bind_addr, &sock->addr.addr, sizeof(sock->addr) ); + } + return 1; } + case IOCTL_AFD_GETSOCKNAME: + if (!sock->bound) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + + if (get_reply_max_size() < sock->addr_len) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + + set_reply_data( &sock->addr, sock->addr_len ); + return 1; + default: set_error( STATUS_NOT_SUPPORTED ); return 0; @@ -2972,6 +3038,17 @@ DECL_HANDLER(send_socket) if (!sock) return; fd = sock->fd; + if (sock->type == WS_SOCK_DGRAM) + { + /* sendto() and sendmsg() implicitly binds a socket */ + union unix_sockaddr unix_addr; + socklen_t unix_len = sizeof(unix_addr); + + if (!sock->bound && !getsockname( get_unix_fd( fd ), &unix_addr.addr, &unix_len )) + sock->addr_len = sockaddr_from_unix( &unix_addr, &sock->addr.addr, sizeof(sock->addr) ); + sock->bound = 1; + } + if (status != STATUS_SUCCESS) { /* send() calls only clear and reselect events if unsuccessful. */

1 0

Alexandre Julliard : ntdll: Don't allow single-stepping through syscalls.
by Alexandre Julliard June 16, 2021

June 16, 2021

Module: wine Branch: master Commit: 0702d6b8862b6817a994facb62ad7a00bf1d53ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=0702d6b8862b6817a994facb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 16 14:56:36 2021 +0200 ntdll: Don't allow single-stepping through syscalls. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51273 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 30 ++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_x86_64.c | 31 +++++++++++++++++++++++++++++++ tools/winebuild/import.c | 12 +++++++----- 3 files changed, 68 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 89f4fb4151c..d04935bb1b2 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1753,6 +1753,34 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, void *stack_ptr, } +/*********************************************************************** + * handle_syscall_trap + * + * Handle a trap exception during a system call. + */ +static BOOL handle_syscall_trap( ucontext_t *sigcontext ) +{ + extern void __wine_syscall_dispatcher_prolog_end(void); + struct syscall_frame *frame = x86_thread_data()->syscall_frame; + + /* disallow single-stepping through a syscall */ + + if ((void *)EIP_sig( sigcontext ) != __wine_syscall_dispatcher) return FALSE; + + TRACE( "ignoring trap in syscall eip=%08x eflags=%08x\n", EIP_sig(sigcontext), EFL_sig(sigcontext) ); + + frame->eip = *(ULONG *)ESP_sig( sigcontext ); + frame->eflags = EFL_sig(sigcontext); + frame->restore_flags = CONTEXT_CONTROL; + + EIP_sig( sigcontext ) = (ULONG)__wine_syscall_dispatcher_prolog_end; + ECX_sig( sigcontext ) = (ULONG)frame; + ESP_sig( sigcontext ) += sizeof(ULONG); + EFL_sig( sigcontext ) &= ~0x100; /* clear single-step flag */ + return TRUE; +} + + /********************************************************************** * segv_handler * @@ -1855,6 +1883,8 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) ucontext_t *ucontext = sigcontext; void *stack = setup_exception_record( sigcontext, &rec, &xcontext ); + if (handle_syscall_trap( ucontext )) return; + switch (TRAP_sig(ucontext)) { case TRAP_x86_TRCTRAP: /* Single-step exception */ diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 10aa2a516b0..c36699589d9 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2202,6 +2202,35 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, } +/*********************************************************************** + * handle_syscall_trap + * + * Handle a trap exception during a system call. + */ +static BOOL handle_syscall_trap( ucontext_t *sigcontext ) +{ + extern void __wine_syscall_dispatcher_prolog_end(void); + struct syscall_frame *frame = amd64_thread_data()->syscall_frame; + + /* disallow single-stepping through a syscall */ + + if ((void *)RIP_sig( sigcontext ) != __wine_syscall_dispatcher) return FALSE; + + TRACE( "ignoring trap in syscall rip=%p eflags=%08x\n", + (void *)RIP_sig(sigcontext), (ULONG)EFL_sig(sigcontext) ); + + frame->rip = *(ULONG64 *)RSP_sig( sigcontext ); + frame->eflags = EFL_sig(sigcontext); + frame->restore_flags = CONTEXT_CONTROL; + + RIP_sig( sigcontext ) = (ULONG64)__wine_syscall_dispatcher_prolog_end; + RCX_sig( sigcontext ) = (ULONG64)frame; + RSP_sig( sigcontext ) += sizeof(ULONG64); + EFL_sig( sigcontext ) &= ~0x100; /* clear single-step flag */ + return TRUE; +} + + /********************************************************************** * segv_handler * @@ -2281,6 +2310,8 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) struct xcontext context; ucontext_t *ucontext = sigcontext; + if (handle_syscall_trap( sigcontext )) return; + rec.ExceptionAddress = (void *)RIP_sig(ucontext); save_context( &context, sigcontext ); diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index f92c1b89c9c..a194ae50104 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1436,9 +1436,10 @@ static void output_syscall_dispatcher(void) output( "\tmovl %%fs:0x1f8,%%ecx\n" ); /* x86_thread_data()->syscall_frame */ output( "\tmovl $0,0x00(%%ecx)\n" ); /* frame->restore_flags */ output( "\tpopl 0x08(%%ecx)\n" ); /* frame->eip */ - output( "\tmovl %%esp,0x0c(%%ecx)\n" ); /* frame->esp */ output( "\tpushfl\n" ); output( "\tpopl 0x04(%%ecx)\n" ); /* frame->eflags */ + output( "%s\n", asm_globl("__wine_syscall_dispatcher_prolog_end") ); + output( "\tmovl %%esp,0x0c(%%ecx)\n" ); /* frame->esp */ output( "\tmovw %%cs,0x10(%%ecx)\n" ); output( "\tmovw %%ss,0x12(%%ecx)\n" ); output( "\tmovw %%ds,0x14(%%ecx)\n" ); @@ -1553,6 +1554,11 @@ static void output_syscall_dispatcher(void) case CPU_x86_64: output( "\tmovq %%gs:0x30,%%rcx\n" ); output( "\tmovq 0x328(%%rcx),%%rcx\n" ); /* amd64_thread_data()->syscall_frame */ + output( "\tpopq 0x70(%%rcx)\n" ); /* frame->rip */ + output( "\tpushfq\n" ); + output( "\tpopq 0x80(%%rcx)\n" ); + output( "\tmovl $0,0x94(%%rcx)\n" ); /* frame->restore_flags */ + output( "%s\n", asm_globl("__wine_syscall_dispatcher_prolog_end") ); output( "\tmovq %%rax,0x00(%%rcx)\n" ); output( "\tmovq %%rbx,0x08(%%rcx)\n" ); output( "\tmovq %%rdx,0x18(%%rcx)\n" ); @@ -1562,7 +1568,6 @@ static void output_syscall_dispatcher(void) output( "\tmovq %%r13,0x58(%%rcx)\n" ); output( "\tmovq %%r14,0x60(%%rcx)\n" ); output( "\tmovq %%r15,0x68(%%rcx)\n" ); - output( "\tpopq 0x70(%%rcx)\n" ); /* frame->rip */ output( "\tmovw %%cs,0x78(%%rcx)\n" ); output( "\tmovw %%ds,0x7a(%%rcx)\n" ); output( "\tmovw %%es,0x7c(%%rcx)\n" ); @@ -1570,10 +1575,7 @@ static void output_syscall_dispatcher(void) output( "\tmovq %%rsp,0x88(%%rcx)\n" ); output( "\tmovw %%ss,0x90(%%rcx)\n" ); output( "\tmovw %%gs,0x92(%%rcx)\n" ); - output( "\tmovl $0,0x94(%%rcx)\n" ); /* frame->restore_flags */ output( "\tmovq %%rbp,0x98(%%rcx)\n" ); - output( "\tpushfq\n" ); - output( "\tpopq 0x80(%%rcx)\n" ); /* Legends of Runeterra hooks the first system call return instruction, and * depends on us returning to it. Adjust the return address accordingly. */ output( "\tsubq $0xb,0x70(%%rcx)\n" );

1 0

Zebediah Figura : ws2_32/tests: Add a couple more tests for getsockname().
by Alexandre Julliard June 16, 2021

June 16, 2021

Module: wine Branch: master Commit: 533fd1b127dd46f2e805178e68aa5a6072ed1254 URL: https://source.winehq.org/git/wine.git/?a=commit;h=533fd1b127dd46f2e805178e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 15 23:13:26 2021 -0500 ws2_32/tests: Add a couple more tests for getsockname(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 76d0a3f3b19..c8ac0d0ad8a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3592,6 +3592,7 @@ static void test_getsockname(void) ok(sock != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); sa_get = sa_set; + WSASetLastError(0xdeadbeef); ret = getsockname(sock, (struct sockaddr *)&sa_get, &sa_get_len); ok(ret == SOCKET_ERROR, "expected failure\n"); ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); @@ -3600,12 +3601,21 @@ static void test_getsockname(void) ret = bind(sock, (struct sockaddr *) &sa_set, sa_set_len); ok(!ret, "failed to bind, error %u\n", WSAGetLastError()); + WSASetLastError(0xdeadbeef); ret = getsockname(sock, (struct sockaddr *) &sa_get, &sa_get_len); - ok(!ret, "failed to get address, error %u\n", WSAGetLastError()); + ok(!ret, "got %d\n", ret); + ok(!WSAGetLastError() || WSAGetLastError() == 0xdeadbeef /* < 7 */, "got error %u\n", WSAGetLastError()); ret = memcmp(sa_get.sin_zero, null_padding, 8); ok(ret == 0, "getsockname did not zero the sockaddr_in structure\n"); + sa_get_len = sizeof(sa_get) - 1; + WSASetLastError(0xdeadbeef); + ret = getsockname(sock, (struct sockaddr *)&sa_get, &sa_get_len); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + ok(sa_get_len == sizeof(sa_get) - 1, "got size %d\n", sa_get_len); + closesocket(sock); h = gethostbyname(""); @@ -5546,11 +5556,11 @@ todo_wine static void test_WSASendTo(void) { SOCKET s; - struct sockaddr_in addr; + struct sockaddr_in addr, ret_addr; char buf[12] = "hello world"; WSABUF data_buf; DWORD bytesSent; - int ret; + int ret, len; addr.sin_family = AF_INET; addr.sin_port = htons(139); @@ -5566,6 +5576,11 @@ static void test_WSASendTo(void) ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAENOTSOCK, "WSASendTo() failed: %d/%d\n", ret, WSAGetLastError()); + len = sizeof(ret_addr); + ret = getsockname(s, (struct sockaddr *)&ret_addr, &len); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + WSASetLastError(12345); ret = WSASendTo(s, &data_buf, 1, NULL, 0, (struct sockaddr*)&addr, sizeof(addr), NULL, NULL); ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, @@ -5575,6 +5590,12 @@ static void test_WSASendTo(void) ret = WSASendTo(s, &data_buf, 1, &bytesSent, 0, (struct sockaddr *)&addr, sizeof(addr), NULL, NULL); ok(!ret, "expected success\n"); ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + + len = sizeof(ret_addr); + ret = getsockname(s, (struct sockaddr *)&ret_addr, &len); + ok(!ret, "got error %u\n", WSAGetLastError()); + ok(ret_addr.sin_family == AF_INET, "got family %u\n", ret_addr.sin_family); + ok(ret_addr.sin_port, "expected nonzero port\n"); } static DWORD WINAPI recv_thread(LPVOID arg)

1 0

Zhiyi Zhang : winetest: Enable visual styles.
by Alexandre Julliard June 16, 2021

June 16, 2021

Module: wine Branch: master Commit: b527c13c546a9343945fe7cb5d9cf297153409b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b527c13c546a9343945fe7cb… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 16 10:33:57 2021 +0800 winetest: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 3 +++ programs/winetest/winetest.manifest | 16 ++++++++++++++++ programs/winetest/winetest.rc | 3 +++ 3 files changed, 22 insertions(+) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index a05c8f9939b..64a807b6c73 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -29,6 +29,7 @@ #include <stdio.h> #include <assert.h> #include <windows.h> +#include <commctrl.h> #include <winternl.h> #include <mshtml.h> @@ -1265,6 +1266,8 @@ int __cdecl main( int argc, char *argv[] ) int interactive = 1; int i; + InitCommonControls(); + if (!LoadStringA( 0, IDS_BUILD_ID, build_id, sizeof(build_id) )) build_id[0] = 0; pIsWow64Process = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"),"IsWow64Process"); diff --git a/programs/winetest/winetest.manifest b/programs/winetest/winetest.manifest new file mode 100644 index 00000000000..a3b110b5eda --- /dev/null +++ b/programs/winetest/winetest.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Winetest" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index a3898b6ce01..4571a752f66 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -88,6 +88,9 @@ BEGIN DEFPUSHBUTTON "Close", IDCANCEL, 55, 40, 40, 14 END +/* @makedep: winetest.manifest */ +1 RT_MANIFEST winetest.manifest + /* @makedep: winetest.ico */ IDI_WINE ICON "winetest.ico"

1 0

Zebediah Figura : server: Return the socket address from IOCTL_AFD_BIND.
by Alexandre Julliard June 16, 2021

June 16, 2021

Module: wine Branch: master Commit: dd147ed65a70fd6fc125ddc0526e42d364434b99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd147ed65a70fd6fc125ddc0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 15 23:13:29 2021 -0500 server: Return the socket address from IOCTL_AFD_BIND. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/sock.c b/server/sock.c index e5acf585dcc..8cd3475d7b2 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2449,6 +2449,8 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) sock->addr_len = sockaddr_from_unix( &bind_addr, &sock->addr.addr, sizeof(sock->addr) ); } + if (get_reply_max_size() >= sock->addr_len) + set_reply_data( &sock->addr, sock->addr_len ); return 1; }

1 0

Zhiyi Zhang : clock: Enable visual styles.
by Alexandre Julliard June 16, 2021

June 16, 2021

Module: wine Branch: master Commit: af242e43cb31d355a53937b1f31d024e330a1e73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af242e43cb31d355a53937b1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 16 10:31:42 2021 +0800 clock: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/clock/Makefile.in | 2 +- programs/clock/clock.manifest | 16 ++++++++++++++++ programs/clock/clock.rc | 3 +++ programs/clock/clock_res.h | 1 + programs/clock/main.c | 3 +++ 5 files changed, 24 insertions(+), 1 deletion(-) diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in index 060e2ff0881..ad1681aeef0 100644 --- a/programs/clock/Makefile.in +++ b/programs/clock/Makefile.in @@ -1,5 +1,5 @@ MODULE = clock.exe -IMPORTS = comdlg32 shell32 user32 gdi32 +IMPORTS = comdlg32 shell32 user32 gdi32 comctl32 EXTRADLLFLAGS = -mwindows -mno-cygwin diff --git a/programs/clock/clock.manifest b/programs/clock/clock.manifest new file mode 100644 index 00000000000..4a9f38c4ff8 --- /dev/null +++ b/programs/clock/clock.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Clock" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/clock/clock.rc b/programs/clock/clock.rc index 8e3b9ef4b7c..0d19369b9f4 100644 --- a/programs/clock/clock.rc +++ b/programs/clock/clock.rc @@ -49,3 +49,6 @@ STRINGTABLE { IDS_CLOCK, "Clock" } + +/* @makedep: clock.manifest */ +1 RT_MANIFEST clock.manifest diff --git a/programs/clock/clock_res.h b/programs/clock/clock_res.h index b7abf1c35d3..32fd9ff8a0f 100644 --- a/programs/clock/clock_res.h +++ b/programs/clock/clock_res.h @@ -17,6 +17,7 @@ */ #include <windef.h> +#include <winuser.h> #define MAIN_MENU 0x100 #define IDM_ANALOG 0x101 diff --git a/programs/clock/main.c b/programs/clock/main.c index 43364745ea5..e64e66dffe6 100644 --- a/programs/clock/main.c +++ b/programs/clock/main.c @@ -26,6 +26,7 @@ #include <stdio.h> #include "windows.h" +#include "commctrl.h" #include "commdlg.h" #include "shellapi.h" @@ -389,6 +390,8 @@ int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show MSG msg; WNDCLASSW class; + InitCommonControls(); + /* Setup Globals */ memset(&Globals.hFont, 0, sizeof (Globals.hFont)); Globals.bAnalog = TRUE;

1 0

Zebediah Figura : server: Introduce IOCTL_AFD_WINE_MESSAGE_SELECT.
by Alexandre Julliard June 15, 2021

June 15, 2021

Module: wine Branch: master Commit: ce31d1253db0601dc27e88aff426bfe3eb7306fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce31d1253db0601dc27e88af… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 15 10:39:47 2021 -0500 server: Introduce IOCTL_AFD_WINE_MESSAGE_SELECT. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/afd.h | 9 +++++++++ server/sock.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/include/wine/afd.h b/include/wine/afd.h index 46d242c7582..35d047c59d8 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -147,6 +147,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SIOCATMARK CTL_CODE(FILE_DEVICE_NETWORK, 212, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_INTERFACE_LIST CTL_CODE(FILE_DEVICE_NETWORK, 213, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_KEEPALIVE_VALS CTL_CODE(FILE_DEVICE_NETWORK, 214, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_MESSAGE_SELECT CTL_CODE(FILE_DEVICE_NETWORK, 215, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params { @@ -199,4 +200,12 @@ struct afd_transmit_params DWORD flags; }; +struct afd_message_select_params +{ + obj_handle_t handle; + user_handle_t window; + unsigned int message; + int mask; +}; + #endif diff --git a/server/sock.c b/server/sock.c index e1b30507514..6d2ac6af2b7 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2095,6 +2095,35 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 1; } + case IOCTL_AFD_WINE_MESSAGE_SELECT: + { + const struct afd_message_select_params *params = get_req_data(); + + if (get_req_data_size() < sizeof(params)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + + if (sock->event) release_object( sock->event ); + + if (params->window) + { + sock->pending_events = 0; + sock->reported_events = 0; + } + sock->event = NULL; + sock->mask = params->mask; + sock->window = params->window; + sock->message = params->message; + sock->wparam = params->handle; + sock->nonblocking = 1; + + sock_reselect( sock ); + + return 1; + } + default: set_error( STATUS_NOT_SUPPORTED ); return 0;

1 0

Brendan Shanks : configure: Work around Xcode 12's ld assuming 16KB page sizes.
by Alexandre Julliard June 15, 2021

June 15, 2021

Module: wine Branch: master Commit: 11fd7e8394b53b04b027d7c5b26c51b8b50242b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11fd7e8394b53b04b027d7c5… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Jun 15 13:25:31 2021 -0700 configure: Work around Xcode 12's ld assuming 16KB page sizes. Starting in Xcode 12, ld rounds page sizes and alignments up to 16KB for all architectures. Passing '-segalign 0x1000' resets this back to 4KB. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index e63afb100b7..1ddc2ea65a8 100755 --- a/configure +++ b/configure @@ -8781,10 +8781,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu SYSTEMCONFIGURATION_LIBS="-framework SystemConfiguration" - WINELOADER_LDFLAGS="-Wl,-pie,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" + WINELOADER_LDFLAGS="-Wl,-pie,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" wine_can_build_preloader=yes - WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist,-segaddr,WINE_4GB_RESERVE,0x100000000" + WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist,-segaddr,WINE_4GB_RESERVE,0x100000000" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-no_new_main -e _main" >&5 $as_echo_n "checking whether the compiler supports -Wl,-no_new_main -e _main... " >&6; } if ${ac_cv_cflags__Wl__no_new_main__e__main+:} false; then : diff --git a/configure.ac b/configure.ac index f340fd7b286..ade04399af0 100644 --- a/configure.ac +++ b/configure.ac @@ -762,10 +762,10 @@ case $host_os in AC_SUBST(APPKIT_LIBS,"-framework AppKit") AC_SUBST(SYSTEMCONFIGURATION_LIBS,"-framework SystemConfiguration") - WINELOADER_LDFLAGS="-Wl,-pie,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" + WINELOADER_LDFLAGS="-Wl,-pie,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" wine_can_build_preloader=yes - WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist,-segaddr,WINE_4GB_RESERVE,0x100000000" + WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist,-segaddr,WINE_4GB_RESERVE,0x100000000" WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main], [WINEPRELOADER_LDFLAGS="-Wl,-no_new_main $WINEPRELOADER_LDFLAGS" WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main -nostartfiles -nodefaultlibs],,

1 0

Zebediah Figura : server: Remove the no longer used set_socket_event request.
by Alexandre Julliard June 15, 2021

June 15, 2021

Module: wine Branch: master Commit: 43e67ebddc8312f1bd8d325abc106a7f9625ebb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43e67ebddc8312f1bd8d325a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 15 10:39:49 2021 -0500 server: Remove the no longer used set_socket_event request. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 21 +-------------- server/protocol.def | 10 ------- server/request.h | 8 ------ server/sock.c | 60 ------------------------------------------ server/trace.c | 12 --------- 5 files changed, 1 insertion(+), 110 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index a97974027f1..1f0e25c31fa 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1730,22 +1730,6 @@ struct unlock_file_reply -struct set_socket_event_request -{ - struct request_header __header; - obj_handle_t handle; - unsigned int mask; - obj_handle_t event; - user_handle_t window; - unsigned int msg; -}; -struct set_socket_event_reply -{ - struct reply_header __header; -}; - - - struct get_socket_event_request { struct request_header __header; @@ -5501,7 +5485,6 @@ enum request REQ_get_volume_info, REQ_lock_file, REQ_unlock_file, - REQ_set_socket_event, REQ_get_socket_event, REQ_get_socket_info, REQ_set_socket_deferred, @@ -5784,7 +5767,6 @@ union generic_request struct get_volume_info_request get_volume_info_request; struct lock_file_request lock_file_request; struct unlock_file_request unlock_file_request; - struct set_socket_event_request set_socket_event_request; struct get_socket_event_request get_socket_event_request; struct get_socket_info_request get_socket_info_request; struct set_socket_deferred_request set_socket_deferred_request; @@ -6065,7 +6047,6 @@ union generic_reply struct get_volume_info_reply get_volume_info_reply; struct lock_file_reply lock_file_reply; struct unlock_file_reply unlock_file_reply; - struct set_socket_event_reply set_socket_event_reply; struct get_socket_event_reply get_socket_event_reply; struct get_socket_info_reply get_socket_info_reply; struct set_socket_deferred_reply set_socket_deferred_reply; @@ -6292,7 +6273,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 712 +#define SERVER_PROTOCOL_VERSION 713 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 3609261b848..d3f44482c37 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1423,16 +1423,6 @@ enum server_fd_type @END -/* Set socket event parameters */ -(a)REQ(set_socket_event) - obj_handle_t handle; /* handle to the socket */ - unsigned int mask; /* event mask */ - obj_handle_t event; /* event object */ - user_handle_t window; /* window to send the message to */ - unsigned int msg; /* message to send */ -(a)END - - /* Get socket event parameters */ @REQ(get_socket_event) obj_handle_t handle; /* handle to the socket */ diff --git a/server/request.h b/server/request.h index 4f6adaa97c2..c3f77a233ab 100644 --- a/server/request.h +++ b/server/request.h @@ -172,7 +172,6 @@ DECL_HANDLER(get_file_info); DECL_HANDLER(get_volume_info); DECL_HANDLER(lock_file); DECL_HANDLER(unlock_file); -DECL_HANDLER(set_socket_event); DECL_HANDLER(get_socket_event); DECL_HANDLER(get_socket_info); DECL_HANDLER(set_socket_deferred); @@ -454,7 +453,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_get_volume_info, (req_handler)req_lock_file, (req_handler)req_unlock_file, - (req_handler)req_set_socket_event, (req_handler)req_get_socket_event, (req_handler)req_get_socket_info, (req_handler)req_set_socket_deferred, @@ -1040,12 +1038,6 @@ C_ASSERT( FIELD_OFFSET(struct unlock_file_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct unlock_file_request, offset) == 16 ); C_ASSERT( FIELD_OFFSET(struct unlock_file_request, count) == 24 ); C_ASSERT( sizeof(struct unlock_file_request) == 32 ); -C_ASSERT( FIELD_OFFSET(struct set_socket_event_request, handle) == 12 ); -C_ASSERT( FIELD_OFFSET(struct set_socket_event_request, mask) == 16 ); -C_ASSERT( FIELD_OFFSET(struct set_socket_event_request, event) == 20 ); -C_ASSERT( FIELD_OFFSET(struct set_socket_event_request, window) == 24 ); -C_ASSERT( FIELD_OFFSET(struct set_socket_event_request, msg) == 28 ); -C_ASSERT( sizeof(struct set_socket_event_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_socket_event_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_socket_event_request, service) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_socket_event_request, c_event) == 20 ); diff --git a/server/sock.c b/server/sock.c index 6d2ac6af2b7..a3062cff8ab 100644 --- a/server/sock.c +++ b/server/sock.c @@ -444,28 +444,6 @@ static unsigned int afd_poll_flag_to_win32( unsigned int flags ) return ret; } -static unsigned int afd_poll_flag_from_win32( unsigned int flags ) -{ - static const unsigned int map[] = - { - AFD_POLL_READ, - AFD_POLL_WRITE, - AFD_POLL_OOB, - AFD_POLL_ACCEPT, - AFD_POLL_CONNECT | AFD_POLL_CONNECT_ERR, - AFD_POLL_RESET | AFD_POLL_HUP, - }; - - unsigned int i, ret = 0; - - for (i = 0; i < ARRAY_SIZE(map); ++i) - { - if (flags & (1 << i)) ret |= map[i]; - } - - return ret; -} - /* wake anybody waiting on the socket event or send the associated message */ static void sock_wake_up( struct sock *sock ) { @@ -2520,44 +2498,6 @@ struct object *create_socket_device( struct object *root, const struct unicode_s return create_named_object( root, &socket_device_ops, name, attr, sd ); } -/* set socket event parameters */ -DECL_HANDLER(set_socket_event) -{ - struct sock *sock; - struct event *old_event; - - if (!(sock = (struct sock *)get_handle_obj( current->process, req->handle, - FILE_WRITE_ATTRIBUTES, &sock_ops))) return; - if (get_unix_fd( sock->fd ) == -1) return; - old_event = sock->event; - sock->mask = afd_poll_flag_from_win32( req->mask ); - if (req->window) - { - sock->pending_events &= ~sock->mask; - sock->reported_events &= ~sock->mask; - } - sock->event = NULL; - sock->window = req->window; - sock->message = req->msg; - sock->wparam = req->handle; /* wparam is the socket handle */ - if (req->event) sock->event = get_event_obj( current->process, req->event, EVENT_MODIFY_STATE ); - - if (debug_level && sock->event) fprintf(stderr, "event ptr: %p\n", sock->event); - - sock_reselect( sock ); - - sock->nonblocking = 1; - - /* if a network event is pending, signal the event object - it is possible that CONNECT or ACCEPT network events has happened - before a WSAEventSelect() was done on it. - (when dealing with Asynchronous socket) */ - sock_wake_up( sock ); - - if (old_event) release_object( old_event ); /* we're through with it */ - release_object( &sock->obj ); -} - /* get socket event parameters */ DECL_HANDLER(get_socket_event) { diff --git a/server/trace.c b/server/trace.c index 42952d3cdff..27500eae589 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2073,15 +2073,6 @@ static void dump_unlock_file_request( const struct unlock_file_request *req ) dump_uint64( ", count=", &req->count ); } -static void dump_set_socket_event_request( const struct set_socket_event_request *req ) -{ - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", mask=%08x", req->mask ); - fprintf( stderr, ", event=%04x", req->event ); - fprintf( stderr, ", window=%08x", req->window ); - fprintf( stderr, ", msg=%08x", req->msg ); -} - static void dump_get_socket_event_request( const struct get_socket_event_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -4598,7 +4589,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_volume_info_request, (dump_func)dump_lock_file_request, (dump_func)dump_unlock_file_request, - (dump_func)dump_set_socket_event_request, (dump_func)dump_get_socket_event_request, (dump_func)dump_get_socket_info_request, (dump_func)dump_set_socket_deferred_request, @@ -4877,7 +4867,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_volume_info_reply, (dump_func)dump_lock_file_reply, NULL, - NULL, (dump_func)dump_get_socket_event_reply, (dump_func)dump_get_socket_info_reply, NULL, @@ -5156,7 +5145,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "get_volume_info", "lock_file", "unlock_file", - "set_socket_event", "get_socket_event", "get_socket_info", "set_socket_deferred",

1 0