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

[PATCH 4/6] dnsapi: Implement support for returning ipv4 servers in a DNS_ADDR_ARRAY.
by Huw Davies Aug. 3, 2021

Aug. 3, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/dnsapi/dnsapi.h | 4 +- dlls/dnsapi/libresolv.c | 31 +++++++++----- dlls/dnsapi/query.c | 50 +++++++++++++++++++++-- dlls/dnsapi/tests/Makefile.in | 2 +- dlls/dnsapi/tests/query.c | 76 +++++++++++++++++++++++++++++++++++ include/windns.h | 7 +++- 6 files changed, 152 insertions(+), 18 deletions(-) diff --git a/dlls/dnsapi/dnsapi.h b/dlls/dnsapi/dnsapi.h index bcd6a6d5bc3..168c37282bd 100644 --- a/dlls/dnsapi/dnsapi.h +++ b/dlls/dnsapi/dnsapi.h @@ -121,13 +121,13 @@ static inline char *strdup_ua( const char *src ) extern const char *type_to_str( unsigned short ) DECLSPEC_HIDDEN; -extern DNS_STATUS CDECL resolv_get_serverlist( IP4_ARRAY *, DWORD * ) DECLSPEC_HIDDEN; +extern DNS_STATUS CDECL resolv_get_serverlist( USHORT, DNS_ADDR_ARRAY *, DWORD * ) DECLSPEC_HIDDEN; extern DNS_STATUS CDECL resolv_query( const char *, WORD, DWORD, DNS_RECORDA ** ) DECLSPEC_HIDDEN; extern DNS_STATUS CDECL resolv_set_serverlist( const IP4_ARRAY * ) DECLSPEC_HIDDEN; struct resolv_funcs { - DNS_STATUS (CDECL *get_serverlist)( IP4_ARRAY *addrs, DWORD *len ); + DNS_STATUS (CDECL *get_serverlist)( USHORT family, DNS_ADDR_ARRAY *addrs, DWORD *len ); DNS_STATUS (CDECL *query)( const char *name, WORD type, DWORD options, DNS_RECORDA **result ); DNS_STATUS (CDECL *set_serverlist)( const IP4_ARRAY *addrs ); }; diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c index ac52147af01..7e754d73af3 100644 --- a/dlls/dnsapi/libresolv.c +++ b/dlls/dnsapi/libresolv.c @@ -50,6 +50,9 @@ #include "winbase.h" #include "winnls.h" #include "windns.h" +#define USE_WS_PREFIX +#include "ws2def.h" +#include "ws2ipdef.h" #include "wine/debug.h" #include "wine/heap.h" @@ -225,25 +228,33 @@ static DNS_STATUS map_h_errno( int error ) } } -DNS_STATUS CDECL resolv_get_serverlist( IP4_ARRAY *addrs, DWORD *len ) +DNS_STATUS CDECL resolv_get_serverlist( USHORT family, DNS_ADDR_ARRAY *addrs, DWORD *len ) { - unsigned int size; - int i; + DWORD needed, i; init_resolver(); - size = FIELD_OFFSET(IP4_ARRAY, AddrArray[_res.nscount]); - if (!addrs || *len < size) + if (family != WS_AF_INET) return ERROR_NOT_SUPPORTED; + + needed = FIELD_OFFSET(DNS_ADDR_ARRAY, AddrArray[_res.nscount]); + + if (!addrs || *len < needed) { - *len = size; - return ERROR_INSUFFICIENT_BUFFER; + *len = needed; + return !addrs ? ERROR_SUCCESS : ERROR_MORE_DATA; } - addrs->AddrCount = _res.nscount; + *len = needed; + memset( addrs, 0, needed ); + addrs->AddrCount = addrs->MaxCount = _res.nscount; for (i = 0; i < _res.nscount; i++) - addrs->AddrArray[i] = _res.nsaddr_list[i].sin_addr.s_addr; - + { + SOCKADDR_INET *inet = (SOCKADDR_INET *)addrs->AddrArray[i].MaxSa; + inet->Ipv4.sin_family = WS_AF_INET; + inet->Ipv4.sin_addr.WS_s_addr = _res.nsaddr_list[i].sin_addr.s_addr; + addrs->AddrArray[i].Data.DnsAddrUserDword[0] = sizeof(SOCKADDR_IN); + } return ERROR_SUCCESS; } diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index a7ae77148be..b836cdaaf48 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -25,6 +25,7 @@ #include "winnls.h" #include "windns.h" #include "nb30.h" +#include "ws2def.h" #include "wine/debug.h" #include "dnsapi.h" @@ -259,6 +260,46 @@ static DNS_STATUS get_hostname_w( COMPUTER_NAME_FORMAT format, PWSTR buffer, PDW return ERROR_SUCCESS; } +static DNS_STATUS get_dns_server_list( IP4_ARRAY *out, DWORD *len ) +{ + char buf[FIELD_OFFSET(DNS_ADDR_ARRAY, AddrArray[3])]; + DNS_ADDR_ARRAY *servers = (DNS_ADDR_ARRAY *)buf; + DWORD ret, needed, i, num, array_len = sizeof(buf); + + for (;;) + { + ret = resolv_funcs->get_serverlist( AF_INET, servers, &array_len ); + if (ret != ERROR_SUCCESS && ret != ERROR_MORE_DATA) goto err; + num = (array_len - FIELD_OFFSET(DNS_ADDR_ARRAY, AddrArray[0])) / sizeof(DNS_ADDR); + needed = FIELD_OFFSET(IP4_ARRAY, AddrArray[num]); + if (!out || *len < needed) + { + *len = needed; + ret = !out ? ERROR_SUCCESS : ERROR_MORE_DATA; + goto err; + } + if (!ret) break; + + if ((char *)servers != buf) heap_free( servers ); + servers = heap_alloc( array_len ); + if (!servers) + { + ret = ERROR_NOT_ENOUGH_MEMORY; + goto err; + } + } + + out->AddrCount = num; + for (i = 0; i < num; i++) + out->AddrArray[i] = ((SOCKADDR_IN *)servers->AddrArray[i].MaxSa)->sin_addr.s_addr; + *len = needed; + ret = ERROR_SUCCESS; + +err: + if ((char *)servers != buf) heap_free( servers ); + return ret; +} + /****************************************************************************** * DnsQueryConfig [DNSAPI.@] * @@ -276,10 +317,8 @@ DNS_STATUS WINAPI DnsQueryConfig( DNS_CONFIG_TYPE config, DWORD flag, PCWSTR ada switch (config) { case DnsConfigDnsServerList: - { - ret = resolv_funcs->get_serverlist( buffer, len ); - break; - } + return get_dns_server_list( buffer, len ); + case DnsConfigHostName_A: case DnsConfigHostName_UTF8: return get_hostname_a( ComputerNameDnsHostname, buffer, len ); @@ -312,6 +351,9 @@ DNS_STATUS WINAPI DnsQueryConfig( DNS_CONFIG_TYPE config, DWORD flag, PCWSTR ada FIXME( "unimplemented config type %d\n", config ); break; + case DnsConfigDnsServersIpv4: + return resolv_funcs->get_serverlist( AF_INET, buffer, len ); + default: WARN( "unknown config type: %d\n", config ); break; diff --git a/dlls/dnsapi/tests/Makefile.in b/dlls/dnsapi/tests/Makefile.in index f476103b096..3f8c424b4f7 100644 --- a/dlls/dnsapi/tests/Makefile.in +++ b/dlls/dnsapi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dnsapi.dll -IMPORTS = dnsapi ws2_32 +IMPORTS = dnsapi ws2_32 iphlpapi C_SRCS = \ cache.c \ diff --git a/dlls/dnsapi/tests/query.c b/dlls/dnsapi/tests/query.c index bee3353e1b9..d11a53b5306 100644 --- a/dlls/dnsapi/tests/query.c +++ b/dlls/dnsapi/tests/query.c @@ -25,6 +25,7 @@ #include "windns.h" #include "winsock2.h" #include "ws2ipdef.h" +#include "iphlpapi.h" #include "wine/test.h" @@ -118,6 +119,80 @@ static void test_DnsQuery(void) } } +static IP_ADAPTER_ADDRESSES *get_adapters(void) +{ + ULONG err, size = 1024; + IP_ADAPTER_ADDRESSES *ret = malloc( size ); + for (;;) + { + err = GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST | + GAA_FLAG_SKIP_FRIENDLY_NAME, + NULL, ret, &size ); + if (err != ERROR_BUFFER_OVERFLOW) break; + ret = realloc( ret, size ); + } + if (err == ERROR_SUCCESS) return ret; + free( ret ); + return NULL; +} + +static void test_DnsQueryConfig( void ) +{ + DWORD err, size, i; + WCHAR name[MAX_ADAPTER_NAME_LENGTH + 1]; + IP_ADAPTER_ADDRESSES *adapters, *ptr; + DNS_ADDR_ARRAY *ipv4; + IP4_ARRAY *ip4_array; + + if (!(adapters = get_adapters())) return; + + for (ptr = adapters; ptr; ptr = ptr->Next) + { + MultiByteToWideChar( CP_ACP, 0, ptr->AdapterName, -1, name, ARRAY_SIZE(name) ); + if (ptr->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue; + + size = 0; + err = DnsQueryConfig( DnsConfigDnsServersIpv4, 0, name, NULL, NULL, &size ); + if (err) continue; + ipv4 = malloc( size ); + err = DnsQueryConfig( DnsConfigDnsServersIpv4, 0, name, NULL, ipv4, &size ); + ok( !err, "got %d\n", err ); + + ok( ipv4->AddrCount == ipv4->MaxCount, "got %d vs %d\n", ipv4->AddrCount, ipv4->MaxCount ); + ok( !ipv4->Tag, "got %08x\n", ipv4->Tag ); + ok( !ipv4->Family, "got %d\n", ipv4->Family ); + ok( !ipv4->WordReserved, "got %04x\n", ipv4->WordReserved ); + ok( !ipv4->Flags, "got %08x\n", ipv4->Flags ); + ok( !ipv4->MatchFlag, "got %08x\n", ipv4->MatchFlag ); + ok( !ipv4->Reserved1, "got %08x\n", ipv4->Reserved1 ); + ok( !ipv4->Reserved2, "got %08x\n", ipv4->Reserved2 ); + + size = 0; + err = DnsQueryConfig( DnsConfigDnsServerList, 0, name, NULL, NULL, &size ); + ok( !err, "got %d\n", err ); + ip4_array = malloc( size ); + err = DnsQueryConfig( DnsConfigDnsServerList, 0, name, NULL, ip4_array, &size ); + ok( !err, "got %d\n", err ); + + ok( ipv4->AddrCount == ip4_array->AddrCount, "got %d vs %d\n", ipv4->AddrCount, ip4_array->AddrCount ); + + for (i = 0; i < ipv4->AddrCount; i++) + { + SOCKADDR_IN *sa = (SOCKADDR_IN *)ipv4->AddrArray[i].MaxSa; + + ok( sa->sin_family == AF_INET, "got %d\n", sa->sin_family ); + ok( sa->sin_addr.s_addr == ip4_array->AddrArray[i], "got %08x vs %08x\n", + sa->sin_addr.s_addr, ip4_array->AddrArray[i] ); + ok( ipv4->AddrArray[i].Data.DnsAddrUserDword[0] == sizeof(*sa), "got %d\n", + ipv4->AddrArray[i].Data.DnsAddrUserDword[0] ); + } + free( ip4_array ); + free( ipv4 ); + } + + free( adapters ); +} + START_TEST(query) { WSADATA data; @@ -125,4 +200,5 @@ START_TEST(query) WSAStartup(MAKEWORD(2, 2), &data); test_DnsQuery(); + test_DnsQueryConfig(); } diff --git a/include/windns.h b/include/windns.h index 26d37165ce1..f1f2184281c 100644 --- a/include/windns.h +++ b/include/windns.h @@ -152,7 +152,12 @@ typedef enum _DNS_CONFIG_TYPE DnsConfigHostName_UTF8, DnsConfigFullHostName_W, DnsConfigFullHostName_A, - DnsConfigFullHostName_UTF8 + DnsConfigFullHostName_UTF8, + + /* These are undocumented and return a DNS_ADDR_ARRAY */ + DnsConfigDnsServersUnspec = 4144, + DnsConfigDnsServersIpv4, + DnsConfigDnsServersIpv6 } DNS_CONFIG_TYPE; typedef enum _DnsSection -- 2.23.0

