wine-commits June 2022

wine-commits@winehq.org

2 participants
791 discussions

Paul Gofman : nsiproxy.sys: Add static ARP entries which are always present on Windows.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: 9a11957babb536d23ec8daaeafdd12f81244b5cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a11957babb536d23ec8daae… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jun 20 20:17:06 2022 -0500 nsiproxy.sys: Add static ARP entries which are always present on Windows. Some apps (Roon or SCP: Secret Laboratory are examples) depend on ARP table always containing some entries if there is a network adapter present. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53175 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/iphlpapi/tests/iphlpapi.c | 52 +++++++++++++++++++++- dlls/nsiproxy.sys/ip.c | 96 +++++++++++++++++++++++++++++++++++++++- dlls/nsiproxy.sys/unix_private.h | 6 +++ 3 files changed, 152 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 84d5143ba8e..1a0cb76bcf5 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -120,6 +120,11 @@ static const char *ntoa6( IN6_ADDR *ip ) return buffers[i]; } +static DWORD ipv4_addr( BYTE b1, BYTE b2, BYTE b3, BYTE b4 ) +{ + return htonl( (b1 << 24) | (b2 << 16) | (b3 << 8) | b4 ); +} + /* still-to-be-tested 98-only functions: GetUniDirectionalAdapterInfo @@ -369,10 +374,16 @@ static void testGetIpForwardTable(void) static void testGetIpNetTable(void) { - DWORD apiReturn; + DWORD apiReturn, ret, prev_idx; + BOOL igmp3_found, ssdp_found; + DWORD igmp3_addr, ssdp_addr; + MIB_IPNET_TABLE2 *table2; ULONG dwSize = 0; unsigned int i; + igmp3_addr = ipv4_addr( 224, 0, 0, 22 ); + ssdp_addr = ipv4_addr( 239, 255, 255, 250 ); + apiReturn = GetIpNetTable(NULL, NULL, FALSE); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetIpNetTable is not supported\n"); @@ -406,6 +417,45 @@ static void testGetIpNetTable(void) ok(ntohl(buf->table[i].dwAddr) <= ntohl(buf->table[i + 1].dwAddr), "Entries are not sorted by address, i %u.\n", i ); } + + igmp3_found = ssdp_found = FALSE; + prev_idx = ~0ul; + for (i = 0; i < buf->dwNumEntries; ++i) + { + if (buf->table[i].dwIndex != prev_idx) + { + if (prev_idx != ~0ul) + { + ok( igmp3_found, "%s not found, iface index %lu.\n", ntoa( igmp3_addr ), prev_idx); + ok( ssdp_found || broken(!ssdp_found) /* 239.255.255.250 is always present since Win10 */, + "%s not found.\n", ntoa( ssdp_addr )); + } + prev_idx = buf->table[i].dwIndex; + igmp3_found = ssdp_found = FALSE; + } + if (buf->table[i].dwAddr == igmp3_addr) + igmp3_found = TRUE; + else if (buf->table[i].dwAddr == ssdp_addr) + ssdp_found = TRUE; + } + ok( igmp3_found, "%s not found.\n", ntoa( igmp3_addr )); + ok( ssdp_found || broken(!ssdp_found) /* 239.255.255.250 is always present since Win10 */, + "%s not found.\n", ntoa( ssdp_addr )); + + ret = GetIpNetTable2( AF_INET, &table2 ); + ok( !ret, "got ret %lu.\n", ret ); + for (i = 0; i < table2->NumEntries; ++i) + { + MIB_IPNET_ROW2 *row = &table2->Table[i]; + if (row->Address.Ipv4.sin_addr.s_addr == igmp3_addr + || row->Address.Ipv4.sin_addr.s_addr == ssdp_addr) + { + ok( row->State == NlnsPermanent, "got state %d.\n", row->State ); + ok( !row->IsRouter, "IsRouter is set.\n" ); + ok( !row->IsUnreachable, "IsUnreachable is set.\n" ); + } + } + FreeMibTable( table2 ); } if (apiReturn == NO_ERROR && winetest_debug > 1) diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index 79f3bd80bfe..dbe3a0b46b7 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -1000,18 +1000,75 @@ static void ipv4_neighbour_fill_entry( struct ipv4_neighbour_data *entry, struct } } +/* ARP entries for these multicast addresses are always present on Windows for each interface. */ +static DWORD ipv4_multicast_addresses[] = +{ + IPV4_ADDR(224, 0, 0, 22), + IPV4_ADDR(239, 255, 255, 250), +}; + +static void update_static_address_found( DWORD address, UINT if_index, struct nsi_ndis_ifinfo_static *iface, + unsigned int iface_count ) +{ + unsigned int i, j; + + for (i = 0; i < ARRAY_SIZE(ipv4_multicast_addresses); ++i) + if (ipv4_multicast_addresses[i] == address) break; + + if (i == ARRAY_SIZE(ipv4_multicast_addresses)) return; + + for (j = 0; j < iface_count; ++j) + { + if (iface[j].if_index == if_index) + { + iface[j].unk |= 1 << i; + return; + } + } +} + static NTSTATUS ipv4_neighbour_enumerate_all( void *key_data, UINT key_size, void *rw_data, UINT rw_size, void *dynamic_data, UINT dynamic_size, void *static_data, UINT static_size, UINT_PTR *count ) { - UINT num = 0; + UINT num = 0, iface_count; NTSTATUS status = STATUS_SUCCESS; BOOL want_data = key_size || rw_size || dynamic_size || static_size; + struct nsi_ndis_ifinfo_static *iface_static; struct ipv4_neighbour_data entry; + NET_LUID *luid_tbl; + unsigned int i, j; TRACE( "%p %d %p %d %p %d %p %d %p\n", key_data, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count ); + iface_count = 0; + if ((status = nsi_enumerate_all( 1, 0, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, NULL, 0, NULL, 0, + NULL, 0, NULL, 0, &iface_count ))) + return status; + + if (!(luid_tbl = malloc( iface_count * sizeof(*luid_tbl) ))) + return STATUS_NO_MEMORY; + + if (!(iface_static = malloc( iface_count * sizeof(*iface_static) ))) + { + free( luid_tbl ); + return STATUS_NO_MEMORY; + } + + if ((status = nsi_enumerate_all( 1, 0, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl, sizeof(*luid_tbl), + NULL, 0, NULL, 0, iface_static, sizeof(*iface_static), &iface_count )) + && status != STATUS_BUFFER_OVERFLOW) + { + free( luid_tbl ); + free( iface_static ); + return status; + } + + /* Use unk field to indicate whether we found mandatory multicast addresses in the host ARP table. */ + for (i = 0; i < iface_count; ++i) + iface_static[i].unk = 0; + #ifdef __linux__ { char buf[512], *ptr, *s; @@ -1059,6 +1116,8 @@ static NTSTATUS ipv4_neighbour_enumerate_all( void *key_data, UINT key_size, voi if (!convert_unix_name_to_luid( ptr, &entry.luid )) continue; if (!convert_luid_to_index( &entry.luid, &entry.if_index )) continue; + update_static_address_found( entry.addr.s_addr, entry.if_index, iface_static, iface_count ); + if (num < *count) { ipv4_neighbour_fill_entry( &entry, key_data, rw_data, dynamic_data, static_data ); @@ -1119,6 +1178,8 @@ static NTSTATUS ipv4_neighbour_enumerate_all( void *key_data, UINT key_size, voi #endif entry.is_unreachable = 0; /* FIXME */ + update_static_address_found( entry.addr.s_addr, entry.if_index, iface_static, iface_count ); + if (num < *count) { ipv4_neighbour_fill_entry( &entry, key_data, rw_data, dynamic_data, static_data ); @@ -1136,9 +1197,42 @@ static NTSTATUS ipv4_neighbour_enumerate_all( void *key_data, UINT key_size, voi } #else FIXME( "not implemented\n" ); + free( luid_tbl ); + free( iface_static ); return STATUS_NOT_IMPLEMENTED; #endif + if (!want_data || num <= *count) + { + /* Certain ipv4 multicast addresses are always present on Windows for each interface. + * Add those if they weren't added already. */ + memset( &entry, 0, sizeof(entry) ); + entry.state = NlnsPermanent; + for (i = 0; i < iface_count; ++i) + { + entry.if_index = iface_static[i].if_index; + entry.luid = luid_tbl[i]; + for (j = 0; j < ARRAY_SIZE(ipv4_multicast_addresses); ++j) + { + if (iface_static[i].unk & (1 << j)) continue; + if (num <= *count) + { + entry.addr.s_addr = ipv4_multicast_addresses[j]; + ipv4_neighbour_fill_entry( &entry, key_data, rw_data, dynamic_data, static_data ); + + if (key_data) key_data = (BYTE *)key_data + key_size; + if (rw_data) rw_data = (BYTE *)rw_data + rw_size; + if (dynamic_data) dynamic_data = (BYTE *)dynamic_data + dynamic_size; + if (static_data) static_data = (BYTE *)static_data + static_size; + } + ++num; + } + } + } + + free( luid_tbl ); + free( iface_static ); + if (!want_data || num <= *count) *count = num; else status = STATUS_BUFFER_OVERFLOW; diff --git a/dlls/nsiproxy.sys/unix_private.h b/dlls/nsiproxy.sys/unix_private.h index 8ab56f6d9a3..84fea0c42d2 100644 --- a/dlls/nsiproxy.sys/unix_private.h +++ b/dlls/nsiproxy.sys/unix_private.h @@ -18,6 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifdef WORDS_BIGENDIAN +#define IPV4_ADDR(b1, b2, b3, b4) (((unsigned int)b1 << 24) | (b2 << 16) | (b3 << 8) | b4) +#else +#define IPV4_ADDR(b1, b2, b3, b4) (((unsigned int)b4 << 24) | (b3 << 16) | (b2 << 8) | b1) +#endif + NTSTATUS nsi_enumerate_all_ex( struct nsi_enumerate_all_ex *params ) DECLSPEC_HIDDEN; NTSTATUS nsi_get_all_parameters_ex( struct nsi_get_all_parameters_ex *params ) DECLSPEC_HIDDEN; NTSTATUS nsi_get_parameter_ex( struct nsi_get_parameter_ex *params ) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : ntdll: Add some documentation for ntdll_umbstowcs() and ntdll_wcstoumbs().
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: 88b77020f27b83d5c11eb425756a0dee20ad5f63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88b77020f27b83d5c11eb425… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 22 17:06:07 2022 -0500 ntdll: Add some documentation for ntdll_umbstowcs() and ntdll_wcstoumbs(). These functions do match e.g. mbstowcs() and MultiByteToWideChar(), but that fact is not inherently obvious [and they don't match RtlMultiByteToUnicodeN(), for example.] --- dlls/ntdll/unix/env.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index a71df03966f..f69e4e80f0d 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -364,6 +364,13 @@ static BOOL is_dynamic_env_var( const char *var ) /****************************************************************** * ntdll_umbstowcs (ntdll.so) + * + * Convert a multi-byte string in the Unix code page to UTF-16. Returns the + * number of characters converted, which may be less than the entire source + * string. The destination string must not be NULL. + * + * The size of the output buffer, and the return value, are both given in + * characters, not bytes. */ DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen ) { @@ -381,6 +388,11 @@ DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen ) /****************************************************************** * ntdll_wcstoumbs (ntdll.so) + * + * Convert a UTF-16 string to a multi-byte string in the Unix code page. + * The destination string must not be NULL. + * + * The size of the source string is given in characters, not bytes. */ int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DWORD dstlen, BOOL strict ) {

1 0

Zebediah Figura : dnsapi: Return a double-null-terminated string from DnsQueryConfig(DnsConfigSearchList).
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: 23d85e6e9ab0b7f0f79beb41fe6738c50d02d632 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23d85e6e9ab0b7f0f79beb41… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jun 24 15:33:42 2022 -0500 dnsapi: Return a double-null-terminated string from DnsQueryConfig(DnsConfigSearchList). DNS_TEXT_DATA contains pointers and is thus not WoW64 compatible. Since the API is internal to Wine, use a simpler format instead of fixing our WoW64 translation. The problem was found by Brendan Shanks; this solution was suggested by Hans Leidekker. --- dlls/dnsapi/dnsapi.h | 2 +- dlls/dnsapi/libresolv.c | 21 ++++++++------------- dlls/iphlpapi/iphlpapi_main.c | 6 +++--- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/dnsapi/dnsapi.h b/dlls/dnsapi/dnsapi.h index f27cce9a99d..a81cb712f3e 100644 --- a/dlls/dnsapi/dnsapi.h +++ b/dlls/dnsapi/dnsapi.h @@ -128,7 +128,7 @@ extern const char *debugstr_type( unsigned short ) DECLSPEC_HIDDEN; struct get_searchlist_params { - DNS_TXT_DATAW *list; + WCHAR *list; DWORD *len; }; diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c index 51a44f88aa5..fd645d53fd7 100644 --- a/dlls/dnsapi/libresolv.c +++ b/dlls/dnsapi/libresolv.c @@ -125,16 +125,15 @@ static DNS_STATUS map_h_errno( int error ) static NTSTATUS resolv_get_searchlist( void *args ) { const struct get_searchlist_params *params = args; - DNS_TXT_DATAW *list = params->list; - DWORD i, needed, str_needed = 0; + WCHAR *list = params->list; + DWORD i, needed = 0; WCHAR *ptr, *end; init_resolver(); for (i = 0; i < MAXDNSRCH + 1 && _res.dnsrch[i]; i++) - str_needed += (strlen(_res.dnsrch[i]) + 1) * sizeof(WCHAR); - - needed = FIELD_OFFSET(DNS_TXT_DATAW, pStringArray[i]) + str_needed; + needed += (strlen(_res.dnsrch[i]) + 1) * sizeof(WCHAR); + needed += sizeof(WCHAR); /* null terminator */ if (!list || *params->len < needed) { @@ -143,16 +142,12 @@ static NTSTATUS resolv_get_searchlist( void *args ) } *params->len = needed; - list->dwStringCount = i; - ptr = (WCHAR *)(list->pStringArray + i); - end = ptr + str_needed / sizeof(WCHAR); + ptr = list; + end = ptr + needed / sizeof(WCHAR); for (i = 0; i < MAXDNSRCH + 1 && _res.dnsrch[i]; i++) - { - list->pStringArray[i] = ptr; - ptr += ntdll_umbstowcs( _res.dnsrch[i], strlen(_res.dnsrch[i]) + 1, - list->pStringArray[i], end - ptr ); - } + ptr += ntdll_umbstowcs( _res.dnsrch[i], strlen(_res.dnsrch[i]) + 1, ptr, end - ptr ); + *ptr = 0; /* null terminator */ return ERROR_SUCCESS; } diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 65d3793011b..a95a581532f 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1138,7 +1138,7 @@ static DWORD dns_info_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG family, ULONG flags DWORD err, i, size, attempt, sockaddr_len; WCHAR name[MAX_ADAPTER_NAME_LENGTH + 1]; DNS_ADDR_ARRAY *servers; - DNS_TXT_DATAW *search; + WCHAR *search; while (aa) { @@ -1192,9 +1192,9 @@ static DWORD dns_info_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG family, ULONG flags (search = heap_alloc( size ))) { if (!DnsQueryConfig( DnsConfigSearchList, 0, name, NULL, search, &size ) && - search->dwStringCount && wcslen( search->pStringArray[0] ) < MAX_DNS_SUFFIX_STRING_LENGTH) + search[0] && wcslen( search ) < MAX_DNS_SUFFIX_STRING_LENGTH) { - wcscpy( aa->DnsSuffix, search->pStringArray[0] ); + wcscpy( aa->DnsSuffix, search ); } heap_free( search ); }

1 0

Zebediah Figura : dnsapi: ntdll_umbstowcs() deals in characters, not bytes.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: 91083d451022bdac99ac6c349f0965dec1d1db67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91083d451022bdac99ac6c34… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 22 17:03:47 2022 -0500 dnsapi: ntdll_umbstowcs() deals in characters, not bytes. --- dlls/dnsapi/libresolv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c index e19e867c76c..51a44f88aa5 100644 --- a/dlls/dnsapi/libresolv.c +++ b/dlls/dnsapi/libresolv.c @@ -127,7 +127,7 @@ static NTSTATUS resolv_get_searchlist( void *args ) const struct get_searchlist_params *params = args; DNS_TXT_DATAW *list = params->list; DWORD i, needed, str_needed = 0; - char *ptr, *end; + WCHAR *ptr, *end; init_resolver(); @@ -145,11 +145,11 @@ static NTSTATUS resolv_get_searchlist( void *args ) *params->len = needed; list->dwStringCount = i; - ptr = (char *)(list->pStringArray + i); - end = ptr + str_needed; + ptr = (WCHAR *)(list->pStringArray + i); + end = ptr + str_needed / sizeof(WCHAR); for (i = 0; i < MAXDNSRCH + 1 && _res.dnsrch[i]; i++) { - list->pStringArray[i] = (WCHAR *)ptr; + list->pStringArray[i] = ptr; ptr += ntdll_umbstowcs( _res.dnsrch[i], strlen(_res.dnsrch[i]) + 1, list->pStringArray[i], end - ptr ); }

1 0

Zebediah Figura : dnsapi: Clarify that Windows does not implement DnsQueryConfig(DnsConfigSearchList).
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: f66880c86aa283503434a0ff871a38082d2452e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f66880c86aa283503434a0ff… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 22 17:09:57 2022 -0500 dnsapi: Clarify that Windows does not implement DnsQueryConfig(DnsConfigSearchList). >From 17e2d5c1ca655a29775e1a4cd08d9fdec9654dcd. --- dlls/dnsapi/query.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 12aa1086540..0e2f1b39ece 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -387,6 +387,7 @@ DNS_STATUS WINAPI DnsQueryConfig( DNS_CONFIG_TYPE config, DWORD flag, const WCHA struct get_serverlist_params params = { AF_INET6, buffer, len }; return RESOLV_CALL( get_serverlist, &params ); } + /* Windows does not implement this, but we need it in iphlpapi. */ case DnsConfigSearchList: { struct get_searchlist_params params = { buffer, len };

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: 85596986a797973770f93f4323aeaba4559ade18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85596986a797973770f93f43… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Sat Jun 25 00:19:53 2022 +0200 po: Update Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/po/nl.po b/po/nl.po index bf4ff469379..8e3074e26e5 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-04-15 18:10+0200\n" +"PO-Revision-Date: 2022-06-25 00:15+0200\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -16455,10 +16455,8 @@ msgstr "&DWORD-waarde" #: programs/regedit/regedit.rc:52 programs/regedit/regedit.rc:105 #: programs/regedit/regedit.rc:128 -#, fuzzy -#| msgid "&DWORD Value" msgid "&QWORD Value" -msgstr "&DWORD-waarde" +msgstr "&QWORD-waarde" #: programs/regedit/regedit.rc:53 programs/regedit/regedit.rc:106 #: programs/regedit/regedit.rc:129 @@ -17017,16 +17015,12 @@ msgid "Collapse" msgstr "Invouwen" #: programs/regedit/regedit.rc:178 -#, fuzzy -#| msgid "Adds a new 32-bit value" msgid "Adds a new 64-bit value" -msgstr "Een nieuwe 32-bit waarde toevoegen" +msgstr "Een nieuwe 64-bit waarde toevoegen" #: programs/regedit/regedit.rc:221 -#, fuzzy -#| msgid "Edit DWORD" msgid "Edit QWORD" -msgstr "DWORD waarde bewerken" +msgstr "QWORD waarde bewerken" #: programs/regsvr32/regsvr32.rc:33 msgid ""

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: 70b3b2e0186c820a2da603c0a91d7cdd7bda320e URL: https://source.winehq.org/git/wine.git/?a=commit;h=70b3b2e0186c820a2da603c0… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Sat Jun 25 00:19:19 2022 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/po/lt.po b/po/lt.po index 56ba5411a05..ea1d281a430 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-04-15 11:35+0300\n" +"PO-Revision-Date: 2022-06-25 00:18+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -16379,10 +16379,8 @@ msgstr "&DWORD reikšmė" #: programs/regedit/regedit.rc:52 programs/regedit/regedit.rc:105 #: programs/regedit/regedit.rc:128 -#, fuzzy -#| msgid "&DWORD Value" msgid "&QWORD Value" -msgstr "&DWORD reikšmė" +msgstr "&QWORD reikšmė" #: programs/regedit/regedit.rc:53 programs/regedit/regedit.rc:106 #: programs/regedit/regedit.rc:129 @@ -16939,16 +16937,12 @@ msgid "Collapse" msgstr "Suskleisti" #: programs/regedit/regedit.rc:178 -#, fuzzy -#| msgid "Adds a new 32-bit value" msgid "Adds a new 64-bit value" -msgstr "Prideda naują 32-bitų reikšmę" +msgstr "Prideda naują 64-bitų reikšmę" #: programs/regedit/regedit.rc:221 -#, fuzzy -#| msgid "Edit DWORD" msgid "Edit QWORD" -msgstr "Redaguoti DWORD reikšmę" +msgstr "Redaguoti QWORD reikšmę" #: programs/regsvr32/regsvr32.rc:33 msgid ""

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Parse lerp() intrinsic.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: vkd3d Branch: master Commit: 7682da58a87f7cbd0d024a83797cc8914dc6f3d3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7682da58a87f7cbd0d024a8… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jun 24 09:41:30 2022 +0200 vkd3d-shader/hlsl: Parse lerp() intrinsic. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 21 +++++++++++++++++++++ tests/hlsl-lerp.shader_test | 4 ++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 7469b525..09a01c6d 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2109,6 +2109,26 @@ static bool intrinsic_ldexp(struct hlsl_ctx *ctx, return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, params->args[0], arg, loc); } +static bool intrinsic_lerp(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg, *neg, *add, *mul; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + if (!(neg = add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_NEG, arg, loc))) + return false; + + if (!(add = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_ADD, params->args[1], neg, loc))) + return false; + + if (!(mul = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, params->args[2], add, loc))) + return false; + + return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_ADD, arg, mul, loc); +} + static bool intrinsic_max(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -2298,6 +2318,7 @@ intrinsic_functions[] = {"dot", 2, true, intrinsic_dot}, {"floor", 1, true, intrinsic_floor}, {"ldexp", 2, true, intrinsic_ldexp}, + {"lerp", 3, true, intrinsic_lerp}, {"max", 2, true, intrinsic_max}, {"min", 2, true, intrinsic_min}, {"mul", 2, true, intrinsic_mul}, diff --git a/tests/hlsl-lerp.shader_test b/tests/hlsl-lerp.shader_test index a472379b..3f93b02d 100644 --- a/tests/hlsl-lerp.shader_test +++ b/tests/hlsl-lerp.shader_test @@ -12,7 +12,7 @@ float4 main() : SV_TARGET uniform 0 float4 2.0 3.0 4.0 5.0 uniform 4 float4 0.0 -10.0 10.0 100.0 uniform 8 float4 0.0 1.0 -1.0 0.75 -todo draw quad +draw quad probe all rgba (2.0, -10.0, -2.0, 76.25) [require] @@ -32,5 +32,5 @@ float4 main() : SV_TARGET uniform 0 int4 2 3 4 0 uniform 4 int4 0 -10 10 1000000 uniform 8 int4 0 1 -1 1000000 -todo draw quad +draw quad probe all rgba (2.0, -10.0, -2.0, 1e12)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Parse the ldexp() intrinsic.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: vkd3d Branch: master Commit: bb32ffad1878b89d99d9a9815c0d9dbcad1f241a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bb32ffad1878b89d99d9a98… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jun 24 09:41:29 2022 +0200 vkd3d-shader/hlsl: Parse the ldexp() intrinsic. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 15 +++++++++++++++ tests/hlsl-ldexp.shader_test | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 391cf890..7469b525 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2095,6 +2095,20 @@ static bool intrinsic_floor(struct hlsl_ctx *ctx, return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_FLOOR, arg, loc); } +static bool intrinsic_ldexp(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[1], loc))) + return false; + + if (!(arg = add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_EXP2, arg, loc))) + return false; + + return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, params->args[0], arg, loc); +} + static bool intrinsic_max(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -2283,6 +2297,7 @@ intrinsic_functions[] = {"cross", 2, true, intrinsic_cross}, {"dot", 2, true, intrinsic_dot}, {"floor", 1, true, intrinsic_floor}, + {"ldexp", 2, true, intrinsic_ldexp}, {"max", 2, true, intrinsic_max}, {"min", 2, true, intrinsic_min}, {"mul", 2, true, intrinsic_mul}, diff --git a/tests/hlsl-ldexp.shader_test b/tests/hlsl-ldexp.shader_test index 46b87a38..0873fc9e 100644 --- a/tests/hlsl-ldexp.shader_test +++ b/tests/hlsl-ldexp.shader_test @@ -10,7 +10,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 4.0 5.0 uniform 4 float4 0.0 -10.0 10.0 100.0 -todo draw quad +draw quad probe all rgba (2.0, 0.00292968750, 4096.0, 6.33825300e+030) [require] @@ -28,5 +28,5 @@ float4 main() : SV_TARGET [test] uniform 0 int4 2 3 4 5 uniform 4 int4 0 -10 10 100 -todo draw quad +draw quad probe all rgba (2.0, 0.00292968750, 4096.0, 6.33825300e+030)

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 dot product instructions.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: vkd3d Branch: master Commit: c7198bc964fd38cb23ca929064a29c99f0fbf66d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c7198bc964fd38cb23ca929… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jun 24 09:41:28 2022 +0200 vkd3d-shader/hlsl: Write SM4 dot product instructions. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 51 ++++++++++++++++++++++++++++++++++++++++++++ tests/hlsl-dot.shader_test | 6 +++--- 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index a6ac2aa3..79027169 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1314,6 +1314,25 @@ static void write_sm4_binary_op(struct vkd3d_bytecode_buffer *buffer, enum vkd3d write_sm4_instruction(buffer, &instr); } +/* dp# instructions don't map the swizzle. */ +static void write_sm4_binary_op_dot(struct vkd3d_bytecode_buffer *buffer, enum vkd3d_sm4_opcode opcode, + const struct hlsl_ir_node *dst, const struct hlsl_ir_node *src1, const struct hlsl_ir_node *src2) +{ + struct sm4_instruction instr; + + memset(&instr, 0, sizeof(instr)); + instr.opcode = opcode; + + sm4_dst_from_node(&instr.dsts[0], dst); + instr.dst_count = 1; + + sm4_src_from_node(&instr.srcs[0], src1, VKD3DSP_WRITEMASK_ALL); + sm4_src_from_node(&instr.srcs[1], src2, VKD3DSP_WRITEMASK_ALL); + instr.src_count = 2; + + write_sm4_instruction(buffer, &instr); +} + static void write_sm4_binary_op_with_two_destinations(struct vkd3d_bytecode_buffer *buffer, enum vkd3d_sm4_opcode opcode, const struct hlsl_ir_node *dst, unsigned dst_idx, const struct hlsl_ir_node *src1, const struct hlsl_ir_node *src2) @@ -1679,6 +1698,38 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, } break; + case HLSL_OP2_DOT: + switch (dst_type->base_type) + { + case HLSL_TYPE_FLOAT: + switch (arg1->data_type->dimx) + { + case 4: + write_sm4_binary_op_dot(buffer, VKD3D_SM4_OP_DP4, &expr->node, arg1, arg2); + break; + + case 3: + write_sm4_binary_op_dot(buffer, VKD3D_SM4_OP_DP3, &expr->node, arg1, arg2); + break; + + case 2: + write_sm4_binary_op_dot(buffer, VKD3D_SM4_OP_DP2, &expr->node, arg1, arg2); + break; + + case 1: + assert(0); + break; + + default: + assert(0); + } + break; + + default: + hlsl_fixme(ctx, &expr->node.loc, "SM4 %s dot expression.", dst_type_string->buffer); + } + break; + case HLSL_OP2_EQUAL: { const struct hlsl_type *src_type = arg1->data_type; diff --git a/tests/hlsl-dot.shader_test b/tests/hlsl-dot.shader_test index 74a85ca0..a83c2488 100644 --- a/tests/hlsl-dot.shader_test +++ b/tests/hlsl-dot.shader_test @@ -10,7 +10,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 4.0 5.0 uniform 4 float4 10.0 11.0 12.0 13.0 -todo draw quad +draw quad probe all rgba (166.0, 166.0, 166.0, 166.0) [pixel shader] @@ -25,7 +25,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 0.0 0.0 uniform 4 float4 10.0 11.0 12.0 13.0 -todo draw quad +draw quad probe all rgba (53.0, 53.0, 53.0, 53.0) [pixel shader] @@ -40,7 +40,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 0.0 0.0 0.0 uniform 4 float4 10.0 11.0 12.0 13.0 -todo draw quad +draw quad probe all rgba (92.0, 92.0, 92.0, 92.0) [pixel shader]

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2022