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

Zebediah Figura : ws2_32/tests: Expand tests for WSAStringToAddress().
by Alexandre Julliard Aug. 3, 2021

Aug. 3, 2021

Module: wine Branch: master Commit: 4ed061f458d2b073b21b5ade0f8fec48ff09faf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ed061f458d2b073b21b5ade… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 2 19:37:39 2021 -0500 ws2_32/tests: Expand tests for WSAStringToAddress(). Adapted from RtlIpv4StringToAddress() tests. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/protocol.c | 101 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 89 insertions(+), 12 deletions(-) diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 27ef6ff92aa..b2a933d4f51 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -1093,14 +1093,91 @@ static void test_WSAStringToAddress(void) } ipv4_tests[] = { - { "0.0.0.0", 0 }, - { "127.127.127.127", 0x7f7f7f7f }, - { "255.255.255.255", 0xffffffff }, - { "127.127.127.127:65535", 0x7f7f7f7f, 65535 }, - { "255.255.255.255:65535", 0xffffffff, 65535 }, - { "2001::1", 0xd1070000, 0, WSAEINVAL }, - { "1.2.3.", 0, 0, WSAEINVAL }, - { "", 0, 0, WSAEINVAL }, + { "", 0, 0, WSAEINVAL }, + { " ", 0, 0, WSAEINVAL }, + { "1.1.1.1", 0x01010101 }, + { "0.0.0.0", 0 }, + { "127.127.127.127", 0x7f7f7f7f }, + { "127.127.127.127:", 0x7f7f7f7f, 0, WSAEINVAL }, + { "127.127.127.127:0", 0x7f7f7f7f, 0, WSAEINVAL }, + { "127.127.127.127:123", 0x7f7f7f7f, 123 }, + { "127.127.127.127:65535", 0x7f7f7f7f, 65535 }, + { "127.127.127.127:65537", 0x7f7f7f7f, 0, WSAEINVAL }, + { "127.127.127.127::1", 0x7f7f7f7f, 0, WSAEINVAL }, + { "127.127.127.127:0xAbCd", 0x7f7f7f7f, 43981 }, + { "127.127.127.127:0XaBcD", 0x7f7f7f7f, 43981 }, + { "127.127.127.127:0x", 0x7f7f7f7f, 0, WSAEINVAL }, + { "127.127.127.127:0x10000",0x7f7f7f7f, 0, WSAEINVAL }, + { "127.127.127.127:010", 0x7f7f7f7f, 8 }, + { "127.127.127.127:007", 0x7f7f7f7f, 7 }, + { "127.127.127.127:08", 0x7f7f7f7f, 0, WSAEINVAL }, + { "127.127.127.127:008", 0x7f7f7f7f, 0, WSAEINVAL }, + { "127.127.127.127:0a", 0x7f7f7f7f, 0, WSAEINVAL }, + { "127.127.127.127:0o10", 0x7f7f7f7f, 0, WSAEINVAL }, + { "127.127.127.127:0b10", 0x7f7f7f7f, 0, WSAEINVAL }, + { "255.255.255.255", 0xffffffff }, + { "255.255.255.255:123", 0xffffffff, 123 }, + { "255.255.255.255:65535", 0xffffffff, 65535 }, + { "255.255.255.256", 0, 0, WSAEINVAL }, + { "a", 0, 0, WSAEINVAL }, + { "1.1.1.0xaA", 0x010101aa }, + { "1.1.1.0XaA", 0x010101aa }, + { "1.1.1.0x", 0, 0, WSAEINVAL }, + { "1.1.1.0xff", 0x010101ff }, + { "1.1.1.0x100", 0, 0, WSAEINVAL }, + { "1.1.1.010", 0x01010108 }, + { "1.1.1.00", 0x01010100 }, + { "1.1.1.007", 0x01010107 }, + { "1.1.1.08", 0, 0, WSAEINVAL }, + { "1.1.1.008", 0x01010100, 0, WSAEINVAL }, + { "1.1.1.0a", 0x01010100, 0, WSAEINVAL }, + { "1.1.1.0o10", 0x01010100, 0, WSAEINVAL }, + { "1.1.1.0b10", 0x01010100, 0, WSAEINVAL }, + { "1.1.1.-2", 0, 0, WSAEINVAL }, + { "1", 0x00000001 }, + { "-1", 0, 0, WSAEINVAL }, + { "1:1", 0x00000001, 1 }, + { "1.2", 0x01000002 }, + { "1.2:1", 0x01000002, 1 }, + { "1000.2000", 0, 0, WSAEINVAL }, + { "1.2.", 0, 0, WSAEINVAL }, + { "1..2", 0, 0, WSAEINVAL }, + { "1...2", 0, 0, WSAEINVAL }, + { "1.2.3", 0x01020003 }, + { "1.2.3.", 0, 0, WSAEINVAL }, + { "1.2.3:1", 0x01020003, 1 }, + { "203569230", 0x0c22384e }, + { "203569230:123", 0x0c22384e, 123 }, + { "2001::1", 0x000007d1, 0, WSAEINVAL }, + { "1.223756", 0x01036a0c }, + { "3.4.756", 0x030402f4 }, + { "756.3.4", 0, 0, WSAEINVAL }, + { "3.756.4", 0, 0, WSAEINVAL }, + { "3.4.756.1", 0, 0, WSAEINVAL }, + { "3.4.65536", 0, 0, WSAEINVAL }, + { "3.4.5.6.7", 0, 0, WSAEINVAL }, + { "3.4.5.+6", 0, 0, WSAEINVAL }, + { " 3.4.5.6", 0, 0, WSAEINVAL }, + { "\t3.4.5.6", 0, 0, WSAEINVAL }, + { "3.4.5.6 ", 0x03040506, 0, WSAEINVAL }, + { "3.4.5.6:7 ", 0x03040506, 0, WSAEINVAL }, + { "3.4.5.6: 7", 0x03040506, 0, WSAEINVAL }, + { "3. 4.5.6", 0, 0, WSAEINVAL }, + { ".", 0, 0, WSAEINVAL }, + { "[0.1.2.3]", 0, 0, WSAEINVAL }, + { "0x00010203", 0x00010203 }, + { "0X00010203", 0x00010203 }, + { "0x00010203:10", 0x00010203, 10 }, + { "0x1234", 0x00001234 }, + { "0x123456789", 0x23456789 }, + { "0x00010Q03", 0x00000010, 0, WSAEINVAL }, + { "x00010203", 0, 0, WSAEINVAL }, + { "1234BEEF", 0x000004d2, 0, WSAEINVAL }, + { "017700000001", 0x7f000001 }, + { "0777", 0x000001ff }, + { "0777:10", 0x000001ff, 10 }, + { "::1", 0, 0, WSAEINVAL }, + { ":1", 0, 0, WSAEINVAL }, }; static struct { @@ -1167,12 +1244,12 @@ static void test_WSAStringToAddress(void) ok( sockaddr.sin_family == expected_family, "WSAStringToAddress(%s) gave family %d, expected %d\n", wine_dbgstr_a( ipv4_tests[j].input ), sockaddr.sin_family, expected_family ); - ok( sockaddr.sin_addr.s_addr == ipv4_tests[j].address, + ok( sockaddr.sin_addr.s_addr == htonl( ipv4_tests[j].address ), "WSAStringToAddress(%s) gave address %08x, expected %08x\n", - wine_dbgstr_a( ipv4_tests[j].input ), sockaddr.sin_addr.s_addr, ipv4_tests[j].address ); - ok( sockaddr.sin_port == ipv4_tests[j].port, + wine_dbgstr_a( ipv4_tests[j].input ), sockaddr.sin_addr.s_addr, htonl( ipv4_tests[j].address) ); + ok( sockaddr.sin_port == htons( ipv4_tests[j].port ), "WSAStringToAddress(%s) gave port %04x, expected %04x\n", - wine_dbgstr_a( ipv4_tests[j].input ), sockaddr.sin_port, ipv4_tests[j].port ); + wine_dbgstr_a( ipv4_tests[j].input ), sockaddr.sin_port, htons( ipv4_tests[j].port ) ); ok( len == expected_len, "WSAStringToAddress(%s) gave length %d, expected %d\n", wine_dbgstr_a( ipv4_tests[j].input ), len, expected_len );

1 0

Nikolay Sivov : gdi32: Update font realization structure definition.
by Alexandre Julliard Aug. 3, 2021

Aug. 3, 2021

Module: wine Branch: master Commit: f47751a992967af7bb35534fa424baaea867750c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f47751a992967af7bb35534f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 2 20:46:35 2021 +0300 gdi32: Update font realization structure definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/gdiinterop.c | 12 +++++++----- dlls/dwrite/tests/font.c | 2 +- dlls/gdi32/font.c | 8 ++++---- dlls/gdi32/ntgdi_private.h | 2 +- dlls/gdi32/tests/font.c | 2 +- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 6a5953a67e9..8df3f9f97ca 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -737,17 +737,19 @@ static HRESULT WINAPI gdiinterop_ConvertFontFaceToLOGFONT(IDWriteGdiInterop1 *if return S_OK; } -struct font_realization_info { +struct font_realization_info +{ DWORD size; DWORD flags; DWORD cache_num; DWORD instance_id; - DWORD unk; + DWORD file_count; WORD face_index; WORD simulations; }; -struct font_fileinfo { +struct font_fileinfo +{ FILETIME writetime; LARGE_INTEGER size; WCHAR path[1]; @@ -755,8 +757,8 @@ struct font_fileinfo { /* Undocumented gdi32 exports, used to access actually selected font information */ extern BOOL WINAPI GetFontRealizationInfo(HDC hdc, struct font_realization_info *info); -extern BOOL WINAPI GetFontFileInfo(DWORD instance_id, DWORD unknown, struct font_fileinfo *info, SIZE_T size, SIZE_T *needed); -extern BOOL WINAPI GetFontFileData(DWORD instance_id, DWORD unknown, UINT64 offset, void *buff, DWORD buff_size); +extern BOOL WINAPI GetFontFileInfo(DWORD instance_id, DWORD file_index, struct font_fileinfo *info, SIZE_T size, SIZE_T *needed); +extern BOOL WINAPI GetFontFileData(DWORD instance_id, DWORD file_index, UINT64 offset, void *buff, DWORD buff_size); static HRESULT WINAPI gdiinterop_CreateFontFaceFromHdc(IDWriteGdiInterop1 *iface, HDC hdc, IDWriteFontFace **fontface) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 9f814504a44..be367463414 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -4276,7 +4276,7 @@ struct font_realization_info DWORD flags; DWORD cache_num; DWORD instance_id; - DWORD unk; + DWORD file_count; WORD face_index; WORD simulations; }; diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 16d3bdf26ba..442c76fb026 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3177,7 +3177,7 @@ static BOOL CDECL font_GetFontRealizationInfo( PHYSDEV dev, void *ptr ) info->instance_id = physdev->font->handle; if (info->size == sizeof(*info)) { - info->unk = 0; + info->file_count = 1; info->face_index = physdev->font->face_index; info->simulations = 0; if (physdev->font->fake_bold) info->simulations |= 0x1; @@ -8304,7 +8304,7 @@ BOOL WINAPI FontIsLinked(HDC hdc) */ BOOL WINAPI GetFontRealizationInfo(HDC hdc, struct font_realization_info *info) { - BOOL is_v0 = info->size == FIELD_OFFSET(struct font_realization_info, unk); + BOOL is_v0 = info->size == FIELD_OFFSET(struct font_realization_info, file_count); PHYSDEV dev; BOOL ret; DC *dc; @@ -8334,7 +8334,7 @@ BOOL WINAPI GetRasterizerCaps( LPRASTERIZER_STATUS lprs, UINT cbNumBytes) /************************************************************************* * GetFontFileData (GDI32.@) */ -BOOL WINAPI GetFontFileData( DWORD instance_id, DWORD unknown, UINT64 offset, void *buff, DWORD buff_size ) +BOOL WINAPI GetFontFileData( DWORD instance_id, DWORD file_index, UINT64 offset, void *buff, DWORD buff_size ) { struct gdi_font *font; DWORD tag = 0, size; @@ -8366,7 +8366,7 @@ struct font_fileinfo /************************************************************************* * GetFontFileInfo (GDI32.@) */ -BOOL WINAPI GetFontFileInfo( DWORD instance_id, DWORD unknown, struct font_fileinfo *info, +BOOL WINAPI GetFontFileInfo( DWORD instance_id, DWORD file_index, struct font_fileinfo *info, SIZE_T size, SIZE_T *needed ) { SIZE_T required_size = 0; diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 4817e428a46..ebcaef89f1c 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -289,7 +289,7 @@ struct font_realization_info DWORD flags; /* 1 for bitmap fonts, 3 for scalable fonts */ DWORD cache_num; /* keeps incrementing - num of fonts that have been created allowing for caching?? */ DWORD instance_id; /* identifies a realized font instance */ - DWORD unk; /* unknown */ + DWORD file_count; /* number of files that make up this font */ WORD face_index; /* face index in case of font collections */ WORD simulations; /* 0 bit - bold simulation, 1 bit - oblique simulation */ }; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 7aee0a86d23..ef1dc26595d 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4334,7 +4334,7 @@ struct font_realization_info DWORD flags; DWORD cache_num; DWORD instance_id; - DWORD unk; + DWORD file_count; WORD face_index; WORD simulations; };

1 0

Huw Davies : dnsapi: Add support for DnsConfigSearchList.
by Alexandre Julliard Aug. 3, 2021

Aug. 3, 2021

Module: wine Branch: master Commit: 17e2d5c1ca655a29775e1a4cd08d9fdec9654dcd URL: https://source.winehq.org/git/wine.git/?a=commit;h=17e2d5c1ca655a29775e1a4c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 3 09:20:23 2021 +0100 dnsapi: Add support for DnsConfigSearchList. This doesn't appear to be implemented on Windows, however it will be needed by iphlpapi.dll. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/dnsapi.h | 2 ++ dlls/dnsapi/libresolv.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/dnsapi/query.c | 4 ++- dlls/nsi/tests/nsi.c | 1 - dlls/nsiproxy.sys/ip.c | 3 +- 5 files changed, 88 insertions(+), 3 deletions(-) diff --git a/dlls/dnsapi/dnsapi.h b/dlls/dnsapi/dnsapi.h index 168c37282bd..5b4fc1019e2 100644 --- a/dlls/dnsapi/dnsapi.h +++ b/dlls/dnsapi/dnsapi.h @@ -121,12 +121,14 @@ static inline char *strdup_ua( const char *src ) extern const char *type_to_str( unsigned short ) DECLSPEC_HIDDEN; +extern DNS_STATUS CDECL resolv_get_searchlist( DNS_TXT_DATAW *, 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_searchlist)( DNS_TXT_DATAW *list, 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 b0374927b6d..7e545cf36fb 100644 --- a/dlls/dnsapi/libresolv.c +++ b/dlls/dnsapi/libresolv.c @@ -61,6 +61,54 @@ WINE_DEFAULT_DEBUG_CHANNEL(dnsapi); +static CPTABLEINFO unix_cptable; +static ULONG unix_cp = CP_UTF8; + +static DWORD WINAPI get_unix_codepage_once( RTL_RUN_ONCE *once, void *param, void **context ) +{ + static const WCHAR wineunixcpW[] = { 'W','I','N','E','U','N','I','X','C','P',0 }; + UNICODE_STRING name, value; + WCHAR value_buffer[13]; + SIZE_T size; + void *ptr; + + RtlInitUnicodeString( &name, wineunixcpW ); + value.Buffer = value_buffer; + value.MaximumLength = sizeof(value_buffer); + if (!RtlQueryEnvironmentVariable_U( NULL, &name, &value )) + RtlUnicodeStringToInteger( &value, 10, &unix_cp ); + if (unix_cp != CP_UTF8 && !NtGetNlsSectionPtr( 11, unix_cp, NULL, &ptr, &size )) + RtlInitCodePageTable( ptr, &unix_cptable ); + return TRUE; +} + +static BOOL get_unix_codepage( void ) +{ + static RTL_RUN_ONCE once = RTL_RUN_ONCE_INIT; + + return !RtlRunOnceExecuteOnce( &once, get_unix_codepage_once, NULL, NULL ); +} + +static DWORD dnsapi_umbstowcs( const char *src, WCHAR *dst, DWORD dstlen ) +{ + DWORD srclen = strlen( src ) + 1; + DWORD len; + + get_unix_codepage(); + + if (unix_cp == CP_UTF8) + { + RtlUTF8ToUnicodeN( dst, dstlen, &len, src, srclen ); + return len; + } + else + { + len = srclen * sizeof(WCHAR); + if (dst) RtlCustomCPToUnicodeN( &unix_cptable, dst, dstlen, &len, src, srclen ); + return len; + } +} + static const char *debugstr_type( unsigned short type ) { const char *str; @@ -229,6 +277,38 @@ static DNS_STATUS map_h_errno( int error ) } } +DNS_STATUS CDECL resolv_get_searchlist( DNS_TXT_DATAW *list, DWORD *len ) +{ + DWORD i, needed, str_needed = 0; + char *ptr, *end; + + init_resolver(); + + for (i = 0; i < MAXDNSRCH + 1 && _res.dnsrch[i]; i++) + str_needed += dnsapi_umbstowcs( _res.dnsrch[i], NULL, 0 ); + + needed = FIELD_OFFSET(DNS_TXT_DATAW, pStringArray[i]) + str_needed; + + if (!list || *len < needed) + { + *len = needed; + return !list ? ERROR_SUCCESS : ERROR_MORE_DATA; + } + + *len = needed; + list->dwStringCount = i; + + ptr = (char *)(list->pStringArray + i); + end = ptr + str_needed; + for (i = 0; i < MAXDNSRCH + 1 && _res.dnsrch[i]; i++) + { + list->pStringArray[i] = (WCHAR *)ptr; + ptr += dnsapi_umbstowcs( _res.dnsrch[i], list->pStringArray[i], end - ptr ); + } + return ERROR_SUCCESS; +} + + static inline int filter( unsigned short sin_family, USHORT family ) { if (sin_family != AF_INET && sin_family != AF_INET6) return TRUE; @@ -851,6 +931,7 @@ exit: static const struct resolv_funcs funcs = { + resolv_get_searchlist, resolv_get_serverlist, resolv_query, resolv_set_serverlist diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 9900166aeb8..3155c93b360 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -343,7 +343,6 @@ DNS_STATUS WINAPI DnsQueryConfig( DNS_CONFIG_TYPE config, DWORD flag, PCWSTR ada case DnsConfigAdapterDomainName_A: case DnsConfigAdapterDomainName_W: case DnsConfigAdapterDomainName_UTF8: - case DnsConfigSearchList: case DnsConfigAdapterInfo: case DnsConfigPrimaryHostNameRegistrationEnabled: case DnsConfigAdapterHostNameRegistrationEnabled: @@ -358,6 +357,9 @@ DNS_STATUS WINAPI DnsQueryConfig( DNS_CONFIG_TYPE config, DWORD flag, PCWSTR ada case DnsConfigDnsServersIpv6: return resolv_funcs->get_serverlist( AF_INET6, buffer, len ); + case DnsConfigSearchList: + return resolv_funcs->get_searchlist( buffer, len ); + default: WARN( "unknown config type: %d\n", config ); break; diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index c689aca6754..9d12530cb27 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -514,7 +514,6 @@ static void test_ip_forward( int family ) NULL, 0, &count, 0 ); if (!err) break; } -todo_wine_if (family == AF_INET6) ok( !err, "got %d\n", err ); if (err) { winetest_pop_context(); return; } rw_size = rw_sizes[i]; diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index dbd019c8442..fa88b8e0819 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -470,7 +470,8 @@ static NTSTATUS ipv6_forward_enumerate_all( void *key_data, DWORD key_size, void void *static_data, DWORD static_size, DWORD_PTR *count ) { FIXME( "not implemented\n" ); - return STATUS_NOT_IMPLEMENTED; + *count = 0; + return STATUS_SUCCESS; } static struct module_table ipv4_tables[] =

1 0

Huw Davies : dnsapi: Add support for returning ipv6 dns server addresses.
by Alexandre Julliard Aug. 3, 2021

Aug. 3, 2021

Module: wine Branch: master Commit: f705f5837cbcd4f3f1da13f2bdcf7918e859c541 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f705f5837cbcd4f3f1da13f2… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 3 09:20:22 2021 +0100 dnsapi: Add support for returning ipv6 dns server addresses. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/libresolv.c | 131 ++++++++++++++++++++++++++++++++++++++++++---- dlls/dnsapi/query.c | 4 ++ dlls/dnsapi/tests/query.c | 30 ++++++++++- 3 files changed, 154 insertions(+), 11 deletions(-) diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c index 7e754d73af3..b0374927b6d 100644 --- a/dlls/dnsapi/libresolv.c +++ b/dlls/dnsapi/libresolv.c @@ -28,6 +28,7 @@ #include <stdarg.h> #include <string.h> #include <stdio.h> +#include <stdlib.h> #include <sys/types.h> #ifdef HAVE_NETINET_IN_H @@ -228,35 +229,147 @@ static DNS_STATUS map_h_errno( int error ) } } +static inline int filter( unsigned short sin_family, USHORT family ) +{ + if (sin_family != AF_INET && sin_family != AF_INET6) return TRUE; + if (sin_family == AF_INET6 && family == WS_AF_INET) return TRUE; + if (sin_family == AF_INET && family == WS_AF_INET6) return TRUE; + + return FALSE; +} + +#ifdef HAVE_RES_GETSERVERS + DNS_STATUS CDECL resolv_get_serverlist( USHORT family, DNS_ADDR_ARRAY *addrs, DWORD *len ) { - DWORD needed, i; + struct __res_state *state = &_res; + DWORD i, found, total, needed; + union res_sockaddr_union *buf; init_resolver(); - if (family != WS_AF_INET) return ERROR_NOT_SUPPORTED; + total = res_getservers( state, NULL, 0 ); + if (!total) return DNS_ERROR_NO_DNS_SERVERS; - needed = FIELD_OFFSET(DNS_ADDR_ARRAY, AddrArray[_res.nscount]); + if (!addrs && family != WS_AF_INET && family != WS_AF_INET6) + { + *len = FIELD_OFFSET(DNS_ADDR_ARRAY, AddrArray[total]); + return ERROR_SUCCESS; + } + buf = malloc( total * sizeof(union res_sockaddr_union) ); + if (!buf) return ERROR_NOT_ENOUGH_MEMORY; + + total = res_getservers( state, buf, total ); + + for (i = 0, found = 0; i < total; i++) + { + if (filter( buf[i].sin.sin_family, family )) continue; + found++; + } + if (!found) return DNS_ERROR_NO_DNS_SERVERS; + + needed = FIELD_OFFSET(DNS_ADDR_ARRAY, AddrArray[found]); if (!addrs || *len < needed) { *len = needed; return !addrs ? ERROR_SUCCESS : ERROR_MORE_DATA; } + *len = needed; + memset( addrs, 0, needed ); + addrs->AddrCount = addrs->MaxCount = found; + + for (i = 0, found = 0; i < total; i++) + { + if (filter( buf[i].sin.sin_family, family )) continue; + + if (buf[i].sin6.sin6_family == AF_INET6) + { + SOCKADDR_IN6 *sa = (SOCKADDR_IN6 *)addrs->AddrArray[found].MaxSa; + sa->sin6_family = WS_AF_INET6; + memcpy( &sa->sin6_addr, &buf[i].sin6.sin6_addr, sizeof(sa->sin6_addr) ); + addrs->AddrArray[found].Data.DnsAddrUserDword[0] = sizeof(*sa); + } + else + { + SOCKADDR_IN *sa = (SOCKADDR_IN *)addrs->AddrArray[found].MaxSa; + sa->sin_family = WS_AF_INET; + sa->sin_addr.WS_s_addr = buf[i].sin.sin_addr.s_addr; + addrs->AddrArray[found].Data.DnsAddrUserDword[0] = sizeof(*sa); + } + found++; + } + + free( buf ); + return ERROR_SUCCESS; +} + +#else + +DNS_STATUS CDECL resolv_get_serverlist( USHORT family, DNS_ADDR_ARRAY *addrs, DWORD *len ) +{ + DWORD needed, found, i; + + init_resolver(); + + if (!_res.nscount) return DNS_ERROR_NO_DNS_SERVERS; + if (!addrs && family != WS_AF_INET && family != WS_AF_INET6) + { + *len = FIELD_OFFSET(DNS_ADDR_ARRAY, AddrArray[_res.nscount]); + return ERROR_SUCCESS; + } + + for (i = 0, found = 0; i < _res.nscount; i++) + { + unsigned short sin_family = AF_INET; +#ifdef HAVE_STRUCT___RES_STATE__U__EXT_NSCOUNT6 + if (_res._u._ext.nsaddrs[i]) sin_family = _res._u._ext.nsaddrs[i]->sin6_family; +#endif + if (filter( sin_family, family )) continue; + found++; + } + if (!found) return DNS_ERROR_NO_DNS_SERVERS; + needed = FIELD_OFFSET(DNS_ADDR_ARRAY, AddrArray[found]); + if (!addrs || *len < needed) + { + *len = needed; + return !addrs ? ERROR_SUCCESS : ERROR_INSUFFICIENT_BUFFER; + } *len = needed; memset( addrs, 0, needed ); - addrs->AddrCount = addrs->MaxCount = _res.nscount; + addrs->AddrCount = addrs->MaxCount = found; - for (i = 0; i < _res.nscount; i++) + for (i = 0, found = 0; i < _res.nscount; i++) { - 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); + unsigned short sin_family = AF_INET; +#ifdef HAVE_STRUCT___RES_STATE__U__EXT_NSCOUNT6 + if (_res._u._ext.nsaddrs[i]) sin_family = _res._u._ext.nsaddrs[i]->sin6_family; +#endif + if (filter( sin_family, family )) continue; + +#ifdef HAVE_STRUCT___RES_STATE__U__EXT_NSCOUNT6 + if (sin_family == AF_INET6) + { + SOCKADDR_IN6 *sa = (SOCKADDR_IN6 *)addrs->AddrArray[found].MaxSa; + sa->sin6_family = WS_AF_INET6; + memcpy( &sa->sin6_addr, &_res._u._ext.nsaddrs[i]->sin6_addr, sizeof(sa->sin6_addr) ); + addrs->AddrArray[found].Data.DnsAddrUserDword[0] = sizeof(*sa); + } + else +#endif + { + SOCKADDR_IN *sa = (SOCKADDR_IN *)addrs->AddrArray[found].MaxSa; + sa->sin_family = WS_AF_INET; + sa->sin_addr.WS_s_addr = _res.nsaddr_list[i].sin_addr.s_addr; + addrs->AddrArray[found].Data.DnsAddrUserDword[0] = sizeof(*sa); + } + found++; } + return ERROR_SUCCESS; } +#endif DNS_STATUS CDECL resolv_set_serverlist( const IP4_ARRAY *addrs ) { diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index b836cdaaf48..9900166aeb8 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -351,8 +351,12 @@ DNS_STATUS WINAPI DnsQueryConfig( DNS_CONFIG_TYPE config, DWORD flag, PCWSTR ada FIXME( "unimplemented config type %d\n", config ); break; + case DnsConfigDnsServersUnspec: + return resolv_funcs->get_serverlist( AF_UNSPEC, buffer, len ); case DnsConfigDnsServersIpv4: return resolv_funcs->get_serverlist( AF_INET, buffer, len ); + case DnsConfigDnsServersIpv6: + return resolv_funcs->get_serverlist( AF_INET6, buffer, len ); default: WARN( "unknown config type: %d\n", config ); diff --git a/dlls/dnsapi/tests/query.c b/dlls/dnsapi/tests/query.c index d11a53b5306..5fb47d89782 100644 --- a/dlls/dnsapi/tests/query.c +++ b/dlls/dnsapi/tests/query.c @@ -138,10 +138,10 @@ static IP_ADAPTER_ADDRESSES *get_adapters(void) static void test_DnsQueryConfig( void ) { - DWORD err, size, i; + DWORD err, size, i, ipv6_count; WCHAR name[MAX_ADAPTER_NAME_LENGTH + 1]; IP_ADAPTER_ADDRESSES *adapters, *ptr; - DNS_ADDR_ARRAY *ipv4; + DNS_ADDR_ARRAY *ipv4, *ipv6, *unspec; IP4_ARRAY *ip4_array; if (!(adapters = get_adapters())) return; @@ -186,7 +186,33 @@ static void test_DnsQueryConfig( void ) ok( ipv4->AddrArray[i].Data.DnsAddrUserDword[0] == sizeof(*sa), "got %d\n", ipv4->AddrArray[i].Data.DnsAddrUserDword[0] ); } + + size = 0; + err = DnsQueryConfig( DnsConfigDnsServersIpv6, 0, name, NULL, NULL, &size ); + ok( !err || err == DNS_ERROR_NO_DNS_SERVERS, "got %d\n", err ); + ipv6_count = 0; + ipv6 = NULL; + if (!err) + { + ipv6 = malloc( size ); + err = DnsQueryConfig( DnsConfigDnsServersIpv6, 0, name, NULL, ipv6, &size ); + ok( !err, "got %d\n", err ); + ipv6_count = ipv6->AddrCount; + } + + size = 0; + err = DnsQueryConfig( DnsConfigDnsServersUnspec, 0, name, NULL, NULL, &size ); + ok( !err, "got %d\n", err ); + unspec = malloc( size ); + err = DnsQueryConfig( DnsConfigDnsServersUnspec, 0, name, NULL, unspec, &size ); + ok( !err, "got %d\n", err ); + + ok( unspec->AddrCount == ipv4->AddrCount + ipv6_count, "got %d vs %d + %d\n", + unspec->AddrCount, ipv4->AddrCount, ipv6_count ); + free( ip4_array ); + free( unspec ); + free( ipv6 ); free( ipv4 ); }

1 0

Huw Davies : dnsapi: Implement support for returning ipv4 servers in a DNS_ADDR_ARRAY.
by Alexandre Julliard Aug. 3, 2021

Aug. 3, 2021

Module: wine Branch: master Commit: bd80dd0903069eacef818c1ebda898320578ec7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd80dd0903069eacef818c1e… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 3 09:20:21 2021 +0100 dnsapi: Implement support for returning ipv4 servers in a DNS_ADDR_ARRAY. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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

1 0

Huw Davies : iphlpapi: Implement GetAdaptersInfo() on top of nsi.
by Alexandre Julliard Aug. 3, 2021

Aug. 3, 2021

Module: wine Branch: master Commit: 2e399e48579acf0fbee26ecd5ce5fd9e9e8cb5bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e399e48579acf0fbee26ecd… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 3 09:20:20 2021 +0100 iphlpapi: Implement GetAdaptersInfo() on top of nsi. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 281 ++++++++++++++++++++++-------------------- 1 file changed, 144 insertions(+), 137 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2e399e48579acf0fbee2…

1 0

Huw Davies : iphlpapi/tests: Add more tests for GetAdaptersInfo().
by Alexandre Julliard Aug. 3, 2021

Aug. 3, 2021

Module: wine Branch: master Commit: fabd9e1f80023b81b50f9bac5824c4a619eaddae URL: https://source.winehq.org/git/wine.git/?a=commit;h=fabd9e1f80023b81b50f9bac… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 3 09:20:19 2021 +0100 iphlpapi/tests: Add more tests for GetAdaptersInfo(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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)

1 0

Huw Davies : iphlpapi: Move the WINS server lookup to a helper.
by Alexandre Julliard Aug. 3, 2021

Aug. 3, 2021

Module: wine Branch: master Commit: 1f2adbb3a9ccb77b473b93667ab456401ccf19e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f2adbb3a9ccb77b473b9366… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 3 09:20:18 2021 +0100 iphlpapi: Move the WINS server lookup to a helper. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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);

1 0

Zebediah Figura : ws2_32: Check for presence in the socket list in closesocket().
by Alexandre Julliard Aug. 3, 2021

Aug. 3, 2021

Module: wine Branch: master Commit: c70f64f82c3c9774b4f65bf091c130f0e24db36c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c70f64f82c3c9774b4f65bf0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 2 19:37:37 2021 -0500 ws2_32: Check for presence in the socket list in closesocket(). Instead of trying to retrieve the fd. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 61 +++++++++++++++++----------------------------------- 1 file changed, 20 insertions(+), 41 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f7996410db1..40e4ecb9325 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -396,7 +396,7 @@ static BOOL socket_list_find( SOCKET socket ) } -static void socket_list_remove(SOCKET socket) +static BOOL socket_list_remove( SOCKET socket ) { unsigned int i; @@ -406,10 +406,12 @@ static void socket_list_remove(SOCKET socket) if (socket_list[i] == socket) { socket_list[i] = 0; - break; + LeaveCriticalSection( &cs_socket_list ); + return TRUE; } } LeaveCriticalSection(&cs_socket_list); + return FALSE; } #define WS_MAX_SOCKETS_PER_PROCESS 128 /* reasonable guess */ @@ -584,29 +586,6 @@ static DWORD NtStatusToWSAError( NTSTATUS status ) return NT_SUCCESS(status) ? RtlNtStatusToDosErrorNoTeb(status) : WSAEINVAL; } -/* set last error code from NT status without mapping WSA errors */ -static inline unsigned int set_error( unsigned int err ) -{ - if (err) - { - err = NtStatusToWSAError( err ); - SetLastError( err ); - } - return err; -} - -static inline int get_sock_fd( SOCKET s, DWORD access, unsigned int *options ) -{ - int fd; - if (set_error( wine_server_handle_to_fd( SOCKET2HANDLE(s), access, &fd, options ) )) - return -1; - return fd; -} - -static inline void release_sock_fd( SOCKET s, int fd ) -{ - close( fd ); -} struct per_thread_data *get_per_thread_data(void) { @@ -1514,26 +1493,26 @@ int WINAPI WS_bind( SOCKET s, const struct WS_sockaddr *addr, int len ) /*********************************************************************** - * closesocket (WS2_32.3) + * closesocket (ws2_32.3) */ -int WINAPI WS_closesocket(SOCKET s) +int WINAPI WS_closesocket( SOCKET s ) { - int res = SOCKET_ERROR, fd; - if (num_startup) + TRACE( "%#lx\n", s ); + + if (!num_startup) { - fd = get_sock_fd(s, FILE_READ_DATA, NULL); - if (fd >= 0) - { - release_sock_fd(s, fd); - socket_list_remove(s); - if (CloseHandle(SOCKET2HANDLE(s))) - res = 0; - } + SetLastError( WSANOTINITIALISED ); + return -1; } - else - SetLastError(WSANOTINITIALISED); - TRACE("(socket %04lx) -> %d\n", s, res); - return res; + + if (!socket_list_remove( s )) + { + SetLastError( WSAENOTSOCK ); + return -1; + } + + CloseHandle( (HANDLE)s ); + return 0; }

1 0

Alex Henrie : include: Fix size of MsiEnumClientsEx[AW]'s array argument (GCC).
by Alexandre Julliard Aug. 3, 2021

Aug. 3, 2021

Module: wine Branch: master Commit: 14e205ff502ec7275d2c4cf59b1446ac0a294416 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14e205ff502ec7275d2c4cf5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 2 22:13:38 2021 -0600 include: Fix size of MsiEnumClientsEx[AW]'s array argument (GCC). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/msi.h b/include/msi.h index 604331a9e5f..c1ca99771a4 100644 --- a/include/msi.h +++ b/include/msi.h @@ -470,8 +470,8 @@ UINT WINAPI MsiEnumClientsA(LPCSTR, DWORD, LPSTR); UINT WINAPI MsiEnumClientsW(LPCWSTR, DWORD, LPWSTR); #define MsiEnumClients WINELIB_NAME_AW(MsiEnumClients) -UINT WINAPI MsiEnumClientsExA(LPCSTR, LPCSTR, DWORD, DWORD, CHAR*, MSIINSTALLCONTEXT*, LPSTR, LPDWORD); -UINT WINAPI MsiEnumClientsExW(LPCWSTR, LPCWSTR, DWORD, DWORD, WCHAR*, MSIINSTALLCONTEXT*, LPWSTR, LPDWORD); +UINT WINAPI MsiEnumClientsExA(LPCSTR, LPCSTR, DWORD, DWORD, CHAR[39], MSIINSTALLCONTEXT*, LPSTR, LPDWORD); +UINT WINAPI MsiEnumClientsExW(LPCWSTR, LPCWSTR, DWORD, DWORD, WCHAR[39], MSIINSTALLCONTEXT*, LPWSTR, LPDWORD); #define MsiEnumClientsEx WINELIB_NAME_AW(MsiEnumClientsEx) UINT WINAPI MsiOpenPackageA(LPCSTR, MSIHANDLE*);

1 0