1 0

[PATCH 3/6] iphlpapi: Implement GetAdaptersInfo() on top of nsi.
by Huw Davies Aug. 3, 2021

Aug. 3, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 281 +++++++++++++++++----------------- 1 file changed, 144 insertions(+), 137 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 462dc055527..93efed2ca2e 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -608,155 +608,162 @@ static DWORD get_wins_servers( SOCKADDR_INET **servers ) return count; } +static void ip_addr_string_init( IP_ADDR_STRING *s, const IN_ADDR *addr, const IN_ADDR *mask, DWORD ctxt ) +{ + s->Next = NULL; + + if (addr) RtlIpv4AddressToStringA( addr, s->IpAddress.String ); + else s->IpAddress.String[0] = '\0'; + if (mask) RtlIpv4AddressToStringA( mask, s->IpMask.String ); + else s->IpMask.String[0] = '\0'; + s->Context = ctxt; +} + /****************************************************************** * GetAdaptersInfo (IPHLPAPI.@) * * Get information about adapters. * * PARAMS - * pAdapterInfo [Out] buffer for adapter infos - * pOutBufLen [In] length of output buffer - * - * RETURNS - * Success: NO_ERROR - * Failure: error code from winerror.h + * info [Out] buffer for adapter infos + * size [In] length of output buffer */ -DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) +DWORD WINAPI GetAdaptersInfo( IP_ADAPTER_INFO *info, ULONG *size ) { - DWORD ret; + DWORD err, if_count, if_num = 0, uni_count, fwd_count, needed, wins_server_count; + DWORD len, i, uni, fwd; + NET_LUID *if_keys = NULL; + struct nsi_ndis_ifinfo_rw *if_rw = NULL; + struct nsi_ndis_ifinfo_dynamic *if_dyn = NULL; + struct nsi_ndis_ifinfo_static *if_stat = NULL; + struct nsi_ipv4_unicast_key *uni_keys = NULL; + struct nsi_ip_unicast_rw *uni_rw = NULL; + struct nsi_ipv4_forward_key *fwd_keys = NULL; + SOCKADDR_INET *wins_servers = NULL; + IP_ADDR_STRING *extra_ip_addrs, *cursor; + IN_ADDR gw, mask; - TRACE("pAdapterInfo %p, pOutBufLen %p\n", pAdapterInfo, pOutBufLen); - if (!pOutBufLen) - ret = ERROR_INVALID_PARAMETER; - else { - DWORD numNonLoopbackInterfaces = get_interface_indices( TRUE, NULL ); - - if (numNonLoopbackInterfaces > 0) { - DWORD numIPAddresses = getNumIPAddresses(); - ULONG size; - - /* This may slightly overestimate the amount of space needed, because - * the IP addresses include the loopback address, but it's easier - * to make sure there's more than enough space than to make sure there's - * precisely enough space. - */ - size = sizeof(IP_ADAPTER_INFO) * numNonLoopbackInterfaces; - size += numIPAddresses * sizeof(IP_ADDR_STRING); - if (!pAdapterInfo || *pOutBufLen < size) { - *pOutBufLen = size; - ret = ERROR_BUFFER_OVERFLOW; - } - else { - InterfaceIndexTable *table = NULL; - PMIB_IPADDRTABLE ipAddrTable = NULL; - PMIB_IPFORWARDTABLE routeTable = NULL; - - ret = getIPAddrTable(&ipAddrTable, GetProcessHeap(), 0); - if (!ret) - ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, GetProcessHeap(), 0); - if (!ret) - get_interface_indices( TRUE, &table ); - if (table) { - size = sizeof(IP_ADAPTER_INFO) * table->numIndexes; - size += ipAddrTable->dwNumEntries * sizeof(IP_ADDR_STRING); - if (*pOutBufLen < size) { - *pOutBufLen = size; - ret = ERROR_INSUFFICIENT_BUFFER; - } - else { - SOCKADDR_INET *wins_servers = NULL; - DWORD ndx, wins_server_count = get_wins_servers( &wins_servers ); - PIP_ADDR_STRING nextIPAddr = (PIP_ADDR_STRING)((LPBYTE)pAdapterInfo - + numNonLoopbackInterfaces * sizeof(IP_ADAPTER_INFO)); - - memset(pAdapterInfo, 0, size); - for (ndx = 0; ndx < table->numIndexes; ndx++) { - PIP_ADAPTER_INFO ptr = &pAdapterInfo[ndx]; - DWORD i; - PIP_ADDR_STRING currentIPAddr = &ptr->IpAddressList; - BOOL firstIPAddr = TRUE; - NET_LUID luid; - GUID guid; - - /* on Win98 this is left empty, but whatever */ - ConvertInterfaceIndexToLuid(table->indexes[ndx], &luid); - ConvertInterfaceLuidToGuid(&luid, &guid); - ConvertGuidToStringA( &guid, ptr->AdapterName, ARRAY_SIZE(ptr->AdapterName) ); - getInterfaceNameByIndex(table->indexes[ndx], ptr->Description); - ptr->AddressLength = sizeof(ptr->Address); - getInterfacePhysicalByIndex(table->indexes[ndx], - &ptr->AddressLength, ptr->Address, &ptr->Type); - ptr->Index = table->indexes[ndx]; - for (i = 0; i < ipAddrTable->dwNumEntries; i++) { - if (ipAddrTable->table[i].dwIndex == ptr->Index) { - if (firstIPAddr) { - RtlIpv4AddressToStringA((IN_ADDR *)&ipAddrTable->table[i].dwAddr, - ptr->IpAddressList.IpAddress.String); - RtlIpv4AddressToStringA((IN_ADDR *)&ipAddrTable->table[i].dwMask, - ptr->IpAddressList.IpMask.String); - firstIPAddr = FALSE; - } - else { - currentIPAddr->Next = nextIPAddr; - currentIPAddr = nextIPAddr; - RtlIpv4AddressToStringA((IN_ADDR *)&ipAddrTable->table[i].dwAddr, - currentIPAddr->IpAddress.String); - RtlIpv4AddressToStringA((IN_ADDR *)&ipAddrTable->table[i].dwMask, - currentIPAddr->IpMask.String); - nextIPAddr++; - } - } - } - /* If no IP was found it probably means that the interface is not - * configured. In this case we have to return a zeroed IP and mask. */ - if (firstIPAddr) { - strcpy(ptr->IpAddressList.IpAddress.String, "0.0.0.0"); - strcpy(ptr->IpAddressList.IpMask.String, "0.0.0.0"); - } - /* Find first router through this interface, which we'll assume - * is the default gateway for this adapter */ - strcpy(ptr->GatewayList.IpAddress.String, "0.0.0.0"); - strcpy(ptr->GatewayList.IpMask.String, "255.255.255.255"); - for (i = 0; i < routeTable->dwNumEntries; i++) - if (routeTable->table[i].dwForwardIfIndex == ptr->Index - && routeTable->table[i].u1.ForwardType == - MIB_IPROUTE_TYPE_INDIRECT) - { - RtlIpv4AddressToStringA((IN_ADDR *)&routeTable->table[i].dwForwardNextHop, - ptr->GatewayList.IpAddress.String); - RtlIpv4AddressToStringA((IN_ADDR *)&routeTable->table[i].dwForwardMask, - ptr->GatewayList.IpMask.String); - } - if (wins_server_count) - { - ptr->HaveWins = TRUE; - RtlIpv4AddressToStringA( &wins_servers[0].Ipv4.sin_addr, ptr->PrimaryWinsServer.IpAddress.String ); - if (wins_server_count > 1) - RtlIpv4AddressToStringA( &wins_servers[1].Ipv4.sin_addr, ptr->SecondaryWinsServer.IpAddress.String ); - } - if (ndx < table->numIndexes - 1) - ptr->Next = &pAdapterInfo[ndx + 1]; - else - ptr->Next = NULL; - - ptr->DhcpEnabled = TRUE; + TRACE( "info %p, size %p\n", info, size ); + if (!size) return ERROR_INVALID_PARAMETER; + + err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, + (void **)&if_keys, sizeof(*if_keys), (void **)&if_rw, sizeof(*if_rw), + (void **)&if_dyn, sizeof(*if_dyn), (void **)&if_stat, sizeof(*if_stat), &if_count, 0 ); + if (err) return err; + for (i = 0; i < if_count; i++) + { + if (if_stat[i].type == IF_TYPE_SOFTWARE_LOOPBACK) continue; + if_num++; + } + + if (!if_num) + { + err = ERROR_NO_DATA; + goto err; + } + + err = NsiAllocateAndGetTable( 1, &NPI_MS_IPV4_MODULEID, NSI_IP_UNICAST_TABLE, + (void **)&uni_keys, sizeof(*uni_keys), (void **)&uni_rw, sizeof(*uni_rw), + NULL, 0, NULL, 0, &uni_count, 0 ); + if (err) goto err; + + /* Slightly overestimate the needed size by assuming that all + unicast addresses require a separate IP_ADDR_STRING. */ + + needed = if_num * sizeof(*info) + uni_count * sizeof(IP_ADDR_STRING); + if (!info || *size < needed) + { + *size = needed; + err = ERROR_BUFFER_OVERFLOW; + goto err; + } + + err = NsiAllocateAndGetTable( 1, &NPI_MS_IPV4_MODULEID, NSI_IP_FORWARD_TABLE, + (void **)&fwd_keys, sizeof(*fwd_keys), NULL, 0, + NULL, 0, NULL, 0, &fwd_count, 0 ); + if (err) goto err; + + wins_server_count = get_wins_servers( &wins_servers ); + + extra_ip_addrs = (IP_ADDR_STRING *)(info + if_num); + for (i = 0; i < if_count; i++) + { + if (if_stat[i].type == IF_TYPE_SOFTWARE_LOOPBACK) continue; + + info->Next = info + 1; + info->ComboIndex = 0; + ConvertGuidToStringA( &if_stat[i].if_guid, info->AdapterName, sizeof(info->AdapterName) ); + len = WideCharToMultiByte( CP_ACP, 0, if_stat[i].descr.String, if_stat[i].descr.Length / sizeof(WCHAR), + info->Description, sizeof(info->Description) - 1, NULL, NULL ); + info->Description[len] = '\0'; + info->AddressLength = if_rw[i].phys_addr.Length; + if (info->AddressLength > sizeof(info->Address)) info->AddressLength = 0; + memcpy( info->Address, if_rw[i].phys_addr.Address, info->AddressLength ); + memset( info->Address + info->AddressLength, 0, sizeof(info->Address) - info->AddressLength ); + info->Index = if_stat[i].if_index; + info->Type = if_stat[i].type; + info->DhcpEnabled = TRUE; /* FIXME */ + info->CurrentIpAddress = NULL; + + cursor = NULL; + for (uni = 0; uni < uni_count; uni++) + { + if (uni_keys[uni].luid.Value != if_keys[i].Value) continue; + if (!cursor) cursor = &info->IpAddressList; + else + { + cursor->Next = extra_ip_addrs++; + cursor = cursor->Next; } - heap_free( wins_servers ); - ret = NO_ERROR; - } - HeapFree(GetProcessHeap(), 0, table); + ConvertLengthToIpv4Mask( uni_rw[uni].on_link_prefix, &mask.WS_s_addr ); + ip_addr_string_init( cursor, &uni_keys[uni].addr, &mask, 0 ); } - else - ret = ERROR_OUTOFMEMORY; - HeapFree(GetProcessHeap(), 0, routeTable); - HeapFree(GetProcessHeap(), 0, ipAddrTable); - } + if (!cursor) + { + mask.WS_s_addr = INADDR_ANY; + ip_addr_string_init( &info->IpAddressList, &mask, &mask, 0 ); + } + + gw.WS_s_addr = INADDR_ANY; + mask.WS_s_addr = INADDR_NONE; + for (fwd = 0; fwd < fwd_count; fwd++) + { /* find the first router on this interface */ + if (fwd_keys[fwd].luid.Value == if_keys[i].Value && + fwd_keys[fwd].next_hop.WS_s_addr != INADDR_ANY && + !fwd_keys[fwd].prefix_len) + { + gw = fwd_keys[fwd].next_hop; + break; + } + } + ip_addr_string_init( &info->GatewayList, &gw, &mask, 0 ); + + ip_addr_string_init( &info->DhcpServer, NULL, NULL, 0 ); + + info->HaveWins = !!wins_server_count; + ip_addr_string_init( &info->PrimaryWinsServer, NULL, NULL, 0 ); + ip_addr_string_init( &info->SecondaryWinsServer, NULL, NULL, 0 ); + if (info->HaveWins) + { + mask.WS_s_addr = INADDR_NONE; + ip_addr_string_init( &info->PrimaryWinsServer, &wins_servers[0].Ipv4.sin_addr, &mask, 0 ); + if (wins_server_count > 1) + ip_addr_string_init( &info->SecondaryWinsServer, &wins_servers[1].Ipv4.sin_addr, &mask, 0 ); + } + + info->LeaseObtained = 0; + info->LeaseExpires = 0; + + info++; } - else - ret = ERROR_NO_DATA; - } - TRACE("returning %d\n", ret); - return ret; + info[-1].Next = NULL; + +err: + heap_free( wins_servers ); + NsiFreeTable( fwd_keys, NULL, NULL, NULL ); + NsiFreeTable( uni_keys, uni_rw, NULL, NULL ); + NsiFreeTable( if_keys, if_rw, if_dyn, if_stat ); + return err; } static DWORD typeFromMibType(DWORD mib_type) -- 2.23.0

1 0

[PATCH 2/6] iphlpapi/tests: Add more tests for GetAdaptersInfo().
by Huw Davies Aug. 3, 2021

Aug. 3, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/tests/iphlpapi.c | 83 ++++++++++++++++------------------ 1 file changed, 40 insertions(+), 43 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 785e4e9fb70..e5a9994fbd5 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1118,53 +1118,50 @@ todo_wine_if( row.dwType == IF_TYPE_SOFTWARE_LOOPBACK) static void testGetAdaptersInfo(void) { - DWORD apiReturn; + IP_ADAPTER_INFO *ptr, *buf; + NET_LUID luid; + GUID guid; + char name[ARRAY_SIZE(ptr->AdapterName)]; + DWORD err; ULONG len = 0; + MIB_IFROW row; - apiReturn = GetAdaptersInfo(NULL, NULL); - if (apiReturn == ERROR_NOT_SUPPORTED) { - skip("GetAdaptersInfo is not supported\n"); - return; - } - ok(apiReturn == ERROR_INVALID_PARAMETER, - "GetAdaptersInfo returned %d, expected ERROR_INVALID_PARAMETER\n", - apiReturn); - apiReturn = GetAdaptersInfo(NULL, &len); - ok(apiReturn == ERROR_NO_DATA || apiReturn == ERROR_BUFFER_OVERFLOW, - "GetAdaptersInfo returned %d, expected ERROR_NO_DATA or ERROR_BUFFER_OVERFLOW\n", - apiReturn); - if (apiReturn == ERROR_NO_DATA) - ; /* no adapter's, that's okay */ - else if (apiReturn == ERROR_BUFFER_OVERFLOW) { - PIP_ADAPTER_INFO ptr, buf = HeapAlloc(GetProcessHeap(), 0, len); - NET_LUID luid; - GUID guid; - char AdapterName[ARRAY_SIZE(ptr->AdapterName)]; + err = GetAdaptersInfo( NULL, NULL ); + ok( err == ERROR_INVALID_PARAMETER, "got %d\n", err ); + err = GetAdaptersInfo( NULL, &len ); + ok( err == ERROR_NO_DATA || err == ERROR_BUFFER_OVERFLOW, "got %d\n", err ); + if (err == ERROR_NO_DATA) return; - apiReturn = GetAdaptersInfo(buf, &len); - ok(apiReturn == NO_ERROR, - "GetAdaptersInfo(buf, &dwSize) returned %d, expected NO_ERROR\n", - apiReturn); - ptr = buf; - while (ptr) { - ConvertInterfaceIndexToLuid(ptr->Index, &luid); - ConvertInterfaceLuidToGuid(&luid, &guid); - sprintf(AdapterName, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], - guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], - guid.Data4[6], guid.Data4[7]); - ok(!strcmp(ptr->AdapterName, AdapterName), "expected '%s' got '%s'\n", ptr->AdapterName, AdapterName); - ok(ptr->IpAddressList.IpAddress.String[0], "A valid IP address must be present\n"); - ok(ptr->IpAddressList.IpMask.String[0], "A valid mask must be present\n"); - ok(ptr->GatewayList.IpAddress.String[0], "A valid IP address must be present\n"); - ok(ptr->GatewayList.IpMask.String[0], "A valid mask must be present\n"); - trace("adapter '%s', address %s/%s gateway %s/%s\n", ptr->AdapterName, - ptr->IpAddressList.IpAddress.String, ptr->IpAddressList.IpMask.String, - ptr->GatewayList.IpAddress.String, ptr->GatewayList.IpMask.String); - ptr = ptr->Next; - } - HeapFree(GetProcessHeap(), 0, buf); + buf = malloc( len ); + err = GetAdaptersInfo( buf, &len ); + ok( !err, "got %d\n", err ); + ptr = buf; + while (ptr) + { + trace( "adapter '%s', address %s/%s gateway %s/%s\n", ptr->AdapterName, + ptr->IpAddressList.IpAddress.String, ptr->IpAddressList.IpMask.String, + ptr->GatewayList.IpAddress.String, ptr->GatewayList.IpMask.String ); + row.dwIndex = ptr->Index; + GetIfEntry( &row ); + ConvertInterfaceIndexToLuid( ptr->Index, &luid ); + ConvertInterfaceLuidToGuid( &luid, &guid ); + sprintf( name, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], + guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], + guid.Data4[6], guid.Data4[7] ); + ok( !strcmp( ptr->AdapterName, name ), "expected '%s' got '%s'\n", ptr->AdapterName, name ); + ok( !strcmp( ptr->Description, (char *)row.bDescr ), "got %s vs %s\n", ptr->Description, (char *)row.bDescr ); + ok( ptr->AddressLength == row.dwPhysAddrLen, "got %d vs %d\n", ptr->AddressLength, row.dwPhysAddrLen ); + ok( !memcmp(ptr->Address, row.bPhysAddr, ptr->AddressLength ), "mismatch\n" ); + ok( ptr->Type == row.dwType, "got %d vs %d\n", ptr->Type, row.dwType ); + ok( ptr->Type != MIB_IF_TYPE_LOOPBACK, "shouldn't get loopback\n" ); + ok( ptr->IpAddressList.IpAddress.String[0], "A valid IP address must be present\n" ); + ok( ptr->IpAddressList.IpMask.String[0], "A valid mask must be present\n" ); + ok( ptr->GatewayList.IpAddress.String[0], "A valid IP address must be present\n" ); + ok( ptr->GatewayList.IpMask.String[0], "A valid mask must be present\n" ); + ptr = ptr->Next; } + free( buf ); } static void testGetNetworkParams(void) -- 2.23.0

