June 2022 - Wine-Commits - list.winehq.org

Zhiyi Zhang : uxtheme: Place DrawThemeBackgroundEx() at ordinal 47.
by Alexandre Julliard June 27, 2022

June 27, 2022

Module: wine Branch: master Commit: 684b04f31ef0409061b7648848c6ffc124d4a4c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=684b04f31ef0409061b76488… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 31 17:49:39 2022 +0800 uxtheme: Place DrawThemeBackgroundEx() at ordinal 47. Qt5 applications call DrawThemeBackgroundEx() by ordinal. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53066 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/tests/system.c | 1 - dlls/uxtheme/uxtheme.spec | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index f169231b214..aa491ffb2d2 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -2268,7 +2268,6 @@ static void test_DrawThemeBackgroundEx(void) void *proc; proc = GetProcAddress(GetModuleHandleA("uxtheme.dll"), MAKEINTRESOURCEA(47)); - todo_wine ok(proc == (void *)pDrawThemeBackgroundEx, "Expected DrawThemeBackgroundEx() at ordinal 47.\n"); } diff --git a/dlls/uxtheme/uxtheme.spec b/dlls/uxtheme/uxtheme.spec index 140388245f2..c60254b677d 100644 --- a/dlls/uxtheme/uxtheme.spec +++ b/dlls/uxtheme/uxtheme.spec @@ -36,6 +36,7 @@ 44 stub -noname ClassicSystemParametersInfoA 45 stub -noname ClassicSystemParametersInfoW 46 stub -noname ClassicAdjustWindowRectEx +47 stdcall DrawThemeBackgroundEx(ptr ptr long long ptr ptr) 48 stub -noname GetThemeParseErrorInfo 60 stub -noname CreateThemeDataFromObjects 61 stdcall OpenThemeDataEx(ptr wstr long) @@ -53,7 +54,6 @@ @ stdcall BufferedPaintUnInit() @ stdcall CloseThemeData(ptr) @ stdcall DrawThemeBackground(ptr ptr long long ptr ptr) -@ stdcall DrawThemeBackgroundEx(ptr ptr long long ptr ptr) @ stdcall DrawThemeEdge(ptr ptr long long ptr long long ptr) @ stdcall DrawThemeIcon(ptr ptr long long ptr ptr long) @ stdcall DrawThemeParentBackground(ptr ptr ptr)

1 0

Zebediah Figura : dnsapi: Return a double-null-terminated string from DnsQueryConfig(DnsConfigSearchList).
by Alexandre Julliard June 27, 2022

June 27, 2022

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 : ntdll: Add some documentation for ntdll_umbstowcs() and ntdll_wcstoumbs().
by Alexandre Julliard June 27, 2022

June 27, 2022

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

Zhiyi Zhang : uxtheme/tests: Test that DrawThemeBackgroundEx() is at ordinal 47.
by Alexandre Julliard June 27, 2022

June 27, 2022

