- wine-devel - winehq.org

[PATCH v2 5/6] iphlpapi: Move the loopback check to get_dns_server_list().
by Huw Davies 05 Aug '21

05 Aug '21

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 v2 4/6] iphlpapi: Use DnsQueryConfig() to retrieve the dns suffix.
by Huw Davies 05 Aug '21

05 Aug '21

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 v2 3/6] iphlpapi: Use DnsQueryConfig() to retrieve the dns servers for the remaining functions.
by Huw Davies 05 Aug '21

05 Aug '21

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 v2 2/6] iphlpapi: Use DnsQueryConfig() to retrieve the dns servers for GetAdaptersAddresses().
by Huw Davies 05 Aug '21

05 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/Makefile.in | 2 +- dlls/iphlpapi/iphlpapi_main.c | 84 ++++++++++++++++++++++------------- 2 files changed, 55 insertions(+), 31 deletions(-) diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in index 3db17289bf4..14a45e419a3 100644 --- a/dlls/iphlpapi/Makefile.in +++ b/dlls/iphlpapi/Makefile.in @@ -1,6 +1,6 @@ MODULE = iphlpapi.dll IMPORTLIB = iphlpapi -IMPORTS = advapi32 nsi uuid +IMPORTS = advapi32 dnsapi nsi uuid EXTRALIBS = $(RESOLV_LIBS) $(KSTAT_LIBS) $(PROCSTAT_LIBS) C_SRCS = \ diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 93efed2ca2e..2c8c1644b78 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1395,41 +1395,65 @@ static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) } #endif -static ULONG get_dns_server_addresses(PIP_ADAPTER_DNS_SERVER_ADDRESS address, ULONG *len) +static DWORD dns_servers_query_code( ULONG family ) { - int num = get_dns_servers( NULL, 0, FALSE ); - DWORD size; + if (family == WS_AF_INET) return DnsConfigDnsServersIpv4; + if (family == WS_AF_INET6) return DnsConfigDnsServersIpv6; + return DnsConfigDnsServersUnspec; +} - size = num * (sizeof(IP_ADAPTER_DNS_SERVER_ADDRESS) + sizeof(SOCKADDR_STORAGE)); - if (!address || *len < size) - { - *len = size; - return ERROR_BUFFER_OVERFLOW; - } - *len = size; - if (num > 0) - { - PIP_ADAPTER_DNS_SERVER_ADDRESS addr = address; - SOCKADDR_STORAGE *sock_addrs = (SOCKADDR_STORAGE *)(address + num); - int i; +static ULONG get_dns_server_addresses( ULONG family, IP_ADAPTER_DNS_SERVER_ADDRESS *address, ULONG *len ) +{ + char buf[FIELD_OFFSET(DNS_ADDR_ARRAY, AddrArray[3])]; + DNS_ADDR_ARRAY *servers = (DNS_ADDR_ARRAY *)buf; + DWORD err, num, i, needed, array_len = sizeof(buf); + DWORD query = dns_servers_query_code( family ); + SOCKADDR_INET *out_addrs; - get_dns_servers( sock_addrs, num, FALSE ); + for (;;) + { + err = DnsQueryConfig( query, 0, NULL, NULL, servers, &array_len ); + if (err != ERROR_SUCCESS && err != ERROR_MORE_DATA) goto err; + num = (array_len - FIELD_OFFSET(DNS_ADDR_ARRAY, AddrArray[0])) / sizeof(DNS_ADDR); + needed = num * (sizeof(IP_ADAPTER_DNS_SERVER_ADDRESS) + sizeof(*out_addrs)); + if (!address || *len < needed) + { + *len = needed; + err = ERROR_BUFFER_OVERFLOW; + goto err; + } + if (!err) break; - for (i = 0; i < num; i++, addr = addr->Next) + if ((char *)servers != buf) heap_free( servers ); + servers = heap_alloc( array_len ); + if (!servers) { - addr->u.s.Length = sizeof(*addr); - if (sock_addrs[i].ss_family == WS_AF_INET6) - addr->Address.iSockaddrLength = sizeof(SOCKADDR_IN6); - else - addr->Address.iSockaddrLength = sizeof(SOCKADDR_IN); - addr->Address.lpSockaddr = (SOCKADDR *)(sock_addrs + i); - if (i == num - 1) - addr->Next = NULL; - else - addr->Next = addr + 1; + err = ERROR_NOT_ENOUGH_MEMORY; + goto err; } } - return ERROR_SUCCESS; + + *len = needed; + out_addrs = (SOCKADDR_INET *)(address + num); + for (i = 0; i < num; i++) + { + address[i].u.s.Length = sizeof(*address); + address[i].u.s.Reserved = 0; + address[i].Next = NULL; + address[i].Address.iSockaddrLength = servers->AddrArray[i].Data.DnsAddrUserDword[0]; + if (address[i].Address.iSockaddrLength > sizeof(*out_addrs)) + address[i].Address.iSockaddrLength = 0; + address[i].Address.lpSockaddr = (SOCKADDR *)(out_addrs + i); + memcpy( out_addrs + i, servers->AddrArray[i].MaxSa, address[i].Address.iSockaddrLength ); + memset( (BYTE *)(out_addrs + i) + address[i].Address.iSockaddrLength, 0, + sizeof(*out_addrs) - address[i].Address.iSockaddrLength ); + if (i) address[i - 1].Next = address + i; + } + err = ERROR_SUCCESS; + +err: + if ((char *)servers != buf) heap_free( servers ); + return err; } #ifdef HAVE_STRUCT___RES_STATE @@ -1506,7 +1530,7 @@ ULONG WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses(ULONG family, ULONG flags, P /* Since DNS servers aren't really per adapter, get enough space for a * single copy of them. */ - get_dns_server_addresses(NULL, &dns_server_size); + get_dns_server_addresses( family, NULL, &dns_server_size ); total_size += dns_server_size; } /* Since DNS suffix also isn't really per adapter, get enough space for a @@ -1538,7 +1562,7 @@ ULONG WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses(ULONG family, ULONG flags, P if (dns_server_size) { firstDns = (PIP_ADAPTER_DNS_SERVER_ADDRESS)((BYTE *)first_aa + total_size - dns_server_size - dns_suffix_size); - get_dns_server_addresses(firstDns, &dns_server_size); + get_dns_server_addresses( family, firstDns, &dns_server_size ); for (aa = first_aa; aa; aa = aa->Next) { if (aa->IfType != IF_TYPE_SOFTWARE_LOOPBACK && aa->OperStatus == IfOperStatusUp) -- 2.23.0

1 0

[PATCH 1/6] hidclass.sys: Use call_minidriver for IOCTL_HID_GET_INPUT_REPORT.
by Rémi Bernon 05 Aug '21