1 0

[PATCH 1/6] iphlpapi: Move the WINS server lookup to a helper.
by Huw Davies Aug. 3, 2021

Aug. 3, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 70 +++++++++++++++++++++-------------- 1 file changed, 42 insertions(+), 28 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 4b13b42fc6a..462dc055527 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -573,6 +573,40 @@ DWORD WINAPI GetAdapterIndex( WCHAR *adapter_name, ULONG *index ) return err; } +static DWORD get_wins_servers( SOCKADDR_INET **servers ) +{ + HKEY key; + char buf[4 * 4]; + DWORD size, i, count = 0; + static const char *values[] = { "WinsServer", "BackupWinsServer" }; + IN_ADDR addrs[ARRAY_SIZE(values)]; + + *servers = NULL; + /* @@ Wine registry key: HKCU\Software\Wine\Network */ + if (RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Network", &key )) return 0; + + for (i = 0; i < ARRAY_SIZE(values); i++) + { + size = sizeof(buf); + if (!RegQueryValueExA( key, values[i], NULL, NULL, (LPBYTE)buf, &size )) + if (!RtlIpv4StringToAddressA( buf, TRUE, NULL, addrs + count ) && + addrs[count].WS_s_addr != INADDR_NONE && addrs[count].WS_s_addr != INADDR_ANY) + count++; + } + RegCloseKey( key ); + + if (count) + { + *servers = heap_alloc_zero( count * sizeof(**servers) ); + if (!*servers) return 0; + for (i = 0; i < count; i++) + { + (*servers)[i].Ipv4.sin_family = WS_AF_INET; + (*servers)[i].Ipv4.sin_addr = addrs[i]; + } + } + return count; +} /****************************************************************** * GetAdaptersInfo (IPHLPAPI.@) @@ -630,33 +664,12 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) ret = ERROR_INSUFFICIENT_BUFFER; } else { - DWORD ndx; - HKEY hKey; - BOOL winsEnabled = FALSE; - IP_ADDRESS_STRING primaryWINS, secondaryWINS; + SOCKADDR_INET *wins_servers = NULL; + DWORD ndx, wins_server_count = get_wins_servers( &wins_servers ); PIP_ADDR_STRING nextIPAddr = (PIP_ADDR_STRING)((LPBYTE)pAdapterInfo + numNonLoopbackInterfaces * sizeof(IP_ADAPTER_INFO)); memset(pAdapterInfo, 0, size); - /* @@ Wine registry key: HKCU\Software\Wine\Network */ - if (RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Network", - &hKey) == ERROR_SUCCESS) { - DWORD size = sizeof(primaryWINS.String); - unsigned long addr; - - RegQueryValueExA(hKey, "WinsServer", NULL, NULL, - (LPBYTE)primaryWINS.String, &size); - addr = inet_addr(primaryWINS.String); - if (addr != INADDR_NONE && addr != INADDR_ANY) - winsEnabled = TRUE; - size = sizeof(secondaryWINS.String); - RegQueryValueExA(hKey, "BackupWinsServer", NULL, NULL, - (LPBYTE)secondaryWINS.String, &size); - addr = inet_addr(secondaryWINS.String); - if (addr != INADDR_NONE && addr != INADDR_ANY) - winsEnabled = TRUE; - RegCloseKey(hKey); - } for (ndx = 0; ndx < table->numIndexes; ndx++) { PIP_ADAPTER_INFO ptr = &pAdapterInfo[ndx]; DWORD i; @@ -714,12 +727,12 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) RtlIpv4AddressToStringA((IN_ADDR *)&routeTable->table[i].dwForwardMask, ptr->GatewayList.IpMask.String); } - if (winsEnabled) { + if (wins_server_count) + { ptr->HaveWins = TRUE; - memcpy(ptr->PrimaryWinsServer.IpAddress.String, - primaryWINS.String, sizeof(primaryWINS.String)); - memcpy(ptr->SecondaryWinsServer.IpAddress.String, - secondaryWINS.String, sizeof(secondaryWINS.String)); + RtlIpv4AddressToStringA( &wins_servers[0].Ipv4.sin_addr, ptr->PrimaryWinsServer.IpAddress.String ); + if (wins_server_count > 1) + RtlIpv4AddressToStringA( &wins_servers[1].Ipv4.sin_addr, ptr->SecondaryWinsServer.IpAddress.String ); } if (ndx < table->numIndexes - 1) ptr->Next = &pAdapterInfo[ndx + 1]; @@ -728,6 +741,7 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) ptr->DhcpEnabled = TRUE; } + heap_free( wins_servers ); ret = NO_ERROR; } HeapFree(GetProcessHeap(), 0, table); -- 2.23.0

