Module: wine Branch: master Commit: ac3ec2d955573e187413743428ee7e4d1a6906d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac3ec2d955573e18741374342...
Author: Zebediah Figura z.figura12@gmail.com Date: Wed May 26 23:36:52 2021 -0500
ntdll: No longer export __wine_locked_recvmsg().
Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/ntdll/ntdll.spec | 3 --- dlls/ntdll/unix/socket.c | 4 +--- dlls/ntdll/unix/unix_private.h | 3 +++ dlls/ntdll/unix/virtual.c | 4 ++-- 4 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index c092e7a9d78..529bf6f269a 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1623,9 +1623,6 @@ @ cdecl -norelay __wine_dbg_output(str) @ cdecl -norelay __wine_dbg_strdup(str)
-# Virtual memory -@ cdecl -syscall __wine_locked_recvmsg(long ptr long) - # Version @ cdecl wine_get_version() @ cdecl wine_get_build_id() diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index aa56e529f0d..8d126e004f0 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -147,8 +147,6 @@ static NTSTATUS sock_errno_to_status( int err ) } }
-extern ssize_t CDECL __wine_locked_recvmsg( int fd, struct msghdr *hdr, int flags ); - union unix_sockaddr { struct sockaddr addr; @@ -349,7 +347,7 @@ static NTSTATUS try_recv( int fd, struct async_recv_ioctl *async, ULONG_PTR *siz hdr.msg_control = control_buffer; hdr.msg_controllen = sizeof(control_buffer); #endif - while ((ret = __wine_locked_recvmsg( fd, &hdr, async->unix_flags )) < 0 && errno == EINTR); + while ((ret = virtual_locked_recvmsg( fd, &hdr, async->unix_flags )) < 0 && errno == EINTR);
if (ret < 0) { diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index fdede25cfbc..f28d5cf4e99 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -27,6 +27,8 @@ #include "wine/server.h" #include "wine/list.h"
+struct msghdr; + #ifdef __i386__ static const WORD current_machine = IMAGE_FILE_MACHINE_I386; #elif defined(__x86_64__) @@ -216,6 +218,7 @@ extern NTSTATUS virtual_handle_fault( void *addr, DWORD err, void *stack ) DECLS extern unsigned int virtual_locked_server_call( void *req_ptr ) DECLSPEC_HIDDEN; extern ssize_t virtual_locked_read( int fd, void *addr, size_t size ) DECLSPEC_HIDDEN; extern ssize_t virtual_locked_pread( int fd, void *addr, size_t size, off_t offset ) DECLSPEC_HIDDEN; +extern ssize_t virtual_locked_recvmsg( int fd, struct msghdr *hdr, int flags ) DECLSPEC_HIDDEN; extern BOOL virtual_is_valid_code_address( const void *addr, SIZE_T size ) DECLSPEC_HIDDEN; extern void *virtual_setup_exception( void *stack_ptr, size_t size, EXCEPTION_RECORD *rec ) DECLSPEC_HIDDEN; extern BOOL virtual_check_buffer_for_read( const void *ptr, SIZE_T size ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index fd2e80c75f3..2ef72220a45 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3356,9 +3356,9 @@ ssize_t virtual_locked_pread( int fd, void *addr, size_t size, off_t offset )
/*********************************************************************** - * __wine_locked_recvmsg (NTDLL.@) + * virtual_locked_recvmsg */ -ssize_t CDECL __wine_locked_recvmsg( int fd, struct msghdr *hdr, int flags ) +ssize_t virtual_locked_recvmsg( int fd, struct msghdr *hdr, int flags ) { sigset_t sigset; size_t i;