05 Aug '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hidclass.sys/device.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 61126571ac6..3a577aabfbd 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -193,18 +193,11 @@ static DWORD CALLBACK hid_device_thread(void *args) { while(1) { - KEVENT event; - - KeInitializeEvent(&event, NotificationEvent, FALSE); - packet->reportBufferLen = report_size; packet->reportId = 0; - irp = IoBuildDeviceIoControlRequest(IOCTL_HID_GET_INPUT_REPORT, ext->u.pdo.parent_fdo, - NULL, 0, packet, sizeof(*packet), TRUE, &event, &irp_status); - - if (IoCallDriver(ext->u.pdo.parent_fdo, irp) == STATUS_PENDING) - KeWaitForSingleObject(&event, Executive, KernelMode, FALSE, NULL); + call_minidriver( IOCTL_HID_GET_INPUT_REPORT, ext->u.pdo.parent_fdo, NULL, 0, packet, + sizeof(*packet), &irp_status ); if (irp_status.Status == STATUS_SUCCESS) { -- 2.32.0

1 5

[PATCH] dinput/tests: Make overlapped format tests more robust.
by Arkadiusz Hiler 05 Aug '21

05 Aug '21

Both Acquire() and event processing with DirectInput seem to be asynchronous. In most cases we can just keep hammering GetDeviceData() until the event gets processed. Things get pretty racy around Acquire() though. If we fire event right after the call we can find ourselves in one of the three situations: 1. Event happened after acquiring has completed - the wait will suffice. 2. Event happened before acquiring did any real work - the device will pick up the state as if the event was processed, but there's nothing in GetDeviceData(). Because of that we cannot fail on wait. 3. Event happened somewhere in the middle of acquiring - we ended up both missing the event for GetDeviceData() and we have outdated state. Firing the event again will register as if the button was not already pressed. This change covers all three scenarios. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- I've done some more testing and noticed that indeed event processing is asynchronous - events can arrive a bit late but we never miss them. The situation gets a bit tricky around Acquire(). After trying many things to make it behave nicely it turned out there are three possible states we can find ourselves in. I've been spamming the testbot and two VMs locally with the tests and it seems to be reliable now. If this solution gets accepted I'll give the same treatment to dinput mouse tests (which are currently testing nothing on Windows) and dinput8 device tests. Thanks Rémi for the suggestions! Cc: Rémi Bernon <rbernon(a)codeweavers.com> dlls/dinput/tests/device.c | 54 +++++++++++++++++++++++++++++++++----- 1 file changed, 48 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index 6307957b6e2..d404c769953 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -343,11 +343,32 @@ static void pump_messages(void) } } +BOOL wait_for_device_data_and_discard_(int line, IDirectInputDeviceA *device) +{ + DWORD cnt; + HRESULT hr; + DWORD start_time = GetTickCount(); + + do + { + cnt = 10; + hr = IDirectInputDevice_GetDeviceData(device, sizeof(DIDEVICEOBJECTDATA_DX3), NULL, &cnt, 0); + ok_(__FILE__, line)(SUCCEEDED(hr), "IDirectInputDevice_GetDeviceData() failed: %08x\n", hr); + ok_(__FILE__, line)(cnt == 0 || cnt == 1, "Unexpected number of events: %d\n", cnt); + } while (cnt != 1 && (GetTickCount() - start_time < 500)); + + return cnt == 1; +} + +#define wait_for_device_data_and_discard(device) wait_for_device_data_and_discard_(__LINE__, device) + void overlapped_format_tests(IDirectInputA *pDI, HWND hwnd) { HRESULT hr; struct overlapped_state state; IDirectInputDeviceA *keyboard = NULL; + DIPROPDWORD dp; + DWORD tries; hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &keyboard, NULL); ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); @@ -355,15 +376,28 @@ void overlapped_format_tests(IDirectInputA *pDI, HWND hwnd) /* test overlapped slider - default value 0 */ hr = IDirectInputDevice_SetDataFormat(keyboard, &overlapped_slider_format); ok(SUCCEEDED(hr), "IDirectInputDevice_SetDataFormat() failed: %08x\n", hr); + + dp.diph.dwSize = sizeof(DIPROPDWORD); + dp.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dp.diph.dwHow = DIPH_DEVICE; + dp.diph.dwObj = 0; + dp.dwData = 10; + hr = IDirectInputDevice_SetProperty(keyboard, DIPROP_BUFFERSIZE, &dp.diph); + ok(SUCCEEDED(hr), "IDirectInputDevice_SetProperty() failed: %08x\n", hr); + hr = IDirectInputDevice_Acquire(keyboard); ok(SUCCEEDED(hr), "IDirectInputDevice_Acquire() failed: %08x\n", hr); SetFocus(hwnd); pump_messages(); - /* press D */ - keybd_event(0, DIK_D, KEYEVENTF_SCANCODE, 0); - pump_messages(); + tries = 2; + do + { + /* press D */ + keybd_event(0, DIK_D, KEYEVENTF_SCANCODE, 0); + pump_messages(); + } while (!wait_for_device_data_and_discard(keyboard) && tries--); memset(&state, 0xFF, sizeof(state)); hr = IDirectInputDevice_GetDeviceState(keyboard, sizeof(state), &state); @@ -378,6 +412,8 @@ void overlapped_format_tests(IDirectInputA *pDI, HWND hwnd) /* release D */ keybd_event(0, DIK_D, KEYEVENTF_SCANCODE|KEYEVENTF_KEYUP, 0); pump_messages(); + ok(wait_for_device_data_and_discard(keyboard), + "Timed out while waiting for injected events to be picked up by DirectInput.\n"); hr = IDirectInputDevice_Unacquire(keyboard); ok(SUCCEEDED(hr), "IDirectInputDevice_Unacquire() failed: %08x\n", hr); @@ -391,9 +427,13 @@ void overlapped_format_tests(IDirectInputA *pDI, HWND hwnd) SetFocus(hwnd); pump_messages(); - /* press D */ - keybd_event(0, DIK_D, KEYEVENTF_SCANCODE, 0); - pump_messages(); + tries = 2; + do + { + /* press D */ + keybd_event(0, DIK_D, KEYEVENTF_SCANCODE, 0); + pump_messages(); + } while (!wait_for_device_data_and_discard(keyboard) && tries--); memset(&state, 0xFF, sizeof(state)); hr = IDirectInputDevice_GetDeviceState(keyboard, sizeof(state), &state); @@ -408,6 +448,8 @@ void overlapped_format_tests(IDirectInputA *pDI, HWND hwnd) /* release D */ keybd_event(0, DIK_D, KEYEVENTF_SCANCODE|KEYEVENTF_KEYUP, 0); pump_messages(); + ok(wait_for_device_data_and_discard(keyboard), + "Timed out while waiting for injected events to be picked up by DirectInput.\n"); if (keyboard) IUnknown_Release(keyboard); } -- 2.32.0

3 7

[PATCH] dxtrans: Add stub DLL
by Alex Henrie 05 Aug '21