1 0

[PATCH] krnl386: Remove the unused relay stub which enables interrupts.
by Zebediah Figura Aug. 2, 2021

Aug. 2, 2021

This was used by DOS IRQ handling, removed in 5ec544959632d63ad50175885503cc78f6ed6c58. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/krnl386.exe16/dosmem.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/krnl386.exe16/dosmem.c b/dlls/krnl386.exe16/dosmem.c index d847bdbb8f3..36b02aec484 100644 --- a/dlls/krnl386.exe16/dosmem.c +++ b/dlls/krnl386.exe16/dosmem.c @@ -307,7 +307,6 @@ static void DOSMEM_InitSegments(void) { 0xca, 0x04, 0x00, /* 16-bit far return and pop 4 bytes (relay void* arg) */ 0xcd, 0x31, /* int 31 */ - 0xfb, 0x66, 0xcb /* sti and 32-bit far return */ }; /* @@ -332,7 +331,6 @@ static void DOSMEM_InitSegments(void) /* * PM / offset 0: Stub where __wine_call_from_16_regs returns. * PM / offset 3: Stub which swaps back to 32-bit application code/stack. - * PM / offset 5: Stub which enables interrupts */ relay_code_sel = GLOBAL_Alloc( GMEM_FIXED, sizeof(relay), 0, LDT_FLAGS_CODE ); ptr = GlobalLock16( relay_code_sel ); -- 2.32.0