Module: wine Branch: master Commit: 56b5d56c355e48ea714009977986fd23ca9705b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56b5d56c355e48ea71400997… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 23 15:33:14 2022 +0800 uxtheme/tests: Test that DrawThemeBackgroundEx() is at ordinal 47. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/tests/system.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 1f04ac879ec..f169231b214 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -40,6 +40,7 @@ static HTHEME (WINAPI * pOpenThemeDataEx)(HWND, LPCWSTR, DWORD); static HTHEME (WINAPI *pOpenThemeDataForDpi)(HWND, LPCWSTR, UINT); static HPAINTBUFFER (WINAPI *pBeginBufferedPaint)(HDC, const RECT *, BP_BUFFERFORMAT, BP_PAINTPARAMS *, HDC *); static HRESULT (WINAPI *pBufferedPaintClear)(HPAINTBUFFER, const RECT *); +static HRESULT (WINAPI *pDrawThemeBackgroundEx)(HTHEME, HDC, int, int, const RECT *, const DTBGOPTS *); static HRESULT (WINAPI *pEndBufferedPaint)(HPAINTBUFFER, BOOL); static HRESULT (WINAPI *pGetBufferedPaintBits)(HPAINTBUFFER, RGBQUAD **, int *); static HDC (WINAPI *pGetBufferedPaintDC)(HPAINTBUFFER); @@ -80,6 +81,7 @@ static void init_funcs(void) GET_PROC(uxtheme, BeginBufferedPaint) GET_PROC(uxtheme, BufferedPaintClear) GET_PROC(uxtheme, EndBufferedPaint) + GET_PROC(uxtheme, DrawThemeBackgroundEx) GET_PROC(uxtheme, GetBufferedPaintBits) GET_PROC(uxtheme, GetBufferedPaintDC) GET_PROC(uxtheme, GetBufferedPaintTargetDC) @@ -2261,6 +2263,15 @@ static void test_EnableThemeDialogTexture(void) UnregisterClassA(cls.lpszClassName, GetModuleHandleA(NULL)); } +static void test_DrawThemeBackgroundEx(void) +{ + void *proc; + + proc = GetProcAddress(GetModuleHandleA("uxtheme.dll"), MAKEINTRESOURCEA(47)); + todo_wine + ok(proc == (void *)pDrawThemeBackgroundEx, "Expected DrawThemeBackgroundEx() at ordinal 47.\n"); +} + START_TEST(system) { ULONG_PTR ctx_cookie; @@ -2287,6 +2298,7 @@ START_TEST(system) test_GetThemeIntList(); test_GetThemeTransitionDuration(); test_DrawThemeParentBackground(); + test_DrawThemeBackgroundEx(); if (load_v6_module(&ctx_cookie, &ctx)) {

1 0

Paul Gofman : nsiproxy.sys: Add static ARP entries which are always present on Windows.
by Alexandre Julliard June 27, 2022

June 27, 2022

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

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard June 27, 2022

June 27, 2022

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 June 27, 2022

June 27, 2022

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 : tests: Test ldexp() intrinsic.
by Alexandre Julliard June 27, 2022

June 27, 2022

Module: vkd3d Branch: master Commit: 0462d814845feec61a2809d999bd62adbc5f0451 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0462d814845feec61a2809d… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jun 24 09:41:25 2022 +0200 tests: Test 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> --- Makefile.am | 1 + tests/hlsl-ldexp.shader_test | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/Makefile.am b/Makefile.am index 400e79e1..ff900a6c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -88,6 +88,7 @@ vkd3d_shader_tests = \ tests/hlsl-initializer-struct.shader_test \ tests/hlsl-intrinsic-override.shader_test \ tests/hlsl-invalid.shader_test \ + tests/hlsl-ldexp.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-matrix-indexing.shader_test \ diff --git a/tests/hlsl-ldexp.shader_test b/tests/hlsl-ldexp.shader_test new file mode 100644 index 00000000..46b87a38 --- /dev/null +++ b/tests/hlsl-ldexp.shader_test @@ -0,0 +1,32 @@ +[pixel shader] +uniform float4 x; +uniform float4 y; + +float4 main() : SV_TARGET +{ + return ldexp(x, y); +} + +[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 +probe all rgba (2.0, 0.00292968750, 4096.0, 6.33825300e+030) + +[require] +shader model >= 4.0 + +[pixel shader] +uniform int4 x; +uniform int4 y; + +float4 main() : SV_TARGET +{ + return ldexp(x, y); +} + +[test] +uniform 0 int4 2 3 4 5 +uniform 4 int4 0 -10 10 100 +todo draw quad +probe all rgba (2.0, 0.00292968750, 4096.0, 6.33825300e+030)

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Parse dot() intrinsic.
by Alexandre Julliard June 27, 2022

June 27, 2022

Module: vkd3d Branch: master Commit: 58d017ccc17ba79739deddb812d6b88023e4707d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=58d017ccc17ba79739deddb… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jun 24 09:41:27 2022 +0200 vkd3d-shader/hlsl: Parse dot() 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 | 62 ++++++++++++++++++++++++++++++++++++++++++++++ tests/hlsl-dot.shader_test | 2 +- 2 files changed, 63 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index df5fda47..391cf890 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1516,6 +1516,61 @@ static struct list *add_binary_shift_expr_merge(struct hlsl_ctx *ctx, struct lis return list1; } +static struct hlsl_ir_node *add_binary_dot_expr(struct hlsl_ctx *ctx, struct list *instrs, + struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2, const struct vkd3d_shader_location *loc) +{ + enum hlsl_base_type base = expr_common_base_type(arg1->data_type->base_type, arg2->data_type->base_type); + struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {0}; + struct hlsl_type *common_type, *ret_type; + enum hlsl_ir_expr_op op; + unsigned dim; + + if (arg1->data_type->type == HLSL_CLASS_MATRIX) + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_type_to_string(ctx, arg1->data_type))) + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Invalid type %s.\n", string->buffer); + hlsl_release_string_buffer(ctx, string); + return NULL; + } + + if (arg2->data_type->type == HLSL_CLASS_MATRIX) + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_type_to_string(ctx, arg2->data_type))) + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Invalid type %s.\n", string->buffer); + hlsl_release_string_buffer(ctx, string); + return NULL; + } + + if (arg1->data_type->type == HLSL_CLASS_SCALAR) + dim = arg2->data_type->dimx; + else if (arg1->data_type->type == HLSL_CLASS_SCALAR) + dim = arg1->data_type->dimx; + else + dim = min(arg1->data_type->dimx, arg2->data_type->dimx); + + if (dim == 1) + op = HLSL_OP2_MUL; + else + op = HLSL_OP2_DOT; + + common_type = hlsl_get_vector_type(ctx, base, dim); + ret_type = hlsl_get_scalar_type(ctx, base); + + if (!(args[0] = add_implicit_conversion(ctx, instrs, arg1, common_type, loc))) + return NULL; + + if (!(args[1] = add_implicit_conversion(ctx, instrs, arg2, common_type, loc))) + return NULL; + + return add_expr(ctx, instrs, op, args, ret_type, loc); +} + static enum hlsl_ir_expr_op op_from_assignment(enum parse_assign_op op) { static const enum hlsl_ir_expr_op ops[] = @@ -2023,6 +2078,12 @@ static bool intrinsic_cross(struct hlsl_ctx *ctx, return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_ADD, mul2, mul1_neg, loc); } +static bool intrinsic_dot(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + return !!add_binary_dot_expr(ctx, params->instrs, params->args[0], params->args[1], loc); +} + static bool intrinsic_floor(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -2220,6 +2281,7 @@ intrinsic_functions[] = {"abs", 1, true, intrinsic_abs}, {"clamp", 3, true, intrinsic_clamp}, {"cross", 2, true, intrinsic_cross}, + {"dot", 2, true, intrinsic_dot}, {"floor", 1, true, intrinsic_floor}, {"max", 2, true, intrinsic_max}, {"min", 2, true, intrinsic_min}, diff --git a/tests/hlsl-dot.shader_test b/tests/hlsl-dot.shader_test index cb117d15..74a85ca0 100644 --- a/tests/hlsl-dot.shader_test +++ b/tests/hlsl-dot.shader_test @@ -56,7 +56,7 @@ float4 main() : SV_TARGET % Account for both the SM1 and SM4 uniform layout uniform 0 float4 2.0 3.0 0.0 0.0 uniform 4 float4 3.0 0.0 0.0 0.0 -todo draw quad +draw quad probe all rgba (6.0, 6.0, 6.0, 6.0) [pixel shader fail]

1 0

Zebediah Figura : vkd3d-shader/hlsl: Parse the ldexp() intrinsic.
by Alexandre Julliard June 27, 2022

June 27, 2022

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