05 Aug '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50419 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This is enough to avoid the error during setup. I'm not sure what depends on dxtrans at run time; the program starts up fine without it. --- configure.ac | 1 + dlls/dxtrans/Makefile.in | 3 +++ dlls/dxtrans/dxtrans.spec | 11 +++++++++++ 3 files changed, 15 insertions(+) create mode 100644 dlls/dxtrans/Makefile.in create mode 100644 dlls/dxtrans/dxtrans.spec diff --git a/configure.ac b/configure.ac index a42c2aff272..5d9ca31099e 100644 --- a/configure.ac +++ b/configure.ac @@ -3205,6 +3205,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr9) WINE_CONFIG_MAKEFILE(dlls/dxgi) WINE_CONFIG_MAKEFILE(dlls/dxgi/tests) WINE_CONFIG_MAKEFILE(dlls/dxguid) +WINE_CONFIG_MAKEFILE(dlls/dxtrans) WINE_CONFIG_MAKEFILE(dlls/dxva2) WINE_CONFIG_MAKEFILE(dlls/dxva2/tests) WINE_CONFIG_MAKEFILE(dlls/esent) diff --git a/dlls/dxtrans/Makefile.in b/dlls/dxtrans/Makefile.in new file mode 100644 index 00000000000..cfecac807d0 --- /dev/null +++ b/dlls/dxtrans/Makefile.in @@ -0,0 +1,3 @@ +MODULE = dxtrans.dll + +EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/dxtrans/dxtrans.spec b/dlls/dxtrans/dxtrans.spec new file mode 100644 index 00000000000..2221c3dfabe --- /dev/null +++ b/dlls/dxtrans/dxtrans.spec @@ -0,0 +1,11 @@ +@ stub ?DXConstOverArray@@YGXPAVDXPMSAMPLE@@ABV1@K@Z +@ stub ?DXConstUnderArray@@YGXPAVDXPMSAMPLE@@ABV1@K@Z +@ stub ?DXDitherArray@@YGXPBUDXDITHERDESC@@@Z +@ stub ?DXLinearInterpolateArray@@YGXPBVDXBASESAMPLE@@PAUDXLIMAPINFO@@PAV1@K@Z +@ stub ?DXOverArray@@YGXPAVDXPMSAMPLE@@PBV1@K@Z +@ stub ?DXOverArrayMMX@@YGXPAVDXPMSAMPLE@@PBV1@K@Z +@ stub DllCanUnloadNow +@ stub DllEnumClassObjects +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer -- 2.32.0

1 0

[PATCH 1/4] wlanapi: Add WlanHostedNetworkQueryProperty stub
by Alex Henrie 05 Aug '21

05 Aug '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51469 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/wlanapi/main.c | 11 +++++++++++ dlls/wlanapi/wlanapi.spec | 1 + include/wlanapi.h | 8 ++++++++ 3 files changed, 20 insertions(+) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index d54cc1463ba..bbe560bcd8d 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -172,6 +172,17 @@ DWORD WINAPI WlanQueryInterface(HANDLE handle, const GUID *guid, WLAN_INTF_OPCOD return ERROR_CALL_NOT_IMPLEMENTED; } + +DWORD WINAPI WlanHostedNetworkQueryProperty(HANDLE handle, WLAN_HOSTED_NETWORK_OPCODE opcode, + DWORD *data_size, void **data, + WLAN_OPCODE_VALUE_TYPE *opcode_type, void *reserved) +{ + FIXME("(%p, 0x%x, %p, %p, %p, %p) stub\n", + handle, opcode, data_size, data, opcode_type, reserved); + + return ERROR_CALL_NOT_IMPLEMENTED; +} + void WINAPI WlanFreeMemory(void *ptr) { TRACE("(%p)\n", ptr); diff --git a/dlls/wlanapi/wlanapi.spec b/dlls/wlanapi/wlanapi.spec index 1c21ab5a2ea..8931112fcf8 100644 --- a/dlls/wlanapi/wlanapi.spec +++ b/dlls/wlanapi/wlanapi.spec @@ -14,6 +14,7 @@ @ stub WlanGetProfileCustomUserData @ stub WlanGetProfileList @ stub WlanGetSecuritySettings +@ stdcall WlanHostedNetworkQueryProperty(ptr long ptr ptr ptr ptr) @ stub WlanIhvControl @ stdcall WlanOpenHandle(long ptr ptr ptr) @ stub WlanQueryAutoConfigParameter diff --git a/include/wlanapi.h b/include/wlanapi.h index a3288d7778b..10f7cae0f61 100644 --- a/include/wlanapi.h +++ b/include/wlanapi.h @@ -187,6 +187,14 @@ typedef struct _WLAN_AVAILABLE_NETWORK_LIST WLAN_AVAILABLE_NETWORK Network[1]; } WLAN_AVAILABLE_NETWORK_LIST, *PWLAN_AVAILABLE_NETWORK_LIST; +typedef enum _WLAN_HOSTED_NETWORK_OPCODE +{ + wlan_hosted_network_opcode_connection_settings, + wlan_hosted_network_opcode_security_settings, + wlan_hosted_network_opcode_station_profile, + wlan_hosted_network_opcode_enable +} WLAN_HOSTED_NETWORK_OPCODE, *PWLAN_HOSTED_NETWORK_OPCODE; + DWORD WINAPI WlanCloseHandle(HANDLE, void *); DWORD WINAPI WlanEnumInterfaces(HANDLE, void *, WLAN_INTERFACE_INFO_LIST **); DWORD WINAPI WlanOpenHandle(DWORD, void *, DWORD *, HANDLE *); -- 2.32.0

1 3

[PATCH 1/4] include: Add IN6_PKTINFO
by Alex Henrie 04 Aug '21

04 Aug '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- include/ws2ipdef.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index 2f9d4f663ad..0938db2db9f 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -177,6 +177,11 @@ typedef struct WS(in_pktinfo) { UINT ipi_ifindex; } IN_PKTINFO, *PIN_PKTINFO; +typedef struct WS(in6_pktinfo) { + IN6_ADDR ipi6_addr; + ULONG ipi6_ifindex; +} IN6_PKTINFO, *PIN6_PKTINFO; + #ifndef USE_WS_PREFIX #define IPV6_OPTIONS 1 #define IPV6_HDRINCL 2 -- 2.32.0

2 7

[PATCH 1/5] iphlpapi: Use DnsQueryConfig() to retrieve the dns servers for GetAdaptersAddresses().
by Huw Davies 04 Aug '21