1 0

[PATCH 4/8] gdi32: Store viewport extent in DC_ATTR.
by Jacek Caban Aug. 2, 2021

Aug. 2, 2021

3 2

[PATCH] mf/tests: Add some tests for EVR stream services.
by Nikolay Sivov Aug. 2, 2021

Aug. 2, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index c8c7e0569cc..4b894df1de0 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4273,6 +4273,7 @@ static void test_evr(void) check_service_interface(sink, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerControl2, TRUE); check_service_interface(sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, TRUE); check_service_interface(sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPositionMapper, TRUE); + check_service_interface(sink, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IMFVideoSampleAllocator, FALSE); check_service_interface(sink, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, TRUE); check_service_interface(sink, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, TRUE); @@ -4423,7 +4424,15 @@ static void test_evr(void) /* Stream uses an allocator. */ check_service_interface(stream_sink, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IMFVideoSampleAllocator, TRUE); check_service_interface(stream_sink, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, TRUE); - +todo_wine { + check_service_interface(stream_sink, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoProcessor, TRUE); + check_service_interface(stream_sink, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerBitmap, TRUE); + check_service_interface(stream_sink, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerControl, TRUE); + check_service_interface(stream_sink, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerControl2, TRUE); + check_service_interface(stream_sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, TRUE); + check_service_interface(stream_sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPositionMapper, TRUE); + check_service_interface(stream_sink, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, TRUE); +} hr = MFGetService((IUnknown *)stream_sink, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IMFVideoSampleAllocator, (void **)&allocator); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -- 2.30.2

