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

Huw Davies : iphlpapi: Move the loopback check to get_dns_server_list().
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: wine Branch: master Commit: 131307746d83ba8ad855b2fd7af9ec1bb48316d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=131307746d83ba8ad855b2fd… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 5 09:56:45 2021 +0100 iphlpapi: Move the loopback check to get_dns_server_list(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 55 ++++++++++++++++++++---------------------- dlls/iphlpapi/tests/iphlpapi.c | 4 --- 2 files changed, 26 insertions(+), 33 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 13b5fa4f742..a790d3339ac 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2343,13 +2343,15 @@ DWORD WINAPI GetIpNetTable(PMIB_IPNETTABLE pIpNetTable, PULONG pdwSize, BOOL bOr * Returns ERROR_BUFFER_OVERFLOW if *len is insufficient, * ERROR_SUCCESS otherwise. */ -static DWORD get_dns_server_list( IP_ADDR_STRING *list, IP_ADDR_STRING *second, DWORD *len ) +static DWORD get_dns_server_list( const NET_LUID *luid, IP_ADDR_STRING *list, IP_ADDR_STRING *second, DWORD *len ) { char buf[FIELD_OFFSET(IP4_ARRAY, AddrArray[3])]; IP4_ARRAY *servers = (IP4_ARRAY *)buf; DWORD needed, num, err, i, array_len = sizeof(buf); IP_ADDR_STRING *ptr; + if (luid && luid->Info.IfType == MIB_IF_TYPE_LOOPBACK) return ERROR_NO_DATA; + for (;;) { err = DnsQueryConfig( DnsConfigDnsServerList, 0, NULL, NULL, servers, &array_len ); @@ -2415,7 +2417,7 @@ DWORD WINAPI GetNetworkParams(PFIXED_INFO pFixedInfo, PULONG pOutBufLen) if (!pOutBufLen) return ERROR_INVALID_PARAMETER; - get_dns_server_list(NULL, NULL, &serverListSize); + get_dns_server_list( NULL, NULL, NULL, &serverListSize ); size = sizeof(FIXED_INFO) + serverListSize - sizeof(IP_ADDR_STRING); if (!pFixedInfo || *pOutBufLen < size) { *pOutBufLen = size; @@ -2427,9 +2429,8 @@ DWORD WINAPI GetNetworkParams(PFIXED_INFO pFixedInfo, PULONG pOutBufLen) GetComputerNameExA(ComputerNameDnsHostname, pFixedInfo->HostName, &size); size = sizeof(pFixedInfo->DomainName); GetComputerNameExA(ComputerNameDnsDomain, pFixedInfo->DomainName, &size); - get_dns_server_list(&pFixedInfo->DnsServerList, - (PIP_ADDR_STRING)((BYTE *)pFixedInfo + sizeof(FIXED_INFO)), - &serverListSize); + get_dns_server_list( NULL, &pFixedInfo->DnsServerList, (IP_ADDR_STRING *)(pFixedInfo + 1), + &serverListSize ); /* Assume the first DNS server in the list is the "current" DNS server: */ pFixedInfo->CurrentDnsServer = &pFixedInfo->DnsServerList; pFixedInfo->NodeType = HYBRID_NODETYPE; @@ -2493,35 +2494,31 @@ DWORD WINAPI GetNumberOfInterfaces( DWORD *count ) * Success: NO_ERROR * Failure: error code from winerror.h */ -DWORD WINAPI GetPerAdapterInfo(ULONG IfIndex, PIP_PER_ADAPTER_INFO pPerAdapterInfo, PULONG pOutBufLen) +DWORD WINAPI GetPerAdapterInfo( ULONG index, IP_PER_ADAPTER_INFO *info, ULONG *size ) { - ULONG bytesNeeded = sizeof(IP_PER_ADAPTER_INFO), serverListSize = 0; - DWORD ret = NO_ERROR; + DWORD needed = sizeof(*info), dns_size; + NET_LUID luid; - TRACE("(IfIndex %d, pPerAdapterInfo %p, pOutBufLen %p)\n", IfIndex, pPerAdapterInfo, pOutBufLen); + TRACE( "(index %d, info %p, size %p)\n", index, info, size ); - if (!pOutBufLen) return ERROR_INVALID_PARAMETER; + if (!size) return ERROR_INVALID_PARAMETER; + if (ConvertInterfaceIndexToLuid( index, &luid )) return ERROR_NO_DATA; - if (!isIfIndexLoopback(IfIndex)) { - get_dns_server_list(NULL, NULL, &serverListSize); - if (serverListSize > sizeof(IP_ADDR_STRING)) - bytesNeeded += serverListSize - sizeof(IP_ADDR_STRING); - } - if (!pPerAdapterInfo || *pOutBufLen < bytesNeeded) - { - *pOutBufLen = bytesNeeded; - return ERROR_BUFFER_OVERFLOW; - } + if (get_dns_server_list( &luid, NULL, NULL, &dns_size ) == ERROR_BUFFER_OVERFLOW) + needed += dns_size - sizeof(IP_ADDR_STRING); - memset(pPerAdapterInfo, 0, bytesNeeded); - if (!isIfIndexLoopback(IfIndex)) { - ret = get_dns_server_list(&pPerAdapterInfo->DnsServerList, - (PIP_ADDR_STRING)((PBYTE)pPerAdapterInfo + sizeof(IP_PER_ADAPTER_INFO)), - &serverListSize); - /* Assume the first DNS server in the list is the "current" DNS server: */ - pPerAdapterInfo->CurrentDnsServer = &pPerAdapterInfo->DnsServerList; - } - return ret; + if (!info || *size < needed) + { + *size = needed; + return ERROR_BUFFER_OVERFLOW; + } + + memset( info, 0, needed ); + get_dns_server_list( &luid, &info->DnsServerList, (IP_ADDR_STRING *)(info + 1), &dns_size ); + info->CurrentDnsServer = &info->DnsServerList; + + /* FIXME Autoconfig: get unicast addresses and compare to 169.254.x.x */ + return ERROR_SUCCESS; } diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index e5a9994fbd5..d439f71069b 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1213,10 +1213,6 @@ static void testGetPerAdapterInfo(void) void *buffer; ret = GetPerAdapterInfo(1, NULL, NULL); - if (ret == ERROR_NOT_SUPPORTED) { - skip("GetPerAdapterInfo is not supported\n"); - return; - } ok( ret == ERROR_INVALID_PARAMETER, "got %u instead of ERROR_INVALID_PARAMETER\n", ret ); needed = 0xdeadbeef; ret = GetPerAdapterInfo(1, NULL, &needed);

1 0

Huw Davies : iphlpapi: Add support for the EnableRouting member.
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: wine Branch: master Commit: b45b4048cfdae60edfce6e05a66e2410c2db2cf2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b45b4048cfdae60edfce6e05… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 5 09:56:46 2021 +0100 iphlpapi: Add support for the EnableRouting member. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 86 +++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 45 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index a790d3339ac..6a934f926d1 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2395,64 +2395,60 @@ err: * Get the network parameters for the local computer. * * PARAMS - * pFixedInfo [Out] buffer for network parameters - * pOutBufLen [In/Out] length of output buffer + * info [Out] buffer for network parameters + * size [In/Out] length of output buffer * * RETURNS * Success: NO_ERROR * Failure: error code from winerror.h * * NOTES - * If pOutBufLen is less than required, the function will return - * ERROR_INSUFFICIENT_BUFFER, and pOutBufLen will be set to the required byte + * If size is less than required, the function will return + * ERROR_INSUFFICIENT_BUFFER, and size will be set to the required byte * size. */ -DWORD WINAPI GetNetworkParams(PFIXED_INFO pFixedInfo, PULONG pOutBufLen) +DWORD WINAPI GetNetworkParams( FIXED_INFO *info, ULONG *size ) { - DWORD ret, size, serverListSize; - LONG regReturn; - HKEY hKey; + DWORD needed = sizeof(*info), dns_size, err; + MIB_IPSTATS ip_stats; + HKEY key; - TRACE("pFixedInfo %p, pOutBufLen %p\n", pFixedInfo, pOutBufLen); - if (!pOutBufLen) - return ERROR_INVALID_PARAMETER; + TRACE( "info %p, size %p\n", info, size ); + if (!size) return ERROR_INVALID_PARAMETER; - get_dns_server_list( NULL, NULL, NULL, &serverListSize ); - size = sizeof(FIXED_INFO) + serverListSize - sizeof(IP_ADDR_STRING); - if (!pFixedInfo || *pOutBufLen < size) { - *pOutBufLen = size; - return ERROR_BUFFER_OVERFLOW; - } + if (get_dns_server_list( NULL, NULL, NULL, &dns_size ) == ERROR_BUFFER_OVERFLOW) + needed += dns_size - sizeof(IP_ADDR_STRING); + if (!info || *size < needed) + { + *size = needed; + return ERROR_BUFFER_OVERFLOW; + } - memset(pFixedInfo, 0, size); - size = sizeof(pFixedInfo->HostName); - GetComputerNameExA(ComputerNameDnsHostname, pFixedInfo->HostName, &size); - size = sizeof(pFixedInfo->DomainName); - GetComputerNameExA(ComputerNameDnsDomain, pFixedInfo->DomainName, &size); - get_dns_server_list( NULL, &pFixedInfo->DnsServerList, (IP_ADDR_STRING *)(pFixedInfo + 1), - &serverListSize ); - /* Assume the first DNS server in the list is the "current" DNS server: */ - pFixedInfo->CurrentDnsServer = &pFixedInfo->DnsServerList; - pFixedInfo->NodeType = HYBRID_NODETYPE; - regReturn = RegOpenKeyExA(HKEY_LOCAL_MACHINE, - "SYSTEM\\CurrentControlSet\\Services\\VxD\\MSTCP", 0, KEY_READ, &hKey); - if (regReturn != ERROR_SUCCESS) - regReturn = RegOpenKeyExA(HKEY_LOCAL_MACHINE, - "SYSTEM\\CurrentControlSet\\Services\\NetBT\\Parameters", 0, KEY_READ, - &hKey); - if (regReturn == ERROR_SUCCESS) - { - DWORD size = sizeof(pFixedInfo->ScopeId); - - RegQueryValueExA(hKey, "ScopeID", NULL, NULL, (LPBYTE)pFixedInfo->ScopeId, &size); - RegCloseKey(hKey); - } + *size = needed; + memset( info, 0, needed ); + needed = sizeof(info->HostName); + GetComputerNameExA( ComputerNameDnsHostname, info->HostName, &needed ); + needed = sizeof(info->DomainName); + GetComputerNameExA( ComputerNameDnsDomain, info->DomainName, &needed ); + get_dns_server_list( NULL, &info->DnsServerList, (IP_ADDR_STRING *)(info + 1), &dns_size ); + info->CurrentDnsServer = &info->DnsServerList; + info->NodeType = HYBRID_NODETYPE; + err = RegOpenKeyExA( HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Services\\VxD\\MSTCP", + 0, KEY_READ, &key ); + if (err) + err = RegOpenKeyExA( HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Services\\NetBT\\Parameters", + 0, KEY_READ, &key ); + if (!err) + { + needed = sizeof(info->ScopeId); + RegQueryValueExA( key, "ScopeID", NULL, NULL, (BYTE *)info->ScopeId, &needed ); + RegCloseKey( key ); + } - /* FIXME: can check whether routing's enabled in /proc/sys/net/ipv4/ip_forward - I suppose could also check for a listener on port 53 to set EnableDns */ - ret = NO_ERROR; - TRACE("returning %d\n", ret); - return ret; + if (!GetIpStatistics( &ip_stats )) + info->EnableRouting = (ip_stats.u.Forwarding == MIB_IP_FORWARDING); + + return ERROR_SUCCESS; }

1 0

Gerald Pfeifer : nsiproxy: Include sys/types.h.
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: wine Branch: master Commit: 9ddc04c671525c3be62f32e1c07c20017a6124a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ddc04c671525c3be62f32e1… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Aug 5 17:46:23 2021 +0200 nsiproxy: Include sys/types.h. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/ip.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index fa88b8e0819..cb98c6a5206 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -21,6 +21,10 @@ #include "config.h" #include <stdarg.h> +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif + #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif

1 0

Alex Henrie : ntdll: Add missing break to case IPV6_PKTINFO.
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: wine Branch: master Commit: 21752cc9568de4e1c4219b43ca630c3528ca1a84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21752cc9568de4e1c4219b43… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 5 23:26:25 2021 -0600 ntdll: Add missing break to case IPV6_PKTINFO. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 4f1b9a468eb..35c846eb7ae 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -458,6 +458,7 @@ static int convert_control_headers(struct msghdr *hdr, WSABUF *control) ptr = fill_control_message( WS_IPPROTO_IPV6, WS_IPV6_PKTINFO, ptr, &ctlsize, (void *)&data_win, sizeof(data_win) ); if (!ptr) goto error; + break; } #endif /* IPV6_PKTINFO */

1 0

Alex Henrie : include: Add remaining IPv6 socket options.
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: wine Branch: master Commit: 8e1f149ecd7c6288979591b8602f478aa0da2c5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e1f149ecd7c6288979591b8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 5 23:26:26 2021 -0600 include: Add remaining IPv6 socket options. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ws2ipdef.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index 0938db2db9f..d5a4dab6ce0 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -207,6 +207,17 @@ typedef struct WS(in6_pktinfo) { #define IPV6_UNICAST_IF 31 #define IPV6_RTHDR 32 #define IPV6_RECVRTHDR 38 +#define IPV6_TCLASS 39 +#define IPV6_RECVTCLASS 40 +#define IPV6_ECN 50 +#define IPV6_PKTINFO_EX 51 +#define IPV6_WFP_REDIRECT_RECORDS 60 +#define IPV6_WFP_REDIRECT_CONTEXT 70 +#define IPV6_MTU_DISCOVER 71 +#define IPV6_MTU 72 +#define IPV6_NRT_INTERFACE 74 +#define IPV6_RECVERR 75 +#define IPV6_USER_MTU 76 #else #define WS_IPV6_OPTIONS 1 #define WS_IPV6_HDRINCL 2 @@ -231,6 +242,17 @@ typedef struct WS(in6_pktinfo) { #define WS_IPV6_UNICAST_IF 31 #define WS_IPV6_RTHDR 32 #define WS_IPV6_RECVRTHDR 38 +#define WS_IPV6_TCLASS 39 +#define WS_IPV6_RECVTCLASS 40 +#define WS_IPV6_ECN 50 +#define WS_IPV6_PKTINFO_EX 51 +#define WS_IPV6_WFP_REDIRECT_RECORDS 60 +#define WS_IPV6_WFP_REDIRECT_CONTEXT 70 +#define WS_IPV6_MTU_DISCOVER 71 +#define WS_IPV6_MTU 72 +#define WS_IPV6_NRT_INTERFACE 74 +#define WS_IPV6_RECVERR 75 +#define WS_IPV6_USER_MTU 76 #endif /* USE_WS_PREFIX */ #ifndef USE_WS_PREFIX

1 0

Zebediah Figura : ws2_32: Read protocols from the etc/protocol file.
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: wine Branch: master Commit: 8504e40d5b5e7076b998b36e6291515b863482cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=8504e40d5b5e7076b998b36e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 4 21:20:45 2021 -0500 ws2_32: Read protocols from the etc/protocol file. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/Makefile.in | 2 +- dlls/ws2_32/protocol.c | 262 ++++++++++++++++++++++++++++++++++++------------ 2 files changed, 198 insertions(+), 66 deletions(-) diff --git a/dlls/ws2_32/Makefile.in b/dlls/ws2_32/Makefile.in index 77983bba66f..691c8fe1d65 100644 --- a/dlls/ws2_32/Makefile.in +++ b/dlls/ws2_32/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -DUSE_WS_PREFIX MODULE = ws2_32.dll IMPORTLIB = ws2_32 -DELAYIMPORTS = iphlpapi user32 +DELAYIMPORTS = advapi32 iphlpapi user32 EXTRALIBS = $(POLL_LIBS) C_SRCS = \ diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 8b39d5c3274..c1789fb4c77 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -981,33 +981,64 @@ static int list_dup( char **src, char **dst, int item_size ) return p - (char *)dst; } -static const struct -{ - int prot; - const char *names[3]; -} -protocols[] = -{ - { 0, {"ip", "IP"}}, - { 1, {"icmp", "ICMP"}}, - { 3, {"ggp", "GGP"}}, - { 6, {"tcp", "TCP"}}, - { 8, {"egp", "EGP"}}, - {12, {"pup", "PUP"}}, - {17, {"udp", "UDP"}}, - {20, {"hmp", "HMP"}}, - {22, {"xns-idp", "XNS-IDP"}}, - {27, {"rdp", "RDP"}}, - {41, {"ipv6", "IPv6"}}, - {43, {"ipv6-route", "IPv6-Route"}}, - {44, {"ipv6-frag", "IPv6-Frag"}}, - {50, {"esp", "ESP"}}, - {51, {"ah", "AH"}}, - {58, {"ipv6-icmp", "IPv6-ICMP"}}, - {59, {"ipv6-nonxt", "IPv6-NoNxt"}}, - {60, {"ipv6-opts", "IPv6-Opts"}}, - {66, {"rvd", "RVD"}}, -}; + +static char *read_etc_file( const WCHAR *filename, DWORD *ret_size ) +{ + static const WCHAR key_pathW[] = {'S','y','s','t','e','m', + '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', + '\\','S','e','r','v','i','c','e','s', + '\\','t','c','p','i','p', + '\\','P','a','r','a','m','e','t','e','r','s',0}; + static const WCHAR databasepathW[] = {'D','a','t','a','b','a','s','e','P','a','t','h',0}; + static const WCHAR backslashW[] = {'\\',0}; + WCHAR path[MAX_PATH]; + DWORD size = sizeof(path); + HANDLE file; + char *data; + LONG ret; + + if ((ret = RegGetValueW( HKEY_LOCAL_MACHINE, key_pathW, databasepathW, RRF_RT_REG_SZ, NULL, path, &size ))) + { + ERR( "failed to get database path, error %u\n", ret ); + return NULL; + } + lstrcatW( path, backslashW ); + lstrcatW( path, filename ); + + file = CreateFileW( path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL ); + if (file == INVALID_HANDLE_VALUE) + { + ERR( "failed to open %s, error %u\n", debugstr_w( path ), GetLastError() ); + return NULL; + } + + size = GetFileSize( file, NULL ); + if (!(data = HeapAlloc( GetProcessHeap(), 0, size )) || + !ReadFile( file, data, size, ret_size, NULL )) + { + WARN( "failed to read file, error %u\n", GetLastError() ); + HeapFree( GetProcessHeap(), 0, data ); + data = NULL; + } + CloseHandle( file ); + return data; +} + +/* returns "end" if there was no space */ +static char *next_space( const char *p, const char *end ) +{ + while (p < end && !isspace( *p )) + ++p; + return (char *)p; +} + +/* returns "end" if there was no non-space */ +static char *next_non_space( const char *p, const char *end ) +{ + while (p < end && isspace( *p )) + ++p; + return (char *)p; +} static struct WS_protoent *get_protoent_buffer( unsigned int size ) { @@ -1024,18 +1055,111 @@ static struct WS_protoent *get_protoent_buffer( unsigned int size ) return data->pe_buffer; } -static struct WS_protoent *create_protoent( const char *name, char **aliases, int prot ) +/* Parse the first valid line into a protoent structure, returning NULL if + * there is no valid line. Updates cursor to point to the start of the next + * line or the end of the file. */ +static struct WS_protoent *get_next_protocol( const char **cursor, const char *end ) { - struct WS_protoent *ret; - unsigned int size = sizeof(*ret) + strlen( name ) + sizeof(char *) + list_size( aliases, 0 ); + const char *p = *cursor; - if (!(ret = get_protoent_buffer( size ))) return NULL; - ret->p_proto = prot; - ret->p_name = (char *)(ret + 1); - strcpy( ret->p_name, name ); - ret->p_aliases = (char **)ret->p_name + strlen( name ) / sizeof(char *) + 1; - list_dup( aliases, ret->p_aliases, 0 ); - return ret; + while (p < end) + { + const char *line_end, *next_line; + size_t needed_size, line_len; + unsigned int alias_count = 0; + struct WS_protoent *proto; + const char *name; + int number; + char *q; + + for (line_end = p; line_end < end && *line_end != '\n' && *line_end != '#'; ++line_end) + ; + TRACE( "parsing line %s\n", debugstr_an(p, line_end - p) ); + + for (next_line = line_end; next_line < end && *next_line != '\n'; ++next_line) + ; + if (next_line < end) + ++next_line; /* skip over the newline */ + + p = next_non_space( p, line_end ); + if (p == line_end) + { + p = next_line; + continue; + } + + /* parse the name */ + + name = p; + line_len = line_end - name; + + p = next_space( p, line_end ); + if (p == line_end) + { + p = next_line; + continue; + } + + p = next_non_space( p, line_end ); + + /* parse the number */ + + number = atoi( p ); + + p = next_space( p, line_end ); + p = next_non_space( p, line_end ); + + /* we will copy the entire line after the protoent structure, then + * replace spaces with null bytes as necessary */ + + while (p < line_end) + { + ++alias_count; + + p = next_space( p, line_end ); + p = next_non_space( p, line_end ); + } + needed_size = sizeof(*proto) + line_len + 1 + (alias_count + 1) * sizeof(char *); + + if (!(proto = get_protoent_buffer( needed_size ))) + { + SetLastError( WSAENOBUFS ); + return NULL; + } + + proto->p_proto = number; + proto->p_aliases = (char **)(proto + 1); + proto->p_name = (char *)(proto->p_aliases + alias_count + 1); + + memcpy( proto->p_name, name, line_len ); + proto->p_name[line_len] = 0; + + line_end = proto->p_name + line_len; + + q = proto->p_name; + q = next_space( q, line_end ); + *q++ = 0; + q = next_non_space( q, line_end ); + /* skip over the number */ + q = next_space( q, line_end ); + q = next_non_space( q, line_end ); + + alias_count = 0; + while (q < line_end) + { + proto->p_aliases[alias_count++] = q; + q = next_space( q, line_end ); + if (q < line_end) *q++ = 0; + q = next_non_space( q, line_end ); + } + proto->p_aliases[alias_count] = NULL; + + *cursor = next_line; + return proto; + } + + SetLastError( WSANO_DATA ); + return NULL; } @@ -1044,25 +1168,29 @@ static struct WS_protoent *create_protoent( const char *name, char **aliases, in */ struct WS_protoent * WINAPI WS_getprotobyname( const char *name ) { - struct WS_protoent *retval = NULL; - unsigned int i; + static const WCHAR protocolW[] = {'p','r','o','t','o','c','o','l',0}; + struct WS_protoent *proto; + const char *cursor; + char *file; + DWORD size; - for (i = 0; i < ARRAY_SIZE(protocols); i++) + TRACE( "%s\n", debugstr_a(name) ); + + if (!(file = read_etc_file( protocolW, &size ))) { - if (!_strnicmp( protocols[i].names[0], name, -1 )) - { - retval = create_protoent( protocols[i].names[0], (char **)protocols[i].names + 1, - protocols[i].prot ); - break; - } + SetLastError( WSANO_DATA ); + return NULL; } - if (!retval) + + cursor = file; + while ((proto = get_next_protocol( &cursor, file + size ))) { - WARN( "protocol %s not found\n", debugstr_a(name) ); - SetLastError( WSANO_DATA ); + if (!strcasecmp( proto->p_name, name )) + break; } - TRACE( "%s ret %p\n", debugstr_a(name), retval ); - return retval; + + HeapFree( GetProcessHeap(), 0, file ); + return proto; } @@ -1071,25 +1199,29 @@ struct WS_protoent * WINAPI WS_getprotobyname( const char *name ) */ struct WS_protoent * WINAPI WS_getprotobynumber( int number ) { - struct WS_protoent *retval = NULL; - unsigned int i; + static const WCHAR protocolW[] = {'p','r','o','t','o','c','o','l',0}; + struct WS_protoent *proto; + const char *cursor; + char *file; + DWORD size; + + TRACE( "%d\n", number ); - for (i = 0; i < ARRAY_SIZE(protocols); i++) + if (!(file = read_etc_file( protocolW, &size ))) { - if (protocols[i].prot == number) - { - retval = create_protoent( protocols[i].names[0], (char **)protocols[i].names + 1, - protocols[i].prot ); - break; - } + SetLastError( WSANO_DATA ); + return NULL; } - if (!retval) + + cursor = file; + while ((proto = get_next_protocol( &cursor, file + size ))) { - WARN( "protocol %d not found\n", number ); - SetLastError( WSANO_DATA ); + if (proto->p_proto == number) + break; } - TRACE( "%d ret %p\n", number, retval ); - return retval; + + HeapFree( GetProcessHeap(), 0, file ); + return proto; }

1 0

Zebediah Figura : ws2_32: Read services from the etc/services file.
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: wine Branch: master Commit: d3138d711beedf3e06ac64f7ebad2d7f4d205c1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3138d711beedf3e06ac64f7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 4 21:20:46 2021 -0500 ws2_32: Read services from the etc/services file. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/protocol.c | 249 ++++++++++++++++++++++++++++--------------------- 1 file changed, 143 insertions(+), 106 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index c1789fb4c77..46b6a25fc69 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -29,8 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winsock); WINE_DECLARE_DEBUG_CHANNEL(winediag); -DECLARE_CRITICAL_SECTION(csWSgetXXXbyYYY); - static char *get_fqdn(void) { char *ret; @@ -949,39 +947,6 @@ int WINAPI GetHostNameW( WCHAR *name, int namelen ) } -static int list_size( char **list, int item_size ) -{ - int i, size = 0; - if (list) - { - for (i = 0; list[i]; i++) - size += (item_size ? item_size : strlen(list[i]) + 1); - size += (i + 1) * sizeof(char *); - } - return size; -} - -static int list_dup( char **src, char **dst, int item_size ) -{ - char *p; - int i; - - for (i = 0; src[i]; i++) - ; - p = (char *)(dst + i + 1); - - for (i = 0; src[i]; i++) - { - int count = item_size ? item_size : strlen(src[i]) + 1; - memcpy( p, src[i], count ); - dst[i] = p; - p += count; - } - dst[i] = NULL; - return p - (char *)dst; -} - - static char *read_etc_file( const WCHAR *filename, DWORD *ret_size ) { static const WCHAR key_pathW[] = {'S','y','s','t','e','m', @@ -1225,20 +1190,6 @@ struct WS_protoent * WINAPI WS_getprotobynumber( int number ) } -static char *strdup_lower( const char *str ) -{ - char *ret = HeapAlloc( GetProcessHeap(), 0, strlen(str) + 1 ); - int i; - - if (ret) - { - for (i = 0; str[i]; i++) ret[i] = tolower( str[i] ); - ret[i] = 0; - } - else SetLastError( WSAENOBUFS ); - return ret; -} - static struct WS_servent *get_servent_buffer( int size ) { struct per_thread_data *data = get_per_thread_data(); @@ -1253,31 +1204,120 @@ static struct WS_servent *get_servent_buffer( int size ) return data->se_buffer; } -static struct WS_servent *servent_from_unix( const struct servent *p_se ) +/* Parse the first valid line into a servent structure, returning NULL if + * there is no valid line. Updates cursor to point to the start of the next + * line or the end of the file. */ +static struct WS_servent *get_next_service( const char **cursor, const char *end ) { - char *p; - struct WS_servent *p_to; + const char *p = *cursor; - int size = (sizeof(*p_se) + - strlen(p_se->s_proto) + 1 + - strlen(p_se->s_name) + 1 + - list_size(p_se->s_aliases, 0)); + while (p < end) + { + const char *line_end, *next_line; + size_t needed_size, line_len; + unsigned int alias_count = 0; + struct WS_servent *serv; + const char *name; + int port; + char *q; - if (!(p_to = get_servent_buffer( size ))) return NULL; - p_to->s_port = p_se->s_port; + for (line_end = p; line_end < end && *line_end != '\n' && *line_end != '#'; ++line_end) + ; + TRACE( "parsing line %s\n", debugstr_an(p, line_end - p) ); - p = (char *)(p_to + 1); - p_to->s_name = p; - strcpy( p, p_se->s_name ); - p += strlen(p) + 1; + for (next_line = line_end; next_line < end && *next_line != '\n'; ++next_line) + ; + if (next_line < end) + ++next_line; /* skip over the newline */ - p_to->s_proto = p; - strcpy( p, p_se->s_proto ); - p += strlen(p) + 1; + p = next_non_space( p, line_end ); + if (p == line_end) + { + p = next_line; + continue; + } - p_to->s_aliases = (char **)p; - list_dup( p_se->s_aliases, p_to->s_aliases, 0 ); - return p_to; + /* parse the name */ + + name = p; + line_len = line_end - name; + + p = next_space( p, line_end ); + if (p == line_end) + { + p = next_line; + continue; + } + + p = next_non_space( p, line_end ); + + /* parse the port */ + + port = atoi( p ); + p = memchr( p, '/', line_end - p ); + if (!p) + { + p = next_line; + continue; + } + + p = next_space( p, line_end ); + p = next_non_space( p, line_end ); + + /* we will copy the entire line after the servent structure, then + * replace spaces with null bytes as necessary */ + + while (p < line_end) + { + ++alias_count; + + p = next_space( p, line_end ); + p = next_non_space( p, line_end ); + } + needed_size = sizeof(*serv) + line_len + 1 + (alias_count + 1) * sizeof(char *); + + if (!(serv = get_servent_buffer( needed_size ))) + { + SetLastError( WSAENOBUFS ); + return NULL; + } + + serv->s_port = htons( port ); + serv->s_aliases = (char **)(serv + 1); + serv->s_name = (char *)(serv->s_aliases + alias_count + 1); + + memcpy( serv->s_name, name, line_len ); + serv->s_name[line_len] = 0; + + line_end = serv->s_name + line_len; + + q = serv->s_name; + q = next_space( q, line_end ); + *q++ = 0; + q = next_non_space( q, line_end ); + /* skip over the number */ + q = memchr( q, '/', line_end - q ); + serv->s_proto = ++q; + q = next_space( q, line_end ); + if (q < line_end) *q++ = 0; + q = next_non_space( q, line_end ); + + alias_count = 0; + while (q < line_end) + { + serv->s_aliases[alias_count++] = q; + q = next_space( q, line_end ); + if (q < line_end) *q++ = 0; + q = next_non_space( q, line_end ); + } + serv->s_aliases[alias_count] = NULL; + + *cursor = next_line; + return serv; + } + + SetLastError( WSANO_DATA ); + return NULL; } @@ -1286,34 +1326,29 @@ static struct WS_servent *servent_from_unix( const struct servent *p_se ) */ struct WS_servent * WINAPI WS_getservbyname( const char *name, const char *proto ) { - struct WS_servent *retval = NULL; - struct servent *serv; - char *name_str; - char *proto_str = NULL; + static const WCHAR servicesW[] = {'s','e','r','v','i','c','e','s',0}; + struct WS_servent *serv; + const char *cursor; + char *file; + DWORD size; - if (!(name_str = strdup_lower( name ))) return NULL; + TRACE( "name %s, proto %s\n", debugstr_a(name), debugstr_a(proto) ); - if (proto && *proto) + if (!(file = read_etc_file( servicesW, &size ))) { - if (!(proto_str = strdup_lower( proto ))) - { - HeapFree( GetProcessHeap(), 0, name_str ); - return NULL; - } + SetLastError( WSANO_DATA ); + return NULL; } - EnterCriticalSection( &csWSgetXXXbyYYY ); - serv = getservbyname( name_str, proto_str ); - if (serv) - retval = servent_from_unix( serv ); - else - SetLastError( WSANO_DATA ); - LeaveCriticalSection( &csWSgetXXXbyYYY ); + cursor = file; + while ((serv = get_next_service( &cursor, file + size ))) + { + if (!strcasecmp( serv->s_name, name ) && (!proto || !strcasecmp( serv->s_proto, proto ))) + break; + } - HeapFree( GetProcessHeap(), 0, proto_str ); - HeapFree( GetProcessHeap(), 0, name_str ); - TRACE( "%s, %s ret %p\n", debugstr_a(name), debugstr_a(proto), retval ); - return retval; + HeapFree( GetProcessHeap(), 0, file ); + return serv; } @@ -1322,27 +1357,29 @@ struct WS_servent * WINAPI WS_getservbyname( const char *name, const char *proto */ struct WS_servent * WINAPI WS_getservbyport( int port, const char *proto ) { - struct WS_servent *retval = NULL; -#ifdef HAVE_GETSERVBYPORT - struct servent *serv; - char *proto_str = NULL; + static const WCHAR servicesW[] = {'s','e','r','v','i','c','e','s',0}; + struct WS_servent *serv; + const char *cursor; + char *file; + DWORD size; - if (proto && *proto) + TRACE( "port %d, proto %s\n", port, debugstr_a(proto) ); + + if (!(file = read_etc_file( servicesW, &size ))) { - if (!(proto_str = strdup_lower( proto ))) return NULL; + SetLastError( WSANO_DATA ); + return NULL; } - EnterCriticalSection( &csWSgetXXXbyYYY ); - if ((serv = getservbyport( port, proto_str ))) - retval = servent_from_unix( serv ); - else - SetLastError( WSANO_DATA ); - LeaveCriticalSection( &csWSgetXXXbyYYY ); + cursor = file; + while ((serv = get_next_service( &cursor, file + size ))) + { + if (serv->s_port == port && (!proto || !strcasecmp( serv->s_proto, proto ))) + break; + } - HeapFree( GetProcessHeap(), 0, proto_str ); -#endif - TRACE( "%d (i.e. port %d), %s ret %p\n", port, (int)ntohl(port), debugstr_a(proto), retval ); - return retval; + HeapFree( GetProcessHeap(), 0, file ); + return serv; }

1 0

Zebediah Figura : ws2_32: Build with msvcrt.
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: wine Branch: master Commit: 0c81cc2782352d2b7bf88aef8ba5c86890e0556c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c81cc2782352d2b7bf88aef… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 4 21:20:47 2021 -0500 ws2_32: Build with msvcrt. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/Makefile.in | 2 + dlls/ws2_32/async.c | 3 -- dlls/ws2_32/protocol.c | 76 +++++++++++++++++-------------- dlls/ws2_32/socket.c | 40 ++++++++++------- dlls/ws2_32/unixlib.c | 34 ++++++++++++++ dlls/ws2_32/ws2_32_private.h | 103 ------------------------------------------- 6 files changed, 101 insertions(+), 157 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0c81cc2782352d2b7bf8…

1 0

Zebediah Figura : ws2_32: Do not use the WS_ prefix in PE code.
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: wine Branch: master Commit: 815ac66558bfc035c03cb694cd7c36986c3150a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=815ac66558bfc035c03cb694… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 4 21:20:48 2021 -0500 ws2_32: Do not use the WS_ prefix in PE code. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/Makefile.in | 1 - dlls/ws2_32/async.c | 30 +- dlls/ws2_32/protocol.c | 269 +++++++------ dlls/ws2_32/socket.c | 870 +++++++++++++++++++++---------------------- dlls/ws2_32/unixlib.c | 1 + dlls/ws2_32/ws2_32.spec | 62 +-- dlls/ws2_32/ws2_32_private.h | 8 +- 7 files changed, 598 insertions(+), 643 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=815ac66558bfc035c03c…

1 0

Nikolay Sivov : include: Add d3dx10 vector and matrix types.
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: wine Branch: master Commit: 7ac3a7341ea9bf9d1440d9e6b652bcf3fdc999f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ac3a7341ea9bf9d1440d9e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 5 23:21:21 2021 +0200 include: Add d3dx10 vector and matrix types. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3dx10math.h | 164 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) diff --git a/include/d3dx10math.h b/include/d3dx10math.h index c8bcfd2ce4e..5790fbdf63b 100644 --- a/include/d3dx10math.h +++ b/include/d3dx10math.h @@ -24,6 +24,34 @@ #include <math.h> +#ifndef D3DVECTOR_DEFINED +#define D3DVECTOR_DEFINED +typedef struct _D3DVECTOR +{ + float x; + float y; + float z; +} D3DVECTOR; +#endif + +#ifndef D3DMATRIX_DEFINED +#define D3DMATRIX_DEFINED +typedef struct _D3DMATRIX +{ + union + { + struct + { + float _11, _12, _13, _14; + float _21, _22, _23, _24; + float _31, _32, _33, _34; + float _41, _42, _43, _44; + }; + float m[4][4]; + }; +} D3DMATRIX; +#endif + typedef enum _D3DX_CPU_OPTIMIZATION { D3DX_NOT_OPTIMIZED, @@ -82,6 +110,142 @@ public: float r, g, b, a; } D3DXCOLOR, *LPD3DXCOLOR; +typedef struct D3DXVECTOR2 +{ +#ifdef __cplusplus + D3DXVECTOR2() {}; + D3DXVECTOR2(const float *pf); + D3DXVECTOR2(float fx, float fy); + + operator float* (); + operator const float* () const; + + D3DXVECTOR2& operator += (const D3DXVECTOR2&); + D3DXVECTOR2& operator -= (const D3DXVECTOR2&); + D3DXVECTOR2& operator *= (float); + D3DXVECTOR2& operator /= (float); + + D3DXVECTOR2 operator + () const; + D3DXVECTOR2 operator - () const; + + D3DXVECTOR2 operator + (const D3DXVECTOR2&) const; + D3DXVECTOR2 operator - (const D3DXVECTOR2&) const; + D3DXVECTOR2 operator * (float) const; + D3DXVECTOR2 operator / (float) const; + + friend D3DXVECTOR2 operator * (float, const D3DXVECTOR2&); + + BOOL operator == (const D3DXVECTOR2&) const; + BOOL operator != (const D3DXVECTOR2&) const; +#endif /* __cplusplus */ + float x, y; +} D3DXVECTOR2, *LPD3DXVECTOR2; + +#ifdef __cplusplus +typedef struct D3DXVECTOR3 : public D3DVECTOR +{ + D3DXVECTOR3() {}; + D3DXVECTOR3(const float *pf); + D3DXVECTOR3(const D3DVECTOR& v); + D3DXVECTOR3(float fx, float fy, float fz); + + operator float* (); + operator const float* () const; + + D3DXVECTOR3& operator += (const D3DXVECTOR3&); + D3DXVECTOR3& operator -= (const D3DXVECTOR3&); + D3DXVECTOR3& operator *= (float); + D3DXVECTOR3& operator /= (float); + + D3DXVECTOR3 operator + () const; + D3DXVECTOR3 operator - () const; + + D3DXVECTOR3 operator + (const D3DXVECTOR3&) const; + D3DXVECTOR3 operator - (const D3DXVECTOR3&) const; + D3DXVECTOR3 operator * (float) const; + D3DXVECTOR3 operator / (float) const; + + friend D3DXVECTOR3 operator * (float, const struct D3DXVECTOR3&); + + BOOL operator == (const D3DXVECTOR3&) const; + BOOL operator != (const D3DXVECTOR3&) const; +} D3DXVECTOR3, *LPD3DXVECTOR3; +#else /* !__cplusplus */ +typedef struct _D3DVECTOR D3DXVECTOR3, *LPD3DXVECTOR3; +#endif /* !__cplusplus */ + +typedef struct D3DXVECTOR4 +{ +#ifdef __cplusplus + D3DXVECTOR4() {}; + D3DXVECTOR4(const float *pf); + D3DXVECTOR4(float fx, float fy, float fz, float fw); + + operator float* (); + operator const float* () const; + + D3DXVECTOR4& operator += (const D3DXVECTOR4&); + D3DXVECTOR4& operator -= (const D3DXVECTOR4&); + D3DXVECTOR4& operator *= (float); + D3DXVECTOR4& operator /= (float); + + D3DXVECTOR4 operator + () const; + D3DXVECTOR4 operator - () const; + + D3DXVECTOR4 operator + (const D3DXVECTOR4&) const; + D3DXVECTOR4 operator - (const D3DXVECTOR4&) const; + D3DXVECTOR4 operator * (float) const; + D3DXVECTOR4 operator / (float) const; + + friend D3DXVECTOR4 operator * (float, const D3DXVECTOR4&); + + BOOL operator == (const D3DXVECTOR4&) const; + BOOL operator != (const D3DXVECTOR4&) const; +#endif /* __cplusplus */ + float x, y, z, w; +} D3DXVECTOR4, *LPD3DXVECTOR4; + +#ifdef __cplusplus +typedef struct D3DXMATRIX : public D3DMATRIX +{ + D3DXMATRIX() {}; + D3DXMATRIX(const float *pf); + D3DXMATRIX(const D3DMATRIX& mat); + D3DXMATRIX(float f11, float f12, float f13, float f14, + float f21, float f22, float f23, float f24, + float f31, float f32, float f33, float f34, + float f41, float f42, float f43, float f44); + + float& operator () (UINT row, UINT col); + float operator () (UINT row, UINT col) const; + + operator float* (); + operator const float* () const; + + D3DXMATRIX& operator *= (const D3DXMATRIX&); + D3DXMATRIX& operator += (const D3DXMATRIX&); + D3DXMATRIX& operator -= (const D3DXMATRIX&); + D3DXMATRIX& operator *= (float); + D3DXMATRIX& operator /= (float); + + D3DXMATRIX operator + () const; + D3DXMATRIX operator - () const; + + D3DXMATRIX operator * (const D3DXMATRIX&) const; + D3DXMATRIX operator + (const D3DXMATRIX&) const; + D3DXMATRIX operator - (const D3DXMATRIX&) const; + D3DXMATRIX operator * (float) const; + D3DXMATRIX operator / (float) const; + + friend D3DXMATRIX operator * (float, const D3DXMATRIX&); + + BOOL operator == (const D3DXMATRIX&) const; + BOOL operator != (const D3DXMATRIX&) const; +} D3DXMATRIX, *LPD3DXMATRIX; +#else /* !__cplusplus */ +typedef struct _D3DMATRIX D3DXMATRIX, *LPD3DXMATRIX; +#endif /* !__cplusplus */ + #ifdef __cplusplus extern "C" { #endif

1 0