04 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/Makefile.in | 2 +- dlls/iphlpapi/iphlpapi_main.c | 84 ++++++++++++++++++++++------------- 2 files changed, 55 insertions(+), 31 deletions(-) diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in index 3db17289bf4..14a45e419a3 100644 --- a/dlls/iphlpapi/Makefile.in +++ b/dlls/iphlpapi/Makefile.in @@ -1,6 +1,6 @@ MODULE = iphlpapi.dll IMPORTLIB = iphlpapi -IMPORTS = advapi32 nsi uuid +IMPORTS = advapi32 dnsapi nsi uuid EXTRALIBS = $(RESOLV_LIBS) $(KSTAT_LIBS) $(PROCSTAT_LIBS) C_SRCS = \ diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 93efed2ca2e..2c8c1644b78 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1395,41 +1395,65 @@ static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) } #endif -static ULONG get_dns_server_addresses(PIP_ADAPTER_DNS_SERVER_ADDRESS address, ULONG *len) +static DWORD dns_servers_query_code( ULONG family ) { - int num = get_dns_servers( NULL, 0, FALSE ); - DWORD size; + if (family == WS_AF_INET) return DnsConfigDnsServersIpv4; + if (family == WS_AF_INET6) return DnsConfigDnsServersIpv6; + return DnsConfigDnsServersUnspec; +} - size = num * (sizeof(IP_ADAPTER_DNS_SERVER_ADDRESS) + sizeof(SOCKADDR_STORAGE)); - if (!address || *len < size) - { - *len = size; - return ERROR_BUFFER_OVERFLOW; - } - *len = size; - if (num > 0) - { - PIP_ADAPTER_DNS_SERVER_ADDRESS addr = address; - SOCKADDR_STORAGE *sock_addrs = (SOCKADDR_STORAGE *)(address + num); - int i; +static ULONG get_dns_server_addresses( ULONG family, IP_ADAPTER_DNS_SERVER_ADDRESS *address, ULONG *len ) +{ + char buf[FIELD_OFFSET(DNS_ADDR_ARRAY, AddrArray[3])]; + DNS_ADDR_ARRAY *servers = (DNS_ADDR_ARRAY *)buf; + DWORD err, num, i, needed, array_len = sizeof(buf); + DWORD query = dns_servers_query_code( family ); + SOCKADDR_INET *out_addrs; - get_dns_servers( sock_addrs, num, FALSE ); + for (;;) + { + err = DnsQueryConfig( query, 0, NULL, NULL, servers, &array_len ); + if (err != ERROR_SUCCESS && err != ERROR_MORE_DATA) goto err; + num = (array_len - FIELD_OFFSET(DNS_ADDR_ARRAY, AddrArray[0])) / sizeof(DNS_ADDR); + needed = num * (sizeof(IP_ADAPTER_DNS_SERVER_ADDRESS) + sizeof(*out_addrs)); + if (!address || *len < needed) + { + *len = needed; + err = ERROR_BUFFER_OVERFLOW; + goto err; + } + if (!err) break; - for (i = 0; i < num; i++, addr = addr->Next) + if ((char *)servers != buf) heap_free( servers ); + servers = heap_alloc( array_len ); + if (!servers) { - addr->u.s.Length = sizeof(*addr); - if (sock_addrs[i].ss_family == WS_AF_INET6) - addr->Address.iSockaddrLength = sizeof(SOCKADDR_IN6); - else - addr->Address.iSockaddrLength = sizeof(SOCKADDR_IN); - addr->Address.lpSockaddr = (SOCKADDR *)(sock_addrs + i); - if (i == num - 1) - addr->Next = NULL; - else - addr->Next = addr + 1; + err = ERROR_NOT_ENOUGH_MEMORY; + goto err; } } - return ERROR_SUCCESS; + + *len = needed; + out_addrs = (SOCKADDR_INET *)(address + num); + for (i = 0; i < num; i++) + { + address[i].u.s.Length = sizeof(*address); + address[i].u.s.Reserved = 0; + address[i].Next = NULL; + address[i].Address.iSockaddrLength = servers->AddrArray[i].Data.DnsAddrUserDword[0]; + if (address[i].Address.iSockaddrLength > sizeof(*out_addrs)) + address[i].Address.iSockaddrLength = 0; + address[i].Address.lpSockaddr = (SOCKADDR *)(out_addrs + i); + memcpy( out_addrs + i, servers->AddrArray[i].MaxSa, address[i].Address.iSockaddrLength ); + memset( (BYTE *)(out_addrs + i) + address[i].Address.iSockaddrLength, 0, + sizeof(*out_addrs) - address[i].Address.iSockaddrLength ); + if (i) address[i - 1].Next = address + i; + } + err = ERROR_SUCCESS; + +err: + if ((char *)servers != buf) heap_free( servers ); + return err; } #ifdef HAVE_STRUCT___RES_STATE @@ -1506,7 +1530,7 @@ ULONG WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses(ULONG family, ULONG flags, P /* Since DNS servers aren't really per adapter, get enough space for a * single copy of them. */ - get_dns_server_addresses(NULL, &dns_server_size); + get_dns_server_addresses( family, NULL, &dns_server_size ); total_size += dns_server_size; } /* Since DNS suffix also isn't really per adapter, get enough space for a @@ -1538,7 +1562,7 @@ ULONG WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses(ULONG family, ULONG flags, P if (dns_server_size) { firstDns = (PIP_ADAPTER_DNS_SERVER_ADDRESS)((BYTE *)first_aa + total_size - dns_server_size - dns_suffix_size); - get_dns_server_addresses(firstDns, &dns_server_size); + get_dns_server_addresses( family, firstDns, &dns_server_size ); for (aa = first_aa; aa; aa = aa->Next) { if (aa->IfType != IF_TYPE_SOFTWARE_LOOPBACK && aa->OperStatus == IfOperStatusUp) -- 2.23.0

2 1

[PATCH] ntdll: Fix offsetof calculation for IOCTL_AFD_WINE_GET_IRLMP_ENUMDEVICES.
by Gabriel Ivăncescu 04 Aug '21

04 Aug '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Fixes error: ‘DEVICELIST {aka struct _DEVICELIST}’ has no member named ‘unix_list’ dlls/ntdll/unix/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 0e52db1..9dc697e 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1976,7 +1976,7 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc if (needs_close) close( fd ); if (ret) return sock_errno_to_status( errno ); - io->Information = offsetof( DEVICELIST, unix_list->len ); + io->Information = offsetof( DEVICELIST, Device[unix_list->len] ); if (out_size < io->Information) return STATUS_BUFFER_TOO_SMALL; -- 2.31.1

2 1

[PATCH 01/12] ucrtbase: Update the fenv test for non-x86 architectures
by Piotr Caban 04 Aug '21

04 Aug '21

From: Martin Storsjö <martin(a)martin.st> The x86 style x87/sse split of status bits isn't present on arm64. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- Changes: - fixed compilation warnings in patch 1 - add _EM_DENORMAL handling to fenv_encode/fenv decode in patch 2 - temporarily mask exceptions when setting status word in patch 2 - added patches 4-12 to avoid code duplication dlls/ucrtbase/tests/misc.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)

2 1

[PATCH] conhost: Copy font properties to the new screen buffer
by Hugh McMaster 04 Aug '21