1 0

[PATCH v2 1/4] msvcrt/tests: Add test for fopen sequential access hint
by Luke Deller Aug. 2, 2021

Aug. 2, 2021

Test that adding "S" to the fopen mode results in the underlying file handle having the sequential access hint set. Signed-off-by: Luke Deller <luke(a)deller.id.au> --- dlls/msvcrt/tests/file.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index fb242d81282..d02087be46c 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -35,6 +35,7 @@ #include <process.h> #include <errno.h> #include <locale.h> +#include <winternl.h> #define MSVCRT_FD_BLOCK_SIZE 32 typedef struct { @@ -2731,6 +2732,39 @@ static void test_lseek(void) DeleteFileA("_creat.tst"); } +static void test_fopen_hints(void) +{ + char *tempf; + FILE *fp; + HANDLE handle; + FILE_MODE_INFORMATION mode_info; + IO_STATUS_BLOCK io; + NTSTATUS status; + + /* create a test file */ + tempf = _tempnam(".","wne"); + fp = fopen(tempf, "wb"); + ok(fp != NULL, "unable to create test file\n"); + fwrite("abc\n", 1, 4, fp); + fclose(fp); + + /* open test file with sequential access hint */ + fp = fopen(tempf, "rbS"); + ok(fp != NULL, "unable to open test file with sequential access hint\n"); + + /* check that sequential access hint is set on underlying file handle */ + handle = (HANDLE)_get_osfhandle(_fileno(fp)); + status = NtQueryInformationFile(handle, &io, &mode_info, sizeof(mode_info), + FileModeInformation); + ok(!status, "NtQueryInformationFile failed\n"); + ok(mode_info.Mode & FILE_SEQUENTIAL_ONLY, "handle missing hint\n"); + + /* clean up */ + fclose(fp); + unlink(tempf); + free(tempf); +} + START_TEST(file) { int arg_c; @@ -2803,6 +2837,7 @@ START_TEST(file) test_close(); test__creat(); test_lseek(); + test_fopen_hints(); /* Wait for the (_P_NOWAIT) spawned processes to finish to make sure the report * file contains lines in the correct order -- 2.25.1

