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

Zebediah Figura : ws2_32: Move gethostbyname() to the Unix library.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: wine Branch: master Commit: 68257d0f3971a7891d509df7472fb657b524f1f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68257d0f3971a7891d509df7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 3 23:53:36 2021 -0500 ws2_32: Move gethostbyname() to the Unix library. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/protocol.c | 132 +++++++------------------------------------ dlls/ws2_32/unixlib.c | 55 ++++++++++++++++++ dlls/ws2_32/ws2_32_private.h | 1 + 3 files changed, 77 insertions(+), 111 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 2a7200ee137..c65e6b9674e 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -53,33 +53,6 @@ static const int ws_eai_map[][2] = { 0, 0 } }; -static const int ws_af_map[][2] = -{ - MAP_OPTION( AF_UNSPEC ), - MAP_OPTION( AF_INET ), - MAP_OPTION( AF_INET6 ), -#ifdef HAS_IPX - MAP_OPTION( AF_IPX ), -#endif -#ifdef AF_IRDA - MAP_OPTION( AF_IRDA ), -#endif - {FROM_PROTOCOL_INFO, FROM_PROTOCOL_INFO}, -}; - -static int convert_af_u2w( int family ) -{ - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(ws_af_map); i++) - { - if (ws_af_map[i][1] == family) - return ws_af_map[i][0]; - } - FIXME( "unhandled UNIX address family %d\n", family ); - return -1; -} - int convert_eai_u2w( int unixret ) { int i; @@ -706,24 +679,6 @@ int WINAPI GetNameInfoW( const SOCKADDR *addr, WS_socklen_t addr_len, WCHAR *hos } -static UINT host_errno_from_unix( int err ) -{ - WARN( "%d\n", err ); - - switch (err) - { - case HOST_NOT_FOUND: return WSAHOST_NOT_FOUND; - case TRY_AGAIN: return WSATRY_AGAIN; - case NO_RECOVERY: return WSANO_RECOVERY; - case NO_DATA: return WSANO_DATA; - case ENOBUFS: return WSAENOBUFS; - case 0: return 0; - default: - WARN( "Unknown h_errno %d!\n", err ); - return WSAEOPNOTSUPP; - } -} - static struct WS_hostent *get_hostent_buffer( unsigned int size ) { struct per_thread_data *data = get_per_thread_data(); @@ -791,37 +746,6 @@ static struct WS_hostent *create_hostent( char *name, int alias_count, int alias return p_to; } -static struct WS_hostent *hostent_from_unix( const struct hostent *p_he ) -{ - int i, addresses = 0, alias_size = 0; - struct WS_hostent *p_to; - char *p; - - for (i = 0; p_he->h_aliases[i]; i++) - alias_size += strlen( p_he->h_aliases[i] ) + 1; - while (p_he->h_addr_list[addresses]) - addresses++; - - p_to = create_hostent( p_he->h_name, i + 1, alias_size, addresses + 1, p_he->h_length ); - - if (!p_to) return NULL; - p_to->h_addrtype = convert_af_u2w( p_he->h_addrtype ); - p_to->h_length = p_he->h_length; - - for (i = 0, p = p_to->h_addr_list[0]; p_he->h_addr_list[i]; i++, p += p_to->h_length) - memcpy( p, p_he->h_addr_list[i], p_to->h_length ); - - /* Fill the aliases after the IP data */ - for (i = 0; p_he->h_aliases[i]; i++) - { - p_to->h_aliases[i] = p; - strcpy( p, p_he->h_aliases[i] ); - p += strlen(p) + 1; - } - - return p_to; -} - /*********************************************************************** * gethostbyaddr (ws2_32.51) @@ -987,16 +911,11 @@ cleanup: */ struct WS_hostent * WINAPI WS_gethostbyname( const char *name ) { - struct WS_hostent *retval = NULL; - struct hostent *host; -#ifdef HAVE_LINUX_GETHOSTBYNAME_R_6 - char *extrabuf; - int ebufsize = 1024; - struct hostent hostentry; - int locerr = ENOBUFS; -#endif + struct WS_hostent *host = NULL; char hostname[100]; + TRACE( "%s\n", debugstr_a(name) ); + if (!num_startup) { SetLastError( WSANOTINITIALISED ); @@ -1006,7 +925,7 @@ struct WS_hostent * WINAPI WS_gethostbyname( const char *name ) if (gethostname( hostname, 100 ) == -1) { SetLastError( WSAENOBUFS ); - return retval; + return NULL; } if (!name || !name[0]) @@ -1015,45 +934,36 @@ struct WS_hostent * WINAPI WS_gethostbyname( const char *name ) /* If the hostname of the local machine is requested then return the * complete list of local IP addresses */ if (!strcmp( name, hostname )) - retval = get_local_ips( hostname ); + host = get_local_ips( hostname ); /* If any other hostname was requested (or the routing table lookup failed) * then return the IP found by the host OS */ - if (!retval) + if (!host) { -#ifdef HAVE_LINUX_GETHOSTBYNAME_R_6 - host = NULL; - extrabuf = HeapAlloc( GetProcessHeap(), 0, ebufsize ); - while (extrabuf) + unsigned int size = 1024; + int ret; + + if (!(host = get_hostent_buffer( size ))) + return NULL; + + while ((ret = unix_funcs->gethostbyname( name, host, &size )) == ERROR_INSUFFICIENT_BUFFER) { - int res = gethostbyname_r( name, &hostentry, extrabuf, ebufsize, &host, &locerr ); - if (res != ERANGE) break; - ebufsize *= 2; - extrabuf = HeapReAlloc( GetProcessHeap(), 0, extrabuf, ebufsize ); + if (!(host = get_hostent_buffer( size ))) + return NULL; } - if (!host) SetLastError( (locerr < 0) ? sock_get_error( errno ) : host_errno_from_unix( locerr ) ); -#else - EnterCriticalSection( &csWSgetXXXbyYYY ); - host = gethostbyname( name ); - if (!host) SetLastError( (h_errno < 0) ? sock_get_error( errno ) : host_errno_from_unix( h_errno ) ); -#endif - if (host) retval = hostent_from_unix( host ); -#ifdef HAVE_LINUX_GETHOSTBYNAME_R_6 - HeapFree( GetProcessHeap(), 0, extrabuf ); -#else - LeaveCriticalSection( &csWSgetXXXbyYYY ); -#endif + + SetLastError( ret ); + return ret ? NULL : host; } - if (retval && retval->h_addr_list[0][0] == 127 && strcmp( name, "localhost" )) + if (host && host->h_addr_list[0][0] == 127 && strcmp( name, "localhost" )) { /* hostname != "localhost" but has loopback address. replace by our * special address.*/ - memcpy( retval->h_addr_list[0], magic_loopback_addr, 4 ); + memcpy( host->h_addr_list[0], magic_loopback_addr, 4 ); } - TRACE( "%s ret %p\n", debugstr_a(name), retval ); - return retval; + return host; } diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index 2423ef5aa2e..2a5fcd1b60d 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -735,10 +735,65 @@ static int CDECL unix_gethostbyaddr( const void *addr, int len, int family, } +#ifdef HAVE_LINUX_GETHOSTBYNAME_R_6 +static int CDECL unix_gethostbyname( const char *name, struct WS_hostent *const host, unsigned int *size ) +{ + struct hostent stack_host, *unix_host; + char *unix_buffer, *new_buffer; + int unix_size = 1024; + int locerr; + int ret; + + if (!(unix_buffer = malloc( unix_size ))) + return WSAENOBUFS; + + while (gethostbyname_r( name, &stack_host, unix_buffer, unix_size, &unix_host, &locerr ) == ERANGE) + { + unix_size *= 2; + if (!(new_buffer = realloc( unix_buffer, unix_size ))) + { + free( unix_buffer ); + return WSAENOBUFS; + } + unix_buffer = new_buffer; + } + + if (!unix_host) + return (locerr < 0 ? errno_from_unix( errno ) : host_errno_from_unix( locerr )); + + ret = hostent_from_unix( unix_host, host, size ); + + free( unix_buffer ); + return ret; +} +#else +static int CDECL unix_gethostbyname( const char *name, struct WS_hostent *const host, unsigned int *size ) +{ + struct hostent *unix_host; + int ret; + + pthread_mutex_lock( &host_mutex ); + + if (!(unix_host = gethostbyname( name ))) + { + ret = (h_errno < 0 ? errno_from_unix( errno ) : host_errno_from_unix( h_errno )); + pthread_mutex_unlock( &host_mutex ); + return ret; + } + + ret = hostent_from_unix( unix_host, host, size ); + + pthread_mutex_unlock( &host_mutex ); + return ret; +} +#endif + + static const struct unix_funcs funcs = { unix_getaddrinfo, unix_gethostbyaddr, + unix_gethostbyname, }; NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) diff --git a/dlls/ws2_32/ws2_32_private.h b/dlls/ws2_32/ws2_32_private.h index f9224306a7c..38454e1a9ba 100644 --- a/dlls/ws2_32/ws2_32_private.h +++ b/dlls/ws2_32/ws2_32_private.h @@ -202,6 +202,7 @@ struct unix_funcs struct WS(addrinfo) *info, unsigned int *size ); int (CDECL *gethostbyaddr)( const void *addr, int len, int family, struct WS(hostent) *host, unsigned int *size ); + int (CDECL *gethostbyname)( const char *name, struct WS(hostent) *host, unsigned int *size ); }; extern const struct unix_funcs *unix_funcs;

1 0

Zebediah Figura : ws2_32: Move gethostbyaddr() to the Unix library.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: wine Branch: master Commit: 684f03c4a3f7b1290ce69f6db133b6ecf27139ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=684f03c4a3f7b1290ce69f6d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 3 23:53:35 2021 -0500 ws2_32: Move gethostbyaddr() to the Unix library. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/protocol.c | 66 ++++---------------- dlls/ws2_32/unixlib.c | 141 +++++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/ws2_32_private.h | 2 + 3 files changed, 154 insertions(+), 55 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index eb97e0d612d..2a7200ee137 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -67,19 +67,6 @@ static const int ws_af_map[][2] = {FROM_PROTOCOL_INFO, FROM_PROTOCOL_INFO}, }; -static int convert_af_w2u( int family ) -{ - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(ws_af_map); i++) - { - if (ws_af_map[i][0] == family) - return ws_af_map[i][1]; - } - FIXME( "unhandled Windows address family %d\n", family ); - return -1; -} - static int convert_af_u2w( int family ) { unsigned int i; @@ -839,54 +826,23 @@ static struct WS_hostent *hostent_from_unix( const struct hostent *p_he ) /*********************************************************************** * gethostbyaddr (ws2_32.51) */ -struct WS_hostent * WINAPI WS_gethostbyaddr( const char *addr, int len, int type ) +struct WS_hostent * WINAPI WS_gethostbyaddr( const char *addr, int len, int family ) { - struct WS_hostent *retval = NULL; - struct hostent *host; - int unixtype = convert_af_w2u(type); - const char *paddr = addr; - unsigned long loopback; -#ifdef HAVE_LINUX_GETHOSTBYNAME_R_6 - char *extrabuf; - int ebufsize = 1024; - struct hostent hostentry; - int locerr = ENOBUFS; -#endif + unsigned int size = 1024; + struct WS_hostent *host; + int ret; - /* convert back the magic loopback address if necessary */ - if (unixtype == AF_INET && len == 4 && !memcmp( addr, magic_loopback_addr, 4 )) - { - loopback = htonl( INADDR_LOOPBACK ); - paddr = (char *)&loopback; - } + if (!(host = get_hostent_buffer( size ))) + return NULL; -#ifdef HAVE_LINUX_GETHOSTBYNAME_R_6 - host = NULL; - extrabuf = HeapAlloc( GetProcessHeap(), 0, ebufsize ); - while (extrabuf) + while ((ret = unix_funcs->gethostbyaddr( addr, len, family, host, &size )) == ERROR_INSUFFICIENT_BUFFER) { - int res = gethostbyaddr_r( paddr, len, unixtype, &hostentry, extrabuf, ebufsize, &host, &locerr ); - if (res != ERANGE) break; - ebufsize *= 2; - extrabuf = HeapReAlloc( GetProcessHeap(), 0, extrabuf, ebufsize ); + if (!(host = get_hostent_buffer( size ))) + return NULL; } - if (host) - retval = hostent_from_unix( host ); - else - SetLastError( (locerr < 0) ? sock_get_error( errno ) : host_errno_from_unix( locerr ) ); - HeapFree( GetProcessHeap(), 0, extrabuf ); -#else - EnterCriticalSection( &csWSgetXXXbyYYY ); - host = gethostbyaddr( paddr, len, unixtype ); - if (host) - retval = hostent_from_unix( host ); - else - SetLastError( (h_errno < 0) ? sock_get_error( errno ) : host_errno_from_unix( h_errno ) ); - LeaveCriticalSection( &csWSgetXXXbyYYY ); -#endif - TRACE( "ptr %p, len %d, type %d ret %p\n", addr, len, type, retval ); - return retval; + SetLastError( ret ); + return ret ? NULL : host; } diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index 2ed8ce2f762..2423ef5aa2e 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -28,6 +28,7 @@ #include "config.h" #include <errno.h> +#include <pthread.h> #include <stdarg.h> #include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H @@ -75,6 +76,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(winsock); +#ifndef HAVE_LINUX_GETHOSTBYNAME_R_6 +static pthread_mutex_t host_mutex = PTHREAD_MUTEX_INITIALIZER; +#endif + #define MAP(x) {WS_ ## x, x} static const int addrinfo_flag_map[][2] = @@ -319,6 +324,24 @@ static unsigned int errno_from_unix( int err ) } } +static UINT host_errno_from_unix( int err ) +{ + WARN( "%d\n", err ); + + switch (err) + { + case HOST_NOT_FOUND: return WSAHOST_NOT_FOUND; + case TRY_AGAIN: return WSATRY_AGAIN; + case NO_RECOVERY: return WSANO_RECOVERY; + case NO_DATA: return WSANO_DATA; + case ENOBUFS: return WSAENOBUFS; + case 0: return 0; + default: + WARN( "Unknown h_errno %d!\n", err ); + return WSAEOPNOTSUPP; + } +} + static int addrinfo_err_from_unix( int err ) { switch (err) @@ -595,9 +618,127 @@ static int CDECL unix_getaddrinfo( const char *node, const char *service, const #endif } + +static int hostent_from_unix( const struct hostent *unix_host, struct WS_hostent *host, unsigned int *const size ) +{ + unsigned int needed_size = sizeof( struct WS_hostent ), alias_count = 0, addr_count = 0, i; + char *p; + + needed_size += strlen( unix_host->h_name ); + + for (alias_count = 0; unix_host->h_aliases[alias_count] != NULL; ++alias_count) + needed_size += sizeof(char *) + strlen( unix_host->h_aliases[alias_count] ) + 1; + needed_size += sizeof(char *); /* null terminator */ + + for (addr_count = 0; unix_host->h_addr_list[addr_count] != NULL; ++addr_count) + needed_size += sizeof(char *) + unix_host->h_length; + needed_size += sizeof(char *); /* null terminator */ + + if (*size < needed_size) + { + *size = needed_size; + return ERROR_INSUFFICIENT_BUFFER; + } + + memset( host, 0, needed_size ); + + /* arrange the memory in the same order as windows >= XP */ + + host->h_addrtype = family_from_unix( unix_host->h_addrtype ); + host->h_length = unix_host->h_length; + + p = (char *)(host + 1); + host->h_aliases = (char **)p; + p += (alias_count + 1) * sizeof(char *); + host->h_addr_list = (char **)p; + p += (addr_count + 1) * sizeof(char *); + + for (i = 0; i < addr_count; ++i) + { + host->h_addr_list[i] = p; + memcpy( host->h_addr_list[i], unix_host->h_addr_list[i], unix_host->h_length ); + p += unix_host->h_length; + } + + for (i = 0; i < alias_count; ++i) + { + size_t len = strlen( unix_host->h_aliases[i] ) + 1; + + host->h_aliases[i] = p; + memcpy( host->h_aliases[i], unix_host->h_aliases[i], len ); + p += len; + } + + host->h_name = p; + strcpy( host->h_name, unix_host->h_name ); + + return 0; +} + + +static int CDECL unix_gethostbyaddr( const void *addr, int len, int family, + struct WS_hostent *const host, unsigned int *size ) +{ + const struct in_addr loopback = { htonl( INADDR_LOOPBACK ) }; + int unix_family = family_to_unix( family ); + struct hostent *unix_host; + int ret; + + if (family == WS_AF_INET && len == 4 && !memcmp( addr, magic_loopback_addr, 4 )) + addr = &loopback; + +#ifdef HAVE_LINUX_GETHOSTBYNAME_R_6 + { + char *unix_buffer, *new_buffer; + struct hostent stack_host; + int unix_size = 1024; + int locerr; + + if (!(unix_buffer = malloc( unix_size ))) + return WSAENOBUFS; + + while (gethostbyaddr_r( addr, len, unix_family, &stack_host, unix_buffer, + unix_size, &unix_host, &locerr ) == ERANGE) + { + unix_size *= 2; + if (!(new_buffer = realloc( unix_buffer, unix_size ))) + { + free( unix_buffer ); + return WSAENOBUFS; + } + unix_buffer = new_buffer; + } + + if (!unix_host) + return (locerr < 0 ? errno_from_unix( errno ) : host_errno_from_unix( locerr )); + + ret = hostent_from_unix( unix_host, host, size ); + + free( unix_buffer ); + return ret; + } +#else + pthread_mutex_lock( &host_mutex ); + + if (!(unix_host = gethostbyaddr( addr, len, unix_family ))) + { + ret = (h_errno < 0 ? errno_from_unix( errno ) : host_errno_from_unix( h_errno )); + pthread_mutex_unlock( &host_mutex ); + return ret; + } + + ret = hostent_from_unix( unix_host, host, size ); + + pthread_mutex_unlock( &host_mutex ); + return ret; +#endif +} + + static const struct unix_funcs funcs = { unix_getaddrinfo, + unix_gethostbyaddr, }; NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) diff --git a/dlls/ws2_32/ws2_32_private.h b/dlls/ws2_32/ws2_32_private.h index 5c0f0af5bd9..f9224306a7c 100644 --- a/dlls/ws2_32/ws2_32_private.h +++ b/dlls/ws2_32/ws2_32_private.h @@ -200,6 +200,8 @@ struct unix_funcs { int (CDECL *getaddrinfo)( const char *node, const char *service, const struct WS(addrinfo) *hints, struct WS(addrinfo) *info, unsigned int *size ); + int (CDECL *gethostbyaddr)( const void *addr, int len, int family, + struct WS(hostent) *host, unsigned int *size ); }; extern const struct unix_funcs *unix_funcs;

1 0

Zebediah Figura : ws2_32: Allocate the addrinfo buffer on the PE side.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: wine Branch: master Commit: d6555b966ecb80da673a20bdfea0a1562187c937 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6555b966ecb80da673a20bd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 3 23:53:34 2021 -0500 ws2_32: Allocate the addrinfo buffer on the PE side. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/protocol.c | 44 +++++++++++++++++++------- dlls/ws2_32/unixlib.c | 75 +++++++++++++++++++------------------------- dlls/ws2_32/ws2_32_private.h | 4 +-- 3 files changed, 67 insertions(+), 56 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 7b6e68555b0..eb97e0d612d 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -130,6 +130,33 @@ static char *get_fqdn(void) return ret; } +/* call Unix getaddrinfo, allocating a large enough buffer */ +static int do_getaddrinfo( const char *node, const char *service, + const struct WS_addrinfo *hints, struct WS_addrinfo **info ) +{ + struct WS_addrinfo *buffer, *new_buffer; + unsigned int size = 1024; + int ret; + + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, size ))) + return WSA_NOT_ENOUGH_MEMORY; + + while ((ret = unix_funcs->getaddrinfo( node, service, hints, buffer, &size )) == ERROR_INSUFFICIENT_BUFFER) + { + if (!(new_buffer = HeapReAlloc( GetProcessHeap(), 0, buffer, size ))) + { + HeapFree( GetProcessHeap(), 0, buffer ); + return WSA_NOT_ENOUGH_MEMORY; + } + buffer = new_buffer; + } + + if (!ret) + *info = buffer; + else + HeapFree( GetProcessHeap(), 0, buffer ); + return ret; +} /*********************************************************************** @@ -173,7 +200,7 @@ int WINAPI WS_getaddrinfo( const char *node, const char *service, } } - ret = unix_funcs->getaddrinfo( node, service, hints, info ); + ret = do_getaddrinfo( node, service, hints, info ); if (ret && (!hints || !(hints->ai_flags & WS_AI_NUMERICHOST)) && node) { @@ -188,7 +215,7 @@ int WINAPI WS_getaddrinfo( const char *node, const char *service, * by sending a NULL host and avoid sending a NULL servname too because that * is invalid */ ERR_(winediag)( "Failed to resolve your host name IP\n" ); - ret = unix_funcs->getaddrinfo( NULL, service, hints, info ); + ret = do_getaddrinfo( NULL, service, hints, info ); if (!ret && hints && (hints->ai_flags & WS_AI_CANONNAME) && *info && !(*info)->ai_canonname) { WS_freeaddrinfo( *info ); @@ -542,18 +569,11 @@ int WINAPI GetAddrInfoW(const WCHAR *nodename, const WCHAR *servname, const ADDR /*********************************************************************** * freeaddrinfo (ws2_32.@) */ -void WINAPI WS_freeaddrinfo( struct WS_addrinfo *res ) +void WINAPI WS_freeaddrinfo( struct WS_addrinfo *info ) { - while (res) - { - struct WS_addrinfo *next; + TRACE( "%p\n", info ); - HeapFree( GetProcessHeap(), 0, res->ai_canonname ); - HeapFree( GetProcessHeap(), 0, res->ai_addr ); - next = res->ai_next; - HeapFree( GetProcessHeap(), 0, res ); - res = next; - } + HeapFree( GetProcessHeap(), 0, info ); } diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index 4b63e8e6415..2ed8ce2f762 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -468,17 +468,16 @@ static BOOL addrinfo_in_list( const struct WS_addrinfo *list, const struct WS_ad return FALSE; } -static int CDECL unix_getaddrinfo( const char *node, const char *service, - const struct WS_addrinfo *hints, struct WS_addrinfo **info ) +static int CDECL unix_getaddrinfo( const char *node, const char *service, const struct WS_addrinfo *hints, + struct WS_addrinfo *info, unsigned int *size ) { #ifdef HAVE_GETADDRINFO struct addrinfo unix_hints = {0}; struct addrinfo *unix_info, *src; struct WS_addrinfo *dst, *prev = NULL; + unsigned int needed_size = 0; int ret; - *info = NULL; - /* servname tweak required by OSX and BSD kernels */ if (service && !service[0]) service = "0"; @@ -528,12 +527,28 @@ static int CDECL unix_getaddrinfo( const char *node, const char *service, if (ret) return addrinfo_err_from_unix( ret ); - *info = NULL; + for (src = unix_info; src != NULL; src = src->ai_next) + { + needed_size += sizeof(struct WS_addrinfo); + if (src->ai_canonname) + needed_size += strlen( src->ai_canonname ) + 1; + needed_size += sockaddr_from_unix( (const union unix_sockaddr *)src->ai_addr, NULL, 0 ); + } + + if (*size < needed_size) + { + *size = needed_size; + freeaddrinfo( unix_info ); + return ERROR_INSUFFICIENT_BUFFER; + } + + dst = info; + + memset( info, 0, needed_size ); for (src = unix_info; src != NULL; src = src->ai_next) { - if (!(dst = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*dst) ))) - goto fail; + void *next = dst + 1; dst->ai_flags = addrinfo_flags_from_unix( src->ai_flags ); dst->ai_family = family_from_unix( src->ai_family ); @@ -549,55 +564,31 @@ static int CDECL unix_getaddrinfo( const char *node, const char *service, } if (src->ai_canonname) { - if (!(dst->ai_canonname = RtlAllocateHeap( GetProcessHeap(), 0, strlen( src->ai_canonname ) + 1 ))) - { - RtlFreeHeap( GetProcessHeap(), 0, dst ); - goto fail; - } - strcpy( dst->ai_canonname, src->ai_canonname ); + size_t len = strlen( src->ai_canonname ) + 1; + + dst->ai_canonname = next; + memcpy( dst->ai_canonname, src->ai_canonname, len ); + next = dst->ai_canonname + len; } dst->ai_addrlen = sockaddr_from_unix( (const union unix_sockaddr *)src->ai_addr, NULL, 0 ); - if (!(dst->ai_addr = RtlAllocateHeap( GetProcessHeap(), 0, dst->ai_addrlen ))) - { - RtlFreeHeap( GetProcessHeap(), 0, dst->ai_canonname ); - RtlFreeHeap( GetProcessHeap(), 0, dst ); - goto fail; - } + dst->ai_addr = next; sockaddr_from_unix( (const union unix_sockaddr *)src->ai_addr, dst->ai_addr, dst->ai_addrlen ); + next = (char *)dst->ai_addr + dst->ai_addrlen; - if (addrinfo_in_list( *info, dst )) - { - RtlFreeHeap( GetProcessHeap(), 0, dst->ai_canonname ); - RtlFreeHeap( GetProcessHeap(), 0, dst->ai_addr ); - RtlFreeHeap( GetProcessHeap(), 0, dst ); - } - else + if (dst == info || !addrinfo_in_list( info, dst )) { if (prev) prev->ai_next = dst; - else - *info = dst; prev = dst; + dst = next; } } + dst->ai_next = NULL; + freeaddrinfo( unix_info ); return 0; - -fail: - dst = *info; - while (dst) - { - struct WS_addrinfo *next; - - RtlFreeHeap( GetProcessHeap(), 0, dst->ai_canonname ); - RtlFreeHeap( GetProcessHeap(), 0, dst->ai_addr ); - next = dst->ai_next; - RtlFreeHeap( GetProcessHeap(), 0, dst ); - dst = next; - } - return WS_EAI_MEMORY; #else FIXME( "getaddrinfo() not found during build time\n" ); return WS_EAI_FAIL; diff --git a/dlls/ws2_32/ws2_32_private.h b/dlls/ws2_32/ws2_32_private.h index 5fd083eac31..5c0f0af5bd9 100644 --- a/dlls/ws2_32/ws2_32_private.h +++ b/dlls/ws2_32/ws2_32_private.h @@ -198,8 +198,8 @@ struct per_thread_data *get_per_thread_data(void) DECLSPEC_HIDDEN; struct unix_funcs { - int (CDECL *getaddrinfo)( const char *node, const char *service, - const struct WS(addrinfo) *hints, struct WS(addrinfo) **info ); + int (CDECL *getaddrinfo)( const char *node, const char *service, const struct WS(addrinfo) *hints, + struct WS(addrinfo) *info, unsigned int *size ); }; extern const struct unix_funcs *unix_funcs;

1 0

Zebediah Figura : ws2_32: Move getaddrinfo() support to a new Unix library.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: wine Branch: master Commit: e58405000c6037d9d281ec06a87bf72c5fc79866 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e58405000c6037d9d281ec06… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 3 23:53:33 2021 -0500 ws2_32: Move getaddrinfo() support to a new Unix library. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/Makefile.in | 3 +- dlls/ws2_32/protocol.c | 316 +++------------------- dlls/ws2_32/socket.c | 150 +---------- dlls/ws2_32/tests/protocol.c | 4 +- dlls/ws2_32/unixlib.c | 618 +++++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/ws2_32_private.h | 12 +- 6 files changed, 673 insertions(+), 430 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e58405000c6037d9d281…

1 0

Alexandre Julliard : ntdll: Move the loading of the global options to the Unix side.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: wine Branch: master Commit: 0bce76d83077960763f6e71a0ecf9757ce08325c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bce76d83077960763f6e71a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 4 11:45:51 2021 +0200 ntdll: Move the loading of the global options to the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 18 ++++++-- dlls/ntdll/heap.c | 4 +- dlls/ntdll/loader.c | 22 ---------- dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/unix/env.c | 100 +++++++++++++++++++++++++++++++++++++----- 5 files changed, 105 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0bce76d83077960763f6…

1 0

Alexandre Julliard : ntdll: Store the 32-bit PEB in the process initial 32-bit context.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: wine Branch: master Commit: 44de9743bfeb088b0aa038da82ba118ce4ab30a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44de9743bfeb088b0aa038da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 4 12:42:44 2021 +0200 ntdll: Store the 32-bit PEB in the process initial 32-bit context. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 2769ebf24d6..bfc5b34a464 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2929,7 +2929,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B { wow_context->ContextFlags = CONTEXT_I386_ALL; wow_context->Eax = (ULONG_PTR)entry; - wow_context->Ebx = (ULONG_PTR)arg; + wow_context->Ebx = (arg == peb ? get_wow_teb( teb )->Peb : (ULONG_PTR)arg); wow_context->Esp = get_wow_teb( teb )->Tib.StackBase - 16; wow_context->Eip = pLdrSystemDllInitBlock->pRtlUserThreadStart; wow_context->SegCs = cs32_sel;

1 0

Oleg Dubinskiy : include: Add RASCREDENTIALSA/W structures.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: wine Branch: master Commit: 2d8fa6b4d14792296383af616a387d39a4d1479b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d8fa6b4d14792296383af61… Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> Date: Tue Aug 3 23:40:54 2021 -0600 include: Add RASCREDENTIALSA/W structures. Signed-off-by: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ras.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/ras.h b/include/ras.h index a8c04da2b6d..210a2a45f09 100644 --- a/include/ras.h +++ b/include/ras.h @@ -372,6 +372,27 @@ typedef struct tagRASCONNSTATUSW DECL_WINELIB_TYPE_AW(RASCONNSTATUS) +typedef struct tagRASCREDENTIALSA +{ + DWORD dwSize; + DWORD dwMask; + CHAR szUserName[UNLEN + 1]; + CHAR szPassword[PWLEN + 1]; + CHAR szDomain[DNLEN + 1]; +} RASCREDENTIALSA, *LPRASCREDENTIALSA; + +typedef struct tagRASCREDENTIALSW +{ + DWORD dwSize; + DWORD dwMask; + WCHAR szUserName[UNLEN + 1]; + WCHAR szPassword[PWLEN + 1]; + WCHAR szDomain[DNLEN + 1]; +} RASCREDENTIALSW, *LPRASCREDENTIALSW; + +DECL_WINELIB_TYPE_AW(RASCREDENTIALS) +DECL_WINELIB_TYPE_AW(LPRASCREDENTIALS) + typedef enum tagRASPROJECTION { RASP_Amb = 0x10000,

1 0

Zebediah Figura : ws2_32: Get rid of supported_pf().
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: wine Branch: master Commit: c07da78a2e3ceb69019e04c1a70dfacf761c8bdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=c07da78a2e3ceb69019e04c1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 3 23:53:32 2021 -0500 ws2_32: Get rid of supported_pf(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 40e4ecb9325..2bcd15463f8 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -727,26 +727,6 @@ void WINAPI WSASetLastError(INT iError) { SetLastError(iError); } -static inline BOOL supported_pf(int pf) -{ - switch (pf) - { - case WS_AF_INET: - case WS_AF_INET6: - return TRUE; -#ifdef HAS_IPX - case WS_AF_IPX: - return TRUE; -#endif -#ifdef HAS_IRDA - case WS_AF_IRDA: - return TRUE; -#endif - default: - return FALSE; - } -} - /**********************************************************************/ /* Returns the length of the converted address if successful, 0 if it was too

1 0

Zebediah Figura : build: Use noinst_HEADERS instead of EXTRA_DIST to track demo and test headers.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: vkd3d Branch: master Commit: 6d687521d08d8a986f3aae5133820c574a711eeb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6d687521d08d8a986f3aae5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 3 22:52:14 2021 -0500 build: Use noinst_HEADERS instead of EXTRA_DIST to track demo and test headers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 8dd803d..8cbcd26 100644 --- a/Makefile.am +++ b/Makefile.am @@ -299,7 +299,7 @@ demos_triangle_CFLAGS = $(DEMOS_CFLAGS) demos_triangle_LDADD = $(DEMOS_LDADD) endif -EXTRA_DIST += $(vkd3d_test_headers) $(vkd3d_demos_headers) +noinst_HEADERS = $(vkd3d_test_headers) $(vkd3d_demos_headers) VKD3D_V_WIDL = $(vkd3d_v_widl_(a)AM_V@) vkd3d_v_widl_ = $(vkd3d_v_widl_(a)AM_DEFAULT_V@)

1 0

Zebediah Figura : build: Add hlsl.h and preproc.h to libvkd3d_shader_la_SOURCES.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: vkd3d Branch: master Commit: 587e85af5b292019fa9c5b8ae30a2f47072dc228 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=587e85af5b292019fa9c5b8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 3 22:52:12 2021 -0500 build: Add hlsl.h and preproc.h to libvkd3d_shader_la_SOURCES. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.am b/Makefile.am index 5b3c4ff..8dd803d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -170,7 +170,9 @@ libvkd3d_shader_la_SOURCES = \ libs/vkd3d-shader/checksum.c \ libs/vkd3d-shader/dxbc.c \ libs/vkd3d-shader/hlsl.c \ + libs/vkd3d-shader/hlsl.h \ libs/vkd3d-shader/hlsl_codegen.c \ + libs/vkd3d-shader/preproc.h \ libs/vkd3d-shader/spirv.c \ libs/vkd3d-shader/trace.c \ libs/vkd3d-shader/vkd3d_shader.map \

1 0