04 Aug '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50187 Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/conhost/conhost.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 061f09989eb..8a787214356 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -68,6 +68,7 @@ static void destroy_screen_buffer( struct screen_buffer *screen_buffer ) if (screen_buffer->console->active == screen_buffer) screen_buffer->console->active = NULL; wine_rb_remove( &screen_buffer_map, &screen_buffer->entry ); + free( screen_buffer->font.face_name ); free( screen_buffer->data ); free( screen_buffer ); } @@ -90,12 +91,18 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int if (console->active) { - screen_buffer->max_width = console->active->max_width; - screen_buffer->max_height = console->active->max_height; - screen_buffer->win.right = console->active->win.right - console->active->win.left; - screen_buffer->win.bottom = console->active->win.bottom - console->active->win.top; - screen_buffer->attr = console->active->attr; - screen_buffer->popup_attr = console->active->attr; + screen_buffer->max_width = console->active->max_width; + screen_buffer->max_height = console->active->max_height; + screen_buffer->win.right = console->active->win.right - console->active->win.left; + screen_buffer->win.bottom = console->active->win.bottom - console->active->win.top; + screen_buffer->attr = console->active->attr; + screen_buffer->popup_attr = console->active->attr; + screen_buffer->font.width = console->active->font.width; + screen_buffer->font.height = console->active->font.height; + screen_buffer->font.face_len = console->active->font.face_len; + if (!(screen_buffer->font.face_name = malloc(screen_buffer->font.face_len))) return NULL; + memcpy(screen_buffer->font.face_name, console->active->font.face_name, + screen_buffer->font.face_len); } else { @@ -105,6 +112,7 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int screen_buffer->win.bottom = height - 1; screen_buffer->attr = FOREGROUND_BLUE|FOREGROUND_GREEN|FOREGROUND_RED; screen_buffer->popup_attr = 0xf5; + screen_buffer->font.face_name = NULL; } if (wine_rb_put( &screen_buffer_map, LongToPtr(id), &screen_buffer->entry )) -- 2.32.0

2 1

[PATCH 1/2] jscript: Fix GetIDsOfNames for more than one name.
by Gabriel Ivăncescu 04 Aug '21

04 Aug '21

Names after the first one are supposed to retrieve DISPIDs for parameters, but it doesn't seem to be implemented on Windows. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 18 +++++++--- dlls/jscript/tests/jscript.c | 68 ++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 3955ed3..345bcd2 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1489,13 +1489,21 @@ static HRESULT WINAPI DispatchEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid, TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - for(i=0; i < cNames; i++) { - hres = IDispatchEx_GetDispID(&This->IDispatchEx_iface, rgszNames[i], 0, rgDispId+i); - if(FAILED(hres)) - return hres; + if(cNames == 0) + return S_OK; + + hres = jsdisp_get_id(This, rgszNames[0], 0, rgDispId); + if(FAILED(hres)) + return hres; + + /* DISPIDs for parameters don't seem to be supported */ + if(cNames > 1) { + for(i = 1; i < cNames; i++) + rgDispId[i] = DISPID_UNKNOWN; + hres = DISP_E_UNKNOWNNAME; } - return S_OK; + return hres; } static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index e96127f..b5803ae 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -924,6 +924,73 @@ static void test_aggregation(void) ok(!unk || broken(unk != NULL), "unk = %p\n", unk); } +static void test_param_ids(void) +{ + static const WCHAR *const names1[] = { L"test", L"c", L"foo", L"b", L"a" }; + static const WCHAR *const names2[] = { L"test", L"bar" }; + static const WCHAR *const names3[] = { L"bar", L"test" }; + DISPID id[ARRAY_SIZE(names1)]; + IActiveScriptParse *parser; + IActiveScript *script; + IDispatchEx *disp; + HRESULT hr; + + script = create_jscript(); + + hr = IActiveScript_QueryInterface(script, &IID_IActiveScriptParse, (void**)&parser); + ok(hr == S_OK, "Could not get IActiveScriptParse iface: %08x\n", hr); + + SET_EXPECT(GetLCID); + hr = IActiveScript_SetScriptSite(script, &ActiveScriptSite); + ok(hr == S_OK, "SetScriptSite failed: %08x\n", hr); + CHECK_CALLED(GetLCID); + + SET_EXPECT(OnStateChange_INITIALIZED); + hr = IActiveScriptParse_InitNew(parser); + ok(hr == S_OK, "InitNew failed: %08x\n", hr); + CHECK_CALLED(OnStateChange_INITIALIZED); + + SET_EXPECT(OnStateChange_CONNECTED); + hr = IActiveScript_SetScriptState(script, SCRIPTSTATE_CONNECTED); + ok(hr == S_OK, "SetScriptState(SCRIPTSTATE_CONNECTED) failed: %08x\n", hr); + CHECK_CALLED(OnStateChange_CONNECTED); + + parse_script(parser, L"function test(a, b, c, foo) { return a + b + c - foo; }\nfunction bar() { }"); + disp = get_script_dispatch(script, NULL); + + hr = IDispatchEx_GetIDsOfNames(disp, &IID_NULL, (WCHAR**)names1, ARRAY_SIZE(names1), 0, id); + ok(hr == DISP_E_UNKNOWNNAME, "GetIDsOfNames returned %08x, expected %08x\n", hr, DISP_E_UNKNOWNNAME); + ok(id[0] > 0, "Unexpected DISPID for \"test\": %d\n", id[0]); + ok(id[4] == DISPID_UNKNOWN, "Unexpected DISPID for \"a\" parameter: %d\n", id[4]); + ok(id[3] == DISPID_UNKNOWN, "Unexpected DISPID for \"b\" parameter: %d\n", id[3]); + ok(id[1] == DISPID_UNKNOWN, "Unexpected DISPID for \"c\" parameter: %d\n", id[1]); + ok(id[2] == DISPID_UNKNOWN, "Unexpected DISPID for \"foo\" parameter: %d\n", id[2]); + + hr = IDispatchEx_GetIDsOfNames(disp, &IID_NULL, (WCHAR**)names2, ARRAY_SIZE(names2), 0, id); + ok(hr == DISP_E_UNKNOWNNAME, "GetIDsOfNames returned %08x, expected %08x\n", hr, DISP_E_UNKNOWNNAME); + ok(id[0] > 0, "Unexpected DISPID for \"test\": %d\n", id[0]); + ok(id[1] == DISPID_UNKNOWN, "Unexpected DISPID for \"bar\": %d\n", id[1]); + + hr = IDispatchEx_GetIDsOfNames(disp, &IID_NULL, (WCHAR**)names3, ARRAY_SIZE(names3), 0, id); + ok(hr == DISP_E_UNKNOWNNAME, "GetIDsOfNames returned %08x, expected %08x\n", hr, DISP_E_UNKNOWNNAME); + ok(id[0] > 0, "Unexpected DISPID for \"bar\": %d\n", id[0]); + ok(id[1] == DISPID_UNKNOWN, "Unexpected DISPID for \"test\": %d\n", id[1]); + + IDispatchEx_Release(disp); + IActiveScriptParse_Release(parser); + + SET_EXPECT(OnStateChange_DISCONNECTED); + SET_EXPECT(OnStateChange_INITIALIZED); + SET_EXPECT(OnStateChange_CLOSED); + hr = IActiveScript_Close(script); + ok(hr == S_OK, "Close failed: %08x\n", hr); + CHECK_CALLED(OnStateChange_DISCONNECTED); + CHECK_CALLED(OnStateChange_INITIALIZED); + CHECK_CALLED(OnStateChange_CLOSED); + + IActiveScript_Release(script); +} + static void test_code_persistence(void) { IActiveScriptParse *parse; @@ -2251,6 +2318,7 @@ START_TEST(jscript) test_jscript2(); test_jscript_uninitializing(); test_aggregation(); + test_param_ids(); test_code_persistence(); test_named_items(); test_typeinfo(NULL); -- 2.31.1

2 3

[PATCH 12/12] msvcrt: Implement _fpreset on arm and aarch64.
by Piotr Caban 04 Aug '21

04 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)