3 6

[PATCH v3] dinput/tests: Prove that GetDeviceData() does nothing.
by Arkadiusz Hiler Aug. 2, 2021

Aug. 2, 2021

Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- v3: use todo_wine only where applicable supersedes 210321 dlls/dinput/tests/mouse.c | 47 ++++++++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index 69051bb2a34..d4ffcf4853b 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -106,7 +106,7 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) DIMOUSESTATE m_state; HWND hwnd2; DIPROPDWORD di_op; - DIDEVICEOBJECTDATA mouse_state; + DIDEVICEOBJECTDATA mouse_state[30]; DWORD cnt; int i; @@ -159,16 +159,22 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) ok(hr == S_OK, "Acquire() failed: %08x\n", hr); mouse_event(MOUSEEVENTF_MOVE, 10, 10, 0, 0); - cnt = 1; - hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); - ok(hr == S_OK && cnt > 0, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); + cnt = ARRAY_SIZE(mouse_state); + mouse_state[0].dwTimeStamp = 0xdeadbeef; + hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state[0]), mouse_state, &cnt, 0); + ok(hr == S_OK, "GetDeviceData() failed: %08x\n", hr); + todo_wine ok(cnt == ARRAY_SIZE(mouse_state), "GetDeviceData() unexpected cnt: %d\n", cnt); + todo_wine ok(mouse_state[0].dwTimeStamp == 0xdeadbeef, "GetDeviceData() overwrote the timestamp: %d\n", mouse_state[0].dwTimeStamp); mouse_event(MOUSEEVENTF_MOVE, 10, 10, 0, 0); hr = IDirectInputDevice_Unacquire(pMouse); ok(hr == S_OK, "Failed: %08x\n", hr); - cnt = 1; - hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); - ok(hr == S_OK && cnt > 0, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); + cnt = ARRAY_SIZE(mouse_state); + mouse_state[0].dwTimeStamp = 0xdeadbeef; + hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state[0]), mouse_state, &cnt, 0); + ok(hr == S_OK, "GetDeviceData() failed: %08x\n", hr); + todo_wine ok(cnt == ARRAY_SIZE(mouse_state), "GetDeviceData() unexpected cnt: %d\n", cnt); + todo_wine ok(mouse_state[0].dwTimeStamp == 0xdeadbeef, "GetDeviceData() overwrote the timestamp: %d\n", mouse_state[0].dwTimeStamp); hr = IDirectInputDevice_Acquire(pMouse); ok(hr == S_OK, "Failed: %08x\n", hr); @@ -178,20 +184,29 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) hr = IDirectInputDevice_Acquire(pMouse); ok(hr == S_OK, "Failed: %08x\n", hr); - cnt = 1; - hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); - ok(hr == S_OK && cnt > 0, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); + cnt = ARRAY_SIZE(mouse_state); + mouse_state[0].dwTimeStamp = 0xdeadbeef; + hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state[0]), mouse_state, &cnt, 0); + ok(hr == S_OK, "GetDeviceData() failed: %08x\n", hr); + todo_wine ok(cnt == ARRAY_SIZE(mouse_state), "GetDeviceData() unexpected cnt: %d\n", cnt); + todo_wine ok(mouse_state[0].dwTimeStamp == 0xdeadbeef, "GetDeviceData() overwrote the timestamp: %d\n", mouse_state[0].dwTimeStamp); /* Check for buffer overflow */ for (i = 0; i < 6; i++) mouse_event(MOUSEEVENTF_MOVE, 10 + i, 10 + i, 0, 0); - cnt = 1; - hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); - ok(hr == DI_OK, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); - cnt = 1; - hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); - ok(hr == DI_OK && cnt == 1, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); + cnt = ARRAY_SIZE(mouse_state); + mouse_state[0].dwTimeStamp = 0xdeadbeef; + hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state[0]), mouse_state, &cnt, 0); + ok(hr == S_OK, "GetDeviceData() failed: %08x\n", hr); + todo_wine ok(cnt == ARRAY_SIZE(mouse_state), "GetDeviceData() unexpected cnt: %d\n", cnt); + todo_wine ok(mouse_state[0].dwTimeStamp == 0xdeadbeef, "GetDeviceData() overwrote the timestamp: %d\n", mouse_state[0].dwTimeStamp); + cnt = ARRAY_SIZE(mouse_state); + mouse_state[0].dwTimeStamp = 0xdeadbeef; + hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state[0]), mouse_state, &cnt, 0); + ok(hr == S_OK, "GetDeviceData() failed: %08x\n", hr); + todo_wine ok(cnt == ARRAY_SIZE(mouse_state), "GetDeviceData() unexpected cnt: %d\n", cnt); + ok(mouse_state[0].dwTimeStamp == 0xdeadbeef, "GetDeviceData() overwrote the timestamp: %d\n", mouse_state[0].dwTimeStamp); /* Check for granularity property using BYOFFSET */ memset(&di_op, 0, sizeof(di_op)); -- 2.32.0

2 1

[PATCH 1/2] conhost: Remove duplicate lines from current_config()
by Hugh McMaster Aug. 2, 2021

Aug. 2, 2021

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/conhost/window.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 92970b44f0e..3af80383958 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -1925,8 +1925,6 @@ static void current_config( struct console *console, struct console_config *conf config->popup_attr = console->active->popup_attr; memcpy( config->color_map, console->active->color_map, sizeof(config->color_map) ); - config->win_height = console->active->win.bottom - console->active->win.top + 1; - config->win_width = console->active->win.right - console->active->win.left + 1; config->cell_width = console->active->font.width; config->cell_height = console->active->font.height; config->font_weight = console->active->font.weight; -- 2.32.0

2 3