ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: No longer export __wine_locked_recvmsg(). 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-05-26 23:36:52 -05:00 committed by Alexandre Julliard
parent 6682aa4747
commit ac3ec2d955
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/ntdll/ntdll.spec
View File

@ -1623,9 +1623,6 @@
@ cdecl -norelay __wine_dbg_output(str) @ cdecl -norelay __wine_dbg_output(str)
@ cdecl -norelay __wine_dbg_strdup(str) @ cdecl -norelay __wine_dbg_strdup(str)
# Virtual memory
@ cdecl -syscall __wine_locked_recvmsg(long ptr long)
# Version # Version
@ cdecl wine_get_version() @ cdecl wine_get_version()
@ cdecl wine_get_build_id() @ cdecl wine_get_build_id()

4
dlls/ntdll/unix/socket.c
View File

@ -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 union unix_sockaddr
{ {
struct sockaddr addr; 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_control = control_buffer;
hdr.msg_controllen = sizeof(control_buffer); hdr.msg_controllen = sizeof(control_buffer);
#endif #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) if (ret < 0)
{ {

3
dlls/ntdll/unix/unix_private.h
View File

@ -27,6 +27,8 @@
#include "wine/server.h" #include "wine/server.h"
#include "wine/list.h" #include "wine/list.h"
struct msghdr;
#ifdef __i386__ #ifdef __i386__
static const WORD current_machine = IMAGE_FILE_MACHINE_I386; static const WORD current_machine = IMAGE_FILE_MACHINE_I386;
#elif defined(__x86_64__) #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 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_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_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 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 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; extern BOOL virtual_check_buffer_for_read( const void *ptr, SIZE_T size ) DECLSPEC_HIDDEN;

4
dlls/ntdll/unix/virtual.c
View File

@ -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; sigset_t sigset;
size_t i; size_t i;