1 0

[PATCH 11/12] msvcrt: Use _setfp helper on all architectures.
by Piotr Caban 04 Aug '21

04 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-)

1 0

[PATCH 10/12] msvcrt: Introduce _setfp helper on arm.
by Piotr Caban 04 Aug '21

04 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 157 +++++++++++++++++++++------------------------ 1 file changed, 73 insertions(+), 84 deletions(-)

1 0

[PATCH 09/12] msvcrt: Introduce _setfp helper on aarch64.
by Piotr Caban 04 Aug '21

04 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 169 +++++++++++++++++++++++---------------------- 1 file changed, 85 insertions(+), 84 deletions(-)

1 0

[PATCH 08/12] msvcrt: Introduce _setfp helper to access floating point status and control words.
by Piotr Caban 04 Aug '21

04 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 320 ++++++++++++++++++++++----------------------- 1 file changed, 160 insertions(+), 160 deletions(-)

1 0

[PATCH 07/12] msvcrt: Don't reset x87 in x86_64 fpreset.
by Piotr Caban 04 Aug '21

04 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[PATCH 06/12] msvcrt: Don't clear x87 status word x86_64 _clearfp.
by Piotr Caban 04 Aug '21

04 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[PATCH 05/12] msvcrt: Don't check x87 status word in x86_64 _statusfp.
by Piotr Caban 04 Aug '21

04 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

1 0

[PATCH 04/12] msvcrt: Introduce _setfp_sse helper to access mxcsr register.
by Piotr Caban 04 Aug '21

04 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 275 +++++++++++++++++++-------------------------- 1 file changed, 115 insertions(+), 160 deletions(-)

1 0

[PATCH 03/12] msvcrt: Implement fesetenv for arm
by Piotr Caban 04 Aug '21

04 Aug '21

From: Martin Storsjö <martin(a)martin.st> Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-)

1 0

[PATCH 02/12] msvcrt: Implement fesetenv for arm64
by Piotr Caban 04 Aug '21

04 Aug '21

From: Martin Storsjö <martin(a)martin.st> Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-)

1 0

[PATCH] d3d10core/tests: Test 2D texture creation with mutually exclusive sharing modes.
by Nikolay Sivov 04 Aug '21

04 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 2014e8edc94..58b5f90fadb 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -1976,6 +1976,8 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R8G8B8A8_UINT, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_SNORM, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_SINT, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D10_BIND_RENDER_TARGET, D3D10_RESOURCE_MISC_SHARED | D3D10_RESOURCE_MISC_SHARED_KEYEDMUTEX, + FALSE, TRUE}, {DXGI_FORMAT_D24_UNORM_S8_UINT, 1, D3D10_BIND_SHADER_RESOURCE, 0, FALSE, TRUE}, {DXGI_FORMAT_D24_UNORM_S8_UINT, 1, D3D10_BIND_RENDER_TARGET, 0, FALSE, FALSE}, {DXGI_FORMAT_D32_FLOAT, 1, D3D10_BIND_SHADER_RESOURCE, 0, FALSE, TRUE}, -- 2.30.2

3 2

[PATCH] krnl386: Remove unused support for WCB16_REGS_LONG.
by Zebediah Figura 04 Aug '21

04 Aug '21

