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

[PATCH] ntdll: Return STATUS_NOT_SUPPORTED if dlinfo() is not present.
by Huw Davies Aug. 4, 2021

Aug. 4, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ntdll/unix/loader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index c2f79bc2c44..30915e443be 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1744,6 +1744,7 @@ NTSTATUS get_builtin_init_funcs( void *handle, void **funcs, SIZE_T len, SIZE_T for (i = 0; i < init_arraysz / sizeof(*init_array); i++) funcs[i] = init_array[i]; return STATUS_SUCCESS; #endif + return STATUS_NOT_SUPPORTED; } -- 2.23.0

1 1

[PATCH v2] ntdll: Return STATUS_NOT_SUPPORTED if dlinfo() is not present.
by Huw Davies Aug. 4, 2021

Aug. 4, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ntdll/unix/loader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index c2f79bc2c44..5e932506c2b 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1743,6 +1743,8 @@ NTSTATUS get_builtin_init_funcs( void *handle, void **funcs, SIZE_T len, SIZE_T if (init_func) *funcs++ = init_func; for (i = 0; i < init_arraysz / sizeof(*init_array); i++) funcs[i] = init_array[i]; return STATUS_SUCCESS; +#else + return STATUS_NOT_SUPPORTED; #endif } -- 2.23.0

1 0

[PATCH] kernelbase: Fix copy size for delete_privs in CreateRestrictedToken().
by Paul Gofman Aug. 4, 2021

Aug. 4, 2021

Fixes 3D Aim Trainer crash on start. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/kernelbase/security.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/security.c b/dlls/kernelbase/security.c index 97943048b01..36196304db3 100644 --- a/dlls/kernelbase/security.c +++ b/dlls/kernelbase/security.c @@ -662,21 +662,21 @@ BOOL WINAPI CreateRestrictedToken( HANDLE token, DWORD flags, { if (!(nt_disable_sids = heap_alloc( offsetof( TOKEN_GROUPS, Groups[disable_sid_count] ) ))) goto out; nt_disable_sids->GroupCount = disable_sid_count; - memcpy( nt_disable_sids->Groups, disable_sids, disable_sid_count * sizeof(SID_AND_ATTRIBUTES) ); + memcpy( nt_disable_sids->Groups, disable_sids, disable_sid_count * sizeof(*disable_sids) ); } if (delete_priv_count) { if (!(nt_privs = heap_alloc( offsetof( TOKEN_GROUPS, Groups[delete_priv_count] ) ))) goto out; nt_privs->PrivilegeCount = delete_priv_count; - memcpy( nt_privs->Privileges, delete_privs, delete_priv_count * sizeof(SID_AND_ATTRIBUTES) ); + memcpy( nt_privs->Privileges, delete_privs, delete_priv_count * sizeof(*delete_privs) ); } if (restrict_sid_count) { if (!(nt_restrict_sids = heap_alloc( offsetof( TOKEN_GROUPS, Groups[restrict_sid_count] ) ))) goto out; nt_restrict_sids->GroupCount = restrict_sid_count; - memcpy( nt_restrict_sids->Groups, restrict_sids, restrict_sid_count * sizeof(SID_AND_ATTRIBUTES) ); + memcpy( nt_restrict_sids->Groups, restrict_sids, restrict_sid_count * sizeof(*restrict_sids) ); } status = NtFilterToken(token, flags, nt_disable_sids, nt_privs, nt_restrict_sids, ret); -- 2.31.1

1 0

[PATCH 1/3] ucrtbase: Update the fenv test for non-x86 architectures
by Martin Storsjö Aug. 4, 2021

Aug. 4, 2021

The x86 style x87/sse split of status bits isn't present on arm64. Also include a couple cases of missing fenv_encode() in test printouts, to avoid surprising error messages like "expected 1, got 1". Signed-off-by: Martin Storsjö <martin(a)martin.st> --- The test talks about "too old ucrtbase", but neither the UCRT in Windows 11 nor the one statically linked with VS 2022 17.0 preview 2 does the x86 style status bit duplication/shifting, so I'm concluding that this behaviour isn't expected/intended on non-x86 architectures. --- dlls/ucrtbase/tests/misc.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 96dd1acfe54..eb323997e68 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -1377,14 +1377,15 @@ static unsigned long fenv_encode(unsigned int e) #if defined(__i386__) return e<<24 | e<<16 | e; -#else +#elif defined(__x86_64__) return e<<24 | e; +#else + return e; #endif } static void test_fenv(void) { -#if defined(__i386__) || defined(__x86_64__) static const int tests[] = { 0, FE_INEXACT, @@ -1425,11 +1426,13 @@ static void test_fenv(void) ret = fegetenv(&env); ok(!ret, "fegetenv returned %x\n", ret); +#if defined(__i386__) || defined(__x86_64__) if (env._Fe_ctl >> 24 != (env._Fe_ctl & 0xff)) { win_skip("fenv_t format not supported (too old ucrtbase)\n"); return; } +#endif fesetround(FE_UPWARD); ok(!env._Fe_stat, "env._Fe_stat = %lx\n", env._Fe_stat); ret = fegetenv(&env2); @@ -1485,13 +1488,13 @@ static void test_fenv(void) ret = fegetexceptflag(&except, ~0); ok(!ret, "Test %d: fegetexceptflag returned %x.\n", i, ret); ok(except == fenv_encode(flags), - "Test %d: expected %x, got %lx\n", i, flags, except); + "Test %d: expected %x, got %lx\n", i, fenv_encode(flags), except); except = ~0; ret = fegetexceptflag(&except, tests[i]); ok(!ret, "Test %d: fegetexceptflag returned %x.\n", i, ret); ok(except == fenv_encode(tests[i]), - "Test %d: expected %x, got %lx\n", i, tests[i], except); + "Test %d: expected %x, got %lx\n", i, fenv_encode(tests[i]), except); } for(i=0; i<ARRAY_SIZE(tests); i++) { @@ -1534,7 +1537,6 @@ static void test_fenv(void) ok(!ret, "feclearexceptflag returned %x\n", ret); except = fetestexcept(FE_ALL_EXCEPT); ok(!except, "expected 0, got %lx\n", except); -#endif } START_TEST(misc) -- 2.25.1

1 2

[PATCH 5/5] iphlpapi: Add support for the EnableRouting member.
by Huw Davies Aug. 4, 2021

Aug. 4, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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; } -- 2.23.0

1 0

[PATCH 4/5] iphlpapi: Move the loopback check to get_dns_server_list().
by Huw Davies Aug. 4, 2021

Aug. 4, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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); -- 2.23.0

1 0

[PATCH 3/5] iphlpapi: Use DnsQueryConfig() to retrieve the dns suffix.
by Huw Davies Aug. 4, 2021

Aug. 4, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/Makefile.in | 2 +- dlls/iphlpapi/iphlpapi_main.c | 79 +++++++++-------------------------- 2 files changed, 20 insertions(+), 61 deletions(-) diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in index 14a45e419a3..3797ac793e6 100644 --- a/dlls/iphlpapi/Makefile.in +++ b/dlls/iphlpapi/Makefile.in @@ -1,7 +1,7 @@ MODULE = iphlpapi.dll IMPORTLIB = iphlpapi IMPORTS = advapi32 dnsapi nsi uuid -EXTRALIBS = $(RESOLV_LIBS) $(KSTAT_LIBS) $(PROCSTAT_LIBS) +EXTRALIBS = $(KSTAT_LIBS) $(PROCSTAT_LIBS) C_SRCS = \ icmp.c \ diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 40cf358d73f..13b5fa4f742 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -30,12 +30,6 @@ #ifdef HAVE_ARPA_INET_H # include <arpa/inet.h> #endif -#ifdef HAVE_ARPA_NAMESER_H -# include <arpa/nameser.h> -#endif -#ifdef HAVE_RESOLV_H -# include <resolv.h> -#endif #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -1223,27 +1217,6 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index return ERROR_SUCCESS; } -#ifdef HAVE_STRUCT___RES_STATE -/* call res_init() just once because of a bug in Mac OS X 10.4 */ -/* Call once per thread on systems that have per-thread _res. */ - -static CRITICAL_SECTION res_init_cs; -static CRITICAL_SECTION_DEBUG res_init_cs_debug = { - 0, 0, &res_init_cs, - { &res_init_cs_debug.ProcessLocksList, &res_init_cs_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": res_init_cs") } -}; -static CRITICAL_SECTION res_init_cs = { &res_init_cs_debug, -1, 0, 0, 0, 0 }; - -static void initialise_resolver(void) -{ - EnterCriticalSection(&res_init_cs); - if ((_res.options & RES_INIT) == 0) - res_init(); - LeaveCriticalSection(&res_init_cs); -} -#endif - static DWORD dns_servers_query_code( ULONG family ) { if (family == WS_AF_INET) return DnsConfigDnsServersIpv4; @@ -1305,46 +1278,32 @@ err: return err; } -#ifdef HAVE_STRUCT___RES_STATE -static BOOL is_ip_address_string(const char *str) +static ULONG get_dns_suffix(WCHAR *suffix, ULONG *len) { - struct in_addr in; - int ret; + DWORD err, list_len = 0, needed = 1; + DNS_TXT_DATAW *search = NULL; - ret = inet_aton(str, &in); - return ret != 0; -} -#endif + if (suffix && *len > 0) *suffix = '\0'; -static ULONG get_dns_suffix(WCHAR *suffix, ULONG *len) -{ - ULONG size; - const char *found_suffix = ""; - /* Always return a NULL-terminated string, even if it's empty. */ + err = DnsQueryConfig( DnsConfigSearchList, 0, NULL, NULL, NULL, &list_len ); + if (err) goto err; -#ifdef HAVE_STRUCT___RES_STATE - { - ULONG i; - initialise_resolver(); - for (i = 0; !*found_suffix && i < MAXDNSRCH + 1 && _res.dnsrch[i]; i++) - { - /* This uses a heuristic to select a DNS suffix: - * the first, non-IP address string is selected. - */ - if (!is_ip_address_string(_res.dnsrch[i])) - found_suffix = _res.dnsrch[i]; - } - } -#endif + search = heap_alloc( list_len ); + err = DnsQueryConfig( DnsConfigSearchList, 0, NULL, NULL, search, &list_len ); + if (err || !search->dwStringCount) goto err; - size = MultiByteToWideChar( CP_UNIXCP, 0, found_suffix, -1, NULL, 0 ) * sizeof(WCHAR); - if (!suffix || *len < size) + needed = (strlenW( search->pStringArray[0] ) + 1) * sizeof(WCHAR); + if (!suffix || *len < needed) { - *len = size; - return ERROR_BUFFER_OVERFLOW; + err = ERROR_INSUFFICIENT_BUFFER; + goto err; } - *len = MultiByteToWideChar( CP_UNIXCP, 0, found_suffix, -1, suffix, *len / sizeof(WCHAR) ) * sizeof(WCHAR); - return ERROR_SUCCESS; + memcpy( suffix, search->pStringArray[0], needed ); + +err: + *len = needed; + heap_free( search ); + return err; } ULONG WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, -- 2.23.0

1 0

[PATCH 2/5] iphlpapi: Use DnsQueryConfig() to retrieve the dns servers for the remaining functions.
by Huw Davies Aug. 4, 2021

Aug. 4, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 217 ++++++---------------------------- 1 file changed, 38 insertions(+), 179 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 2c8c1644b78..40cf358d73f 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1223,34 +1223,6 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index return ERROR_SUCCESS; } -static void sockaddr_in_to_WS_storage( SOCKADDR_STORAGE *dst, const struct sockaddr_in *src ) -{ - SOCKADDR_IN *s = (SOCKADDR_IN *)dst; - - s->sin_family = WS_AF_INET; - s->sin_port = src->sin_port; - memcpy( &s->sin_addr, &src->sin_addr, sizeof(IN_ADDR) ); - memset( (char *)s + FIELD_OFFSET( SOCKADDR_IN, sin_zero ), 0, - sizeof(SOCKADDR_STORAGE) - FIELD_OFFSET( SOCKADDR_IN, sin_zero) ); -} - -#if defined(HAVE_STRUCT___RES_STATE__U__EXT_NSCOUNT6) || \ - (defined(HAVE___RES_GET_STATE) && defined(HAVE___RES_GETSERVERS)) || \ - defined(HAVE_RES_GETSERVERS) -static void sockaddr_in6_to_WS_storage( SOCKADDR_STORAGE *dst, const struct sockaddr_in6 *src ) -{ - SOCKADDR_IN6 *s = (SOCKADDR_IN6 *)dst; - - s->sin6_family = WS_AF_INET6; - s->sin6_port = src->sin6_port; - s->sin6_flowinfo = src->sin6_flowinfo; - memcpy( &s->sin6_addr, &src->sin6_addr, sizeof(IN6_ADDR) ); - s->sin6_scope_id = src->sin6_scope_id; - memset( (char *)s + sizeof(SOCKADDR_IN6), 0, - sizeof(SOCKADDR_STORAGE) - sizeof(SOCKADDR_IN6) ); -} -#endif - #ifdef HAVE_STRUCT___RES_STATE /* call res_init() just once because of a bug in Mac OS X 10.4 */ /* Call once per thread on systems that have per-thread _res. */ @@ -1270,129 +1242,6 @@ static void initialise_resolver(void) res_init(); LeaveCriticalSection(&res_init_cs); } - -#ifdef HAVE_RES_GETSERVERS -static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) -{ - struct __res_state *state = &_res; - int i, found = 0, total; - SOCKADDR_STORAGE *addr = servers; - union res_sockaddr_union *buf; - - initialise_resolver(); - - total = res_getservers( state, NULL, 0 ); - - if ((!servers || !num) && !ip4_only) return total; - - buf = HeapAlloc( GetProcessHeap(), 0, total * sizeof(union res_sockaddr_union) ); - total = res_getservers( state, buf, total ); - - for (i = 0; i < total; i++) - { - if (buf[i].sin6.sin6_family == AF_INET6 && ip4_only) continue; - if (buf[i].sin.sin_family != AF_INET && buf[i].sin6.sin6_family != AF_INET6) continue; - - found++; - if (!servers || !num) continue; - - if (buf[i].sin6.sin6_family == AF_INET6) - { - sockaddr_in6_to_WS_storage( addr, &buf[i].sin6 ); - } - else - { - sockaddr_in_to_WS_storage( addr, &buf[i].sin ); - } - if (++addr >= servers + num) break; - } - - HeapFree( GetProcessHeap(), 0, buf ); - return found; -} -#else - -static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) -{ - int i, ip6_count = 0; - SOCKADDR_STORAGE *addr; - - initialise_resolver(); - -#ifdef HAVE_STRUCT___RES_STATE__U__EXT_NSCOUNT6 - ip6_count = _res._u._ext.nscount6; -#endif - - if (!servers || !num) - { - num = _res.nscount; - if (ip4_only) num -= ip6_count; - return num; - } - - for (i = 0, addr = servers; addr < (servers + num) && i < _res.nscount; i++) - { -#ifdef HAVE_STRUCT___RES_STATE__U__EXT_NSCOUNT6 - if (_res._u._ext.nsaddrs[i] && _res._u._ext.nsaddrs[i]->sin6_family == AF_INET6) - { - if (ip4_only) continue; - sockaddr_in6_to_WS_storage( addr, _res._u._ext.nsaddrs[i] ); - } - else -#endif - { - sockaddr_in_to_WS_storage( addr, _res.nsaddr_list + i ); - } - addr++; - } - return addr - servers; -} -#endif -#elif defined(HAVE___RES_GET_STATE) && defined(HAVE___RES_GETSERVERS) - -static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) -{ - extern struct res_state *__res_get_state( void ); - extern int __res_getservers( struct res_state *, struct sockaddr_storage *, int ); - struct res_state *state = __res_get_state(); - int i, found = 0, total = __res_getservers( state, NULL, 0 ); - SOCKADDR_STORAGE *addr = servers; - struct sockaddr_storage *buf; - - if ((!servers || !num) && !ip4_only) return total; - - buf = HeapAlloc( GetProcessHeap(), 0, total * sizeof(struct sockaddr_storage) ); - total = __res_getservers( state, buf, total ); - - for (i = 0; i < total; i++) - { - if (buf[i].ss_family == AF_INET6 && ip4_only) continue; - if (buf[i].ss_family != AF_INET && buf[i].ss_family != AF_INET6) continue; - - found++; - if (!servers || !num) continue; - - if (buf[i].ss_family == AF_INET6) - { - sockaddr_in6_to_WS_storage( addr, (struct sockaddr_in6 *)(buf + i) ); - } - else - { - sockaddr_in_to_WS_storage( addr, (struct sockaddr_in *)(buf + i) ); - } - if (++addr >= servers + num) break; - } - - HeapFree( GetProcessHeap(), 0, buf ); - return found; -} -#else - -static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) -{ - FIXME("Unimplemented on this system\n"); - return 0; -} #endif static DWORD dns_servers_query_code( ULONG family ) @@ -2528,45 +2377,55 @@ DWORD WINAPI GetIpNetTable(PMIB_IPNETTABLE pIpNetTable, PULONG pdwSize, BOOL bOr * a single server address may be placed at list if *len is at least * sizeof(IP_ADDR_STRING) long. Otherwise, list->Next is set to firstDynamic, * and assumes that all remaining DNS servers are contiguously located - * beginning at firstDynamic. On input, *len is assumed to be the total number + * beginning at second. On input, *len is assumed to be the total number * of bytes available for all DNS servers, and is ignored if list is NULL. * On return, *len is set to the total number of bytes required for all DNS * servers. * Returns ERROR_BUFFER_OVERFLOW if *len is insufficient, * ERROR_SUCCESS otherwise. */ -static DWORD get_dns_server_list(PIP_ADDR_STRING list, - PIP_ADDR_STRING firstDynamic, DWORD *len) +static DWORD get_dns_server_list( IP_ADDR_STRING *list, IP_ADDR_STRING *second, DWORD *len ) { - DWORD size; - int num = get_dns_servers( NULL, 0, TRUE ); + 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; - size = num * sizeof(IP_ADDR_STRING); - if (!list || *len < size) { - *len = size; - return ERROR_BUFFER_OVERFLOW; - } - *len = size; - if (num > 0) { - PIP_ADDR_STRING ptr; - int i; - SOCKADDR_STORAGE *addr = HeapAlloc( GetProcessHeap(), 0, num * sizeof(SOCKADDR_STORAGE) ); + for (;;) + { + err = DnsQueryConfig( DnsConfigDnsServerList, 0, NULL, NULL, servers, &array_len ); + num = (array_len - FIELD_OFFSET(IP4_ARRAY, AddrArray[0])) / sizeof(IP4_ADDRESS); + needed = num * sizeof(IP_ADDR_STRING); + if (!list || *len < needed) + { + *len = needed; + err = ERROR_BUFFER_OVERFLOW; + goto err; + } + if (!err) break; - get_dns_servers( addr, num, TRUE ); + if ((char *)servers != buf) heap_free( servers ); + servers = heap_alloc( array_len ); + if (!servers) + { + err = ERROR_NOT_ENOUGH_MEMORY; + goto err; + } + } - for (i = 0, ptr = list; i < num; i++, ptr = ptr->Next) { - RtlIpv4AddressToStringA((IN_ADDR *)&((struct sockaddr_in *)(addr + i))->sin_addr.s_addr, - ptr->IpAddress.String); - if (i == num - 1) - ptr->Next = NULL; - else if (i == 0) - ptr->Next = firstDynamic; - else - ptr->Next = (PIP_ADDR_STRING)((PBYTE)ptr + sizeof(IP_ADDR_STRING)); + *len = needed; + + for (i = 0, ptr = list; i < num; i++, ptr = ptr->Next) + { + RtlIpv4AddressToStringA( (IN_ADDR *)&servers->AddrArray[i], ptr->IpAddress.String ); + if (i == num - 1) ptr->Next = NULL; + else if (i == 0) ptr->Next = second; + else ptr->Next = ptr + 1; } - HeapFree( GetProcessHeap(), 0, addr ); - } - return ERROR_SUCCESS; + +err: + if ((char *)servers != buf) heap_free( servers ); + return err; } /****************************************************************** -- 2.23.0

1 0

[PATCH 1/2] maintainers: Add a WIDL section.
by Rémi Bernon Aug. 4, 2021

Aug. 4, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- MAINTAINERS | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index c36a70958ed..ad121ab117d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -244,7 +244,6 @@ RPC Runtime P: Huw Davies <huw(a)codeweavers.com> P: Zebediah Figura <z.figura12(a)gmail.com> F: dlls/rpcrt4 -F: tools/widl TWAIN P: Esme Povirk <vincent(a)codeweavers.com> @@ -274,6 +273,11 @@ F: dlls/ieframe/ F: dlls/mshtml/ F: dlls/shdocvw/ +WIDL +P: Huw Davies <huw(a)codeweavers.com> +P: Zebediah Figura <z.figura12(a)gmail.com> +F: tools/widl + Windows Imaging Component M: Esme Povirk <vincent(a)codeweavers.com> F: dlls/windowscodecs/ -- 2.32.0

1 1

[PATCH] include: Add some type aliases in dsound.h.
by Biswapriyo Nath Aug. 4, 2021

Aug. 4, 2021

1 0