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

[PATCH] ntdll: Return STATUS_NOT_SUPPORTED if dlinfo() is not present.
by Huw Davies Aug. 4, 2021

Aug. 4, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ntdll/unix/loader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index c2f79bc2c44..30915e443be 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1744,6 +1744,7 @@ NTSTATUS get_builtin_init_funcs( void *handle, void **funcs, SIZE_T len, SIZE_T for (i = 0; i < init_arraysz / sizeof(*init_array); i++) funcs[i] = init_array[i]; return STATUS_SUCCESS; #endif + return STATUS_NOT_SUPPORTED; } -- 2.23.0

1 1

[PATCH v2] ntdll: Return STATUS_NOT_SUPPORTED if dlinfo() is not present.
by Huw Davies Aug. 4, 2021

Aug. 4, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ntdll/unix/loader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index c2f79bc2c44..5e932506c2b 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1743,6 +1743,8 @@ NTSTATUS get_builtin_init_funcs( void *handle, void **funcs, SIZE_T len, SIZE_T if (init_func) *funcs++ = init_func; for (i = 0; i < init_arraysz / sizeof(*init_array); i++) funcs[i] = init_array[i]; return STATUS_SUCCESS; +#else + return STATUS_NOT_SUPPORTED; #endif } -- 2.23.0

1 0

[PATCH] kernelbase: Fix copy size for delete_privs in CreateRestrictedToken().
by Paul Gofman Aug. 4, 2021

Aug. 4, 2021

Fixes 3D Aim Trainer crash on start. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/kernelbase/security.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/security.c b/dlls/kernelbase/security.c index 97943048b01..36196304db3 100644 --- a/dlls/kernelbase/security.c +++ b/dlls/kernelbase/security.c @@ -662,21 +662,21 @@ BOOL WINAPI CreateRestrictedToken( HANDLE token, DWORD flags, { if (!(nt_disable_sids = heap_alloc( offsetof( TOKEN_GROUPS, Groups[disable_sid_count] ) ))) goto out; nt_disable_sids->GroupCount = disable_sid_count; - memcpy( nt_disable_sids->Groups, disable_sids, disable_sid_count * sizeof(SID_AND_ATTRIBUTES) ); + memcpy( nt_disable_sids->Groups, disable_sids, disable_sid_count * sizeof(*disable_sids) ); } if (delete_priv_count) { if (!(nt_privs = heap_alloc( offsetof( TOKEN_GROUPS, Groups[delete_priv_count] ) ))) goto out; nt_privs->PrivilegeCount = delete_priv_count; - memcpy( nt_privs->Privileges, delete_privs, delete_priv_count * sizeof(SID_AND_ATTRIBUTES) ); + memcpy( nt_privs->Privileges, delete_privs, delete_priv_count * sizeof(*delete_privs) ); } if (restrict_sid_count) { if (!(nt_restrict_sids = heap_alloc( offsetof( TOKEN_GROUPS, Groups[restrict_sid_count] ) ))) goto out; nt_restrict_sids->GroupCount = restrict_sid_count; - memcpy( nt_restrict_sids->Groups, restrict_sids, restrict_sid_count * sizeof(SID_AND_ATTRIBUTES) ); + memcpy( nt_restrict_sids->Groups, restrict_sids, restrict_sid_count * sizeof(*restrict_sids) ); } status = NtFilterToken(token, flags, nt_disable_sids, nt_privs, nt_restrict_sids, ret); -- 2.31.1

1 0

[PATCH 1/3] ucrtbase: Update the fenv test for non-x86 architectures
by Martin Storsjö Aug. 4, 2021

Aug. 4, 2021

The x86 style x87/sse split of status bits isn't present on arm64. Also include a couple cases of missing fenv_encode() in test printouts, to avoid surprising error messages like "expected 1, got 1". Signed-off-by: Martin Storsjö <martin(a)martin.st> --- The test talks about "too old ucrtbase", but neither the UCRT in Windows 11 nor the one statically linked with VS 2022 17.0 preview 2 does the x86 style status bit duplication/shifting, so I'm concluding that this behaviour isn't expected/intended on non-x86 architectures. --- dlls/ucrtbase/tests/misc.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 96dd1acfe54..eb323997e68 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -1377,14 +1377,15 @@ static unsigned long fenv_encode(unsigned int e) #if defined(__i386__) return e<<24 | e<<16 | e; -#else +#elif defined(__x86_64__) return e<<24 | e; +#else + return e; #endif } static void test_fenv(void) { -#if defined(__i386__) || defined(__x86_64__) static const int tests[] = { 0, FE_INEXACT, @@ -1425,11 +1426,13 @@ static void test_fenv(void) ret = fegetenv(&env); ok(!ret, "fegetenv returned %x\n", ret); +#if defined(__i386__) || defined(__x86_64__) if (env._Fe_ctl >> 24 != (env._Fe_ctl & 0xff)) { win_skip("fenv_t format not supported (too old ucrtbase)\n"); return; } +#endif fesetround(FE_UPWARD); ok(!env._Fe_stat, "env._Fe_stat = %lx\n", env._Fe_stat); ret = fegetenv(&env2); @@ -1485,13 +1488,13 @@ static void test_fenv(void) ret = fegetexceptflag(&except, ~0); ok(!ret, "Test %d: fegetexceptflag returned %x.\n", i, ret); ok(except == fenv_encode(flags), - "Test %d: expected %x, got %lx\n", i, flags, except); + "Test %d: expected %x, got %lx\n", i, fenv_encode(flags), except); except = ~0; ret = fegetexceptflag(&except, tests[i]); ok(!ret, "Test %d: fegetexceptflag returned %x.\n", i, ret); ok(except == fenv_encode(tests[i]), - "Test %d: expected %x, got %lx\n", i, tests[i], except); + "Test %d: expected %x, got %lx\n", i, fenv_encode(tests[i]), except); } for(i=0; i<ARRAY_SIZE(tests); i++) { @@ -1534,7 +1537,6 @@ static void test_fenv(void) ok(!ret, "feclearexceptflag returned %x\n", ret); except = fetestexcept(FE_ALL_EXCEPT); ok(!except, "expected 0, got %lx\n", except); -#endif } START_TEST(misc) -- 2.25.1

1 2

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

Aug. 4, 2021

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

1 0

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

Aug. 4, 2021

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

1 0

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

Aug. 4, 2021

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

1 0

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

Aug. 4, 2021

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

1 0

[PATCH 1/2] maintainers: Add a WIDL section.
by Rémi Bernon Aug. 4, 2021

Aug. 4, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- MAINTAINERS | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index c36a70958ed..ad121ab117d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -244,7 +244,6 @@ RPC Runtime P: Huw Davies <huw(a)codeweavers.com> P: Zebediah Figura <z.figura12(a)gmail.com> F: dlls/rpcrt4 -F: tools/widl TWAIN P: Esme Povirk <vincent(a)codeweavers.com> @@ -274,6 +273,11 @@ F: dlls/ieframe/ F: dlls/mshtml/ F: dlls/shdocvw/ +WIDL +P: Huw Davies <huw(a)codeweavers.com> +P: Zebediah Figura <z.figura12(a)gmail.com> +F: tools/widl + Windows Imaging Component M: Esme Povirk <vincent(a)codeweavers.com> F: dlls/windowscodecs/ -- 2.32.0

1 1

[PATCH] include: Add some type aliases in dsound.h.
by Biswapriyo Nath Aug. 4, 2021

Aug. 4, 2021

1 0

[PATCH 1/2] include: Add RASCREDENTIALSA/W structures
by Alex Henrie Aug. 4, 2021

Aug. 4, 2021

From: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> Signed-off-by: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- include/ras.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/ras.h b/include/ras.h index a8c04da2b6d..210a2a45f09 100644 --- a/include/ras.h +++ b/include/ras.h @@ -372,6 +372,27 @@ typedef struct tagRASCONNSTATUSW DECL_WINELIB_TYPE_AW(RASCONNSTATUS) +typedef struct tagRASCREDENTIALSA +{ + DWORD dwSize; + DWORD dwMask; + CHAR szUserName[UNLEN + 1]; + CHAR szPassword[PWLEN + 1]; + CHAR szDomain[DNLEN + 1]; +} RASCREDENTIALSA, *LPRASCREDENTIALSA; + +typedef struct tagRASCREDENTIALSW +{ + DWORD dwSize; + DWORD dwMask; + WCHAR szUserName[UNLEN + 1]; + WCHAR szPassword[PWLEN + 1]; + WCHAR szDomain[DNLEN + 1]; +} RASCREDENTIALSW, *LPRASCREDENTIALSW; + +DECL_WINELIB_TYPE_AW(RASCREDENTIALS) +DECL_WINELIB_TYPE_AW(LPRASCREDENTIALS) + typedef enum tagRASPROJECTION { RASP_Amb = 0x10000, -- 2.32.0

1 1

[PATCH 1/5] ws2_32: Get rid of supported_pf().
by Zebediah Figura Aug. 4, 2021

Aug. 4, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ws2_32/socket.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 40e4ecb9325..2bcd15463f8 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -727,26 +727,6 @@ void WINAPI WSASetLastError(INT iError) { SetLastError(iError); } -static inline BOOL supported_pf(int pf) -{ - switch (pf) - { - case WS_AF_INET: - case WS_AF_INET6: - return TRUE; -#ifdef HAS_IPX - case WS_AF_IPX: - return TRUE; -#endif -#ifdef HAS_IRDA - case WS_AF_IRDA: - return TRUE; -#endif - default: - return FALSE; - } -} - /**********************************************************************/ /* Returns the length of the converted address if successful, 0 if it was too -- 2.32.0

1 4

[PATCH] shell32: Fix use of uninitialized variable in paste_pidls (Clang)
by Alex Henrie Aug. 4, 2021

Aug. 4, 2021

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shell32/shlview_cmenu.c:1163:17: warning: variable 'psfhlpsrc' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized] if (SUCCEEDED(hr)) ^~~~~~~~~~~~~ include/winerror.h:74:25: note: expanded from macro 'SUCCEEDED' ^~~~~~~~~~~~~~~~~~~~ dlls/shell32/shlview_cmenu.c:1175:16: note: uninitialized use occurs here if(psfhlpsrc) ISFHelper_Release(psfhlpsrc); ^~~~~~~~~ dlls/shell32/shlview_cmenu.c:1163:13: note: remove the 'if' if its condition is always true if (SUCCEEDED(hr)) ^~~~~~~~~~~~~~~~~~ dlls/shell32/shlview_cmenu.c:1161:45: note: initialize the variable 'psfhlpsrc' to silence this warning ISFHelper *psfhlpdst, *psfhlpsrc; ^ = NULL --- dlls/shell32/shlview_cmenu.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index ef11957e921..ec54f6b82cd 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -1171,8 +1171,11 @@ static HRESULT paste_pidls(ContextMenu *This, ITEMIDLIST **pidls, UINT count) ISFHelper_DeleteItems(psfhlpsrc, 1, &pidl_item); */ } - if(psfhlpdst) ISFHelper_Release(psfhlpdst); - if(psfhlpsrc) ISFHelper_Release(psfhlpsrc); + if(psfhlpdst) + { + ISFHelper_Release(psfhlpdst); + if(psfhlpsrc) ISFHelper_Release(psfhlpsrc); + } IShellFolder_Release(psfFrom); } SHFree(pidl_dir); -- 2.32.0

2 1

[PATCH v4 1/4] msvcrt/tests: Add test for fopen/_open access hints
by Luke Deller Aug. 4, 2021

Aug. 4, 2021

Test passing sequential and random access hints to fopen and _open. Test that the underlying windows handle actually has the corresponding FILE_SEQUENTIAL_ONLY mode set correctly. Signed-off-by: Luke Deller <luke(a)deller.id.au> --- v4: Adjust the test for the contradictory "rbRS" fopen mode, to match what Marvin <testbot(a)winehq.org> reported is the behaviour on Windows --- dlls/msvcrt/tests/file.c | 124 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index fb242d81282..1117ac0f729 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -35,6 +35,7 @@ #include <process.h> #include <errno.h> #include <locale.h> +#include <winternl.h> #define MSVCRT_FD_BLOCK_SIZE 32 typedef struct { @@ -2731,6 +2732,127 @@ static void test_lseek(void) DeleteFileA("_creat.tst"); } +static BOOL has_sequential_hint(int fd) +{ + HANDLE handle; + FILE_MODE_INFORMATION mode_info; + IO_STATUS_BLOCK io; + NTSTATUS status; + + /* Check whether the file handle has the sequential access hint */ + handle = (HANDLE)_get_osfhandle(fd); + status = NtQueryInformationFile(handle, &io, &mode_info, sizeof(mode_info), + FileModeInformation); + ok(!status, "NtQueryInformationFile failed\n"); + return (mode_info.Mode & FILE_SEQUENTIAL_ONLY) != 0; +} + +static void test_fopen_hints(void) +{ + char *tempf; + FILE *fp; + int i; + + /* fopen modes to test */ + const char *fopen_modes[] = { + "rb", "rbS", "rbR", "rbSR", "rbRS" + }; + /* corresponding expected hints */ + BOOL expected_hints[][2] = { + /* expect_sequential, expect_random */ + {FALSE, FALSE}, + {TRUE, FALSE}, + {FALSE, TRUE}, + {TRUE, FALSE}, + {FALSE, TRUE}, + }; + + /* create a test file */ + tempf = _tempnam(".","wne"); + fp = fopen(tempf, "wb"); + ok(fp != NULL, "unable to create test file\n"); + fwrite("abc\n", 1, 4, fp); + fclose(fp); + + /* test fopen with each mode */ + for (i = 0; i < sizeof(fopen_modes)/sizeof(char*); ++i) + { + BOOL expect_sequential, has_sequential; + const char *mode = fopen_modes[i]; + expect_sequential = expected_hints[i][0]; + + fp = fopen(tempf, mode); + ok(fp != NULL, "unable to fopen test file with mode \"%s\"\n", mode); + + has_sequential = has_sequential_hint(_fileno(fp)); + todo_wine_if(expect_sequential) ok(has_sequential == expect_sequential, + "unexpected sequential hint %d for fopen mode \"%s\"\n", + has_sequential, mode); + + /* TODO: Somehow check whether the random access hint has been applied. + * Sadly NtQueryInformationFile does not expose this information. */ + + fclose(fp); + } + + unlink(tempf); + free(tempf); +} + +static void test_open_hints(void) +{ + char *tempf; + int fd; + int i; + + /* fopen modes to test */ + int open_flags[] = { + _O_RDONLY | _O_BINARY, + _O_RDONLY | _O_BINARY | _O_SEQUENTIAL, + _O_RDONLY | _O_BINARY | _O_RANDOM, + _O_RDONLY | _O_BINARY | _O_RANDOM | _O_SEQUENTIAL, + }; + /* corresponding expected hints */ + BOOL expected_hints[][2] = { + /* expect_sequential, expect_random */ + {FALSE, FALSE}, + {TRUE, FALSE}, + {FALSE, TRUE}, + {TRUE, TRUE}, + }; + + /* create a test file */ + tempf = _tempnam(".","wne"); + fd = _open(tempf, _O_CREAT | _O_WRONLY | _O_BINARY); + ok(fd != -1, "unable to create test file\n"); + _write(fd, "abc\n", 4); + _close(fd); + + /* test _open with each mode */ + for (i = 0; i < sizeof(open_flags)/sizeof(int); ++i) + { + BOOL expect_sequential, has_sequential; + int flags = open_flags[i]; + expect_sequential = expected_hints[i][0]; + + fd = open(tempf, flags); + ok(fd != -1, "unable to _open test file with flags %x\n", flags); + + has_sequential = has_sequential_hint(fd); + todo_wine_if(expect_sequential) ok(has_sequential == expect_sequential, + "unexpected sequential hint %d for _open flags %x\n", + has_sequential, flags); + + /* TODO: Somehow check whether the random access hint has been applied. + * Sadly NtQueryInformationFile does not expose this information. */ + + close(fd); + } + + unlink(tempf); + free(tempf); +} + START_TEST(file) { int arg_c; @@ -2803,6 +2925,8 @@ START_TEST(file) test_close(); test__creat(); test_lseek(); + test_fopen_hints(); + test_open_hints(); /* Wait for the (_P_NOWAIT) spawned processes to finish to make sure the report * file contains lines in the correct order -- 2.25.1

3 5

[PATCH 1/6] ws2_32: Check for presence in the socket list in closesocket().
by Zebediah Figura Aug. 4, 2021

Aug. 4, 2021

Instead of trying to retrieve the fd. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- 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; } -- 2.32.0

4 9

[PATCH v3] loader: Add support for ARM linux in the preloader
by Martin Storsjö Aug. 3, 2021

Aug. 3, 2021

Since 28fe84da45bea7de56539b50eac8ebcec54342de, the main exe image must be mappable at its desired base address, which essentially requires the preloader. This fixes the original issue that lead to https://bugs.winehq.org/show_bug.cgi?id=51539. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- v3: Provide a trivial implementation of __aeabi_uidivmod to avoid relying on extra sources. --- configure.ac | 4 +- dlls/ntdll/unix/loader.c | 6 +- loader/preloader.c | 124 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 126 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index b5d3217f2a0..c018c89f748 100644 --- a/configure.ac +++ b/configure.ac @@ -940,7 +940,7 @@ case $host_os in WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" case $host_cpu in - *i[[3456789]]86* | x86_64 | *aarch64*) + *i[[3456789]]86* | x86_64 | *aarch64* | arm*) WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x7bc00000], [case $host_os in freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x60000000" ;; @@ -2161,7 +2161,7 @@ esac case $host_os in linux*) case $host_cpu in - *i[[3456789]]86*|x86_64*|*aarch64*) + *i[[3456789]]86*|x86_64*|*aarch64*|arm*) test "$wine_binary" = wine || WINE_IGNORE_FILE("loader/wine-preloader") WINELOADER_PROGRAMS="$WINELOADER_PROGRAMS $wine_binary-preloader" ;; diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 0e580cd7556..14f26cbd520 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -2155,11 +2155,7 @@ static int pre_exec(void) int temp; check_vmsplit( &temp ); -#ifdef __i386__ - return 1; /* we have a preloader on x86 */ -#else - return 0; -#endif + return 1; /* we have a preloader on x86/arm */ } #elif defined(__linux__) && (defined(__x86_64__) || defined(__aarch64__)) diff --git a/loader/preloader.c b/loader/preloader.c index bb16ecd96a4..86308484182 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -111,7 +111,7 @@ static struct wine_preload_info preload_info[] = { -#ifdef __i386__ +#if defined(__i386__) || defined(__arm__) { (void *)0x00000000, 0x00010000 }, /* low 64k */ { (void *)0x00010000, 0x00100000 }, /* DOS area */ { (void *)0x00110000, 0x67ef0000 }, /* low memory area */ @@ -536,6 +536,125 @@ SYSCALL_NOERR( wld_geteuid, 175 /* SYS_geteuid */ ); gid_t wld_getegid(void); SYSCALL_NOERR( wld_getegid, 177 /* SYS_getegid */ ); +#elif defined(__arm__) + +void *thread_data[256]; + +/* + * The _start function is the entry and exit point of this program + * + * It calls wld_start, passing a pointer to the args it receives + * then jumps to the address wld_start returns. + */ +void _start(void); +extern char _end[]; +__ASM_GLOBAL_FUNC(_start, + "mov r0, sp\n\t" + "sub sp, sp, #144\n\t" /* allocate some space for extra aux values */ + "str r0, [sp]\n\t" /* orig stack pointer */ + "ldr r0, =thread_data\n\t" + "movw r7, #0x0005\n\t" /* __ARM_NR_set_tls */ + "movt r7, #0xf\n\t" /* __ARM_NR_set_tls */ + "svc #0\n\t" + "mov r0, sp\n\t" /* ptr to orig stack pointer */ + "bl wld_start\n\t" + "ldr r1, [sp]\n\t" /* new stack pointer */ + "mov sp, r1\n\t" + "mov lr, r0\n\t" + "mov r0, #0\n\t" + "mov r1, #0\n\t" + "mov r2, #0\n\t" + "mov r3, #0\n\t" + "mov r12, #0\n\t" + "bx lr\n\t" + ".ltorg\n\t") + +#define SYSCALL_FUNC( name, nr ) \ + __ASM_GLOBAL_FUNC( name, \ + "push {r4-r5,r7,lr}\n\t" \ + "ldr r4, [sp, #16]\n\t" \ + "ldr r5, [sp, #20]\n\t" \ + "mov r7, #" #nr "\n\t" \ + "svc #0\n\t" \ + "cmn r0, #4096\n\t" \ + "it hi\n\t" \ + "movhi r0, #-1\n\t" \ + "pop {r4-r5,r7,pc}\n\t" ) + +#define SYSCALL_NOERR( name, nr ) \ + __ASM_GLOBAL_FUNC( name, \ + "push {r7,lr}\n\t" \ + "mov r7, #" #nr "\n\t" \ + "svc #0\n\t" \ + "pop {r7,pc}\n\t" ) + +void wld_exit( int code ) __attribute__((noreturn)); +SYSCALL_NOERR( wld_exit, 1 /* SYS_exit */ ); + +ssize_t wld_read( int fd, void *buffer, size_t len ); +SYSCALL_FUNC( wld_read, 3 /* SYS_read */ ); + +ssize_t wld_write( int fd, const void *buffer, size_t len ); +SYSCALL_FUNC( wld_write, 4 /* SYS_write */ ); + +int wld_openat( int dirfd, const char *name, int flags ); +SYSCALL_FUNC( wld_openat, 322 /* SYS_openat */ ); + +int wld_open( const char *name, int flags ) +{ + return wld_openat(-100 /* AT_FDCWD */, name, flags); +} + +int wld_close( int fd ); +SYSCALL_FUNC( wld_close, 6 /* SYS_close */ ); + +void *wld_mmap2( void *start, size_t len, int prot, int flags, int fd, int offset ); +SYSCALL_FUNC( wld_mmap2, 192 /* SYS_mmap2 */ ); + +void *wld_mmap( void *start, size_t len, int prot, int flags, int fd, off_t offset ) +{ + return wld_mmap2(start, len, prot, flags, fd, offset >> 12); +} + +int wld_mprotect( const void *addr, size_t len, int prot ); +SYSCALL_FUNC( wld_mprotect, 125 /* SYS_mprotect */ ); + +int wld_prctl( int code, long arg ); +SYSCALL_FUNC( wld_prctl, 172 /* SYS_prctl */ ); + +uid_t wld_getuid(void); +SYSCALL_NOERR( wld_getuid, 24 /* SYS_getuid */ ); + +gid_t wld_getgid(void); +SYSCALL_NOERR( wld_getgid, 47 /* SYS_getgid */ ); + +uid_t wld_geteuid(void); +SYSCALL_NOERR( wld_geteuid, 49 /* SYS_geteuid */ ); + +gid_t wld_getegid(void); +SYSCALL_NOERR( wld_getegid, 50 /* SYS_getegid */ ); + +unsigned long long __aeabi_uidivmod(unsigned int num, unsigned int den) +{ + unsigned int bit = 1; + unsigned int quota = 0; + if (!den) + wld_exit(1); + while (den < num && !(den & 0x80000000)) { + den <<= 1; + bit <<= 1; + } + do { + if (den <= num) { + quota |= bit; + num -= den; + } + bit >>= 1; + den >>= 1; + } while (bit); + return ((unsigned long long)num << 32) | quota; +} + #else #error preloader not implemented for this CPU #endif @@ -809,6 +928,9 @@ static void map_so_lib( const char *name, struct wld_link_map *l) #elif defined(__aarch64__) if( header->e_machine != EM_AARCH64 ) fatal_error("%s: not an aarch64 ELF binary... don't know how to load it\n", name ); +#elif defined(__arm__) + if( header->e_machine != EM_ARM ) + fatal_error("%s: not an arm ELF binary... don't know how to load it\n", name ); #endif if (header->e_phnum > sizeof(loadcmds)/sizeof(loadcmds[0])) -- 2.25.1

1 0

[PATCH 1/3] msvcrt: Implement _statusfp for arm
by Martin Storsjö Aug. 3, 2021

Aug. 3, 2021

Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/msvcrt/math.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 124cdf80098..5b72005170d 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5206,6 +5206,16 @@ unsigned int CDECL _statusfp(void) if (fpsr & 0x8) flags |= _SW_UNDERFLOW; if (fpsr & 0x10) flags |= _SW_INEXACT; if (fpsr & 0x80) flags |= _SW_DENORMAL; +#elif defined(__arm__) + DWORD fpscr; + + __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpscr) ); + if (fpscr & 0x1) flags |= _SW_INVALID; + if (fpscr & 0x2) flags |= _SW_ZERODIVIDE; + if (fpscr & 0x4) flags |= _SW_OVERFLOW; + if (fpscr & 0x8) flags |= _SW_UNDERFLOW; + if (fpscr & 0x10) flags |= _SW_INEXACT; + if (fpscr & 0x80) flags |= _SW_DENORMAL; #else FIXME( "not implemented\n" ); #endif -- 2.25.1

2 5

Proposal to take over macOS packaging
by Gijs Vermeulen Aug. 3, 2021

Aug. 3, 2021

Hi everyone, Currently, official macOS packages haven't been released since wine-5.7. Thus I'm sending this email on behalf of myself and Dean Greer to officially nominate ourselves to take over the macOS packaging. There are, however, some specifics we'd like to discuss. The old packages were built with compatibility for macOS 10.8 and higher, but Apple stopped supporting 10.8 a very long time ago and it would be hard to keep supporting it for the packages. To get anything lower functional would mean needing to compile all the needed dylibs on the lowest supported version, as package managers don't have prebuilds for these versions. The ideal solution would be to raise the minimum macOS version to 10.13. This version has only recently lost support and would allow us to ship feature-complete packages. Metal also started maturing a lot from 10.13 onwards. [1] Is this something that you could agree too? Kind regards, Gijs & Dean [1] https://source.winehq.org/git/wine.git/commit/0d23ecd9ec8a0c24e5444e0fc9cf6…

4 3

[PATCH v2 1/6] hidclass.sys: Implement button array value caps.
by Rémi Bernon Aug. 3, 2021

Aug. 3, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Don't access IRP fields after IoCompleteRequest calls in PATCH 2. dlls/hid/hidp.c | 62 +++++++++++++++++++++++++++++- dlls/hidclass.sys/descriptor.c | 11 ++++-- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 16 +++----- include/wine/hid.h | 1 + 4 files changed, 75 insertions(+), 15 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 6a9fba6e425..a4e5afbbfcc 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -286,6 +286,18 @@ static NTSTATUS get_usage( const struct hid_value_caps *caps, void *user ) { struct get_usage_params *params = user; ULONG bit, last; + BYTE index; + + if (HID_VALUE_CAPS_IS_ARRAY( caps )) + { + for (bit = caps->start_bit, last = bit + caps->report_count * caps->bit_size - 1; bit <= last; bit += 8) + { + if (!(index = params->report_buf[bit / 8])) continue; + if (params->usages < params->usages_end) *params->usages = caps->usage_min + index - caps->start_index; + params->usages++; + } + return HIDP_STATUS_SUCCESS; + } for (bit = caps->start_bit, last = bit + caps->usage_max - caps->usage_min; bit <= last; ++bit) { @@ -423,7 +435,22 @@ struct set_usage_params static NTSTATUS set_usage( const struct hid_value_caps *caps, void *user ) { struct set_usage_params *params = user; - ULONG bit = caps->start_bit + params->usage - caps->usage_min; + ULONG bit, last; + + if (HID_VALUE_CAPS_IS_ARRAY( caps )) + { + for (bit = caps->start_bit, last = bit + caps->report_count * caps->bit_size - 1; bit <= last; bit += 8) + { + if (params->report_buf[bit / 8]) continue; + params->report_buf[bit / 8] = caps->start_index + params->usage - caps->usage_min; + break; + } + + if (bit > last) return HIDP_STATUS_BUFFER_TOO_SMALL; + return HIDP_STATUS_NULL; + } + + bit = caps->start_bit + params->usage - caps->usage_min; params->report_buf[bit / 8] |= (1 << (bit % 8)); return HIDP_STATUS_NULL; } @@ -595,6 +622,22 @@ static NTSTATUS get_usage_and_page( const struct hid_value_caps *caps, void *use { struct get_usage_and_page_params *params = user; ULONG bit, last; + BYTE index; + + if (HID_VALUE_CAPS_IS_ARRAY( caps )) + { + for (bit = caps->start_bit, last = bit + caps->report_count * caps->bit_size - 1; bit <= last; bit += 8) + { + if (!(index = params->report_buf[bit / 8])) continue; + if (params->usages < params->usages_end) + { + params->usages->UsagePage = caps->usage_page; + params->usages->Usage = caps->usage_min + index - caps->start_index; + } + params->usages++; + } + return HIDP_STATUS_SUCCESS; + } for (bit = caps->start_bit, last = bit + caps->usage_max - caps->usage_min; bit <= last; bit++) { @@ -667,9 +710,24 @@ static NTSTATUS find_all_data( const struct hid_value_caps *caps, void *user ) HIDP_DATA *data = params->data, *data_end = params->data_end; ULONG bit, last, bit_count = caps->bit_size * caps->report_count; char *report_buf = params->report_buf; + BYTE index; if (!caps->bit_size) return HIDP_STATUS_SUCCESS; - if (caps->bit_size == 1) + + if (HID_VALUE_CAPS_IS_ARRAY( caps )) + { + for (bit = caps->start_bit, last = bit + caps->report_count * caps->bit_size - 1; bit <= last; bit += 8) + { + if (!(index = report_buf[bit / 8])) continue; + if (data < data_end) + { + data->DataIndex = caps->data_index_min + index - caps->start_index; + data->On = 1; + } + data++; + } + } + else if (HID_VALUE_CAPS_IS_BUTTON( caps )) { for (bit = caps->start_bit, last = bit + caps->usage_max - caps->usage_min; bit <= last; bit++) { diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 986912990a7..f8bacbbbc1a 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -460,6 +460,7 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY USHORT *data_idx = state->data_idx[type]; ULONG *bit_size = &state->bit_size[type][state->items.report_id]; struct feature *feature; + BOOL is_array; int j; for (j = 0; j < state->items.report_count; j++) @@ -496,10 +497,14 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY } value = state->values[type] + *value_idx; - state->items.report_count -= usages_size - 1; + state->items.start_index = 0; + if (!(is_array = HID_VALUE_CAPS_IS_ARRAY( &state->items ))) state->items.report_count -= usages_size - 1; + else state->items.start_bit -= state->items.report_count * state->items.bit_size; + while (usages_size--) { - state->items.start_bit -= state->items.report_count * state->items.bit_size; + if (!is_array) state->items.start_bit -= state->items.report_count * state->items.bit_size; + else state->items.start_index += 1; state->items.usage_page = state->usages_page[usages_size]; state->items.usage_min = state->usages_min[usages_size]; state->items.usage_max = state->usages_max[usages_size]; @@ -508,7 +513,7 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY if (state->items.usage_max || state->items.usage_min) *data_idx = state->items.data_index_max + 1; *value++ = state->items; *value_idx += 1; - state->items.report_count = 1; + if (!is_array) state->items.report_count = 1; } state->items.usage_page = usage_page; diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 401401bbffe..892e839fa56 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2229,10 +2229,10 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled memcpy(buffer, report, caps.InputReportByteLength); status = HidP_SetUsages(HidP_Input, HID_USAGE_PAGE_KEYBOARD, 0, usages, &value, preparsed_data, report, caps.InputReportByteLength); - todo_wine ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_SetUsages returned %#x\n", status); + ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_SetUsages returned %#x\n", status); buffer[6] = 2; buffer[7] = 4; - todo_wine ok(!memcmp(buffer, report, caps.InputReportByteLength), "unexpected report data\n"); + ok(!memcmp(buffer, report, caps.InputReportByteLength), "unexpected report data\n"); status = HidP_SetUsageValue(HidP_Input, HID_USAGE_PAGE_LED, 0, 6, 1, preparsed_data, report, caps.InputReportByteLength); @@ -2272,7 +2272,7 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled status = HidP_GetUsagesEx(HidP_Input, 0, usage_and_pages, &value, preparsed_data, report, caps.InputReportByteLength); ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsagesEx returned %#x\n", status); - todo_wine ok(value == 6, "got usage count %d, expected %d\n", value, 4); + ok(value == 6, "got usage count %d, expected %d\n", value, 4); ok(usage_and_pages[0].UsagePage == HID_USAGE_PAGE_BUTTON, "got usage_and_pages[0] UsagePage %x, expected %x\n", usage_and_pages[0].UsagePage, HID_USAGE_PAGE_BUTTON); ok(usage_and_pages[1].UsagePage == HID_USAGE_PAGE_BUTTON, "got usage_and_pages[1] UsagePage %x, expected %x\n", @@ -2281,7 +2281,6 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled usage_and_pages[2].UsagePage, HID_USAGE_PAGE_KEYBOARD); ok(usage_and_pages[3].UsagePage == HID_USAGE_PAGE_KEYBOARD, "got usage_and_pages[3] UsagePage %x, expected %x\n", usage_and_pages[3].UsagePage, HID_USAGE_PAGE_KEYBOARD); - todo_wine ok(usage_and_pages[4].UsagePage == HID_USAGE_PAGE_LED, "got usage_and_pages[4] UsagePage %x, expected %x\n", usage_and_pages[4].UsagePage, HID_USAGE_PAGE_LED); ok(usage_and_pages[5].UsagePage == HID_USAGE_PAGE_LED, "got usage_and_pages[5] UsagePage %x, expected %x\n", @@ -2292,13 +2291,10 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled usage_and_pages[1].Usage, 6); ok(usage_and_pages[2].Usage == 9, "got usage_and_pages[2] Usage %x, expected %x\n", usage_and_pages[2].Usage, 9); - todo_wine ok(usage_and_pages[3].Usage == 11, "got usage_and_pages[3] Usage %x, expected %x\n", usage_and_pages[3].Usage, 11); - todo_wine ok(usage_and_pages[4].Usage == 6, "got usage_and_pages[4] Usage %x, expected %x\n", usage_and_pages[4].Usage, 6); - todo_wine ok(usage_and_pages[5].Usage == 4, "got usage_and_pages[5] Usage %x, expected %x\n", usage_and_pages[5].Usage, 4); @@ -2314,15 +2310,15 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled value = 1; status = HidP_GetData(HidP_Input, data, &value, preparsed_data, report, caps.InputReportByteLength); ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetData returned %#x\n", status); - todo_wine ok(value == 11, "got data count %d, expected %d\n", value, 11); + ok(value == 11, "got data count %d, expected %d\n", value, 11); memset(data, 0, sizeof(data)); status = HidP_GetData(HidP_Input, data, &value, preparsed_data, report, caps.InputReportByteLength); ok(status == HIDP_STATUS_SUCCESS, "HidP_GetData returned %#x\n", status); for (i = 0; i < ARRAY_SIZE(expect_data); ++i) { winetest_push_context("data[%d]", i); - todo_wine_if(i >= 4) check_member(data[i], expect_data[i], "%d", DataIndex); - todo_wine_if(i >= 4) check_member(data[i], expect_data[i], "%d", RawValue); + check_member(data[i], expect_data[i], "%d", DataIndex); + check_member(data[i], expect_data[i], "%d", RawValue); winetest_pop_context(); } diff --git a/include/wine/hid.h b/include/wine/hid.h index b15b26474a0..ade9681ab7d 100644 --- a/include/wine/hid.h +++ b/include/wine/hid.h @@ -60,6 +60,7 @@ struct hid_value_caps USHORT bit_size; USHORT report_count; ULONG start_bit; + ULONG start_index; LONG logical_min; LONG logical_max; LONG physical_min; -- 2.32.0

1 5

[PATCH] virtdisk: add DetachVirtualDisk stub
by Austin English Aug. 3, 2021

Aug. 3, 2021

Signed-off-by: Austin English <austinenglish(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51535 --- dlls/virtdisk/virtdisk.spec | 2 +- dlls/virtdisk/virtdisk_main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/virtdisk/virtdisk.spec b/dlls/virtdisk/virtdisk.spec index f35b8df524b..d3d90cf8f87 100644 --- a/dlls/virtdisk/virtdisk.spec +++ b/dlls/virtdisk/virtdisk.spec @@ -4,7 +4,7 @@ @ stub CompactVirtualDisk @ stub CreateVirtualDisk @ stub DeleteVirtualDiskMetadata -@ stub DetachVirtualDisk +@ stdcall DetachVirtualDisk(ptr long long) @ stub EnumerateVirtualDiskMetadata @ stub ExpandVirtualDisk @ stub GetAllAttachedVirtualDiskPhysicalPaths diff --git a/dlls/virtdisk/virtdisk_main.c b/dlls/virtdisk/virtdisk_main.c index ef7f176704e..c4d13241698 100644 --- a/dlls/virtdisk/virtdisk_main.c +++ b/dlls/virtdisk/virtdisk_main.c @@ -58,3 +58,9 @@ DWORD WINAPI OpenVirtualDisk(VIRTUAL_STORAGE_TYPE *type, const WCHAR *path, VIRT return ERROR_CALL_NOT_IMPLEMENTED; } + +DWORD WINAPI DetachVirtualDisk(HANDLE handle, DETACH_VIRTUAL_DISK_FLAG flags, ULONG specific_flags) +{ + FIXME("(%p, 0x%x, %d): stub\n", handle, flags, specific_flags); + return ERROR_INVALID_PARAMETER; +} -- 2.30.2

1 0

[PATCH 1/6] hidclass.sys: Implement button array value caps.
by Rémi Bernon Aug. 3, 2021

Aug. 3, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hid/hidp.c | 62 +++++++++++++++++++++++++++++- dlls/hidclass.sys/descriptor.c | 11 ++++-- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 16 +++----- include/wine/hid.h | 1 + 4 files changed, 75 insertions(+), 15 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 6a9fba6e425..a4e5afbbfcc 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -286,6 +286,18 @@ static NTSTATUS get_usage( const struct hid_value_caps *caps, void *user ) { struct get_usage_params *params = user; ULONG bit, last; + BYTE index; + + if (HID_VALUE_CAPS_IS_ARRAY( caps )) + { + for (bit = caps->start_bit, last = bit + caps->report_count * caps->bit_size - 1; bit <= last; bit += 8) + { + if (!(index = params->report_buf[bit / 8])) continue; + if (params->usages < params->usages_end) *params->usages = caps->usage_min + index - caps->start_index; + params->usages++; + } + return HIDP_STATUS_SUCCESS; + } for (bit = caps->start_bit, last = bit + caps->usage_max - caps->usage_min; bit <= last; ++bit) { @@ -423,7 +435,22 @@ struct set_usage_params static NTSTATUS set_usage( const struct hid_value_caps *caps, void *user ) { struct set_usage_params *params = user; - ULONG bit = caps->start_bit + params->usage - caps->usage_min; + ULONG bit, last; + + if (HID_VALUE_CAPS_IS_ARRAY( caps )) + { + for (bit = caps->start_bit, last = bit + caps->report_count * caps->bit_size - 1; bit <= last; bit += 8) + { + if (params->report_buf[bit / 8]) continue; + params->report_buf[bit / 8] = caps->start_index + params->usage - caps->usage_min; + break; + } + + if (bit > last) return HIDP_STATUS_BUFFER_TOO_SMALL; + return HIDP_STATUS_NULL; + } + + bit = caps->start_bit + params->usage - caps->usage_min; params->report_buf[bit / 8] |= (1 << (bit % 8)); return HIDP_STATUS_NULL; } @@ -595,6 +622,22 @@ static NTSTATUS get_usage_and_page( const struct hid_value_caps *caps, void *use { struct get_usage_and_page_params *params = user; ULONG bit, last; + BYTE index; + + if (HID_VALUE_CAPS_IS_ARRAY( caps )) + { + for (bit = caps->start_bit, last = bit + caps->report_count * caps->bit_size - 1; bit <= last; bit += 8) + { + if (!(index = params->report_buf[bit / 8])) continue; + if (params->usages < params->usages_end) + { + params->usages->UsagePage = caps->usage_page; + params->usages->Usage = caps->usage_min + index - caps->start_index; + } + params->usages++; + } + return HIDP_STATUS_SUCCESS; + } for (bit = caps->start_bit, last = bit + caps->usage_max - caps->usage_min; bit <= last; bit++) { @@ -667,9 +710,24 @@ static NTSTATUS find_all_data( const struct hid_value_caps *caps, void *user ) HIDP_DATA *data = params->data, *data_end = params->data_end; ULONG bit, last, bit_count = caps->bit_size * caps->report_count; char *report_buf = params->report_buf; + BYTE index; if (!caps->bit_size) return HIDP_STATUS_SUCCESS; - if (caps->bit_size == 1) + + if (HID_VALUE_CAPS_IS_ARRAY( caps )) + { + for (bit = caps->start_bit, last = bit + caps->report_count * caps->bit_size - 1; bit <= last; bit += 8) + { + if (!(index = report_buf[bit / 8])) continue; + if (data < data_end) + { + data->DataIndex = caps->data_index_min + index - caps->start_index; + data->On = 1; + } + data++; + } + } + else if (HID_VALUE_CAPS_IS_BUTTON( caps )) { for (bit = caps->start_bit, last = bit + caps->usage_max - caps->usage_min; bit <= last; bit++) { diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 986912990a7..f8bacbbbc1a 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -460,6 +460,7 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY USHORT *data_idx = state->data_idx[type]; ULONG *bit_size = &state->bit_size[type][state->items.report_id]; struct feature *feature; + BOOL is_array; int j; for (j = 0; j < state->items.report_count; j++) @@ -496,10 +497,14 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY } value = state->values[type] + *value_idx; - state->items.report_count -= usages_size - 1; + state->items.start_index = 0; + if (!(is_array = HID_VALUE_CAPS_IS_ARRAY( &state->items ))) state->items.report_count -= usages_size - 1; + else state->items.start_bit -= state->items.report_count * state->items.bit_size; + while (usages_size--) { - state->items.start_bit -= state->items.report_count * state->items.bit_size; + if (!is_array) state->items.start_bit -= state->items.report_count * state->items.bit_size; + else state->items.start_index += 1; state->items.usage_page = state->usages_page[usages_size]; state->items.usage_min = state->usages_min[usages_size]; state->items.usage_max = state->usages_max[usages_size]; @@ -508,7 +513,7 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY if (state->items.usage_max || state->items.usage_min) *data_idx = state->items.data_index_max + 1; *value++ = state->items; *value_idx += 1; - state->items.report_count = 1; + if (!is_array) state->items.report_count = 1; } state->items.usage_page = usage_page; diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 401401bbffe..892e839fa56 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2229,10 +2229,10 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled memcpy(buffer, report, caps.InputReportByteLength); status = HidP_SetUsages(HidP_Input, HID_USAGE_PAGE_KEYBOARD, 0, usages, &value, preparsed_data, report, caps.InputReportByteLength); - todo_wine ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_SetUsages returned %#x\n", status); + ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_SetUsages returned %#x\n", status); buffer[6] = 2; buffer[7] = 4; - todo_wine ok(!memcmp(buffer, report, caps.InputReportByteLength), "unexpected report data\n"); + ok(!memcmp(buffer, report, caps.InputReportByteLength), "unexpected report data\n"); status = HidP_SetUsageValue(HidP_Input, HID_USAGE_PAGE_LED, 0, 6, 1, preparsed_data, report, caps.InputReportByteLength); @@ -2272,7 +2272,7 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled status = HidP_GetUsagesEx(HidP_Input, 0, usage_and_pages, &value, preparsed_data, report, caps.InputReportByteLength); ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsagesEx returned %#x\n", status); - todo_wine ok(value == 6, "got usage count %d, expected %d\n", value, 4); + ok(value == 6, "got usage count %d, expected %d\n", value, 4); ok(usage_and_pages[0].UsagePage == HID_USAGE_PAGE_BUTTON, "got usage_and_pages[0] UsagePage %x, expected %x\n", usage_and_pages[0].UsagePage, HID_USAGE_PAGE_BUTTON); ok(usage_and_pages[1].UsagePage == HID_USAGE_PAGE_BUTTON, "got usage_and_pages[1] UsagePage %x, expected %x\n", @@ -2281,7 +2281,6 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled usage_and_pages[2].UsagePage, HID_USAGE_PAGE_KEYBOARD); ok(usage_and_pages[3].UsagePage == HID_USAGE_PAGE_KEYBOARD, "got usage_and_pages[3] UsagePage %x, expected %x\n", usage_and_pages[3].UsagePage, HID_USAGE_PAGE_KEYBOARD); - todo_wine ok(usage_and_pages[4].UsagePage == HID_USAGE_PAGE_LED, "got usage_and_pages[4] UsagePage %x, expected %x\n", usage_and_pages[4].UsagePage, HID_USAGE_PAGE_LED); ok(usage_and_pages[5].UsagePage == HID_USAGE_PAGE_LED, "got usage_and_pages[5] UsagePage %x, expected %x\n", @@ -2292,13 +2291,10 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled usage_and_pages[1].Usage, 6); ok(usage_and_pages[2].Usage == 9, "got usage_and_pages[2] Usage %x, expected %x\n", usage_and_pages[2].Usage, 9); - todo_wine ok(usage_and_pages[3].Usage == 11, "got usage_and_pages[3] Usage %x, expected %x\n", usage_and_pages[3].Usage, 11); - todo_wine ok(usage_and_pages[4].Usage == 6, "got usage_and_pages[4] Usage %x, expected %x\n", usage_and_pages[4].Usage, 6); - todo_wine ok(usage_and_pages[5].Usage == 4, "got usage_and_pages[5] Usage %x, expected %x\n", usage_and_pages[5].Usage, 4); @@ -2314,15 +2310,15 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled value = 1; status = HidP_GetData(HidP_Input, data, &value, preparsed_data, report, caps.InputReportByteLength); ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetData returned %#x\n", status); - todo_wine ok(value == 11, "got data count %d, expected %d\n", value, 11); + ok(value == 11, "got data count %d, expected %d\n", value, 11); memset(data, 0, sizeof(data)); status = HidP_GetData(HidP_Input, data, &value, preparsed_data, report, caps.InputReportByteLength); ok(status == HIDP_STATUS_SUCCESS, "HidP_GetData returned %#x\n", status); for (i = 0; i < ARRAY_SIZE(expect_data); ++i) { winetest_push_context("data[%d]", i); - todo_wine_if(i >= 4) check_member(data[i], expect_data[i], "%d", DataIndex); - todo_wine_if(i >= 4) check_member(data[i], expect_data[i], "%d", RawValue); + check_member(data[i], expect_data[i], "%d", DataIndex); + check_member(data[i], expect_data[i], "%d", RawValue); winetest_pop_context(); } diff --git a/include/wine/hid.h b/include/wine/hid.h index b15b26474a0..ade9681ab7d 100644 --- a/include/wine/hid.h +++ b/include/wine/hid.h @@ -60,6 +60,7 @@ struct hid_value_caps USHORT bit_size; USHORT report_count; ULONG start_bit; + ULONG start_index; LONG logical_min; LONG logical_max; LONG physical_min; -- 2.32.0

2 7

[PATCH 1/4] d2d1: Add a properties list for builtin effects.
by Ziqing Hui Aug. 3, 2021

Aug. 3, 2021

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/device.c | 2 +- dlls/d2d1/effect.c | 45 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index ce99e7c3432..1cca943122e 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -574,7 +574,7 @@ struct d2d_effect ID2D1Factory *factory; }; -void d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory) DECLSPEC_HIDDEN; +void d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory, const CLSID *effect_id) DECLSPEC_HIDDEN; static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 0647bc57fc3..cc86c6332f9 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1893,7 +1893,7 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateEffect(ID2D1DeviceCont if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - d2d_effect_init(object, context->factory); + d2d_effect_init(object, context->factory, effect_id); TRACE("Created effect %p.\n", object); *effect = &object->ID2D1Effect_iface; diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 40dd2187953..c9d8085f81a 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -20,6 +20,31 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); +struct d2d_effect_info +{ + const CLSID *clsid; + BOOL cached; + D2D1_BUFFER_PRECISION precision; + UINT32 min_inputs; + UINT32 max_inputs; +}; + +static const struct d2d_effect_info builtin_effects[] = +{ + { + &CLSID_D2D12DAffineTransform, + FALSE, D2D1_BUFFER_PRECISION_UNKNOWN, 1, 1 + }, + { + &CLSID_D2D13DPerspectiveTransform, + FALSE, D2D1_BUFFER_PRECISION_UNKNOWN, 1, 1 + }, + { + &CLSID_D2D1Composite, + FALSE, D2D1_BUFFER_PRECISION_UNKNOWN, 1, 0xffffffff + } +}; + static inline struct d2d_effect *impl_from_ID2D1Effect(ID2D1Effect *iface) { return CONTAINING_RECORD(iface, struct d2d_effect, ID2D1Effect_iface); @@ -269,10 +294,28 @@ static const ID2D1ImageVtbl d2d_effect_image_vtbl = d2d_effect_image_GetFactory, }; -void d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory) +static void d2d_effect_init_standard_properties(struct d2d_effect *effect, const struct d2d_effect_info *info) { + /* TODO */ +} + +void d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory, const CLSID *effect_id) +{ + unsigned int i; + effect->ID2D1Effect_iface.lpVtbl = &d2d_effect_vtbl; effect->ID2D1Image_iface.lpVtbl = &d2d_effect_image_vtbl; effect->refcount = 1; ID2D1Factory_AddRef(effect->factory = factory); + + for (i = 0; i < ARRAY_SIZE(builtin_effects); ++i) + { + if (IsEqualGUID(effect_id, builtin_effects[i].clsid)) + { + d2d_effect_init_standard_properties(effect, builtin_effects + i); + return; + } + } + + WARN("Unsupported effect clsid %s.\n", debugstr_guid(effect_id)); } -- 2.25.1

4 12

[PATCH v3 1/4] msvcrt/tests: Add test for fopen/_open access hints
by Luke Deller Aug. 3, 2021

Aug. 3, 2021

Test passing sequential and random access hints to fopen and _open. Test that the underlying windows handle actually has the corresponding FILE_SEQUENTIAL_ONLY mode set correctly. Signed-off-by: Luke Deller <luke(a)deller.id.au> --- dlls/msvcrt/tests/file.c | 124 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index fb242d81282..1cabc163a93 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -35,6 +35,7 @@ #include <process.h> #include <errno.h> #include <locale.h> +#include <winternl.h> #define MSVCRT_FD_BLOCK_SIZE 32 typedef struct { @@ -2731,6 +2732,127 @@ static void test_lseek(void) DeleteFileA("_creat.tst"); } +static BOOL has_sequential_hint(int fd) +{ + HANDLE handle; + FILE_MODE_INFORMATION mode_info; + IO_STATUS_BLOCK io; + NTSTATUS status; + + /* Check whether the file handle has the sequential access hint */ + handle = (HANDLE)_get_osfhandle(fd); + status = NtQueryInformationFile(handle, &io, &mode_info, sizeof(mode_info), + FileModeInformation); + ok(!status, "NtQueryInformationFile failed\n"); + return (mode_info.Mode & FILE_SEQUENTIAL_ONLY) != 0; +} + +static void test_fopen_hints(void) +{ + char *tempf; + FILE *fp; + int i; + + /* fopen modes to test */ + const char *fopen_modes[] = { + "rb", "rbS", "rbR", "rbSR", "rbRS" + }; + /* corresponding expected hints */ + BOOL expected_hints[][2] = { + /* expect_sequential, expect_random */ + {FALSE, FALSE}, + {TRUE, FALSE}, + {FALSE, TRUE}, + {TRUE, TRUE}, + {TRUE, TRUE}, + }; + + /* create a test file */ + tempf = _tempnam(".","wne"); + fp = fopen(tempf, "wb"); + ok(fp != NULL, "unable to create test file\n"); + fwrite("abc\n", 1, 4, fp); + fclose(fp); + + /* test fopen with each mode */ + for (i = 0; i < sizeof(fopen_modes)/sizeof(char*); ++i) + { + BOOL expect_sequential, has_sequential; + const char *mode = fopen_modes[i]; + expect_sequential = expected_hints[i][0]; + + fp = fopen(tempf, mode); + ok(fp != NULL, "unable to fopen test file with mode \"%s\"\n", mode); + + has_sequential = has_sequential_hint(_fileno(fp)); + todo_wine_if(expect_sequential) ok(has_sequential == expect_sequential, + "unexpected sequential hint %d for fopen mode \"%s\"\n", + has_sequential, mode); + + /* TODO: Somehow check whether the random access hint has been applied. + * Sadly NtQueryInformationFile does not expose this information. */ + + fclose(fp); + } + + unlink(tempf); + free(tempf); +} + +static void test_open_hints(void) +{ + char *tempf; + int fd; + int i; + + /* fopen modes to test */ + int open_flags[] = { + _O_RDONLY | _O_BINARY, + _O_RDONLY | _O_BINARY | _O_SEQUENTIAL, + _O_RDONLY | _O_BINARY | _O_RANDOM, + _O_RDONLY | _O_BINARY | _O_RANDOM | _O_SEQUENTIAL, + }; + /* corresponding expected hints */ + BOOL expected_hints[][2] = { + /* expect_sequential, expect_random */ + {FALSE, FALSE}, + {TRUE, FALSE}, + {FALSE, TRUE}, + {TRUE, TRUE}, + }; + + /* create a test file */ + tempf = _tempnam(".","wne"); + fd = _open(tempf, _O_CREAT | _O_WRONLY | _O_BINARY); + ok(fd != -1, "unable to create test file\n"); + _write(fd, "abc\n", 4); + _close(fd); + + /* test _open with each mode */ + for (i = 0; i < sizeof(open_flags)/sizeof(int); ++i) + { + BOOL expect_sequential, has_sequential; + int flags = open_flags[i]; + expect_sequential = expected_hints[i][0]; + + fd = open(tempf, flags); + ok(fd != -1, "unable to _open test file with flags %x\n", flags); + + has_sequential = has_sequential_hint(fd); + todo_wine_if(expect_sequential) ok(has_sequential == expect_sequential, + "unexpected sequential hint %d for _open flags %x\n", + has_sequential, flags); + + /* TODO: Somehow check whether the random access hint has been applied. + * Sadly NtQueryInformationFile does not expose this information. */ + + close(fd); + } + + unlink(tempf); + free(tempf); +} + START_TEST(file) { int arg_c; @@ -2803,6 +2925,8 @@ START_TEST(file) test_close(); test__creat(); test_lseek(); + test_fopen_hints(); + test_open_hints(); /* Wait for the (_P_NOWAIT) spawned processes to finish to make sure the report * file contains lines in the correct order -- 2.25.1

2 5

[PATCH v2 1/2] wined3d: Negiotiate less specific memory types on allocation failure.
by Jan Sikorski Aug. 3, 2021

Aug. 3, 2021

Try to combine DEVICE_LOCAL with HOST_CACHED and HOST_VISIBLE properties. Drop HOST_CACHED or DEVICE_LOCAL in case the device does not support a particular combination or there is no more space in a heap. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- v2: simplified sequence --- dlls/wined3d/buffer.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 4420885b15f..afe186042e5 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1390,6 +1390,7 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf uint32_t bind_flags = resource->bind_flags; VkMemoryPropertyFlags memory_type; VkBufferUsageFlags usage; + BOOL success; usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT; if (bind_flags & WINED3D_BIND_VERTEX_BUFFER) @@ -1410,14 +1411,22 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf FIXME("Ignoring some bind flags %#x.\n", bind_flags); memory_type = 0; + if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) + memory_type |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; if (resource->access & WINED3D_RESOURCE_ACCESS_MAP_R) memory_type |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT; else if (resource->access & WINED3D_RESOURCE_ACCESS_MAP_W) memory_type |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; - else if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) - memory_type |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; - if (!(wined3d_context_vk_create_bo(context_vk, resource->size, usage, memory_type, &buffer_vk->bo))) + success = wined3d_context_vk_create_bo(context_vk, resource->size, usage, memory_type, &buffer_vk->bo); + if (!success && memory_type & VK_MEMORY_PROPERTY_HOST_CACHED_BIT) + success = wined3d_context_vk_create_bo(context_vk, resource->size, usage, + memory_type & ~VK_MEMORY_PROPERTY_HOST_CACHED_BIT, &buffer_vk->bo); + if (!success && memory_type & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT) + success = wined3d_context_vk_create_bo(context_vk, resource->size, usage, + memory_type & ~VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, &buffer_vk->bo); + + if (!success) { WARN("Failed to create Vulkan buffer.\n"); return FALSE; -- 2.30.2

2 2

[PATCH] d3d11/tests: Test 2D texture creation with mutually exclusive sharing modes.
by Nikolay Sivov Aug. 3, 2021

Aug. 3, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2213e48e57c..3ea3de95709 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2736,6 +2736,8 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R8G8B8A8_UINT, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_SNORM, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_SINT, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D11_BIND_RENDER_TARGET, D3D11_RESOURCE_MISC_SHARED | D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX, + FALSE, TRUE}, {DXGI_FORMAT_D24_UNORM_S8_UINT, 1, D3D11_BIND_SHADER_RESOURCE, 0, FALSE, TRUE}, {DXGI_FORMAT_D24_UNORM_S8_UINT, 1, D3D11_BIND_RENDER_TARGET, 0, FALSE, FALSE}, {DXGI_FORMAT_D32_FLOAT, 1, D3D11_BIND_SHADER_RESOURCE, 0, FALSE, TRUE}, -- 2.30.2

4 3