This was introduced in 3a5b7cf105f52c3a2936be09e318c4177454bcc9 as way to expose wine_call_to_16_regs_long(); however, the same commit changed the only user to use WCB16_REGS instead. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/krnl386.exe16/wowthunk.c | 19 ++++--------------- include/wownt32.h | 1 - 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/krnl386.exe16/wowthunk.c b/dlls/krnl386.exe16/wowthunk.c index 73d1565c573..5bd9d7aecd4 100644 --- a/dlls/krnl386.exe16/wowthunk.c +++ b/dlls/krnl386.exe16/wowthunk.c @@ -400,7 +400,7 @@ BOOL WINAPI K32WOWCallback16Ex( DWORD vpfn16, DWORD dwFlags, memcpy( stack, pArgs, cbArgs ); - if (dwFlags & (WCB16_REGS|WCB16_REGS_LONG)) + if (dwFlags & WCB16_REGS) { CONTEXT *context = (CONTEXT *)pdwRetCode; @@ -420,20 +420,9 @@ BOOL WINAPI K32WOWCallback16Ex( DWORD vpfn16, DWORD dwFlags, } /* push return address */ - if (dwFlags & WCB16_REGS_LONG) - { - stack -= sizeof(DWORD); - *((DWORD *)stack) = HIWORD(call16_ret_addr); - stack -= sizeof(DWORD); - *((DWORD *)stack) = LOWORD(call16_ret_addr); - cbArgs += 2 * sizeof(DWORD); - } - else - { - stack -= sizeof(SEGPTR); - *((SEGPTR *)stack) = call16_ret_addr; - cbArgs += sizeof(SEGPTR); - } + stack -= sizeof(SEGPTR); + *((SEGPTR *)stack) = call16_ret_addr; + cbArgs += sizeof(SEGPTR); _EnterWin16Lock(); wine_call_to_16_regs( context, cbArgs, call16_handler ); diff --git a/include/wownt32.h b/include/wownt32.h index 51b1108d1c9..ddfa9b562b7 100644 --- a/include/wownt32.h +++ b/include/wownt32.h @@ -150,7 +150,6 @@ WORD WINAPI WOWHandle16(HANDLE,WOW_HANDLE_TYPE); /* Wine extensions: call register function, context ptr is passed in the return value LPDWORD */ #define WCB16_REGS 2 -#define WCB16_REGS_LONG 4 /* function uses 32-bit lret */ DWORD WINAPI WOWCallback16(DWORD,DWORD); BOOL WINAPI WOWCallback16Ex(DWORD,DWORD,DWORD,LPVOID,LPDWORD); -- 2.32.0

1 0

[PATCH v2 1/3] d2d1/tests: Add failure tests for ID2D1Effect_GetValue().
by Ziqing Hui 04 Aug '21

04 Aug '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 72487692abf..629bbd65523 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9680,13 +9680,14 @@ static void test_mt_factory(BOOL d3d11) static void test_effect(BOOL d3d11) { - unsigned int i, min_inputs, max_inputs; + unsigned int i, min_inputs, max_inputs, str_size; D2D1_BUFFER_PRECISION precision; ID2D1Image *image_a, *image_b; struct d2d1_test_context ctx; ID2D1DeviceContext *context; ID2D1Factory1 *factory; ID2D1Effect *effect; + BYTE buffer[64]; BOOL cached; CLSID clsid; HRESULT hr; @@ -9735,6 +9736,33 @@ static void test_effect(BOOL d3d11) todo_wine { + hr = ID2D1Effect_GetValue(effect, 0xdeadbeef, D2D1_PROPERTY_TYPE_CLSID, (BYTE *)&clsid, sizeof(clsid)); + ok(hr == D2DERR_INVALID_PROPERTY, "Got unexpected hr %#x.\n", hr); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_CLSID, buffer, sizeof(clsid) + 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_CLSID, buffer, sizeof(clsid) - 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_CLSID, buffer, sizeof(clsid)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, D2D1_PROPERTY_TYPE_STRING, buffer, sizeof(buffer)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + str_size = (wcslen((WCHAR *)buffer) + 1) * sizeof(WCHAR); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, D2D1_PROPERTY_TYPE_STRING, buffer, str_size); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, D2D1_PROPERTY_TYPE_STRING, buffer, str_size - 1); + ok(hr == D2DERR_INSUFFICIENT_BUFFER, "Got unexpected hr %#x.\n", hr); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, 0xdeadbeef, (BYTE *)&clsid, sizeof(clsid)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_UNKNOWN, (BYTE *)&clsid, sizeof(clsid)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_VECTOR4, (BYTE *)&clsid, sizeof(clsid)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_VECTOR4, buffer, sizeof(buffer)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_CLSID, (BYTE *)&clsid, sizeof(clsid)); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); -- 2.25.1

3 10

[PATCH] ntdll/tests: Account for some timer resolution rounding.
by Francois Gouget 04 Aug '21

04 Aug '21

With some time source drivers the requested timer resolution is rounded to the nearest value supported by the hardware, and that is then reported by NtSetTimerResolution(). So adjust the timer tests to allow close values, including outside the max-min range! Make sure the values given to NtQueryTimerResolution() are well outside the range of what it could return. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This should fix the failures on cw-gtx560 and cw-rx460 in all Windows versions. --- dlls/ntdll/tests/time.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index f75b159f441..4b378d02e23 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -216,18 +216,20 @@ static void test_RtlQueryPerformanceCounter(void) } #endif +#define TIMER_LEEWAY 10 #define CHECK_CURRENT_TIMER(expected) \ do { \ ok(status == STATUS_SUCCESS, "NtSetTimerResolution failed %x\n", status); \ - ok(cur2 == (expected), "expected new timer resolution %u, got %u\n", (expected), cur2); \ - min2 = min + 10; \ + ok(cur2 == (expected) || broken(abs((expected) - cur2) <= TIMER_LEEWAY), "expected new timer resolution %u, got %u\n", (expected), cur2); \ + set = cur2; \ + min2 = min + 20000; \ cur2 = min2 + 1; \ max2 = cur2 + 1; \ status = NtQueryTimerResolution(&min2, &max2, &cur2); \ ok(status == STATUS_SUCCESS, "NtQueryTimerResolution() failed %x\n", status); \ ok(min2 == min, "NtQueryTimerResolution() expected min=%u, got %u\n", min, min2); \ ok(max2 == max, "NtQueryTimerResolution() expected max=%u, got %u\n", max, max2); \ - ok(cur2 == expected, "NtQueryTimerResolution() expected timer resolution %u, got %u\n", (expected), cur2); \ + ok(cur2 == set, "NtQueryTimerResolution() expected timer resolution %u, got %u\n", set, cur2); \ } while (0) static void test_TimerResolution(void) @@ -252,7 +254,8 @@ static void test_TimerResolution(void) ok(min == 156250 /* 1/64s HPET */ || min == 156001 /* RTC */, "unexpected minimum timer resolution %u\n", min); ok(0 < max, "invalid maximum timer resolution, should be 0 < %u\n", max); - ok(max <= cur && cur <= min, "invalid timer resolutions, should be %u <= %u <= %u\n", max, cur, min); + ok(max <= cur || broken(max - TIMER_LEEWAY <= cur), "invalid timer resolutions, should be %u <= %u\n", max, cur); + ok(cur <= min || broken(cur <= min + TIMER_LEEWAY), "invalid timer resolutions, should be %u <= %u\n", cur, min); status = NtSetTimerResolution(0, FALSE, NULL); ok(status == STATUS_ACCESS_VIOLATION, "NtSetTimerResolution(,,NULL) success\n"); @@ -261,7 +264,7 @@ static void test_TimerResolution(void) status = NtSetTimerResolution(cur - 1, TRUE, NULL); ok(status == STATUS_ACCESS_VIOLATION, "NtSetTimerResolution() failed %x\n", status); - min2 = min + 1; + min2 = min + 10000; cur2 = min2 + 1; max2 = cur2 + 1; status = NtQueryTimerResolution(&min2, &max2, &cur2); @@ -311,7 +314,7 @@ static void test_TimerResolution(void) set = max < cur ? cur - 1 : max; status = NtSetTimerResolution(set, TRUE, &cur2); ok(status == STATUS_SUCCESS, "NtSetTimerResolution() failed %x\n", status); - ok(cur2 <= set, "expected new timer resolution %u <= %u\n", cur2, set); + ok(cur2 <= set || broken(cur2 <= set + TIMER_LEEWAY), "expected new timer resolution %u <= %u\n", cur2, set); trace("timer resolution: %u(max) <= %u(cur) <= %u(prev) <= %u(min)\n", max, cur2, cur, min); cur2 = 7654321; -- 2.20.1

1 0

[PATCH 9/9] gdi32: Use ntgdi name for SetVirtualResolution.
by Jacek Caban 04 Aug '21

04 Aug '21

2 1

[PATCH 8/9] gdi32: Use ntgdi interface for GetTransform and GetWorldTransform.
by Jacek Caban 04 Aug '21

04 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 18 ++---------------- dlls/gdi32/enhmfdrv/bitblt.c | 2 +- dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/gdidc.c | 8 ++++++++ 4 files changed, 12 insertions(+), 18 deletions(-)

2 1

[PATCH 7/9] gdi32: Remove no longer used clipping driver entry points.
by Jacek Caban 04 Aug '21

04 Aug '21

2 1

[PATCH 6/9] gdi32: Use NtGdiSetMetaRgn for SetMetaRgn.
by Jacek Caban 04 Aug '21

04 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/clipping.c | 4 ++-- dlls/gdi32/gdidc.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-)

