- Wine-Devel - list.winehq.org

[PATCH] gdi32: Use documented structure layout for EMF-to-WMF embedding records.
by Nikolay Sivov Aug. 5, 2021

Aug. 5, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- The only goal is to remove "unknowns" that's been documented since. I think this patch does not conflict with last ntgdi batch. dlls/gdi32/enhmetafile.c | 2 +- dlls/gdi32/metafile.c | 10 ++++------ dlls/gdi32/ntgdi_private.h | 10 ++++------ 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 25ffcff93bf..b12db98d9e6 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -2804,7 +2804,7 @@ static HENHMETAFILE extract_emf_from_comment( const BYTE *buf, UINT mf_size ) chunk = (emf_in_wmf_comment *)(mr->rdParm + 2); if (mr->rdFunction != META_ESCAPE || mr->rdParm[0] != MFCOMMENT) goto done; - if (chunk->magic != WMFC_MAGIC) goto done; + if (chunk->comment_id != WMFC_MAGIC) goto done; if (!emf_bits) { diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index b0428960b50..6b4df5680ba 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -1096,13 +1096,11 @@ static BOOL add_mf_comment(HDC hdc, HENHMETAFILE emf) chunk = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(emf_in_wmf_comment, emf_data[max_chunk_size])); if(!chunk) goto end; - chunk->magic = WMFC_MAGIC; - chunk->unk04 = 1; - chunk->unk06 = 0; - chunk->unk08 = 0; - chunk->unk0a = 1; + chunk->comment_id = WMFC_MAGIC; + chunk->comment_type = 0x1; + chunk->version = 0x00010000; chunk->checksum = 0; /* We fixup the first chunk's checksum before returning from GetWinMetaFileBits */ - chunk->unk0e = 0; + chunk->flags = 0; chunk->num_chunks = (size + max_chunk_size - 1) / max_chunk_size; chunk->chunk_size = max_chunk_size; chunk->remaining_size = size; diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index c3ae797ddf6..755d3193615 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -462,13 +462,11 @@ extern HMETAFILE MF_Create_HMETAFILE(METAHEADER *mh) DECLSPEC_HIDDEN; #include <pshpack2.h> typedef struct { - DWORD magic; /* WMFC */ - WORD unk04; /* 1 */ - WORD unk06; /* 0 */ - WORD unk08; /* 0 */ - WORD unk0a; /* 1 */ + DWORD comment_id; /* WMFC */ + DWORD comment_type; /* Always 0x00000001 */ + DWORD version; /* Always 0x00010000 */ WORD checksum; - DWORD unk0e; /* 0 */ + DWORD flags; /* Always 0 */ DWORD num_chunks; DWORD chunk_size; DWORD remaining_size; -- 2.30.2

2 1

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

Aug. 5, 2021

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

1 0

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

Aug. 5, 2021

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

1 0

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

Aug. 5, 2021

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

1 0

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

Aug. 5, 2021

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

1 0

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

Aug. 5, 2021

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 Aug. 5, 2021

Aug. 5, 2021

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 Aug. 5, 2021

Aug. 5, 2021

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 Aug. 5, 2021

Aug. 5, 2021

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(a)K@Z +@ stub ?DXConstUnderArray@@YGXPAVDXPMSAMPLE@@ABV1(a)K@Z +@ stub ?DXDitherArray@@YGXPBUDXDITHERDESC@@@Z +@ stub ?DXLinearInterpolateArray@@YGXPBVDXBASESAMPLE@@PAUDXLIMAPINFO@@PAV1(a)K@Z +@ stub ?DXOverArray@@YGXPAVDXPMSAMPLE@@PBV1(a)K@Z +@ stub ?DXOverArrayMMX@@YGXPAVDXPMSAMPLE@@PBV1(a)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 Aug. 5, 2021

Aug. 5, 2021

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