2 1

[PATCH 5/9] gdi32: Use NtGdiExtSelectClipRgn for ExtSelectClipRgn implementation.
by Jacek Caban 04 Aug '21

04 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/clipping.c | 57 +++++++++++----------------- dlls/gdi32/enhmfdrv/dc.c | 10 ++--- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 + dlls/gdi32/gdidc.c | 24 ++++++++++++ dlls/gdi32/mfdrv/graphics.c | 14 ++++--- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 62 insertions(+), 51 deletions(-)

2 1

[PATCH 4/9] gdi32: Use ntgdi names for PtVisible and RectVisible.
by Jacek Caban 04 Aug '21

04 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/clipping.c | 8 ++++---- dlls/gdi32/gdi32.spec | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)

2 1

[PATCH 3/9] gdi32: Use NtGdiExcludeClipRect for ExcludeClipRect implementation.
by Jacek Caban 04 Aug '21

04 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/clipping.c | 34 +++++++++++++--------------- dlls/gdi32/enhmfdrv/dc.c | 6 ++--- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 4 ++++ dlls/gdi32/gdidc.c | 14 ++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 40 insertions(+), 28 deletions(-)

2 1

[PATCH 2/9] gdi32: Use NtGdiOffsetClipRgn for OffsetClipRgn implementation.
by Jacek Caban 04 Aug '21

04 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/clipping.c | 33 +++++++++++----------------- dlls/gdi32/enhmfdrv/dc.c | 6 ++--- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 13 +++++++++++ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 34 insertions(+), 30 deletions(-)

2 1

[PATCH 1/9] gdi32: Use NtGdiIntersectClipRect for IntersectClipRect implementation.
by Jacek Caban 04 Aug '21

04 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/clipping.c | 49 ++++++++++++---------------- dlls/gdi32/enhmfdrv/dc.c | 6 ++-- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 4 +++ dlls/gdi32/gdidc.c | 16 +++++++++ dlls/gdi32/mfdrv/dc.c | 4 +-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 47 insertions(+), 38 deletions(-)

2 1

[PATCH vkd3d] tests: Include <stddef.h> from "d3d12_crosstest.h".
by Chip Davis 04 Aug '21

04 Aug '21

Neither MinGW's nor Microsoft's <windows.h> includes <stddef.h>, either directly or indirectly. Fixes cross compilation errors related to using offsetof(3). Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- tests/d3d12_crosstest.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 43af375..0b77bde 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -52,6 +52,7 @@ typedef int HRESULT; #include <inttypes.h> #include <limits.h> #include <math.h> +#include <stddef.h> #include <time.h> #ifdef _WIN32 -- 2.31.1

2 2

[PATCH vkd3d 1/4] tests: Add tests for DGE and DLT instructions.
by Conor McCarthy 04 Aug '21

04 Aug '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index f90526c7..8afeaa3a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9245,6 +9245,52 @@ static void test_shader_instructions(void) 0x00000000, 0x0100003e, 0x30494653, 0x00000008, 0x00000001, 0x00000000, }; static struct named_shader ps_dne = {"dne", ps_dne_code, sizeof(ps_dne_code)}; + static const DWORD ps_dge_code[] = + { +#if 0 + double2 src0; + + void main(out uint4 dst : SV_Target) + { + dst = (uint4)0; + if (src0.x >= src0.y) + dst.x = 0xffffffff; + } +#endif + 0x43425844, 0xad9e15a9, 0x80ed9af5, 0x039e7dbd, 0xac8b1634, 0x00000001, 0x00000118, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x00000108, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000008c, 0x00000050, + 0x00000023, 0x0100186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x090000c4, 0x00100012, 0x00000000, 0x00208446, 0x00000000, + 0x00000000, 0x00208ee6, 0x00000000, 0x00000000, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, + 0x00000000, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x0100003e, 0x30494653, 0x00000008, 0x00000001, 0x00000000, + }; + static struct named_shader ps_dge = {"dge", ps_dge_code, sizeof(ps_dge_code)}; + static const DWORD ps_dlt_code[] = + { +#if 0 + double2 src0; + + void main(out uint4 dst : SV_Target) + { + dst = (uint4)0; + if (src0.x < src0.y) + dst.x = 0xffffffff; + } +#endif + 0x43425844, 0xc42b9ef5, 0xd24453bd, 0xc6bc7933, 0x1ba2cbcd, 0x00000001, 0x00000118, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x00000108, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000008c, 0x00000050, + 0x00000023, 0x0100186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x090000c5, 0x00100012, 0x00000000, 0x00208446, 0x00000000, + 0x00000000, 0x00208ee6, 0x00000000, 0x00000000, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, + 0x00000000, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x0100003e, 0x30494653, 0x00000008, 0x00000001, 0x00000000, + }; + static struct named_shader ps_dlt = {"dlt", ps_dlt_code, sizeof(ps_dlt_code)}; static const DWORD ps_dtou_code[] = { #if 0 @@ -9891,6 +9937,11 @@ static void test_shader_instructions(void) {&ps_deq, {.d = {{1.0, 0.0}}}, {{0x00000000}}, true}, {&ps_dne, {.d = {{0.0, 0.0}}}, {{0x00000000}}, true, true}, {&ps_dne, {.d = {{1.0, 0.0}}}, {{0xffffffff}}, true, true}, + {&ps_dge, {.d = {{0.0, 1.0}}}, {{0x00000000}}, true, true}, + {&ps_dge, {.d = {{1.0, 1.0}}}, {{0xffffffff}}, true, true}, + {&ps_dge, {.d = {{1.5, 1.0}}}, {{0xffffffff}}, true, true}, + {&ps_dlt, {.d = {{0.0, 1.0}}}, {{0xffffffff}}, true, true}, + {&ps_dlt, {.d = {{1.0, 1.0}}}, {{0x00000000}}, true, true}, {&ps_dtou, {.d = {{ -NAN}}}, {{ 0, 0 }}, true, true}, {&ps_dtou, {.d = {{ NAN}}}, {{ 0, 0 }}, true, true}, {&ps_dtou, {.d = {{-INFINITY}}}, {{ 0, ~0u}}, true, true}, -- 2.32.0

2 7

[PATCH] ntdll: Return STATUS_NOT_SUPPORTED if dlinfo() is not present.
by Huw Davies 04 Aug '21

04 Aug '21

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 04 Aug '21

04 Aug '21

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 04 Aug '21

04 Aug '21

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ö 04 Aug '21

04 Aug '21

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 04 Aug '21

04 Aug '21

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 04 Aug '21

04 Aug '21

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 04 Aug '21

04 Aug '21

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 04 Aug '21

04 Aug '21

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 04 Aug '21

04 Aug '21

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 04 Aug '21

04 Aug '21

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel