- wine-devel - winehq.org

[PATCH 3/4] nsiproxy: Implement IP compartment get_all_paramters.
by Huw Davies 11 Aug '21

11 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/tests/nsi.c | 42 ++++++++++ dlls/nsiproxy.sys/ip.c | 121 +++++++++++++++++++++++++++ dlls/nsiproxy.sys/nsiproxy_private.h | 29 +++++++ include/wine/nsi.h | 17 ++++ 4 files changed, 209 insertions(+) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index feed72a1626..598e7124afd 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -411,6 +411,46 @@ static void test_ndis_index_luid( void ) ok( err == ERROR_FILE_NOT_FOUND, "got %d\n", err ); } +static void test_ip_cmpt( int family ) +{ + DWORD rw_sizes[] = { FIELD_OFFSET(struct nsi_ip_cmpt_rw, unk2), sizeof(struct nsi_ip_cmpt_rw) }; + const NPI_MODULEID *mod = (family == AF_INET) ? &NPI_MS_IPV4_MODULEID : &NPI_MS_IPV6_MODULEID; + struct nsi_ip_cmpt_dynamic dyn; + struct nsi_ip_cmpt_rw rw; + MIB_IPSTATS table; + DWORD err, key, i; + + winetest_push_context( family == AF_INET ? "AF_INET" : "AF_INET6" ); + + /* key = 0 also seems to work, but NsiAllocateAndGetTable returns + a single table with key == 1. Presumably this is the compartment id */ + key = 1; + for (i = 0; i < ARRAY_SIZE(rw_sizes); i++) + { + err = NsiGetAllParameters( 1, mod, 2, &key, sizeof(key), &rw, rw_sizes[i], &dyn, sizeof(dyn), NULL, 0 ); + if (!err) break; + } + ok( !err, "got %x\n", err ); + + err = GetIpStatisticsEx( &table, family ); + ok( !err, "got %d\n", err ); + if (err) goto err; + +todo_wine_if(family == AF_INET6 && table.dwForwarding - 1 != rw.not_forwarding) + ok( table.dwForwarding - 1 == rw.not_forwarding, "%x vs %x\n", table.dwForwarding, rw.not_forwarding ); +todo_wine_if(family == AF_INET6 && table.dwDefaultTTL != rw.default_ttl) + ok( table.dwDefaultTTL == rw.default_ttl, "%x vs %x\n", table.dwDefaultTTL, rw.default_ttl ); + ok( table.dwNumIf == dyn.num_ifs, "%x vs %x\n", table.dwNumIf, dyn.num_ifs ); +todo_wine_if(table.dwNumAddr != dyn.num_addrs) + ok( table.dwNumAddr == dyn.num_addrs, "%x vs %x\n", table.dwNumAddr, dyn.num_addrs ); +todo_wine_if(family == AF_INET6 && table.dwNumRoutes != dyn.num_routes) + ok( table.dwNumRoutes == dyn.num_routes, "%x vs %x\n", table.dwNumRoutes, dyn.num_routes ); + +err: + winetest_pop_context(); +} + + static void test_ip_ipstats( int family ) { const NPI_MODULEID *mod = (family == AF_INET) ? &NPI_MS_IPV4_MODULEID : &NPI_MS_IPV6_MODULEID; @@ -725,6 +765,8 @@ START_TEST( nsi ) test_ndis_ifinfo(); test_ndis_index_luid(); + test_ip_cmpt( AF_INET ); + test_ip_cmpt( AF_INET6 ); test_ip_ipstats( AF_INET ); test_ip_ipstats( AF_INET6 ); test_ip_unicast( AF_INET ); diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index 7d9af08c711..64a223ab3fb 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -120,6 +120,109 @@ static ULONG64 get_boot_time( void ) return ti.BootTime.QuadPart; } +#if __linux__ +static NTSTATUS read_sysctl_int( const char *file, int *val ) +{ + FILE *fp; + char buf[128], *endptr = buf; + + fp = fopen( file, "r" ); + if (!fp) return STATUS_NOT_SUPPORTED; + + if (fgets( buf, sizeof(buf), fp )) + *val = strtol( buf, &endptr, 10 ); + + fclose( fp ); + return (endptr == buf) ? STATUS_NOT_SUPPORTED : STATUS_SUCCESS; +} +#endif + +static NTSTATUS ip_cmpt_get_all_parameters( DWORD fam, const DWORD *key, DWORD key_size, + struct nsi_ip_cmpt_rw *rw_data, DWORD rw_size, + struct nsi_ip_cmpt_dynamic *dynamic_data, DWORD dynamic_size, + void *static_data, DWORD static_size ) +{ + const NPI_MODULEID *ip_mod = (fam == AF_INET) ? &NPI_MS_IPV4_MODULEID : &NPI_MS_IPV6_MODULEID; + struct nsi_ip_cmpt_rw rw; + struct nsi_ip_cmpt_dynamic dyn; + DWORD count; + + memset( &rw, 0, sizeof(rw) ); + memset( &dyn, 0, sizeof(dyn) ); + + if (*key != 1) return STATUS_NOT_SUPPORTED; + +#if __linux__ + { + const char *fwd = (fam == AF_INET) ? "/proc/sys/net/ipv4/conf/default/forwarding" : + "/proc/sys/net/ipv6/conf/default/forwarding"; + const char *ttl = (fam == AF_INET) ? "/proc/sys/net/ipv4/ip_default_ttl" : + "/proc/sys/net/ipv6/conf/default/hop_limit"; + int value; + + if (!read_sysctl_int( fwd, &value )) rw.not_forwarding = !value; + if (!read_sysctl_int( ttl, &value )) rw.default_ttl = value; + } +#elif defined(HAVE_SYS_SYSCTL_H) + { + int fwd_4[] = { CTL_NET, PF_INET, IPPROTO_IP, IPCTL_FORWARDING }; + int fwd_6[] = { CTL_NET, PF_INET6, IPPROTO_IPV6, IPV6CTL_FORWARDING }; + int ttl_4[] = { CTL_NET, PF_INET, IPPROTO_IP, IPCTL_DEFTTL }; + int ttl_6[] = { CTL_NET, PF_INET6, IPPROTO_IPV6, IPV6CTL_DEFHLIM }; + int value; + size_t needed; + + needed = sizeof(value); + if (!sysctl( (fam == AF_INET) ? fwd_4 : fwd_6, ARRAY_SIZE(fwd_4), &value, &needed, NULL, 0 )) + rw.not_forwarding = value; + + needed = sizeof(value); + if (!sysctl( (fam == AF_INET) ? ttl_4 : ttl_6, ARRAY_SIZE(ttl_4), &value, &needed, NULL, 0 )) + rw.default_ttl = value; + } +#else + FIXME( "forwarding and default ttl not implemented\n" ); +#endif + + count = 0; + if (!nsi_enumerate_all( 1, 0, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, NULL, 0, NULL, 0, + NULL, 0, NULL, 0, &count )) + dyn.num_ifs = count; + + count = 0; + if (!nsi_enumerate_all( 1, 0, ip_mod, NSI_IP_FORWARD_TABLE, NULL, 0, NULL, 0, + NULL, 0, NULL, 0, &count )) + dyn.num_routes = count; + + count = 0; + if (!nsi_enumerate_all( 1, 0, ip_mod, NSI_IP_UNICAST_TABLE, NULL, 0, NULL, 0, + NULL, 0, NULL, 0, &count )) + dyn.num_addrs = count; + + if (rw_data) *rw_data = rw; + if (dynamic_data) *dynamic_data = dyn; + + return STATUS_SUCCESS; +} + +static NTSTATUS ipv4_cmpt_get_all_parameters( const void *key, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ) +{ + TRACE( "%p %d %p %d %p %d %p %d\n", key, key_size, rw_data, rw_size, dynamic_data, dynamic_size, + static_data, static_size ); + return ip_cmpt_get_all_parameters( AF_INET, key, key_size, rw_data, rw_size, + dynamic_data, dynamic_size, static_data, static_size ); +} + +static NTSTATUS ipv6_cmpt_get_all_parameters( const void *key, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ) +{ + TRACE( "%p %d %p %d %p %d %p %d\n", key, key_size, rw_data, rw_size, dynamic_data, dynamic_size, + static_data, static_size ); + return ip_cmpt_get_all_parameters( AF_INET6, key, key_size, rw_data, rw_size, + dynamic_data, dynamic_size, static_data, static_size ); +} + static NTSTATUS ipv4_ipstats_get_all_parameters( const void *key, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ) { @@ -869,6 +972,15 @@ static NTSTATUS ipv6_forward_enumerate_all( void *key_data, DWORD key_size, void static struct module_table ipv4_tables[] = { + { + NSI_IP_COMPARTMENT_TABLE, + { + sizeof(DWORD), sizeof(struct nsi_ip_cmpt_rw), + sizeof(struct nsi_ip_cmpt_dynamic), 0 + }, + NULL, + ipv4_cmpt_get_all_parameters, + }, { NSI_IP_IPSTATS_TABLE, { @@ -916,6 +1028,15 @@ const struct module ipv4_module = static struct module_table ipv6_tables[] = { + { + NSI_IP_COMPARTMENT_TABLE, + { + sizeof(DWORD), sizeof(struct nsi_ip_cmpt_rw), + sizeof(struct nsi_ip_cmpt_dynamic), 0 + }, + NULL, + ipv6_cmpt_get_all_parameters, + }, { NSI_IP_IPSTATS_TABLE, { diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h index 44409ae159e..24f40e184a4 100644 --- a/dlls/nsiproxy.sys/nsiproxy_private.h +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -22,6 +22,35 @@ NTSTATUS nsi_enumerate_all_ex( struct nsi_enumerate_all_ex *params ) DECLSPEC_HI 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; +static inline NTSTATUS nsi_enumerate_all( DWORD unk, DWORD unk2, const NPI_MODULEID *module, DWORD table, + void *key_data, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size, + DWORD *count ) +{ + struct nsi_enumerate_all_ex params; + NTSTATUS status; + + params.unknown[0] = 0; + params.unknown[1] = 0; + params.module = module; + params.table = table; + params.first_arg = unk; + params.second_arg = unk2; + params.key_data = key_data; + params.key_size = key_size; + params.rw_data = rw_data; + params.rw_size = rw_size; + params.dynamic_data = dynamic_data; + params.dynamic_size = dynamic_size; + params.static_data = static_data; + params.static_size = static_size; + params.count = *count; + + status = nsi_enumerate_all_ex( &params ); + *count = params.count; + return status; +} + BOOL convert_luid_to_unix_name( const NET_LUID *luid, const char **unix_name ) DECLSPEC_HIDDEN; BOOL convert_unix_name_to_luid( const char *unix_name, NET_LUID *luid ) DECLSPEC_HIDDEN; diff --git a/include/wine/nsi.h b/include/wine/nsi.h index f3edef9f3fd..6a90f5f1203 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -97,11 +97,28 @@ struct nsi_ndis_ifinfo_static }; /* Undocumented NSI IP tables */ +#define NSI_IP_COMPARTMENT_TABLE 2 #define NSI_IP_IPSTATS_TABLE 6 #define NSI_IP_UNICAST_TABLE 10 #define NSI_IP_NEIGHBOUR_TABLE 11 #define NSI_IP_FORWARD_TABLE 16 +struct nsi_ip_cmpt_rw +{ + DWORD not_forwarding; + DWORD unk; + DWORD default_ttl; + DWORD unk2; +}; + +struct nsi_ip_cmpt_dynamic +{ + DWORD num_ifs; + DWORD num_routes; + DWORD unk; + DWORD num_addrs; +}; + struct nsi_ip_ipstats_dynamic { DWORD unk[4]; -- 2.23.0

1 0

[PATCH 2/4] nsiproxy: Implement IPv6 ipstats get_all_parameters on linux.
by Huw Davies 11 Aug '21

11 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/tests/nsi.c | 1 - dlls/nsiproxy.sys/ip.c | 85 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 1 deletion(-) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index dd1a552cce6..feed72a1626 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -424,7 +424,6 @@ static void test_ip_ipstats( int family ) /* The table appears to consist of a single object without a key. The rw data does exist but isn't part of GetIpStatisticsEx() and isn't yet tested */ err = NsiGetAllParameters( 1, mod, NSI_IP_IPSTATS_TABLE, NULL, 0, NULL, 0, &dyn, sizeof(dyn), &stat, sizeof(stat) ); -todo_wine_if( family == AF_INET6 ) ok( !err, "got %x\n", err ); if (err) goto err; diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index 438ae219174..7d9af08c711 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -226,6 +226,82 @@ static NTSTATUS ipv4_ipstats_get_all_parameters( const void *key, DWORD key_size #endif } +static NTSTATUS ipv6_ipstats_get_all_parameters( const void *key, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ) +{ + struct nsi_ip_ipstats_dynamic dyn; + struct nsi_ip_ipstats_static stat; + + memset( &dyn, 0, sizeof(dyn) ); + memset( &stat, 0, sizeof(stat) ); + +#ifdef __linux__ + { + struct + { + const char *name; + void *elem; + int size; + } ipstatlist[] = + { +#define X(x) &x, sizeof(x) + { "Ip6InReceives", X( dyn.in_recv ) }, + { "Ip6InHdrErrors", X( dyn.in_hdr_errs ) }, + { "Ip6InAddrErrors", X( dyn.in_addr_errs ) }, + { "Ip6OutForwDatagrams", X( dyn.fwd_dgrams ) }, + { "Ip6InUnknownProtos", X( dyn.in_unk_protos ) }, + { "Ip6InDiscards", X( dyn.in_discards ) }, + { "Ip6InDelivers", X( dyn.in_delivers ) }, + { "Ip6OutRequests", X( dyn.out_reqs ) }, + { "Ip6OutDiscards", X( dyn.out_discards ) }, + { "Ip6OutNoRoutes", X( dyn.out_no_routes ) }, + { "Ip6ReasmTimeout", X( stat.reasm_timeout ) }, + { "Ip6ReasmReqds", X( dyn.reasm_reqds ) }, + { "Ip6ReasmOKs", X( dyn.reasm_oks ) }, + { "Ip6ReasmFails", X( dyn.reasm_fails ) }, + { "Ip6FragOKs", X( dyn.frag_oks ) }, + { "Ip6FragFails", X( dyn.frag_fails ) }, + { "Ip6FragCreates", X( dyn.frag_creates ) }, + /* no routingDiscards */ +#undef X + }; + NTSTATUS status = STATUS_NOT_SUPPORTED; + char buf[512], *ptr, *value; + DWORD i; + FILE *fp; + + if (!(fp = fopen( "/proc/net/snmp6", "r" ))) return STATUS_NOT_SUPPORTED; + + while ((ptr = fgets( buf, sizeof(buf), fp ))) + { + if (!(value = strchr( buf, ' ' ))) continue; + /* terminate the valuename */ + *value++ = '\0'; + /* and strip leading spaces from value */ + while (*value == ' ') value++; + if ((ptr = strchr( value, '\n' ))) *ptr = '\0'; + + for (i = 0; i < ARRAY_SIZE(ipstatlist); i++) + if (!_strnicmp( buf, ipstatlist[i].name, -1 )) + { + if (ipstatlist[i].size == sizeof(long)) + *(long *)ipstatlist[i].elem = strtoul( value, NULL, 10 ); + else + *(long long *)ipstatlist[i].elem = strtoull( value, NULL, 10 ); + status = STATUS_SUCCESS; + } + } + fclose( fp ); + if (dynamic_data) *(struct nsi_ip_ipstats_dynamic *)dynamic_data = dyn; + if (static_data) *(struct nsi_ip_ipstats_static *)static_data = stat; + return status;; + } +#else + FIXME( "not implemented\n" ); + return STATUS_NOT_IMPLEMENTED; +#endif +} + static void unicast_fill_entry( struct ifaddrs *entry, void *key, struct nsi_ip_unicast_rw *rw, struct nsi_ip_unicast_dynamic *dyn, struct nsi_ip_unicast_static *stat ) { @@ -840,6 +916,15 @@ const struct module ipv4_module = static struct module_table ipv6_tables[] = { + { + NSI_IP_IPSTATS_TABLE, + { + 0, 0, + sizeof(struct nsi_ip_ipstats_dynamic), sizeof(struct nsi_ip_ipstats_static) + }, + NULL, + ipv6_ipstats_get_all_parameters, + }, { NSI_IP_UNICAST_TABLE, { -- 2.23.0

1 0

[PATCH 1/4] nsiproxy: Implement IPv4 ipstats get_all_parameters.
by Huw Davies 11 Aug '21

11 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/tests/nsi.c | 50 ++++++++++++++++++ dlls/nsiproxy.sys/ip.c | 115 +++++++++++++++++++++++++++++++++++++++++ include/wine/nsi.h | 35 +++++++++++++ 3 files changed, 200 insertions(+) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index f2a247d3333..dd1a552cce6 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -411,6 +411,54 @@ static void test_ndis_index_luid( void ) ok( err == ERROR_FILE_NOT_FOUND, "got %d\n", err ); } +static void test_ip_ipstats( int family ) +{ + const NPI_MODULEID *mod = (family == AF_INET) ? &NPI_MS_IPV4_MODULEID : &NPI_MS_IPV6_MODULEID; + struct nsi_ip_ipstats_dynamic dyn, dyn2; + struct nsi_ip_ipstats_static stat; + MIB_IPSTATS table; + DWORD err; + + winetest_push_context( family == AF_INET ? "AF_INET" : "AF_INET6" ); + + /* The table appears to consist of a single object without a key. The rw data does exist but + isn't part of GetIpStatisticsEx() and isn't yet tested */ + err = NsiGetAllParameters( 1, mod, NSI_IP_IPSTATS_TABLE, NULL, 0, NULL, 0, &dyn, sizeof(dyn), &stat, sizeof(stat) ); +todo_wine_if( family == AF_INET6 ) + ok( !err, "got %x\n", err ); + if (err) goto err; + + err = GetIpStatisticsEx( &table, family ); + ok( !err, "got %d\n", err ); + + err = NsiGetAllParameters( 1, mod, NSI_IP_IPSTATS_TABLE, NULL, 0, NULL, 0, &dyn2, sizeof(dyn2), NULL, 0 ); + ok( !err, "got %x\n", err ); + + /* dwForwarding and dwDefaultTTL come from the compartment table */ + ok( bounded( table.dwInReceives, dyn.in_recv, dyn2.in_recv ), "mismatch\n" ); + ok( bounded( table.dwInHdrErrors, dyn.in_hdr_errs, dyn2.in_hdr_errs ), "mismatch\n" ); + ok( bounded( table.dwInAddrErrors, dyn.in_addr_errs, dyn2.in_addr_errs ), "mismatch\n" ); + ok( bounded( table.dwForwDatagrams, dyn.fwd_dgrams, dyn2.fwd_dgrams ), "mismatch\n" ); + ok( bounded( table.dwInUnknownProtos, dyn.in_unk_protos, dyn2.in_unk_protos ), "mismatch\n" ); + ok( bounded( table.dwInDiscards, dyn.in_discards, dyn2.in_discards ), "mismatch\n" ); + ok( bounded( table.dwInDelivers, dyn.in_delivers, dyn2.in_delivers ), "mismatch\n" ); + ok( bounded( table.dwOutRequests, dyn.out_reqs, dyn2.out_reqs ), "mismatch\n" ); + ok( bounded( table.dwRoutingDiscards, dyn.routing_discards, dyn2.routing_discards ), "mismatch\n" ); + ok( bounded( table.dwOutDiscards, dyn.out_discards, dyn2.out_discards ), "mismatch\n" ); + ok( bounded( table.dwOutNoRoutes, dyn.out_no_routes, dyn2.out_no_routes ), "mismatch\n" ); + ok( table.dwReasmTimeout == stat.reasm_timeout, "mismatch\n" ); + ok( bounded( table.dwReasmReqds, dyn.reasm_reqds, dyn2.reasm_reqds ), "mismatch\n" ); + ok( bounded( table.dwReasmOks, dyn.reasm_oks, dyn2.reasm_oks ), "mismatch\n" ); + ok( bounded( table.dwReasmFails, dyn.reasm_fails, dyn2.reasm_fails ), "mismatch\n" ); + ok( bounded( table.dwFragOks, dyn.frag_oks, dyn2.frag_oks ), "mismatch\n" ); + ok( bounded( table.dwFragFails, dyn.frag_fails, dyn2.frag_fails ), "mismatch\n" ); + ok( bounded( table.dwFragCreates, dyn.frag_creates, dyn2.frag_creates ), "mismatch\n" ); + /* dwNumIf, dwNumAddr and dwNumRoutes come from the compartment table */ + +err: + winetest_pop_context(); +} + static void test_ip_unicast( int family ) { DWORD rw_sizes[] = { FIELD_OFFSET(struct nsi_ip_unicast_rw, unk[0]), FIELD_OFFSET(struct nsi_ip_unicast_rw, unk[1]), @@ -678,6 +726,8 @@ START_TEST( nsi ) test_ndis_ifinfo(); test_ndis_index_luid(); + test_ip_ipstats( AF_INET ); + test_ip_ipstats( AF_INET6 ); test_ip_unicast( AF_INET ); test_ip_unicast( AF_INET6 ); test_ip_neighbour( AF_INET ); diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index 2e727e5f369..438ae219174 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -120,6 +120,112 @@ static ULONG64 get_boot_time( void ) return ti.BootTime.QuadPart; } +static NTSTATUS ipv4_ipstats_get_all_parameters( const void *key, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ) +{ + struct nsi_ip_ipstats_dynamic dyn; + struct nsi_ip_ipstats_static stat; + + TRACE( "%p %d %p %d %p %d %p %d\n", key, key_size, rw_data, rw_size, dynamic_data, dynamic_size, + static_data, static_size ); + + memset( &dyn, 0, sizeof(dyn) ); + memset( &stat, 0, sizeof(stat) ); + +#ifdef __linux__ + { + NTSTATUS status = STATUS_NOT_SUPPORTED; + static const char hdr[] = "Ip:"; + char buf[512], *ptr; + FILE *fp; + + if (!(fp = fopen( "/proc/net/snmp", "r" ))) return STATUS_NOT_SUPPORTED; + + while ((ptr = fgets( buf, sizeof(buf), fp ))) + { + if (_strnicmp( buf, hdr, sizeof(hdr) - 1 )) continue; + /* last line was a header, get another */ + if (!(ptr = fgets( buf, sizeof(buf), fp ))) break; + if (!_strnicmp( buf, hdr, sizeof(hdr) - 1 )) + { + DWORD in_recv, in_hdr_errs, fwd_dgrams, in_delivers, out_reqs; + ptr += sizeof(hdr); + sscanf( ptr, "%*u %*u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u", + &in_recv, + &in_hdr_errs, + &dyn.in_addr_errs, + &fwd_dgrams, + &dyn.in_unk_protos, + &dyn.in_discards, + &in_delivers, + &out_reqs, + &dyn.out_discards, + &dyn.out_no_routes, + &stat.reasm_timeout, + &dyn.reasm_reqds, + &dyn.reasm_oks, + &dyn.reasm_fails, + &dyn.frag_oks, + &dyn.frag_fails, + &dyn.frag_creates ); + /* no routingDiscards */ + dyn.in_recv = in_recv; + dyn.in_hdr_errs = in_hdr_errs; + dyn.fwd_dgrams = fwd_dgrams; + dyn.in_delivers = in_delivers; + dyn.out_reqs = out_reqs; + if (dynamic_data) *(struct nsi_ip_ipstats_dynamic *)dynamic_data = dyn; + if (static_data) *(struct nsi_ip_ipstats_static *)static_data = stat; + status = STATUS_SUCCESS; + break; + } + } + fclose( fp ); + return status; + } +#elif defined(HAVE_SYS_SYSCTL_H) && defined(IPCTL_STATS) && (defined(HAVE_STRUCT_IPSTAT_IPS_TOTAL) || defined(HAVE_STRUCT_IP_STATS_IPS_TOTAL)) + { + int mib[] = { CTL_NET, PF_INET, IPPROTO_IP, IPCTL_STATS }; +#if defined(HAVE_STRUCT_IPSTAT_IPS_TOTAL) + struct ipstat ip_stat; +#elif defined(HAVE_STRUCT_IP_STATS_IPS_TOTAL) + struct ip_stats ip_stat; +#endif + size_t needed; + + needed = sizeof(ip_stat); + if (sysctl( mib, ARRAY_SIZE(mib), &ip_stat, &needed, NULL, 0 ) == -1) return STATUS_NOT_SUPPORTED; + + dyn.in_recv = ip_stat.ips_total; + dyn.in_hdr_errs = ip_stat.ips_badhlen + ip_stat.ips_badsum + ip_stat.ips_tooshort + ip_stat.ips_badlen + + ip_stat.ips_badvers + ip_stat.ips_badoptions; + /* ips_badaddr also includes outgoing packets with a bad address, but we can't account for that right now */ + dyn.in_addr_errs = ip_stat.ips_cantforward + ip_stat.ips_badaddr + ip_stat.ips_notmember; + dyn.fwd_dgrams = ip_stat.ips_forward; + dyn.in_unk_protos = ip_stat.ips_noproto; + dyn.in_discards = ip_stat.ips_fragdropped; + dyn.in_delivers = ip_stat.ips_delivered; + dyn.out_reqs = ip_stat.ips_localout; + dyn.out_discards = ip_stat.ips_odropped; + dyn.out_no_routes = ip_stat.ips_noroute; + stat.reasm_timeout = ip_stat.ips_fragtimeout; + dyn.reasm_reqds = ip_stat.ips_fragments; + dyn.reasm_oks = ip_stat.ips_reassembled; + dyn.reasm_fails = ip_stat.ips_fragments - ip_stat.ips_reassembled; + dyn.frag_oks = ip_stat.ips_fragmented; + dyn.frag_fails = ip_stat.ips_cantfrag; + dyn.frag_creates = ip_stat.ips_ofragments; + + if (dynamic_data) *(struct nsi_ip_ipstats_dynamic *)dynamic_data = dyn; + if (static_data) *(struct nsi_ip_ipstats_static *)static_data = stat; + return STATUS_SUCCESS; + } +#else + FIXME( "not implemented\n" ); + return STATUS_NOT_IMPLEMENTED; +#endif +} + static void unicast_fill_entry( struct ifaddrs *entry, void *key, struct nsi_ip_unicast_rw *rw, struct nsi_ip_unicast_dynamic *dyn, struct nsi_ip_unicast_static *stat ) { @@ -687,6 +793,15 @@ static NTSTATUS ipv6_forward_enumerate_all( void *key_data, DWORD key_size, void static struct module_table ipv4_tables[] = { + { + NSI_IP_IPSTATS_TABLE, + { + 0, 0, + sizeof(struct nsi_ip_ipstats_dynamic), sizeof(struct nsi_ip_ipstats_static) + }, + NULL, + ipv4_ipstats_get_all_parameters, + }, { NSI_IP_UNICAST_TABLE, { diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 437582ad692..f3edef9f3fd 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -97,10 +97,45 @@ struct nsi_ndis_ifinfo_static }; /* Undocumented NSI IP tables */ +#define NSI_IP_IPSTATS_TABLE 6 #define NSI_IP_UNICAST_TABLE 10 #define NSI_IP_NEIGHBOUR_TABLE 11 #define NSI_IP_FORWARD_TABLE 16 +struct nsi_ip_ipstats_dynamic +{ + DWORD unk[4]; + ULONGLONG in_recv; + ULONGLONG in_octets; + ULONGLONG fwd_dgrams; + ULONGLONG in_delivers; + ULONGLONG out_reqs; + ULONGLONG unk2; + ULONGLONG unk3; + ULONGLONG out_octets; + ULONGLONG unk4[6]; + ULONGLONG in_hdr_errs; + DWORD in_addr_errs; + DWORD in_unk_protos; + DWORD unk5; + DWORD reasm_reqds; + DWORD reasm_oks; + DWORD reasm_fails; + DWORD in_discards; + DWORD out_no_routes; + DWORD out_discards; + DWORD routing_discards; + DWORD frag_oks; + DWORD frag_fails; + DWORD frag_creates; + DWORD unk6[7]; +}; + +struct nsi_ip_ipstats_static +{ + DWORD reasm_timeout; +}; + struct nsi_ipv4_unicast_key { NET_LUID luid; -- 2.23.0

1 0

[PATCH 7/7] gdi32/tests: Add more metafile blitting tests.
by Jacek Caban 11 Aug '21

11 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/tests/metafile.c | 299 ++++++++++++++++++++++++++++++++++++ 1 file changed, 299 insertions(+)

1 0

[PATCH 6/7] gdi32: Use NtGdiAlphaBlend for GdiAlphaBlend.
by Jacek Caban 11 Aug '21

11 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 8 ++++---- dlls/gdi32/enhmfdrv/bitblt.c | 13 ++++++++++--- dlls/gdi32/gdi_private.h | 3 +++ dlls/gdi32/gdidc.c | 19 +++++++++++++++++++ include/ntgdi.h | 3 +++ 5 files changed, 39 insertions(+), 7 deletions(-)

1 0

[PATCH 5/7] gdi32: Use NtGdiBitBlt for BitBlt.
by Jacek Caban 11 Aug '21

11 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 9 ++++---- dlls/gdi32/enhmfdrv/bitblt.c | 12 +++++++---- dlls/gdi32/gdi_private.h | 4 ++++ dlls/gdi32/gdidc.c | 18 ++++++++++++++++ dlls/gdi32/mfdrv/bitblt.c | 42 +++++++++++++++++++++++------------- include/ntgdi.h | 2 ++ 6 files changed, 63 insertions(+), 24 deletions(-)

1 0

[PATCH 4/7] gdi32: Use NtGdiStretchBlt for StretchBlt.
by Jacek Caban 11 Aug '21

11 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 9 +++++---- dlls/gdi32/enhmfdrv/bitblt.c | 25 ++++++++++++++++--------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 2 -- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 6 ++++++ dlls/gdi32/gdidc.c | 22 ++++++++++++++++++++++ dlls/gdi32/mfdrv/bitblt.c | 12 ++++++------ dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 2 -- include/ntgdi.h | 3 +++ 10 files changed, 60 insertions(+), 25 deletions(-)

1 0

[PATCH 3/7] gdi32: Use GetDIBits instead of GetObject in MFDRV_StretchBlt.
by Jacek Caban 11 Aug '21

11 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/mfdrv/bitblt.c | 136 +++++++++++++++----------------------- 1 file changed, 54 insertions(+), 82 deletions(-)

1 0

[PATCH 2/7] gdi32: Don't use bitblt_coords in emfdrv_stretchblt.
by Jacek Caban 11 Aug '21

11 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/bitblt.c | 46 ++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 20 deletions(-)

1 0

[PATCH vkd3d 1/7] tests: Add a test for the shader DTOF instruction.
by Conor McCarthy 11 Aug '21

11 Aug '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index ae1394b0..2b1830bd 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9365,6 +9365,31 @@ static void test_shader_instructions(void) 0x00000021, 0x00000000, }; static const struct named_shader ps_dtoi = {"dtoi", ps_dtoi_code, sizeof(ps_dtoi_code)}; + static const DWORD ps_dtof_code[] = + { +#if 0 + double src0; + + void main(out uint4 dst : SV_Target) + { + float2 f = float2(src0, -src0); + dst.x = asuint(f.x); + dst.y = asuint(f.y); + dst.zw = 0; + } +#endif + 0x43425844, 0xa920927f, 0xac06725f, 0x310edf68, 0xec6ab7cd, 0x00000001, 0x00000128, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x00000118, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000009c, 0x00000050, + 0x00000027, 0x0100186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x060000c9, 0x00100012, 0x00000000, 0x00208446, 0x00000000, + 0x00000000, 0x070000c9, 0x00100022, 0x00000000, 0x80208446, 0x00000041, 0x00000000, 0x00000000, + 0x05000036, 0x00102032, 0x00000000, 0x00100046, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, + 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, 0x30494653, 0x00000008, + 0x00000001, 0x00000000, + }; + static const struct named_shader ps_dtof = {"dtof", ps_dtof_code, sizeof(ps_dtof_code)}; static const DWORD ps_utod_code[] = { #if 0 @@ -10004,6 +10029,7 @@ static void test_shader_instructions(void) {&ps_dtou, {.d = {{ -1.0}}}, {{ 0, 1 }}, true, true}, {&ps_dtou, {.d = {{ 1.0}}}, {{ 1, 0 }}, true, true}, {&ps_dtoi, {.d = {{ 1.0}}}, {.i = {1, -1}}, true, true}, + {&ps_dtof, {.d = {{ 1.5}}}, {.f = {1.5f, -1.5f}}, true, true}, {&ps_utod, {.u = {{3, 0xffffffff}}}, {.d = {3.0, 4294967295.0}}, true, true}, {&ps_itod, {.u = {{3, INT_MIN}}}, {.d = {3.0, -2147483648.0}}, true, true}, {&ps_ftod, {.f = {{-2.5f, -2.5f}}}, {.d = {-2.5, 2.5}}, true, true}, -- 2.32.0

3 8

[PATCH vkd3d 1/5] tests: Add a test for the shader DMUL instruction.
by Conor McCarthy 11 Aug '21

11 Aug '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index aaf4bfca..9e8aa837 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9432,6 +9432,29 @@ static void test_shader_instructions(void) 0x00000001, 0x00000000, }; static struct named_shader ps_ftod = {"ftod", ps_ftod_code, sizeof(ps_ftod_code)}; + static const DWORD ps_dmul_code[] = + { +#if 0 + double2 src0; + + void main(out uint4 dst : SV_Target) + { + asuint(src0.x * src0.y, dst.x, dst.y); + asuint(src0.x * -src0.y, dst.z, dst.w); + } +#endif + 0x43425844, 0xe8fbac4e, 0x46b3cd8c, 0x6a38f67a, 0xfe02dbd5, 0x00000001, 0x00000134, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x00000124, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000a8, 0x00000050, + 0x0000002a, 0x0100186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x090000c2, 0x00100032, 0x00000000, 0x00208ee6, 0x00000000, + 0x00000000, 0x00208446, 0x00000000, 0x00000000, 0x05000036, 0x00102032, 0x00000000, 0x00100046, + 0x00000000, 0x0a0000c2, 0x00100032, 0x00000000, 0x80208ee6, 0x00000041, 0x00000000, 0x00000000, + 0x00208446, 0x00000000, 0x00000000, 0x05000036, 0x001020c2, 0x00000000, 0x00100406, 0x00000000, + 0x0100003e, 0x30494653, 0x00000008, 0x00000001, 0x00000000, + }; + static const struct named_shader ps_dmul = {"dmul", ps_dmul_code, sizeof(ps_dmul_code)}; static const DWORD ps_ddiv_code[] = { #if 0 @@ -9984,6 +10007,7 @@ static void test_shader_instructions(void) {&ps_utod, {.u = {{3, 0xffffffff}}}, {.d = {3.0, 4294967295.0}}, true, true}, {&ps_itod, {.u = {{3, INT_MIN}}}, {.d = {3.0, -2147483648.0}}, true, true}, {&ps_ftod, {.f = {{-2.5f, -2.5f}}}, {.d = {-2.5, 2.5}}, true, true}, + {&ps_dmul, {.d = {{ 1.5, 3.0}}}, {.d = { 4.5, -4.5}}, true, true}, {&ps_ddiv, {.d = {{ 2.0, 4.0}}}, {.d = { 0.5, 2.0}}, true, true}, {&ps_ddiv, {.d = {{ 2.0, -4.0}}}, {.d = {-0.5, -2.0}}, true, true}, {&ps_drcp, {.d = {{ 2.0, -0.5}}}, {.d = { 0.5, -2.0}}, true, true}, -- 2.32.0

2 9

[PATCH v2 1/5] advapi32/tests: Expand tests for performance keys.
by Zebediah Figura 11 Aug '21

11 Aug '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/advapi32/tests/registry.c | 517 +++++++++++++++++++++------------ 1 file changed, 338 insertions(+), 179 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 4daf40b7aad..7e1348bf33d 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3600,218 +3600,377 @@ static void test_RegNotifyChangeKeyValue(void) CloseHandle(event); } -#define cmp_li(a, b, c) cmp_li_real(a, b, c, __LINE__) -static void cmp_li_real(LARGE_INTEGER *l1, LARGE_INTEGER *l2, LONGLONG slack, int line) +static const char *find_counter_value(const char *text, const char *index) { - LONGLONG diff = l2->QuadPart - l1->QuadPart; - if (diff < 0) diff = -diff; - ok_(__FILE__, line)(diff <= slack, "values don't match: %s/%s\n", - wine_dbgstr_longlong(l1->QuadPart), wine_dbgstr_longlong(l2->QuadPart)); + const char *p = text; + + while (*p) + { + if (!strcmp(p, index)) + return p + strlen(p) + 1; + + p += strlen(p) + 1; + p += strlen(p) + 1; + } + + return NULL; } -static void test_RegQueryValueExPerformanceData(void) +static void test_counter_values(const char *text, HKEY key) { - static const char * const names[] = { NULL, "", "Global", "2", "invalid counter name" }; - DWORD cbData, len, i, type; - BYTE *value; - DWORD dwret; - LONG limit = 6; - PERF_DATA_BLOCK *pdb; - HKEY hkey; - BYTE buf[256 + sizeof(PERF_DATA_BLOCK)]; + const char *p = text; + const char *name; - /* Test with data == NULL */ - dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, NULL, NULL, &cbData ); - ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret ); + ok(!strcmp(p, "1"), "got first index %s\n", debugstr_a(p)); + p += strlen(p) + 1; + ok(!strcmp(p, "1847"), "got first name %s\n", debugstr_a(p)); + p += strlen(p) + 1; - dwret = RegQueryValueExW( HKEY_PERFORMANCE_DATA, L"Global", NULL, NULL, NULL, &cbData ); - ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret ); - - /* Test ERROR_MORE_DATA, start with small buffer */ - len = 10; - value = HeapAlloc(GetProcessHeap(), 0, len); - cbData = len; - type = 0xdeadbeef; - dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, &type, value, &cbData ); - ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret ); - ok(type == REG_BINARY, "got %u\n", type); - while( dwret == ERROR_MORE_DATA && limit) + while (*p) { - len = len * 10; - value = HeapReAlloc( GetProcessHeap(), 0, value, len ); - cbData = len; - type = 0xdeadbeef; - dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, &type, value, &cbData ); - limit--; - } - ok(limit > 0, "too many times ERROR_MORE_DATA returned\n"); + unsigned int index = atoi(p); - ok(dwret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", dwret); - ok(type == REG_BINARY, "got %u\n", type); + ok(index > 0, "expected nonzero index\n"); - /* Check returned data */ - if (dwret == ERROR_SUCCESS) - { - ok(len >= sizeof(PERF_DATA_BLOCK), "got size %d\n", len); - if (len >= sizeof(PERF_DATA_BLOCK)) { - pdb = (PERF_DATA_BLOCK*) value; - ok(pdb->Signature[0] == 'P', "expected Signature[0] = 'P', got 0x%x\n", pdb->Signature[0]); - ok(pdb->Signature[1] == 'E', "expected Signature[1] = 'E', got 0x%x\n", pdb->Signature[1]); - ok(pdb->Signature[2] == 'R', "expected Signature[2] = 'R', got 0x%x\n", pdb->Signature[2]); - ok(pdb->Signature[3] == 'F', "expected Signature[3] = 'F', got 0x%x\n", pdb->Signature[3]); - /* TODO: check other field */ - } + p += strlen(p) + 1; + ok(*p, "name missing for %u\n", index); + p += strlen(p) + 1; } - HeapFree(GetProcessHeap(), 0, value); + name = find_counter_value(text, "1846"); + ok(name != NULL, "did not find name\n"); + if (key != HKEY_PERFORMANCE_NLSTEXT) + ok(!strcmp(name, "End Marker"), "got name %s\n", debugstr_a(name)); +} - for (i = 0; i < ARRAY_SIZE(names); i++) +static void test_help_values(const char *text, HKEY key) +{ + const char *p = text; + const char *name; + + while (*p) { - cbData = 0xdeadbeef; - dwret = RegQueryValueExA(HKEY_PERFORMANCE_DATA, names[i], NULL, NULL, NULL, &cbData); - ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret); - ok(cbData == 0, "got %u\n", cbData); + unsigned int index = atoi(p); - cbData = 0; - dwret = RegQueryValueExA(HKEY_PERFORMANCE_DATA, names[i], NULL, NULL, NULL, &cbData); - ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret); - ok(cbData == 0, "got %u\n", cbData); + ok(index > 0, "expected nonzero index\n"); - cbData = 0xdeadbeef; - dwret = RegQueryValueExA(HKEY_PERFORMANCE_TEXT, names[i], NULL, NULL, NULL, &cbData); -todo_wine - ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret); - ok(cbData == 0, "got %u\n", cbData); - - cbData = 0; - dwret = RegQueryValueExA(HKEY_PERFORMANCE_TEXT, names[i], NULL, NULL, NULL, &cbData); -todo_wine - ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret); - ok(cbData == 0, "got %u\n", cbData); - - cbData = 0xdeadbeef; - dwret = RegQueryValueExA(HKEY_PERFORMANCE_NLSTEXT, names[i], NULL, NULL, NULL, &cbData); -todo_wine - ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret); - ok(cbData == 0, "got %u\n", cbData); - - cbData = 0; - dwret = RegQueryValueExA(HKEY_PERFORMANCE_NLSTEXT, names[i], NULL, NULL, NULL, &cbData); -todo_wine - ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret); - ok(cbData == 0, "got %u\n", cbData); + p += strlen(p) + 1; + p += strlen(p) + 1; } - memset(buf, 0x77, sizeof(buf)); - type = 0xdeadbeef; - cbData = sizeof(buf); - dwret = RegQueryValueExA(HKEY_PERFORMANCE_DATA, "invalid counter name", NULL, &type, buf, &cbData); - ok(dwret == ERROR_SUCCESS, "got %u\n", dwret); - ok(type == REG_BINARY, "got %u\n", type); - if (dwret == ERROR_SUCCESS) + name = find_counter_value(text, "1847"); + ok(name != NULL, "did not find name\n"); + if (key != HKEY_PERFORMANCE_NLSTEXT) + ok(!strcmp(name, "End Marker"), "got name %s\n", debugstr_a(name)); +} + +static void test_performance_keys(void) +{ + static const HKEY keys[] = {HKEY_PERFORMANCE_DATA, HKEY_PERFORMANCE_TEXT, HKEY_PERFORMANCE_NLSTEXT}; + static const char *const names[] = {NULL, "", "Global", "2", "invalid counter name", "System"}; + DWORD size, type, sysname_len, expect_size, key_count, value_count; + LARGE_INTEGER perftime1, perftime2, systime1, systime2, freq; + WCHAR sysname[MAX_COMPUTERNAME_LENGTH + 1]; + unsigned int buffer_size = 1024 * 1024; + void *buffer, *bufferW; + PERF_DATA_BLOCK *data; + union { - SYSTEMTIME st; - WCHAR sysname[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD sysname_len; - LARGE_INTEGER counter, freq, ftime; + FILETIME f; + LONGLONG l; + } file_time; + unsigned int i, j; + HKEY key; + LONG ret; - GetSystemTime(&st); - GetSystemTimeAsFileTime((FILETIME *)&ftime); - QueryPerformanceCounter(&counter); - QueryPerformanceFrequency(&freq); + buffer = malloc(buffer_size); - sysname_len = MAX_COMPUTERNAME_LENGTH + 1; - GetComputerNameW(sysname, &sysname_len); + sysname_len = ARRAY_SIZE(sysname); + GetComputerNameW(sysname, &sysname_len); - pdb = (PERF_DATA_BLOCK *)buf; - ok(pdb->Signature[0] == 'P', "got '%c'\n", pdb->Signature[0]); - ok(pdb->Signature[1] == 'E', "got '%c'\n", pdb->Signature[1]); - ok(pdb->Signature[2] == 'R', "got '%c'\n", pdb->Signature[2]); - ok(pdb->Signature[3] == 'F', "got '%c'\n", pdb->Signature[3]); + for (i = 0; i < ARRAY_SIZE(keys); ++i) + { + winetest_push_context("key %p", keys[i]); - ok(pdb->LittleEndian == 1, "got %u\n", pdb->LittleEndian); - ok(pdb->Version == 1, "got %u\n", pdb->Version); - ok(pdb->Revision == 1, "got %u\n", pdb->Revision); - len = (sizeof(*pdb) + pdb->SystemNameLength + 7) & ~7; - ok(pdb->TotalByteLength == len, "got %u vs %u\n", pdb->TotalByteLength, len); - ok(pdb->HeaderLength == pdb->TotalByteLength, "got %u\n", pdb->HeaderLength); - ok(pdb->NumObjectTypes == 0, "got %u\n", pdb->NumObjectTypes); -todo_wine - ok(pdb->DefaultObject != 0, "got %u\n", pdb->DefaultObject); - ok(pdb->SystemTime.wYear == st.wYear, "got %u\n", pdb->SystemTime.wYear); - ok(pdb->SystemTime.wMonth == st.wMonth, "got %u\n", pdb->SystemTime.wMonth); - ok(pdb->SystemTime.wDayOfWeek == st.wDayOfWeek, "got %u\n", pdb->SystemTime.wDayOfWeek); - ok(pdb->SystemTime.wDay == st.wDay, "got %u\n", pdb->SystemTime.wDay); - if (U(pdb->PerfTime).LowPart != 0x77777777) /* TestBot is broken */ - cmp_li(&pdb->PerfTime, &counter, freq.QuadPart); - if (U(pdb->PerfFreq).LowPart != 0x77777777) /* TestBot is broken */ - cmp_li(&pdb->PerfFreq, &freq, 0); - cmp_li(&pdb->PerfTime100nSec, &ftime, 200000); /* TestBot needs huge slack value */ - ok(pdb->SystemNameLength == (sysname_len + 1) * sizeof(WCHAR), "expected %u, got %u\n", - (sysname_len + 1) * 2 /*sizeof(WCHAR)*/, pdb->SystemNameLength); - ok(pdb->SystemNameOffset == sizeof(*pdb), "got %u\n", pdb->SystemNameOffset); - ok(!lstrcmpW(sysname, (LPCWSTR)(pdb + 1)), "%s != %s\n", - wine_dbgstr_w(sysname), wine_dbgstr_w((LPCWSTR)(pdb + 1))); - - len = pdb->TotalByteLength - (sizeof(*pdb) + pdb->SystemNameLength); - if (len) + for (j = 0; j < ARRAY_SIZE(names); ++j) { - BYTE remainder[8], *p; + winetest_push_context("value %s", debugstr_a(names[j])); - memset(remainder, 0x77, sizeof(remainder)); - p = buf + sizeof(*pdb) + pdb->SystemNameLength; - ok(!memcmp(p, remainder, len), "remainder: %02x,%02x...\n", p[0], p[1]); + QueryPerformanceFrequency(&freq); + + size = 0; + ret = RegQueryValueExA(keys[i], names[j], NULL, NULL, NULL, &size); + todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) + ok(ret == ERROR_MORE_DATA, "got %u\n", ret); + ok(!size, "got size %u\n", size); + + size = 10; + ret = RegQueryValueExA(keys[i], names[j], NULL, NULL, buffer, &size); + todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) + ok(ret == ERROR_MORE_DATA, "got %u\n", ret); + todo_wine_if (keys[i] == HKEY_PERFORMANCE_DATA) + ok(size == 10, "got size %u\n", size); + + size = buffer_size; + ret = RegQueryValueExA(keys[i], names[j], NULL, NULL, NULL, &size); + todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) + ok(ret == ERROR_MORE_DATA, "got %u\n", ret); + + QueryPerformanceCounter(&perftime1); + NtQuerySystemTime(&systime1); + + size = buffer_size; + type = 0xdeadbeef; + ret = RegQueryValueExA(keys[i], names[j], NULL, &type, buffer, &size); + todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) + { + ok(!ret, "got %u\n", ret); + ok(type == REG_BINARY, "got type %u\n", type); + ok(size >= sizeof(PERF_DATA_BLOCK) && size < buffer_size, "got size %u\n", size); + } + + if (ret) + { + winetest_pop_context(); + continue; + } + + QueryPerformanceCounter(&perftime2); + NtQuerySystemTime(&systime2); + + data = buffer; + ok(!wcsncmp(data->Signature, L"PERF", 4), "got signature %s\n", + debugstr_wn(data->Signature, 4)); + ok(data->LittleEndian == 1, "got endianness %u\n", data->LittleEndian); + ok(data->Version == 1, "got version %u\n", data->Version); + ok(data->Revision == 1, "got version %u\n", data->Revision); + ok(data->TotalByteLength == size, "expected size %u, got %u\n", + size, data->TotalByteLength); + + expect_size = sizeof(PERF_DATA_BLOCK) + data->SystemNameLength; + expect_size = (expect_size + 7) & ~7; + + ok(data->HeaderLength == expect_size, "expected header size %u, got %u\n", + expect_size, data->HeaderLength); + /* todo: test objects... */ + todo_wine ok(data->DefaultObject == 238, "got default object %u\n", data->DefaultObject); + + ok(data->PerfTime.QuadPart >= perftime1.QuadPart + && data->PerfTime.QuadPart <= perftime2.QuadPart, + "got times %I64u, %I64u, %I64u\n", + perftime1.QuadPart, data->PerfTime.QuadPart, perftime2.QuadPart); + ok(data->PerfFreq.QuadPart == freq.QuadPart, "expected frequency %I64u, got %I64u\n", + freq.QuadPart, data->PerfFreq.QuadPart); + ok(data->PerfTime100nSec.QuadPart >= systime1.QuadPart + && data->PerfTime100nSec.QuadPart <= systime2.QuadPart, + "got times %I64u, %I64u, %I64u\n", + systime1.QuadPart, data->PerfTime100nSec.QuadPart, systime2.QuadPart); + SystemTimeToFileTime(&data->SystemTime, &file_time.f); + /* SYSTEMTIME has a granularity of 1 ms */ + ok(file_time.l >= systime1.QuadPart - 10000 && file_time.l <= systime2.QuadPart, + "got times %I64u, %I64u, %I64u\n", systime1.QuadPart, file_time.l, systime2.QuadPart); + + ok(data->SystemNameLength == (sysname_len + 1) * sizeof(WCHAR), + "expected name len %u, got %u\n", + (sysname_len + 1) * sizeof(WCHAR), data->SystemNameLength); + ok(data->SystemNameOffset == sizeof(PERF_DATA_BLOCK), + "got name offset %u\n", data->SystemNameOffset); + ok(!wcscmp(sysname, (const WCHAR *)(data + 1)), "expected name %s, got %s\n", + debugstr_w(sysname), debugstr_w((const WCHAR *)(data + 1))); + + winetest_pop_context(); } + + /* test the "Counter" value */ + + size = 0xdeadbeef; + ret = RegQueryValueExA(keys[i], "cOuNtEr", NULL, NULL, NULL, &size); + todo_wine + { + ok(!ret, "got %u\n", ret); + ok(size > 0 && size < 0xdeadbeef, "got size %u\n", size); + } + + type = 0xdeadbeef; + size = 0; + ret = RegQueryValueExA(keys[i], "cOuNtEr", NULL, &type, buffer, &size); + todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) + ok(ret == ERROR_MORE_DATA, "got %u\n", ret); + todo_wine ok(size > 0, "got size %u\n", size); + + type = 0xdeadbeef; + size = buffer_size; + ret = RegQueryValueExA(keys[i], "cOuNtEr", NULL, &type, buffer, &size); + todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) + ok(!ret, "got %u\n", ret); + todo_wine ok(type == REG_MULTI_SZ, "got type %u\n", type); + if (type == REG_MULTI_SZ) + test_counter_values(buffer, keys[i]); + + type = 0xdeadbeef; + size = buffer_size; + ret = RegQueryValueExA(keys[i], "cOuNtErwine", NULL, &type, buffer, &size); + todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) + ok(!ret, "got %u\n", ret); + todo_wine ok(type == REG_MULTI_SZ, "got type %u\n", type); + if (type == REG_MULTI_SZ) + test_counter_values(buffer, keys[i]); + + size = 0; + ret = RegQueryValueExW(keys[i], L"cOuNtEr", NULL, NULL, NULL, &size); + todo_wine + { + ok(!ret, "got %u\n", ret); + ok(size > 0, "got size %u\n", size); + } + + bufferW = malloc(size); + + type = 0xdeadbeef; + ret = RegQueryValueExW(keys[i], L"cOuNtEr", NULL, &type, bufferW, &size); + todo_wine + { + ok(!ret, "got %u\n", ret); + ok(type == REG_MULTI_SZ, "got type %u\n", type); + } + if (type == REG_MULTI_SZ) + { + WideCharToMultiByte(CP_ACP, 0, bufferW, size / sizeof(WCHAR), buffer, buffer_size, NULL, NULL); + test_counter_values(buffer, keys[i]); + } + + /* test the "Help" value */ + + size = 0xdeadbeef; + ret = RegQueryValueExA(keys[i], "hElP", NULL, NULL, NULL, &size); + todo_wine + { + ok(!ret, "got %u\n", ret); + ok(size > 0 && size < 0xdeadbeef, "got size %u\n", size); + } + + type = 0xdeadbeef; + size = 0; + ret = RegQueryValueExA(keys[i], "hElP", NULL, &type, buffer, &size); + todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) + ok(ret == ERROR_MORE_DATA, "got %u\n", ret); + todo_wine ok(size > 0, "got size %u\n", size); + + type = 0xdeadbeef; + size = buffer_size; + ret = RegQueryValueExA(keys[i], "hElP", NULL, &type, buffer, &size); + todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) + ok(!ret, "got %u\n", ret); + todo_wine ok(type == REG_MULTI_SZ, "got type %u\n", type); + if (type == REG_MULTI_SZ) + test_help_values(buffer, keys[i]); + + type = 0xdeadbeef; + size = buffer_size; + ret = RegQueryValueExA(keys[i], "hElPwine", NULL, &type, buffer, &size); + todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) + ok(!ret, "got %u\n", ret); + todo_wine ok(type == REG_MULTI_SZ, "got type %u\n", type); + if (type == REG_MULTI_SZ) + test_help_values(buffer, keys[i]); + + size = 0; + ret = RegQueryValueExW(keys[i], L"hElP", NULL, NULL, NULL, &size); + todo_wine + { + ok(!ret, "got %u\n", ret); + ok(size > 0, "got size %u\n", size); + } + + bufferW = malloc(size); + + type = 0xdeadbeef; + ret = RegQueryValueExW(keys[i], L"hElP", NULL, &type, bufferW, &size); + todo_wine + { + ok(!ret, "got %u\n", ret); + ok(type == REG_MULTI_SZ, "got type %u\n", type); + } + if (type == REG_MULTI_SZ) + { + WideCharToMultiByte(CP_ACP, 0, bufferW, size / sizeof(WCHAR), buffer, buffer_size, NULL, NULL); + test_help_values(buffer, keys[i]); + } + + /* test other registry APIs */ + + ret = RegOpenKeyA(keys[i], NULL, &key); + todo_wine ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); + + ret = RegOpenKeyA(keys[i], "Global", &key); + todo_wine_if (keys[i] == HKEY_PERFORMANCE_DATA) + ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); + + ret = RegOpenKeyExA(keys[i], "Global", 0, KEY_READ, &key); + todo_wine_if (keys[i] == HKEY_PERFORMANCE_DATA) + ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); + + size = 0; + ret = RegQueryValueA(keys[i], "Global", NULL, (LONG *)&size); + todo_wine_if (keys[i] == HKEY_PERFORMANCE_DATA) + ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); + + ret = RegSetValueA(keys[i], "Global", REG_SZ, "dummy", 5); + todo_wine_if (keys[i] == HKEY_PERFORMANCE_DATA) + ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); + + ret = RegQueryInfoKeyA(keys[i], NULL, NULL, NULL, &key_count, NULL, + NULL, &value_count, NULL, NULL, NULL, NULL); + todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) + ok(!ret, "got %u\n", ret); + todo_wine ok(!key_count, "got %u subkeys\n", key_count); + todo_wine ok(value_count == 2, "got %u values\n", value_count); + + size = buffer_size; + ret = RegEnumValueA(keys[i], 0, buffer, &size, NULL, NULL, NULL, NULL); + todo_wine ok(ret == ERROR_MORE_DATA, "got %u\n", ret); + ok(size == buffer_size, "got size %u\n", size); + + ret = RegCloseKey(keys[i]); + ok(!ret, "got %u\n", ret); + + ret = RegCloseKey(keys[i]); + ok(!ret, "got %u\n", ret); + + winetest_pop_context(); } - dwret = RegOpenKeyA(HKEY_PERFORMANCE_DATA, NULL, &hkey); -todo_wine - ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); + ret = RegSetValueExA(HKEY_PERFORMANCE_DATA, "Global", 0, REG_SZ, (const BYTE *)"dummy", 5); + todo_wine ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); - dwret = RegOpenKeyA(HKEY_PERFORMANCE_DATA, "Global", &hkey); -todo_wine - ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); + ret = RegSetValueExA(HKEY_PERFORMANCE_TEXT, "Global", 0, REG_SZ, (const BYTE *)"dummy", 5); + todo_wine ok(ret == ERROR_BADKEY, "got %u\n", ret); - dwret = RegOpenKeyExA(HKEY_PERFORMANCE_DATA, "Global", 0, KEY_READ, &hkey); -todo_wine - ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); - - dwret = RegQueryValueA(HKEY_PERFORMANCE_DATA, "Global", NULL, (LONG *)&cbData); -todo_wine - ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); - - dwret = RegSetValueA(HKEY_PERFORMANCE_DATA, "Global", REG_SZ, "dummy", 4); -todo_wine - ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); - - dwret = RegSetValueExA(HKEY_PERFORMANCE_DATA, "Global", 0, REG_SZ, (const BYTE *)"dummy", 40); -todo_wine - ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); - - cbData = sizeof(buf); - dwret = RegEnumKeyA(HKEY_PERFORMANCE_DATA, 0, (LPSTR)buf, cbData); -todo_wine - ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); - - cbData = sizeof(buf); - dwret = RegEnumValueA(HKEY_PERFORMANCE_DATA, 0, (LPSTR)buf, &cbData, NULL, NULL, NULL, NULL); -todo_wine - ok(dwret == ERROR_MORE_DATA, "got %u\n", dwret); -todo_wine - ok(cbData == sizeof(buf), "got %u\n", cbData); - - dwret = RegEnumValueA(HKEY_PERFORMANCE_DATA, 0, NULL, &cbData, NULL, NULL, NULL, NULL); - ok(dwret == ERROR_INVALID_PARAMETER, "got %u\n", dwret); + ret = RegSetValueExA(HKEY_PERFORMANCE_NLSTEXT, "Global", 0, REG_SZ, (const BYTE *)"dummy", 5); + todo_wine ok(ret == ERROR_BADKEY, "got %u\n", ret); if (pRegSetKeyValueW) { - dwret = pRegSetKeyValueW(HKEY_PERFORMANCE_DATA, NULL, L"Global", REG_SZ, L"dummy", 10); -todo_wine - ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); + ret = pRegSetKeyValueW(HKEY_PERFORMANCE_DATA, NULL, L"Global", REG_SZ, L"dummy", 10); + todo_wine ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); + + ret = pRegSetKeyValueW(HKEY_PERFORMANCE_TEXT, NULL, L"Global", REG_SZ, L"dummy", 10); + todo_wine ok(ret == ERROR_BADKEY, "got %u\n", ret); + + ret = pRegSetKeyValueW(HKEY_PERFORMANCE_NLSTEXT, NULL, L"Global", REG_SZ, L"dummy", 10); + todo_wine ok(ret == ERROR_BADKEY, "got %u\n", ret); } - dwret = RegCloseKey(HKEY_PERFORMANCE_DATA); - ok(dwret == ERROR_SUCCESS, "got %u\n", dwret); + ret = RegEnumKeyA(HKEY_PERFORMANCE_DATA, 0, buffer, buffer_size); + todo_wine ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); + + ret = RegEnumKeyA(HKEY_PERFORMANCE_TEXT, 0, buffer, buffer_size); + todo_wine ok(ret == ERROR_NO_MORE_ITEMS, "got %u\n", ret); + + ret = RegEnumKeyA(HKEY_PERFORMANCE_NLSTEXT, 0, buffer, buffer_size); + todo_wine ok(ret == ERROR_NO_MORE_ITEMS, "got %u\n", ret); + + free(buffer); } static void test_perflib_key(void) @@ -4348,7 +4507,7 @@ START_TEST(registry) test_delete_key_value(); test_RegOpenCurrentUser(); test_RegNotifyChangeKeyValue(); - test_RegQueryValueExPerformanceData(); + test_performance_keys(); test_RegLoadMUIString(); test_EnumDynamicTimeZoneInformation(); test_perflib_key(); -- 2.30.2

2 5

[PATCH 1/5] advapi32/tests: Expand tests for performance keys.
by Zebediah Figura 11 Aug '21

11 Aug '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/advapi32/tests/registry.c | 516 +++++++++++++++++++++------------ 1 file changed, 337 insertions(+), 179 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 4daf40b7aad..85fb757792a 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3600,218 +3600,376 @@ static void test_RegNotifyChangeKeyValue(void) CloseHandle(event); } -#define cmp_li(a, b, c) cmp_li_real(a, b, c, __LINE__) -static void cmp_li_real(LARGE_INTEGER *l1, LARGE_INTEGER *l2, LONGLONG slack, int line) +static const char *find_counter_value(const char *text, const char *index) { - LONGLONG diff = l2->QuadPart - l1->QuadPart; - if (diff < 0) diff = -diff; - ok_(__FILE__, line)(diff <= slack, "values don't match: %s/%s\n", - wine_dbgstr_longlong(l1->QuadPart), wine_dbgstr_longlong(l2->QuadPart)); + const char *p = text; + + while (*p) + { + if (!strcmp(p, index)) + return p + strlen(p) + 1; + + p += strlen(p) + 1; + p += strlen(p) + 1; + } + + return NULL; } -static void test_RegQueryValueExPerformanceData(void) +static void test_counter_values(const char *text, HKEY key) { - static const char * const names[] = { NULL, "", "Global", "2", "invalid counter name" }; - DWORD cbData, len, i, type; - BYTE *value; - DWORD dwret; - LONG limit = 6; - PERF_DATA_BLOCK *pdb; - HKEY hkey; - BYTE buf[256 + sizeof(PERF_DATA_BLOCK)]; + const char *p = text; + const char *name; - /* Test with data == NULL */ - dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, NULL, NULL, &cbData ); - ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret ); + ok(!strcmp(p, "1"), "got first index %s\n", debugstr_a(p)); + p += strlen(p) + 1; + ok(!strcmp(p, "1847"), "got first name %s\n", debugstr_a(p)); + p += strlen(p) + 1; - dwret = RegQueryValueExW( HKEY_PERFORMANCE_DATA, L"Global", NULL, NULL, NULL, &cbData ); - ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret ); - - /* Test ERROR_MORE_DATA, start with small buffer */ - len = 10; - value = HeapAlloc(GetProcessHeap(), 0, len); - cbData = len; - type = 0xdeadbeef; - dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, &type, value, &cbData ); - ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret ); - ok(type == REG_BINARY, "got %u\n", type); - while( dwret == ERROR_MORE_DATA && limit) + while (*p) { - len = len * 10; - value = HeapReAlloc( GetProcessHeap(), 0, value, len ); - cbData = len; - type = 0xdeadbeef; - dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, &type, value, &cbData ); - limit--; - } - ok(limit > 0, "too many times ERROR_MORE_DATA returned\n"); + unsigned int index = atoi(p); - ok(dwret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", dwret); - ok(type == REG_BINARY, "got %u\n", type); + ok(index > 0, "expected nonzero index\n"); - /* Check returned data */ - if (dwret == ERROR_SUCCESS) - { - ok(len >= sizeof(PERF_DATA_BLOCK), "got size %d\n", len); - if (len >= sizeof(PERF_DATA_BLOCK)) { - pdb = (PERF_DATA_BLOCK*) value; - ok(pdb->Signature[0] == 'P', "expected Signature[0] = 'P', got 0x%x\n", pdb->Signature[0]); - ok(pdb->Signature[1] == 'E', "expected Signature[1] = 'E', got 0x%x\n", pdb->Signature[1]); - ok(pdb->Signature[2] == 'R', "expected Signature[2] = 'R', got 0x%x\n", pdb->Signature[2]); - ok(pdb->Signature[3] == 'F', "expected Signature[3] = 'F', got 0x%x\n", pdb->Signature[3]); - /* TODO: check other field */ - } + p += strlen(p) + 1; + ok(*p, "name missing for %u\n", index); + p += strlen(p) + 1; } - HeapFree(GetProcessHeap(), 0, value); + name = find_counter_value(text, "1846"); + ok(name != NULL, "did not find name\n"); + if (key != HKEY_PERFORMANCE_NLSTEXT) + ok(!strcmp(name, "End Marker"), "got name %s\n", debugstr_a(name)); +} - for (i = 0; i < ARRAY_SIZE(names); i++) +static void test_help_values(const char *text, HKEY key) +{ + const char *p = text; + const char *name; + + while (*p) { - cbData = 0xdeadbeef; - dwret = RegQueryValueExA(HKEY_PERFORMANCE_DATA, names[i], NULL, NULL, NULL, &cbData); - ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret); - ok(cbData == 0, "got %u\n", cbData); + unsigned int index = atoi(p); - cbData = 0; - dwret = RegQueryValueExA(HKEY_PERFORMANCE_DATA, names[i], NULL, NULL, NULL, &cbData); - ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret); - ok(cbData == 0, "got %u\n", cbData); + ok(index > 0, "expected nonzero index\n"); - cbData = 0xdeadbeef; - dwret = RegQueryValueExA(HKEY_PERFORMANCE_TEXT, names[i], NULL, NULL, NULL, &cbData); -todo_wine - ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret); - ok(cbData == 0, "got %u\n", cbData); - - cbData = 0; - dwret = RegQueryValueExA(HKEY_PERFORMANCE_TEXT, names[i], NULL, NULL, NULL, &cbData); -todo_wine - ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret); - ok(cbData == 0, "got %u\n", cbData); - - cbData = 0xdeadbeef; - dwret = RegQueryValueExA(HKEY_PERFORMANCE_NLSTEXT, names[i], NULL, NULL, NULL, &cbData); -todo_wine - ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret); - ok(cbData == 0, "got %u\n", cbData); - - cbData = 0; - dwret = RegQueryValueExA(HKEY_PERFORMANCE_NLSTEXT, names[i], NULL, NULL, NULL, &cbData); -todo_wine - ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret); - ok(cbData == 0, "got %u\n", cbData); + p += strlen(p) + 1; + p += strlen(p) + 1; } - memset(buf, 0x77, sizeof(buf)); - type = 0xdeadbeef; - cbData = sizeof(buf); - dwret = RegQueryValueExA(HKEY_PERFORMANCE_DATA, "invalid counter name", NULL, &type, buf, &cbData); - ok(dwret == ERROR_SUCCESS, "got %u\n", dwret); - ok(type == REG_BINARY, "got %u\n", type); - if (dwret == ERROR_SUCCESS) + name = find_counter_value(text, "1847"); + ok(name != NULL, "did not find name\n"); + if (key != HKEY_PERFORMANCE_NLSTEXT) + ok(!strcmp(name, "End Marker"), "got name %s\n", debugstr_a(name)); +} + +static void test_performance_keys(void) +{ + static const HKEY keys[] = {HKEY_PERFORMANCE_DATA, HKEY_PERFORMANCE_TEXT, HKEY_PERFORMANCE_NLSTEXT}; + static const char *const names[] = {NULL, "", "Global", "2", "invalid counter name", "System"}; + DWORD size, type, sysname_len, expect_size, key_count, value_count; + LARGE_INTEGER perftime1, perftime2, systime1, systime2, freq; + WCHAR sysname[MAX_COMPUTERNAME_LENGTH + 1]; + unsigned int buffer_size = 1024 * 1024; + void *buffer, *bufferW; + PERF_DATA_BLOCK *data; + union { - SYSTEMTIME st; - WCHAR sysname[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD sysname_len; - LARGE_INTEGER counter, freq, ftime; + FILETIME f; + LONGLONG l; + } file_time; + unsigned int i, j; + HKEY key; + LONG ret; - GetSystemTime(&st); - GetSystemTimeAsFileTime((FILETIME *)&ftime); - QueryPerformanceCounter(&counter); - QueryPerformanceFrequency(&freq); + buffer = malloc(buffer_size); - sysname_len = MAX_COMPUTERNAME_LENGTH + 1; - GetComputerNameW(sysname, &sysname_len); + sysname_len = ARRAY_SIZE(sysname); + GetComputerNameW(sysname, &sysname_len); - pdb = (PERF_DATA_BLOCK *)buf; - ok(pdb->Signature[0] == 'P', "got '%c'\n", pdb->Signature[0]); - ok(pdb->Signature[1] == 'E', "got '%c'\n", pdb->Signature[1]); - ok(pdb->Signature[2] == 'R', "got '%c'\n", pdb->Signature[2]); - ok(pdb->Signature[3] == 'F', "got '%c'\n", pdb->Signature[3]); + for (i = 0; i < ARRAY_SIZE(keys); ++i) + { + winetest_push_context("key %p", keys[i]); - ok(pdb->LittleEndian == 1, "got %u\n", pdb->LittleEndian); - ok(pdb->Version == 1, "got %u\n", pdb->Version); - ok(pdb->Revision == 1, "got %u\n", pdb->Revision); - len = (sizeof(*pdb) + pdb->SystemNameLength + 7) & ~7; - ok(pdb->TotalByteLength == len, "got %u vs %u\n", pdb->TotalByteLength, len); - ok(pdb->HeaderLength == pdb->TotalByteLength, "got %u\n", pdb->HeaderLength); - ok(pdb->NumObjectTypes == 0, "got %u\n", pdb->NumObjectTypes); -todo_wine - ok(pdb->DefaultObject != 0, "got %u\n", pdb->DefaultObject); - ok(pdb->SystemTime.wYear == st.wYear, "got %u\n", pdb->SystemTime.wYear); - ok(pdb->SystemTime.wMonth == st.wMonth, "got %u\n", pdb->SystemTime.wMonth); - ok(pdb->SystemTime.wDayOfWeek == st.wDayOfWeek, "got %u\n", pdb->SystemTime.wDayOfWeek); - ok(pdb->SystemTime.wDay == st.wDay, "got %u\n", pdb->SystemTime.wDay); - if (U(pdb->PerfTime).LowPart != 0x77777777) /* TestBot is broken */ - cmp_li(&pdb->PerfTime, &counter, freq.QuadPart); - if (U(pdb->PerfFreq).LowPart != 0x77777777) /* TestBot is broken */ - cmp_li(&pdb->PerfFreq, &freq, 0); - cmp_li(&pdb->PerfTime100nSec, &ftime, 200000); /* TestBot needs huge slack value */ - ok(pdb->SystemNameLength == (sysname_len + 1) * sizeof(WCHAR), "expected %u, got %u\n", - (sysname_len + 1) * 2 /*sizeof(WCHAR)*/, pdb->SystemNameLength); - ok(pdb->SystemNameOffset == sizeof(*pdb), "got %u\n", pdb->SystemNameOffset); - ok(!lstrcmpW(sysname, (LPCWSTR)(pdb + 1)), "%s != %s\n", - wine_dbgstr_w(sysname), wine_dbgstr_w((LPCWSTR)(pdb + 1))); - - len = pdb->TotalByteLength - (sizeof(*pdb) + pdb->SystemNameLength); - if (len) + for (j = 0; j < ARRAY_SIZE(names); ++j) { - BYTE remainder[8], *p; + winetest_push_context("value %s", debugstr_a(names[j])); - memset(remainder, 0x77, sizeof(remainder)); - p = buf + sizeof(*pdb) + pdb->SystemNameLength; - ok(!memcmp(p, remainder, len), "remainder: %02x,%02x...\n", p[0], p[1]); + QueryPerformanceFrequency(&freq); + + size = 0; + ret = RegQueryValueExA(keys[i], names[j], NULL, NULL, NULL, &size); + todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) + ok(ret == ERROR_MORE_DATA, "got %u\n", ret); + ok(!size, "got size %u\n", size); + + size = 10; + ret = RegQueryValueExA(keys[i], names[j], NULL, NULL, buffer, &size); + todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) + ok(ret == ERROR_MORE_DATA, "got %u\n", ret); + todo_wine_if (keys[i] == HKEY_PERFORMANCE_DATA) + ok(size == 10, "got size %u\n", size); + + size = buffer_size; + ret = RegQueryValueExA(keys[i], names[j], NULL, NULL, NULL, &size); + todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) + ok(ret == ERROR_MORE_DATA, "got %u\n", ret); + + QueryPerformanceCounter(&perftime1); + NtQuerySystemTime(&systime1); + + size = buffer_size; + type = 0xdeadbeef; + ret = RegQueryValueExA(keys[i], names[j], NULL, &type, buffer, &size); + todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) + { + ok(!ret, "got %u\n", ret); + ok(type == REG_BINARY, "got type %u\n", type); + ok(size >= sizeof(PERF_DATA_BLOCK) && size < buffer_size, "got size %u\n", size); + } + + if (ret) + { + winetest_pop_context(); + continue; + } + + QueryPerformanceCounter(&perftime2); + NtQuerySystemTime(&systime2); + + data = buffer; + ok(!wcsncmp(data->Signature, L"PERF", 4), "got signature %s\n", + debugstr_wn(data->Signature, 4)); + ok(data->LittleEndian == 1, "got endianness %u\n", data->LittleEndian); + ok(data->Version == 1, "got version %u\n", data->Version); + ok(data->Revision == 1, "got version %u\n", data->Revision); + ok(data->TotalByteLength == size, "expected size %u, got %u\n", + size, data->TotalByteLength); + + expect_size = sizeof(PERF_DATA_BLOCK) + data->SystemNameLength; + expect_size = (expect_size + 7) & ~7; + + ok(data->HeaderLength == expect_size, "expected header size %u, got %u\n", + expect_size, data->HeaderLength); + /* todo: test objects... */ + todo_wine ok(data->DefaultObject == 238, "got default object %u\n", data->DefaultObject); + + ok(data->PerfTime.QuadPart >= perftime1.QuadPart + && data->PerfTime.QuadPart <= perftime2.QuadPart, + "got times %I64u, %I64u, %I64u\n", + perftime1.QuadPart, data->PerfTime.QuadPart, perftime2.QuadPart); + ok(data->PerfFreq.QuadPart == freq.QuadPart, "expected frequency %I64u, got %I64u\n", + freq.QuadPart, data->PerfFreq.QuadPart); + ok(data->PerfTime100nSec.QuadPart >= systime1.QuadPart + && data->PerfTime100nSec.QuadPart <= systime2.QuadPart, + "got times %I64u, %I64u, %I64u\n", + systime1.QuadPart, data->PerfTime100nSec.QuadPart, systime2.QuadPart); + SystemTimeToFileTime(&data->SystemTime, &file_time.f); + ok(file_time.l >= systime1.QuadPart && file_time.l <= systime2.QuadPart, + "got times %I64u, %I64u, %I64u\n", perftime1.QuadPart, file_time.l, perftime2.QuadPart); + + ok(data->SystemNameLength == (sysname_len + 1) * sizeof(WCHAR), + "expected name len %u, got %u\n", + (sysname_len + 1) * sizeof(WCHAR), data->SystemNameLength); + ok(data->SystemNameOffset == sizeof(PERF_DATA_BLOCK), + "got name offset %u\n", data->SystemNameOffset); + ok(!wcscmp(sysname, (const WCHAR *)(data + 1)), "expected name %s, got %s\n", + debugstr_w(sysname), debugstr_w((const WCHAR *)(data + 1))); + + winetest_pop_context(); } + + /* test the "Counter" value */ + + size = 0xdeadbeef; + ret = RegQueryValueExA(keys[i], "cOuNtEr", NULL, NULL, NULL, &size); + todo_wine + { + ok(!ret, "got %u\n", ret); + ok(size > 0 && size < 0xdeadbeef, "got size %u\n", size); + } + + type = 0xdeadbeef; + size = 0; + ret = RegQueryValueExA(keys[i], "cOuNtEr", NULL, &type, buffer, &size); + todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) + ok(ret == ERROR_MORE_DATA, "got %u\n", ret); + todo_wine ok(size > 0, "got size %u\n", size); + + type = 0xdeadbeef; + size = buffer_size; + ret = RegQueryValueExA(keys[i], "cOuNtEr", NULL, &type, buffer, &size); + todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) + ok(!ret, "got %u\n", ret); + todo_wine ok(type == REG_MULTI_SZ, "got type %u\n", type); + if (type == REG_MULTI_SZ) + test_counter_values(buffer, keys[i]); + + type = 0xdeadbeef; + size = buffer_size; + ret = RegQueryValueExA(keys[i], "cOuNtErwine", NULL, &type, buffer, &size); + todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) + ok(!ret, "got %u\n", ret); + todo_wine ok(type == REG_MULTI_SZ, "got type %u\n", type); + if (type == REG_MULTI_SZ) + test_counter_values(buffer, keys[i]); + + size = 0; + ret = RegQueryValueExW(keys[i], L"cOuNtEr", NULL, NULL, NULL, &size); + todo_wine + { + ok(!ret, "got %u\n", ret); + ok(size > 0, "got size %u\n", size); + } + + bufferW = malloc(size); + + type = 0xdeadbeef; + ret = RegQueryValueExW(keys[i], L"cOuNtEr", NULL, &type, bufferW, &size); + todo_wine + { + ok(!ret, "got %u\n", ret); + ok(type == REG_MULTI_SZ, "got type %u\n", type); + } + if (type == REG_MULTI_SZ) + { + WideCharToMultiByte(CP_ACP, 0, bufferW, size / sizeof(WCHAR), buffer, buffer_size, NULL, NULL); + test_counter_values(buffer, keys[i]); + } + + /* test the "Help" value */ + + size = 0xdeadbeef; + ret = RegQueryValueExA(keys[i], "hElP", NULL, NULL, NULL, &size); + todo_wine + { + ok(!ret, "got %u\n", ret); + ok(size > 0 && size < 0xdeadbeef, "got size %u\n", size); + } + + type = 0xdeadbeef; + size = 0; + ret = RegQueryValueExA(keys[i], "hElP", NULL, &type, buffer, &size); + todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) + ok(ret == ERROR_MORE_DATA, "got %u\n", ret); + todo_wine ok(size > 0, "got size %u\n", size); + + type = 0xdeadbeef; + size = buffer_size; + ret = RegQueryValueExA(keys[i], "hElP", NULL, &type, buffer, &size); + todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) + ok(!ret, "got %u\n", ret); + todo_wine ok(type == REG_MULTI_SZ, "got type %u\n", type); + if (type == REG_MULTI_SZ) + test_help_values(buffer, keys[i]); + + type = 0xdeadbeef; + size = buffer_size; + ret = RegQueryValueExA(keys[i], "hElPwine", NULL, &type, buffer, &size); + todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) + ok(!ret, "got %u\n", ret); + todo_wine ok(type == REG_MULTI_SZ, "got type %u\n", type); + if (type == REG_MULTI_SZ) + test_help_values(buffer, keys[i]); + + size = 0; + ret = RegQueryValueExW(keys[i], L"hElP", NULL, NULL, NULL, &size); + todo_wine + { + ok(!ret, "got %u\n", ret); + ok(size > 0, "got size %u\n", size); + } + + bufferW = malloc(size); + + type = 0xdeadbeef; + ret = RegQueryValueExW(keys[i], L"hElP", NULL, &type, bufferW, &size); + todo_wine + { + ok(!ret, "got %u\n", ret); + ok(type == REG_MULTI_SZ, "got type %u\n", type); + } + if (type == REG_MULTI_SZ) + { + WideCharToMultiByte(CP_ACP, 0, bufferW, size / sizeof(WCHAR), buffer, buffer_size, NULL, NULL); + test_help_values(buffer, keys[i]); + } + + /* test other registry APIs */ + + ret = RegOpenKeyA(keys[i], NULL, &key); + todo_wine ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); + + ret = RegOpenKeyA(keys[i], "Global", &key); + todo_wine_if (keys[i] == HKEY_PERFORMANCE_DATA) + ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); + + ret = RegOpenKeyExA(keys[i], "Global", 0, KEY_READ, &key); + todo_wine_if (keys[i] == HKEY_PERFORMANCE_DATA) + ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); + + size = 0; + ret = RegQueryValueA(keys[i], "Global", NULL, (LONG *)&size); + todo_wine_if (keys[i] == HKEY_PERFORMANCE_DATA) + ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); + + ret = RegSetValueA(keys[i], "Global", REG_SZ, "dummy", 5); + todo_wine_if (keys[i] == HKEY_PERFORMANCE_DATA) + ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); + + ret = RegQueryInfoKeyA(keys[i], NULL, NULL, NULL, &key_count, NULL, + NULL, &value_count, NULL, NULL, NULL, NULL); + todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) + ok(!ret, "got %u\n", ret); + todo_wine ok(!key_count, "got %u subkeys\n", key_count); + todo_wine ok(value_count == 2, "got %u values\n", value_count); + + size = buffer_size; + ret = RegEnumValueA(keys[i], 0, buffer, &size, NULL, NULL, NULL, NULL); + todo_wine ok(ret == ERROR_MORE_DATA, "got %u\n", ret); + ok(size == buffer_size, "got size %u\n", size); + + ret = RegCloseKey(keys[i]); + ok(!ret, "got %u\n", ret); + + ret = RegCloseKey(keys[i]); + ok(!ret, "got %u\n", ret); + + winetest_pop_context(); } - dwret = RegOpenKeyA(HKEY_PERFORMANCE_DATA, NULL, &hkey); -todo_wine - ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); + ret = RegSetValueExA(HKEY_PERFORMANCE_DATA, "Global", 0, REG_SZ, (const BYTE *)"dummy", 5); + todo_wine ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); - dwret = RegOpenKeyA(HKEY_PERFORMANCE_DATA, "Global", &hkey); -todo_wine - ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); + ret = RegSetValueExA(HKEY_PERFORMANCE_TEXT, "Global", 0, REG_SZ, (const BYTE *)"dummy", 5); + todo_wine ok(ret == ERROR_BADKEY, "got %u\n", ret); - dwret = RegOpenKeyExA(HKEY_PERFORMANCE_DATA, "Global", 0, KEY_READ, &hkey); -todo_wine - ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); - - dwret = RegQueryValueA(HKEY_PERFORMANCE_DATA, "Global", NULL, (LONG *)&cbData); -todo_wine - ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); - - dwret = RegSetValueA(HKEY_PERFORMANCE_DATA, "Global", REG_SZ, "dummy", 4); -todo_wine - ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); - - dwret = RegSetValueExA(HKEY_PERFORMANCE_DATA, "Global", 0, REG_SZ, (const BYTE *)"dummy", 40); -todo_wine - ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); - - cbData = sizeof(buf); - dwret = RegEnumKeyA(HKEY_PERFORMANCE_DATA, 0, (LPSTR)buf, cbData); -todo_wine - ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); - - cbData = sizeof(buf); - dwret = RegEnumValueA(HKEY_PERFORMANCE_DATA, 0, (LPSTR)buf, &cbData, NULL, NULL, NULL, NULL); -todo_wine - ok(dwret == ERROR_MORE_DATA, "got %u\n", dwret); -todo_wine - ok(cbData == sizeof(buf), "got %u\n", cbData); - - dwret = RegEnumValueA(HKEY_PERFORMANCE_DATA, 0, NULL, &cbData, NULL, NULL, NULL, NULL); - ok(dwret == ERROR_INVALID_PARAMETER, "got %u\n", dwret); + ret = RegSetValueExA(HKEY_PERFORMANCE_NLSTEXT, "Global", 0, REG_SZ, (const BYTE *)"dummy", 5); + todo_wine ok(ret == ERROR_BADKEY, "got %u\n", ret); if (pRegSetKeyValueW) { - dwret = pRegSetKeyValueW(HKEY_PERFORMANCE_DATA, NULL, L"Global", REG_SZ, L"dummy", 10); -todo_wine - ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); + ret = pRegSetKeyValueW(HKEY_PERFORMANCE_DATA, NULL, L"Global", REG_SZ, L"dummy", 10); + todo_wine ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); + + ret = pRegSetKeyValueW(HKEY_PERFORMANCE_TEXT, NULL, L"Global", REG_SZ, L"dummy", 10); + todo_wine ok(ret == ERROR_BADKEY, "got %u\n", ret); + + ret = pRegSetKeyValueW(HKEY_PERFORMANCE_NLSTEXT, NULL, L"Global", REG_SZ, L"dummy", 10); + todo_wine ok(ret == ERROR_BADKEY, "got %u\n", ret); } - dwret = RegCloseKey(HKEY_PERFORMANCE_DATA); - ok(dwret == ERROR_SUCCESS, "got %u\n", dwret); + ret = RegEnumKeyA(HKEY_PERFORMANCE_DATA, 0, buffer, buffer_size); + todo_wine ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); + + ret = RegEnumKeyA(HKEY_PERFORMANCE_TEXT, 0, buffer, buffer_size); + todo_wine ok(ret == ERROR_NO_MORE_ITEMS, "got %u\n", ret); + + ret = RegEnumKeyA(HKEY_PERFORMANCE_NLSTEXT, 0, buffer, buffer_size); + todo_wine ok(ret == ERROR_NO_MORE_ITEMS, "got %u\n", ret); + + free(buffer); } static void test_perflib_key(void) @@ -4348,7 +4506,7 @@ START_TEST(registry) test_delete_key_value(); test_RegOpenCurrentUser(); test_RegNotifyChangeKeyValue(); - test_RegQueryValueExPerformanceData(); + test_performance_keys(); test_RegLoadMUIString(); test_EnumDynamicTimeZoneInformation(); test_perflib_key(); -- 2.30.2

2 9

[PATCH] quartz: Increment reference count for the advise thread to avoid crashes caused by DLL unloading.
by Hiroki Awata 11 Aug '21

11 Aug '21

Some games crash when the DLL is unloaded during SleepConditionVariableCS on SystemClockAdviseThread. This is due to the fact that DllCanUnloadNow returns S_OK even though the advise thread is running. Incrementing the reference count when creating the advise thread resolves it. Signed-off-by: Hiroki Awata <castaneai(a)by.black> --- dlls/quartz/systemclock.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 73a923a7b99..7302de0e58f 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -104,6 +104,7 @@ static ULONG WINAPI system_clock_inner_Release(IUnknown *iface) WakeConditionVariable(&clock->cv); WaitForSingleObject(clock->thread, INFINITE); CloseHandle(clock->thread); + InterlockedDecrement(&object_locks); } LIST_FOR_EACH_ENTRY_SAFE(sink, cursor, &clock->sinks, struct advise_sink, entry) @@ -207,6 +208,8 @@ static HRESULT add_sink(struct system_clock *clock, DWORD_PTR handle, if (!InterlockedCompareExchange(&clock->thread_created, TRUE, FALSE)) { clock->thread = CreateThread(NULL, 0, SystemClockAdviseThread, clock, 0, NULL); + if (clock->thread) + InterlockedIncrement(&object_locks); } WakeConditionVariable(&clock->cv); -- 2.27.0

4 7

[PATCH v2] include: Remove interfaces already define in msxml6.idl
by Alistair Leslie-Hughes 10 Aug '21

10 Aug '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msxml3/factory.c | 1 + dlls/msxml3/tests/saxreader.c | 1 + dlls/msxml3/tests/schema.c | 5 ++ dlls/msxml3/uuid.c | 11 ++++ include/msxml2.idl | 109 ---------------------------------- include/msxml6.idl | 24 ++++---- 6 files changed, 30 insertions(+), 121 deletions(-) diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index 445cfbf730d..b8452ff4b4e 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -35,6 +35,7 @@ #include "ole2.h" #include "msxml.h" #include "msxml2.h" +#include "msxml6.h" #include "xmlparser.h" /* undef the #define in msxml2 so that we can access the v.2 version diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index e401aafc87d..05e9d2c3468 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -29,6 +29,7 @@ #include "windows.h" #include "ole2.h" #include "msxml2.h" +#include "msxml6.h" #include "msxml2did.h" #include "ocidl.h" #include "dispex.h" diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index b66be76c159..cb95394aa39 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -32,6 +32,11 @@ #include "dispex.h" #include "cguid.h" +DEFINE_GUID(CLSID_MXXMLWriter60, 0x88d96a0f, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); +DEFINE_GUID(CLSID_SAXAttributes60, 0x88d96a0e, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); +DEFINE_GUID(CLSID_SAXXMLReader60, 0x88d96a0c, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); +DEFINE_GUID(CLSID_XMLSchemaCache60, 0x88d96a07, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); + #include "wine/test.h" #define EXPECT_HR(hr,hr_exp) \ diff --git a/dlls/msxml3/uuid.c b/dlls/msxml3/uuid.c index 4abbe5e4763..333d4f3d3c7 100644 --- a/dlls/msxml3/uuid.c +++ b/dlls/msxml3/uuid.c @@ -41,6 +41,17 @@ #include "initguid.h" #include "msxml2.h" +/* Cannot include msxml6 here since we will get a duplicate LIBID_MSXML2 error. */ +DEFINE_GUID(CLSID_FreeThreadedDOMDocument60, 0x88d96a06, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); +DEFINE_GUID(CLSID_MXNamespaceManager60, 0x88d96a11, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); +DEFINE_GUID(CLSID_MXXMLWriter60, 0x88d96a0f, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); +DEFINE_GUID(CLSID_SAXAttributes60, 0x88d96a0e, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); +DEFINE_GUID(CLSID_SAXXMLReader60, 0x88d96a0c, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); +DEFINE_GUID(CLSID_ServerXMLHTTP60, 0x88d96a0b, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); +DEFINE_GUID(CLSID_XMLHTTP60, 0x88d96a0a, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); +DEFINE_GUID(CLSID_XMLSchemaCache60, 0x88d96a07, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); +DEFINE_GUID(CLSID_XSLTemplate60, 0x88d96a08, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); + /* * Note that because of a #define in msxml2.h, we end up initializing * CLSID_DOMDocument2 to be the v.3 version independent DOMDocument diff --git a/include/msxml2.idl b/include/msxml2.idl index 916e0e8ab3d..1d1ba7a5248 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -1612,15 +1612,6 @@ coclass FreeThreadedDOMDocument40 [default, source] dispinterface XMLDOMDocumentEvents; } -[ - uuid(88d96a06-f192-11d4-a65f-0040963251e5), -] -coclass FreeThreadedDOMDocument60 -{ - [default] interface IXMLDOMDocument3; - [default, source] dispinterface XMLDOMDocumentEvents; -} - [ helpstring("Free threaded XML DOM Document"), progid("Msxml2.FreeThreadedDOMDocument"), @@ -1662,14 +1653,6 @@ coclass XMLHTTP40 [default] interface IXMLHTTPRequest; } -[ - uuid(88d96a0a-f192-11d4-a65f-0040963251e5) -] -coclass XMLHTTP60 -{ - [default] interface IXMLHTTPRequest; -} - [ helpstring("XML HTTP"), progid("Msxml2.XMLHTTP"), @@ -1702,14 +1685,6 @@ coclass ServerXMLHTTP40 [default] interface IServerXMLHTTPRequest2; } -[ - uuid(88d96a0b-f192-11d4-a65f-0040963251e5) -] -coclass ServerXMLHTTP60 -{ - [default] interface IServerXMLHTTPRequest2; -} - [ helpstring("Server XML HTTP"), progid("Msxml2.ServerXMLHTTP"), @@ -1750,14 +1725,6 @@ coclass XMLSchemaCache40 [default] interface IXMLDOMSchemaCollection2; } -[ - uuid(88d96a07-f192-11d4-a65f-0040963251e5) -] -coclass XMLSchemaCache60 -{ - [default] interface IXMLDOMSchemaCollection2; -} - [ helpstring("XML Schema Cache"), progid("Msxml2.XMLSchemaCache"), @@ -1798,14 +1765,6 @@ coclass XSLTemplate40 [default] interface IXSLTemplate; } -[ - uuid(88d96a08-f192-11d4-a65f-0040963251e5) -] -coclass XSLTemplate60 -{ - [default] interface IXSLTemplate; -} - [ helpstring("XSL Template"), progid("Msxml2.XSLTemplate"), @@ -3297,15 +3256,6 @@ coclass SAXXMLReader40 interface ISAXXMLReader; } -[ - uuid(88d96a0c-f192-11d4-a65f-0040963251e5) -] -coclass SAXXMLReader60 -{ - [default] interface IVBSAXXMLReader; - interface ISAXXMLReader; -} - [ helpstring("SAX XML Reader"), progid("Msxml2.SAXXMLReader"), @@ -3380,26 +3330,6 @@ coclass MXHTMLWriter40 interface IVBSAXLexicalHandler; } -[ - uuid(88d96a10-f192-11d4-a65f-0040963251e5) -] -coclass MXHTMLWriter60 -{ - [default] interface IMXWriter; - - interface ISAXContentHandler; - interface ISAXDeclHandler; - interface ISAXDTDHandler; - interface ISAXErrorHandler; - interface ISAXLexicalHandler; - - interface IVBSAXContentHandler; - interface IVBSAXDeclHandler; - interface IVBSAXDTDHandler; - interface IVBSAXErrorHandler; - interface IVBSAXLexicalHandler; -} - [ helpstring("MXXMLWriter 3.0"), progid("Msxml2.MXXMLWriter.3.0"), @@ -3444,26 +3374,6 @@ coclass MXXMLWriter40 interface IVBSAXLexicalHandler; } -[ - uuid(88d96a0f-f192-11d4-a65f-0040963251e5) -] -coclass MXXMLWriter60 -{ - [default] interface IMXWriter; - - interface ISAXContentHandler; - interface ISAXDeclHandler; - interface ISAXDTDHandler; - interface ISAXErrorHandler; - interface ISAXLexicalHandler; - - interface IVBSAXContentHandler; - interface IVBSAXDeclHandler; - interface IVBSAXDTDHandler; - interface IVBSAXErrorHandler; - interface IVBSAXLexicalHandler; -} - [ helpstring("MXXMLWriter"), progid("Msxml2.MXXMLWriter"), @@ -3506,15 +3416,6 @@ coclass MXNamespaceManager40 interface IMXNamespaceManager; } -[ - uuid(88d96a11-f192-11d4-a65f-0040963251e5) -] -coclass MXNamespaceManager60 -{ - [default] interface IVBMXNamespaceManager; - interface IMXNamespaceManager; -} - [ helpstring("SAXAttributes 3.0"), progid("Msxml2.SAXAttributes.3.0"), @@ -3539,16 +3440,6 @@ coclass SAXAttributes40 interface ISAXAttributes; } -[ - uuid(88d96a0e-f192-11d4-a65f-0040963251e5) -] -coclass SAXAttributes60 -{ - [default] interface IMXAttributes; - interface IVBSAXAttributes; - interface ISAXAttributes; -} - [ helpstring("SAXAttributes"), progid("Msxml2.SAXAttributes"), diff --git a/include/msxml6.idl b/include/msxml6.idl index 4948de39f1f..e6a0a5feda5 100644 --- a/include/msxml6.idl +++ b/include/msxml6.idl @@ -3048,18 +3048,6 @@ coclass DOMDocument60 [default, source] dispinterface XMLDOMDocumentEvents; } -[ - helpstring("Free threaded XML DOM Document 6.0"), - progid("Msxml2.FreeThreadedDOMDocument.6.0"), - threading(both), - uuid(88d96a06-f192-11d4-a65f-0040963251e5), -] -coclass FreeThreadedDOMDocument60 -{ - [default] interface IXMLDOMDocument3; - [default, source] dispinterface XMLDOMDocumentEvents; -} - [ helpstring("SAX XML Reader 6.0"), progid("Msxml2.SAXXMLReader.6.0"), @@ -3165,6 +3153,18 @@ coclass XSLTemplate60 [default] interface IXSLTemplate; } +[ + helpstring("Free threaded XML DOM Document 6.0"), + progid("Msxml2.FreeThreadedDOMDocument.6.0"), + threading(both), + uuid(88d96a06-f192-11d4-a65f-0040963251e5), +] +coclass FreeThreadedDOMDocument60 +{ + [default] interface IXMLDOMDocument3; + [default, source] dispinterface XMLDOMDocumentEvents; +} + [ helpstring("XML HTTP 6.0"), progid("Msxml2.XMLHTTP.6.0"), -- 2.30.2

3 3

[PATCH] kernelbase: Implement ResolveLocaleName
by David Curtiss 10 Aug '21

10 Aug '21

Signed-off-by: David Curtiss <david.curtiss(a)ni.com> --- dlls/kernel32/tests/locale.c | 94 +++++++++++++++++++++++++++++++++++- dlls/kernelbase/locale.c | 44 +++++++++++++++-- 2 files changed, 134 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 75c86bbaf21..7c5f00f91c7 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -87,6 +87,7 @@ static INT (WINAPI *pFindNLSStringEx)(LPCWSTR, DWORD, LPCWSTR, INT, LPCWSTR, INT static LANGID (WINAPI *pSetThreadUILanguage)(LANGID); static LANGID (WINAPI *pGetThreadUILanguage)(VOID); static INT (WINAPI *pNormalizeString)(NORM_FORM, LPCWSTR, INT, LPWSTR, INT); +static INT (WINAPI *pResolveLocaleName)(LPCWSTR, LPWSTR, INT); static INT (WINAPI *pFindStringOrdinal)(DWORD, LPCWSTR lpStringSource, INT, LPCWSTR, INT, BOOL); static BOOL (WINAPI *pGetNLSVersion)(NLS_FUNCTION,LCID,NLSVERSIONINFO*); static BOOL (WINAPI *pGetNLSVersionEx)(NLS_FUNCTION,LPCWSTR,NLSVERSIONINFOEX*); @@ -135,6 +136,7 @@ static void InitFunctionPointers(void) X(SetThreadUILanguage); X(GetThreadUILanguage); X(NormalizeString); + X(ResolveLocaleName); X(FindStringOrdinal); X(GetNLSVersion); X(GetNLSVersionEx); @@ -1903,7 +1905,7 @@ static void test_CompareStringA(void) ret = lstrcmpA(NULL, ""); ok (ret == -1 || broken(ret == -2) /* win9x */, "lstrcmpA(NULL, \"\") should return -1, got %d\n", ret); - + if (0) { /* this requires collation table patch to make it MS compatible */ ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "'o", -1, "-o", -1 ); @@ -6522,6 +6524,95 @@ static void test_NormalizeString(void) } } +static void test_ResolveLocaleName(void) +{ + INT ret; + WCHAR buffer[BUFFER_SIZE], input[BUFFER_SIZE], Expected[BUFFER_SIZE], Alternate[BUFFER_SIZE]; + INT buffer_size = BUFFER_SIZE; + + if (!pResolveLocaleName) + { + win_skip( "ResolveLocaleName not available\n" ); + return; + } + + /* already-valid cases */ + STRINGSW("fr-FR","fr-FR"); + ret = pResolveLocaleName(input, buffer, buffer_size); + EXPECT_LENW; EXPECT_EQW; + + STRINGSW("fr-BE","fr-BE"); + ret = pResolveLocaleName(input, buffer, buffer_size); + EXPECT_LENW; EXPECT_EQW; + + /* just-resolve cases */ + STRINGSW("fr","fr-FR"); + ret = pResolveLocaleName(input, buffer, buffer_size); + EXPECT_LENW; EXPECT_EQW; + + /* truncate-and-resolve cases */ + STRINGSW("fr-aaa-BE","fr-FR"); + ret = pResolveLocaleName(input, buffer, buffer_size); + EXPECT_LENW; EXPECT_EQW; + + STRINGSW("fr-BE_aaa","fr-BE"); /* old Windows gives fr-FR; new gives fr-BE */ + MultiByteToWideChar(CP_ACP,0,"fr-FR",-1,Alternate,ARRAY_SIZE(Alternate)); + ret = pResolveLocaleName(input, buffer, buffer_size); + EXPECT_LENW; + ok(wcsncmp(buffer, Expected, lstrlenW(Expected)) == 0 + || wcsncmp(buffer, Alternate, lstrlenW(Alternate)) == 0, + "Bad conversion\n"); + + STRINGSW("fr-BE-x-y-z","fr-BE"); + ret = pResolveLocaleName(input, buffer, buffer_size); + EXPECT_LENW; EXPECT_EQW; + + /* just-big-enough buffer size */ + STRINGSW("fr","fr-FR"); + buffer_size = lstrlenW(Expected) + 1; + ret = pResolveLocaleName(input, buffer, buffer_size); + EXPECT_LENW; EXPECT_EQW; + + buffer_size = BUFFER_SIZE; /* restore normal value */ + + /* unknown locales return empty string */ + STRINGSW("xx-XX",""); /* unknown locale */ + ret = pResolveLocaleName(input, buffer, buffer_size); + EXPECT_LENW; EXPECT_EQW; + + STRINGSW("xx",""); /* unknown locale, no hyphen */ + ret = pResolveLocaleName(input, buffer, buffer_size); + EXPECT_LENW; EXPECT_EQW; + + STRINGSW("-en-US",""); /* string is empty after truncated */ + ret = pResolveLocaleName(input, buffer, buffer_size); + EXPECT_LENW; EXPECT_EQW; + + /* when no output buffer, returns required buffer size */ + STRINGSW("en-US","en-US"); + ret = pResolveLocaleName(input, NULL, buffer_size); + EXPECT_LENW; + + STRINGSW("en-US-x-y-z","en-US"); + ret = pResolveLocaleName(input, NULL, buffer_size); + EXPECT_LENW; + + /* buffer-size error cases */ + STRINGSW("fr",""); + buffer_size = 5; /* too small to hold "fr-FR\0" */ + ret = pResolveLocaleName(input, buffer, buffer_size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ret == 0 w/ error %d, got %d (%s), error %d\n", + ERROR_INSUFFICIENT_BUFFER, ret, wine_dbgstr_w(buffer), GetLastError()); + + /* null-input error cases */ + STRINGSW("en-US",""); + ret = pResolveLocaleName(NULL, buffer, buffer_size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ret == 0 w/ error %d, got %d (%s), error %d\n", + ERROR_INSUFFICIENT_BUFFER, ret, wine_dbgstr_w(buffer), GetLastError()); +} + static void test_SpecialCasing(void) { int ret, i; @@ -7180,6 +7271,7 @@ START_TEST(locale) test_FindStringOrdinal(); test_SetThreadUILanguage(); test_NormalizeString(); + test_ResolveLocaleName(); test_SpecialCasing(); test_NLSVersion(); test_geo_name(); diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 89b35775053..3fe311b0728 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -5623,10 +5623,48 @@ INT WINAPI DECLSPEC_HOTPATCH NormalizeString(NORM_FORM form, const WCHAR *src, I */ INT WINAPI DECLSPEC_HOTPATCH ResolveLocaleName( LPCWSTR name, LPWSTR buffer, INT len ) { - FIXME( "stub: %s, %p, %d\n", wine_dbgstr_w(name), buffer, len ); + LCID lcid; + WCHAR local_buffer[LOCALE_NAME_MAX_LENGTH]; + WCHAR *output_buffer = buffer ? buffer : local_buffer; + WCHAR *p = 0; + INT new_len; - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return 0; + if (!name) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return 0; + } + + TRACE( "(%s, %p, %d)\n", debugstr_w(name), buffer, len ); + + for (;;) + { + lcid = LocaleNameToLCID( p ? local_buffer : name, 0 ); + if (lcid) break; + + if (!p) /* first loop iteration */ + { + lstrcpynW( local_buffer, name, LOCALE_NAME_MAX_LENGTH ); + local_buffer[LOCALE_NAME_MAX_LENGTH - 1] = L'\0'; + p = local_buffer + lstrlenW( local_buffer ); + } + if (p == local_buffer) + { + /* fail-safe in case LocaleNameToLCID doesn't recognize "" */ + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + + for (--p; p > local_buffer; --p) + { + if (*p == L'-' || *p == L'_') break; + } + *p = L'\0'; + } + new_len = LCIDToLocaleName( lcid, output_buffer, len, 0 ); + + TRACE( "(%s, %p, %d) returning %d %s\n", debugstr_w(name), buffer, len, new_len, debugstr_w(output_buffer) ); + return new_len; } -- 2.32.0.windows.2

1 0

[PATCH] ntdll: Only use sysinfo function when present
by Gerald Pfeifer 10 Aug '21

10 Aug '21

On some systems <sys/sysinfo.h> may be present while the sysinfo function may not, or at least not as part of standard libraries, so check whether the function is actually available before using it. This fixes builds on FreeBSD with the devel/libsysinfo present. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- configure.ac | 1 + dlls/ntdll/unix/virtual.c | 3 ++- include/config.h.in | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 69e27147088..065b3f231bf 100644 --- a/configure.ac +++ b/configure.ac @@ -2205,6 +2205,7 @@ AC_CHECK_FUNCS(\ setprogname \ sigprocmask \ symlink \ + sysinfo \ tcdrain \ thr_kill2 ) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index f055be94238..c47055fb657 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2692,7 +2692,8 @@ ULONG_PTR get_system_affinity_mask(void) */ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info, BOOL wow64 ) { -#if defined(HAVE_STRUCT_SYSINFO_TOTALRAM) && defined(HAVE_STRUCT_SYSINFO_MEM_UNIT) +#if defined(HAVE_SYSINFO) \ + && defined(HAVE_STRUCT_SYSINFO_TOTALRAM) && defined(HAVE_STRUCT_SYSINFO_MEM_UNIT) struct sysinfo sinfo; if (!sysinfo(&sinfo)) diff --git a/include/config.h.in b/include/config.h.in index ad770281471..24f7b64ffd3 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -744,6 +744,9 @@ /* Define to 1 if you have the <syscall.h> header file. */ #undef HAVE_SYSCALL_H +/* Define to 1 if you have the `sysinfo' function. */ +#undef HAVE_SYSINFO + /* Define to 1 if you have the <SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h> header file. */ #undef HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H -- 2.31.1

1 0

[v2 PATCH 1/3] d3d10/effect: Store string annotation values.
by Nikolay Sivov 10 Aug '21

10 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: reuse existing buffer field for string pointer. dlls/d3d10/effect.c | 22 ++++- dlls/d3d10/tests/effect.c | 181 ++++++++++++++++---------------------- 2 files changed, 97 insertions(+), 106 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 86ef50aac01..e121ad9cac2 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1330,12 +1330,28 @@ static HRESULT parse_fx10_variable_head(const char *data, size_t data_size, static HRESULT parse_fx10_annotation(const char *data, size_t data_size, const char **ptr, struct d3d10_effect_variable *a) { + DWORD offset; HRESULT hr; if (FAILED(hr = parse_fx10_variable_head(data, data_size, ptr, a))) return hr; - skip_dword_unknown("annotation", ptr, 1); + read_dword(ptr, &offset); + TRACE("Annotation value is at offset %#x.\n", offset); + + switch (a->type->basetype) + { + case D3D10_SVT_STRING: + if (!fx10_copy_string(data, data_size, offset, (char **)&a->u.buffer.local_buffer)) + { + ERR("Failed to copy name.\n"); + return E_OUTOFMEMORY; + } + break; + + default: + FIXME("Unhandled object type %#x.\n", a->type->basetype); + } /* mark the variable as annotation */ a->flag = D3D10_EFFECT_VARIABLE_ANNOTATION; @@ -2826,6 +2842,10 @@ static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v) heap_free(v->u.resource.srv); break; + case D3D10_SVT_STRING: + heap_free(v->u.buffer.local_buffer); + break; + default: break; } diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index fc0b8180b97..871bf78cc27 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -1161,7 +1161,7 @@ static void test_effect_variable_element(void) * test_effect_variable_type_class */ #if 0 -cbuffer cb <String s = "STRING";> +cbuffer cb <String s = "STRING"; String s2 = "STRING"; > { float f; vector <int, 2> i; @@ -1186,109 +1186,60 @@ GeometryShader gs[2]; PixelShader ps; VertexShader vs[1]; #endif -static DWORD fx_test_evtc[] = { -0x43425844, 0xc04c50cb, 0x0afeb4ef, 0xbb93f346, -0x97a29499, 0x00000001, 0x00000659, 0x00000001, -0x00000024, 0x30315846, 0x0000062d, 0xfeff1001, -0x00000001, 0x00000004, 0x00000011, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x000003d9, -0x00000000, 0x00000008, 0x00000001, 0x00000001, -0x00000001, 0x00000001, 0x00000001, 0x00000001, -0x00000004, 0x00000000, 0x00000000, 0x53006263, -0x6e697274, 0x00070067, 0x00020000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00010000, -0x00730000, 0x49525453, 0x6600474e, 0x74616f6c, -0x00003300, 0x00000100, 0x00000000, 0x00000400, -0x00001000, 0x00000400, 0x00090900, 0x69006600, -0x0032746e, 0x00000057, 0x00000001, 0x00000000, -0x00000008, 0x00000010, 0x00000008, 0x00001112, -0x69750069, 0x7832746e, 0x007a0033, 0x00010000, -0x00000000, 0x00280000, 0x00300000, 0x00180000, -0x5a1b0000, 0x00750000, 0x6c6f6f62, 0x00337832, -0x000000a0, 0x00000001, 0x00000000, 0x0000001c, -0x00000020, 0x00000018, 0x00001a23, 0x6c420062, -0x53646e65, 0x65746174, 0x0000c600, 0x00000200, -0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000200, 0x656c6200, 0x4400646e, 0x68747065, -0x6e657453, 0x536c6963, 0x65746174, 0x0000f300, -0x00000200, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000300, 0x70656400, 0x74736874, -0x69636e65, 0x6152006c, 0x72657473, 0x72657a69, -0x74617453, 0x012e0065, 0x00020000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00040000, -0x61720000, 0x53007473, 0x6c706d61, 0x74537265, -0x00657461, 0x0000015f, 0x00000002, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000015, -0x006d6173, 0x646e6552, 0x61547265, 0x74656772, -0x77656956, 0x00018c00, 0x00000200, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00001300, -0x76747200, 0x70654400, 0x74536874, 0x69636e65, -0x6569566c, 0x01bd0077, 0x00020000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00140000, -0x73640000, 0x65540076, 0x72757478, 0x00443165, -0x000001ee, 0x00000002, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x0000000a, 0x54003174, -0x75747865, 0x44316572, 0x61727241, 0x02170079, -0x00020000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x000b0000, 0x31740000, 0x65540061, -0x72757478, 0x00443265, 0x00000246, 0x00000002, -0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x0000000c, 0x54003274, 0x75747865, 0x44326572, -0x6f00534d, 0x02000002, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x0e000000, 0x74000000, -0x736d6432, 0x78655400, 0x65727574, 0x72414432, -0x00796172, 0x0000029d, 0x00000002, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x0000000d, -0x00613274, 0x74786554, 0x32657275, 0x41534d44, -0x79617272, 0x0002cc00, 0x00000200, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000f00, -0x64327400, 0x0061736d, 0x74786554, 0x33657275, -0x03000044, 0x00020000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00100000, 0x33740000, -0x78655400, 0x65727574, 0x65627543, 0x00032900, -0x00000200, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00001100, 0x00717400, 0x6d6f6547, -0x79727465, 0x64616853, 0x54007265, 0x02000003, -0x02000000, 0x00000000, 0x00000000, 0x00000000, -0x07000000, 0x67000000, 0x69500073, 0x536c6578, -0x65646168, 0x03820072, 0x00020000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00050000, -0x73700000, 0x72655600, 0x53786574, 0x65646168, -0x03ad0072, 0x00020000, 0x00010000, 0x00000000, -0x00000000, 0x00000000, 0x00060000, 0x73760000, -0x00000400, 0x00006000, 0x00000000, 0x00000400, -0xffffff00, 0x000001ff, 0x00002a00, 0x00000e00, -0x00002c00, 0x00005500, 0x00003900, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00007800, 0x00005c00, 0x00000000, 0x00000400, -0x00000000, 0x00000000, 0x00000000, 0x00009e00, -0x00008200, 0x00000000, 0x00001000, 0x00000000, -0x00000000, 0x00000000, 0x0000c400, 0x0000a800, -0x00000000, 0x00004000, 0x00000000, 0x00000000, -0x00000000, 0x0000ed00, 0x0000d100, 0x00000000, -0xffffff00, 0x000000ff, 0x00000000, 0x00012100, -0x00010500, 0x00000000, 0xffffff00, 0x000000ff, -0x00000000, 0x00015a00, 0x00013e00, 0x00000000, -0xffffff00, 0x000000ff, 0x00000000, 0x00018800, -0x00016c00, 0x00000000, 0xffffff00, 0x000000ff, -0x00000000, 0x0001b900, 0x00019d00, 0x00000000, -0xffffff00, 0x000000ff, 0x0001ea00, 0x0001ce00, -0x00000000, 0xffffff00, 0x000000ff, 0x00021400, -0x0001f800, 0x00000000, 0xffffff00, 0x000000ff, -0x00024200, 0x00022600, 0x00000000, 0xffffff00, -0x000000ff, 0x00026c00, 0x00025000, 0x00000000, -0xffffff00, 0x000000ff, 0x00029700, 0x00027b00, -0x00000000, 0xffffff00, 0x000000ff, 0x0002c800, -0x0002ac00, 0x00000000, 0xffffff00, 0x000000ff, -0x0002f900, 0x0002dd00, 0x00000000, 0xffffff00, -0x000000ff, 0x00032600, 0x00030a00, 0x00000000, -0xffffff00, 0x000000ff, 0x00035100, 0x00033500, -0x00000000, 0xffffff00, 0x000000ff, 0x00037f00, -0x00036300, 0x00000000, 0xffffff00, 0x000000ff, -0x00000000, 0x00000000, 0x0003aa00, 0x00038e00, -0x00000000, 0xffffff00, 0x000000ff, 0x00000000, -0x0003d600, 0x0003ba00, 0x00000000, 0xffffff00, -0x000000ff, 0x00000000, 0x00000000, +static DWORD fx_test_evtc[] = +{ +0x43425844, 0x16ff7a62, 0x6eb690dc, 0x60dd5ba4, 0x903b0ce7, 0x00000001, 0x00000668, 0x00000001, +0x00000024, 0x30315846, 0x0000063c, 0xfeff1001, 0x00000001, 0x00000004, 0x00000011, 0x00000000, +0x00000000, 0x00000000, 0x00000000, 0x000003dc, 0x00000000, 0x00000008, 0x00000001, 0x00000001, +0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000004, 0x00000000, 0x00000000, 0x53006263, +0x6e697274, 0x00070067, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, +0x00730000, 0x49525453, 0x7300474e, 0x6c660032, 0x0074616f, 0x00000036, 0x00000001, 0x00000000, +0x00000004, 0x00000010, 0x00000004, 0x00000909, 0x6e690066, 0x5a003274, 0x01000000, 0x00000000, +0x08000000, 0x10000000, 0x08000000, 0x12000000, 0x69000011, 0x6e697500, 0x33783274, 0x00007d00, +0x00000100, 0x00000000, 0x00002800, 0x00003000, 0x00001800, 0x005a1b00, 0x62007500, 0x326c6f6f, +0xa3003378, 0x01000000, 0x00000000, 0x1c000000, 0x20000000, 0x18000000, 0x23000000, 0x6200001a, +0x656c4200, 0x7453646e, 0x00657461, 0x000000c9, 0x00000002, 0x00000000, 0x00000000, 0x00000000, +0x00000000, 0x00000002, 0x6e656c62, 0x65440064, 0x53687470, 0x636e6574, 0x74536c69, 0x00657461, +0x000000f6, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x74706564, +0x65747368, 0x6c69636e, 0x73615200, 0x69726574, 0x5372657a, 0x65746174, 0x00013100, 0x00000200, +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000400, 0x73617200, 0x61530074, 0x656c706d, +0x61745372, 0x62006574, 0x02000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x15000000, +0x73000000, 0x52006d61, 0x65646e65, 0x72615472, 0x56746567, 0x00776569, 0x0000018f, 0x00000002, +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00767472, 0x74706544, 0x65745368, +0x6c69636e, 0x77656956, 0x0001c000, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +0x00001400, 0x76736400, 0x78655400, 0x65727574, 0xf1004431, 0x02000001, 0x00000000, 0x00000000, +0x00000000, 0x00000000, 0x0a000000, 0x74000000, 0x65540031, 0x72757478, 0x41443165, 0x79617272, +0x00021a00, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000b00, 0x61317400, +0x78655400, 0x65727574, 0x49004432, 0x02000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +0x0c000000, 0x74000000, 0x65540032, 0x72757478, 0x4d443265, 0x02720053, 0x00020000, 0x00000000, +0x00000000, 0x00000000, 0x00000000, 0x000e0000, 0x32740000, 0x00736d64, 0x74786554, 0x32657275, +0x72724144, 0xa0007961, 0x02000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0d000000, +0x74000000, 0x54006132, 0x75747865, 0x44326572, 0x7241534d, 0x00796172, 0x000002cf, 0x00000002, +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000f, 0x6d643274, 0x54006173, 0x75747865, +0x44336572, 0x00030300, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001000, +0x00337400, 0x74786554, 0x43657275, 0x00656275, 0x0000032c, 0x00000002, 0x00000000, 0x00000000, +0x00000000, 0x00000000, 0x00000011, 0x47007174, 0x656d6f65, 0x53797274, 0x65646168, 0x03570072, +0x00020000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00070000, 0x73670000, 0x78695000, +0x68536c65, 0x72656461, 0x00038500, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +0x00000500, 0x00737000, 0x74726556, 0x68537865, 0x72656461, 0x0003b000, 0x00000200, 0x00000100, +0x00000000, 0x00000000, 0x00000000, 0x00000600, 0x00737600, 0x00000004, 0x00000060, 0x00000000, +0x00000004, 0xffffffff, 0x00000002, 0x0000002a, 0x0000000e, 0x0000002c, 0x00000033, 0x0000000e, +0x0000002c, 0x00000058, 0x0000003c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +0x0000007b, 0x0000005f, 0x00000000, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x000000a1, +0x00000085, 0x00000000, 0x00000010, 0x00000000, 0x00000000, 0x00000000, 0x000000c7, 0x000000ab, +0x00000000, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x000000f0, 0x000000d4, 0x00000000, +0xffffffff, 0x00000000, 0x00000000, 0x00000124, 0x00000108, 0x00000000, 0xffffffff, 0x00000000, +0x00000000, 0x0000015d, 0x00000141, 0x00000000, 0xffffffff, 0x00000000, 0x00000000, 0x0000018b, +0x0000016f, 0x00000000, 0xffffffff, 0x00000000, 0x00000000, 0x000001bc, 0x000001a0, 0x00000000, +0xffffffff, 0x00000000, 0x000001ed, 0x000001d1, 0x00000000, 0xffffffff, 0x00000000, 0x00000217, +0x000001fb, 0x00000000, 0xffffffff, 0x00000000, 0x00000245, 0x00000229, 0x00000000, 0xffffffff, +0x00000000, 0x0000026f, 0x00000253, 0x00000000, 0xffffffff, 0x00000000, 0x0000029a, 0x0000027e, +0x00000000, 0xffffffff, 0x00000000, 0x000002cb, 0x000002af, 0x00000000, 0xffffffff, 0x00000000, +0x000002fc, 0x000002e0, 0x00000000, 0xffffffff, 0x00000000, 0x00000329, 0x0000030d, 0x00000000, +0xffffffff, 0x00000000, 0x00000354, 0x00000338, 0x00000000, 0xffffffff, 0x00000000, 0x00000382, +0x00000366, 0x00000000, 0xffffffff, 0x00000000, 0x00000000, 0x00000000, 0x000003ad, 0x00000391, +0x00000000, 0xffffffff, 0x00000000, 0x00000000, 0x000003d9, 0x000003bd, 0x00000000, 0xffffffff, +0x00000000, 0x00000000, }; static BOOL is_valid_check(BOOL a, BOOL b) @@ -1382,6 +1333,7 @@ static void check_as(ID3D10EffectVariable *variable) static void test_effect_variable_type_class(void) { + ID3D10EffectStringVariable *string_var; ID3D10Effect *effect; ID3D10EffectConstantBuffer *constantbuffer, *null_buffer, *parent; ID3D10EffectVariable *variable; @@ -1392,6 +1344,7 @@ static void test_effect_variable_type_class(void) ULONG refcount; HRESULT hr; unsigned int variable_nr = 0; + const char *str1, *str2; if (!(device = create_device())) { @@ -1413,7 +1366,7 @@ static void test_effect_variable_type_class(void) ok(strcmp(vd.Name, "cb") == 0, "Name is \"%s\", expected \"cb\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); ok(vd.Flags == 0, "Type is %u, expected 0\n", vd.Flags); - ok(vd.Annotations == 1, "Elements is %u, expected 1\n", vd.Annotations); + ok(vd.Annotations == 2, "Elements is %u, expected 1\n", vd.Annotations); ok(vd.BufferOffset == 0, "Members is %u, expected 0\n", vd.BufferOffset); ok(vd.ExplicitBindPoint == 0, "ExplicitBindPoint is %u, expected 0\n", vd.ExplicitBindPoint); @@ -1469,6 +1422,24 @@ static void test_effect_variable_type_class(void) ok(td.UnpackedSize == 0x0, "UnpackedSize is %#x, expected 0x0\n", td.UnpackedSize); ok(td.Stride == 0x0, "Stride is %#x, expected 0x0\n", td.Stride); + string_var = variable->lpVtbl->AsString(variable); + hr = string_var->lpVtbl->GetString(string_var, &str1); +todo_wine + ok(SUCCEEDED(hr), "GetString failed %#x.\n", hr); + if (SUCCEEDED(hr)) + ok(!strcmp(str1, "STRING"), "Unexpected value %s.\n", str1); + + variable = constantbuffer->lpVtbl->GetAnnotationByIndex(constantbuffer, 1); + string_var = variable->lpVtbl->AsString(variable); + hr = string_var->lpVtbl->GetString(string_var, &str2); +todo_wine + ok(SUCCEEDED(hr), "GetString failed %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(str2 != str1, "Unexpected string pointer.\n"); + ok(!strcmp(str2, "STRING"), "Unexpected value %s.\n", str1); + } + /* check float f */ variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); -- 2.30.2

3 4

[PATCH] winevulkan: Update to VK spec version 1.2.188.
by Georg Lehmann 10 Aug '21

10 Aug '21

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 5e683d42de7..55b5b71691e 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.185" +VK_XML_VERSION = "1.2.188" WINE_VK_VERSION = (1, 2) # Filenames to create. -- 2.32.0

1 0

[PATCH] winebus.sys: Terminate device loop thread on shutdown.
by Rémi Bernon 10 Aug '21

10 Aug '21

Instead of waiting for it. Otherwise the module may be unloaded on process shutdown while the thread is still busy processing events, causing possible invalid memory access (for instance when accessing the static pnp_devset device list). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I'm not sure what's best here, the crash is pretty hard to reproduce, and most likely to happen with a device that sends a lot of events (the DualShock 4 for instance reports a constant stream of data). It's possible to reproduce it more easily by adding Sleep calls in the event processing functions. We could wait a bit before terminating the thread but as we are shutting down the process I don't know if it's even worth it. dlls/winebus.sys/bus_sdl.c | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index f3fcc20893e..6133c8eb147 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -67,7 +67,6 @@ static DWORD map_controllers = 0; static void *sdl_handle = NULL; static HANDLE deviceloop_handle; -static UINT quit_event = -1; #define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL MAKE_FUNCPTR(SDL_GetError); @@ -1072,39 +1071,21 @@ static DWORD CALLBACK deviceloop_thread(void *args) SetEvent(init_done); - while (1) { - while (pSDL_WaitEvent(&event) != 0) { - if (event.type == quit_event) { - TRACE("Device thread exiting\n"); - return 0; - } - process_device_event(&event); - } - } + while (pSDL_WaitEvent(&event) != 0) + process_device_event(&event); + + ERR("SDL_WaitEvent failed: %s\n", pSDL_GetError()); + return -1; } void sdl_driver_unload( void ) { - SDL_Event event; - TRACE("Unload Driver\n"); if (!deviceloop_handle) return; - quit_event = pSDL_RegisterEvents(1); - if (quit_event == -1) { - ERR("error registering quit event\n"); - return; - } - - event.type = quit_event; - if (pSDL_PushEvent(&event) != 1) { - ERR("error pushing quit event\n"); - return; - } - - WaitForSingleObject(deviceloop_handle, INFINITE); + TerminateThread(deviceloop_handle, 0); CloseHandle(deviceloop_handle); dlclose(sdl_handle); } -- 2.32.0

2 4

[PATCH 1/2] ntdll: Add a test for closing INVALID_HANDLE_VALUE handle.
by Nikolay Sivov 10 Aug '21

10 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/tests/process.c | 23 +++++++++++++++++++++++ dlls/ntdll/tests/om.c | 16 ++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index e729bca87ef..ce7de563d9d 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -4972,6 +4972,28 @@ static void test_job_list_attribute(HANDLE parent_job) ok(ret, "SetInformationJobObject error %u\n", GetLastError()); } +static void test_CloseHandle(void) +{ + BOOL ret; + + SetLastError(0xdeadbeef); + ret = CloseHandle(INVALID_HANDLE_VALUE); +todo_wine { + ok(ret, "Unexpected return value %d.\n", ret); + ok(GetLastError() == 0xdeadbeef, "Unexpected error.\n"); +} + + SetLastError(0); + ret = CloseHandle(UlongToHandle(0xdeadbee1)); + ok(!ret, "Unexpected return value %d.\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Unexpected error.\n"); + + SetLastError(0); + ret = CloseHandle(0); + ok(!ret, "Unexpected return value %d.\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Unexpected error.\n"); +} + START_TEST(process) { HANDLE job, hproc, h, h2; @@ -5101,6 +5123,7 @@ START_TEST(process) test_parent_process_attribute(0, NULL); test_handle_list_attribute(FALSE, NULL, NULL); test_dead_process(); + test_CloseHandle(); /* things that can be tested: * lookup: check the way program to be executed is searched diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index af5e014f069..3d518af5f3a 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2944,6 +2944,21 @@ static void test_get_next_thread(void) CloseHandle(thread); } +static void test_close_handle(void) +{ + NTSTATUS status; + + status = NtClose(INVALID_HANDLE_VALUE); +todo_wine + ok(!status, "Unexpected status %#x.\n", status); + + status = NtClose(0); + ok(status == STATUS_INVALID_HANDLE, "Unexpected status %#x.\n", status); + + status = NtClose(UlongToHandle(0xdeadbee1)); + ok(status == STATUS_INVALID_HANDLE, "Unexpected status %#x.\n", status); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -3020,4 +3035,5 @@ START_TEST(om) test_duplicate_object(); test_object_types(); test_get_next_thread(); + test_close_handle(); } -- 2.30.2

2 4

[PATCH] xmllite: Don't lose terminating character when shrinking buffer
by Eduard Permyakov 10 Aug '21

10 Aug '21

The utf16 buffer is expected to be terminated by a '0' character. Flawed buffer shrinking logic would move the buffer contents but forget about the terminating character, which could cause reading junk past the end of the buffer contents. Signed-off-by: Eduard Permyakov <epermyakov(a)codeweavers.com> --- dlls/xmllite/reader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index a5a75c29887..834c36ae18c 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2128,6 +2128,7 @@ static HRESULT reader_parse_reference(xmlreader *reader) memmove(start + 1, ptr + 1, len); buffer->written -= (reader_get_cur(reader) - cur) * sizeof(WCHAR); + *(WCHAR*)(buffer->data + buffer->written) = 0; buffer->cur = cur + 1; *start = ch; @@ -2151,6 +2152,7 @@ static HRESULT reader_parse_reference(xmlreader *reader) memmove(start+1, ptr+1, len); buffer->cur = cur + 1; buffer->written -= (ptr - start) * sizeof(WCHAR); + *(WCHAR*)(buffer->data + buffer->written) = 0; *start = ch; } -- 2.17.1

2 1

[PATCH] kernelbase: Fix an incorrect allocation size.
by Giovanni Mascellani 10 Aug '21

10 Aug '21

Variable nt_privs has type TOKEN_PRIVILEGES*, not TOKEN_GROUPS*. This fixes a crash in the Cyberpunk 2077 launcher. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/kernelbase/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/security.c b/dlls/kernelbase/security.c index 36196304db3..472076cf7fe 100644 --- a/dlls/kernelbase/security.c +++ b/dlls/kernelbase/security.c @@ -667,7 +667,7 @@ BOOL WINAPI CreateRestrictedToken( HANDLE token, DWORD flags, if (delete_priv_count) { - if (!(nt_privs = heap_alloc( offsetof( TOKEN_GROUPS, Groups[delete_priv_count] ) ))) goto out; + if (!(nt_privs = heap_alloc( offsetof( TOKEN_PRIVILEGES, Privileges[delete_priv_count] ) ))) goto out; nt_privs->PrivilegeCount = delete_priv_count; memcpy( nt_privs->Privileges, delete_privs, delete_priv_count * sizeof(*delete_privs) ); } -- 2.32.0

1 0

[PATCH v3 1/5] d3dx10: Partially implement D3DX10CreateEffectFromMemory().
by Matteo Bruni 10 Aug '21

10 Aug '21

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: use default include handler v3 (Matteo): move the function out of d3dx10_43_main.c, make a few tweaks. dlls/d3dx10_43/Makefile.in | 1 + dlls/d3dx10_43/compiler.c | 62 +++++++++++++++++++++++++++++++++ dlls/d3dx10_43/d3dx10_43_main.c | 13 ------- 3 files changed, 63 insertions(+), 13 deletions(-) create mode 100644 dlls/d3dx10_43/compiler.c diff --git a/dlls/d3dx10_43/Makefile.in b/dlls/d3dx10_43/Makefile.in index 1108dcb0948..1fae34191ee 100644 --- a/dlls/d3dx10_43/Makefile.in +++ b/dlls/d3dx10_43/Makefile.in @@ -7,6 +7,7 @@ EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ async.c \ + compiler.c \ d3dx10_43_main.c \ texture.c diff --git a/dlls/d3dx10_43/compiler.c b/dlls/d3dx10_43/compiler.c new file mode 100644 index 00000000000..1ccb0e45a69 --- /dev/null +++ b/dlls/d3dx10_43/compiler.c @@ -0,0 +1,62 @@ +/* + * Copyright 2021 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "wine/debug.h" + +#define COBJMACROS + +#include "d3d10_1.h" +#include "d3dx10.h" +#include "d3dcompiler.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + + +HRESULT WINAPI D3DX10CreateEffectFromMemory(const void *data, SIZE_T datasize, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *profile, + UINT shader_flags, UINT effect_flags, ID3D10Device *device, ID3D10EffectPool *effect_pool, + ID3DX10ThreadPump *pump, ID3D10Effect **effect, ID3D10Blob **errors, HRESULT *hresult) +{ + ID3D10Blob *code; + HRESULT hr; + + TRACE("data %p, datasize %lu, filename %s, defines %p, include %p, profile %s, shader_flags %#x," + "effect_flags %#x, device %p, effect_pool %p, pump %p, effect %p, errors %p, hresult %p.\n", + data, datasize, debugstr_a(filename), defines, include, debugstr_a(profile), + shader_flags, effect_flags, device, effect_pool, pump, effect, errors, hresult); + + if (pump) + FIXME("Asynchronous mode is not supported.\n"); + + if (!include) + include = D3D_COMPILE_STANDARD_FILE_INCLUDE; + + if (FAILED(hr = D3DCompile(data, datasize, filename, defines, include, "main", profile, + shader_flags, effect_flags, &code, errors))) + { + WARN("Effect compilation failed, hr %#x.\n", hr); + return hr; + } + + hr = D3D10CreateEffectFromMemory(ID3D10Blob_GetBufferPointer(code), ID3D10Blob_GetBufferSize(code), + effect_flags, device, effect_pool, effect); + ID3D10Blob_Release(code); + + return hr; +} diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 06b00cb0393..2bbfac9c632 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -74,19 +74,6 @@ HRESULT WINAPI D3DX10CreateEffectFromFileW(const WCHAR *filename, const D3D10_SH return E_NOTIMPL; } -HRESULT WINAPI D3DX10CreateEffectFromMemory(const void *data, SIZE_T datasize, const char *filename, - const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *profile, UINT hlslflags, - UINT fxflags, ID3D10Device *device, ID3D10EffectPool *effectpool, ID3DX10ThreadPump *pump, - ID3D10Effect **effect, ID3D10Blob **errors, HRESULT *hresult) -{ - FIXME("data %p, datasize %lu, filename %s, defines %p, include %p, profile %s, hlslflags %#x, fxflags %#x, " - "device %p, effectpool %p, pump %p, effect %p, errors %p, hresult %p\n", - data, datasize, debugstr_a(filename), defines, include, debugstr_a(profile), hlslflags, fxflags, device, - effectpool, pump, effect, errors, hresult); - - return E_NOTIMPL; -} - HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(const void *data, SIZE_T datasize, const char *filename, const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *profile, UINT hlslflags, UINT fxflags, ID3D10Device *device, ID3DX10ThreadPump *pump, ID3D10EffectPool **effectpool, -- 2.26.3

1 4

[PATCH v5 1/4] msvcrt: Translate file open access pattern hints
by Luke Deller 10 Aug '21

10 Aug '21

Translate access pattern hints supplied to fopen / _open into the corresponding attributes for the lower level CreateFileW call. Signed-off-by: Luke Deller <luke(a)deller.id.au> --- v5: reordered patches so that tests are added after dll changes --- dlls/msvcrt/file.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 6e955099090..b0eeaf2a351 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -22,8 +22,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * - * TODO - * Use the file flag hints O_SEQUENTIAL, O_RANDOM, O_SHORT_LIVED */ #include <direct.h> @@ -1609,8 +1607,12 @@ static int msvcrt_get_flags(const wchar_t* mode, int *open_flags, int* stream_fl case 'w': break; case 'S': + if (!(*open_flags & _O_RANDOM)) + *open_flags |= _O_SEQUENTIAL; + break; case 'R': - FIXME("ignoring cache optimization flag: %c\n", mode[-1]); + if (!(*open_flags & _O_SEQUENTIAL)) + *open_flags |= _O_RANDOM; break; default: ERR("incorrect mode flag: %c\n", mode[-1]); @@ -2269,6 +2271,13 @@ int CDECL _wsopen_dispatch( const wchar_t* path, int oflags, int shflags, int pm sharing |= FILE_SHARE_DELETE; } + if (oflags & _O_RANDOM) + attrib |= FILE_FLAG_RANDOM_ACCESS; + if (oflags & _O_SEQUENTIAL) + attrib |= FILE_FLAG_SEQUENTIAL_SCAN; + if (oflags & _O_SHORT_LIVED) + attrib |= FILE_ATTRIBUTE_TEMPORARY; + sa.nLength = sizeof( SECURITY_ATTRIBUTES ); sa.lpSecurityDescriptor = NULL; sa.bInheritHandle = !(oflags & _O_NOINHERIT); -- 2.25.1

2 4

[PATCH 1/2] d2d1: Implement d2d_effect_SetInputCount().
by Ziqing Hui 10 Aug '21

10 Aug '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- This supersedes 211082. Changes: Add a info field to d2d_effect. dlls/d2d1/d2d1_private.h | 10 ++++++++ dlls/d2d1/effect.c | 55 ++++++++++++++++++++++++++-------------- dlls/d2d1/tests/d2d1.c | 2 -- 3 files changed, 46 insertions(+), 21 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 88c712cf51c..e823b2092bf 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -565,12 +565,22 @@ struct d2d_device void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *factory, IDXGIDevice *dxgi_device) DECLSPEC_HIDDEN; +struct d2d_effect_info +{ + const CLSID *clsid; + UINT32 default_input_count; + UINT32 min_inputs; + UINT32 max_inputs; +}; + struct d2d_effect { ID2D1Effect ID2D1Effect_iface; ID2D1Image ID2D1Image_iface; LONG refcount; + const struct d2d_effect_info *info; + ID2D1Factory *factory; ID2D1Image **inputs; size_t inputs_size; diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 560d87479a9..ef1189ba042 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -20,17 +20,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); -struct d2d_effect_info -{ - const CLSID *clsid; - UINT32 default_input_count; -}; - static const struct d2d_effect_info builtin_effects[] = { - {&CLSID_D2D12DAffineTransform, 1}, - {&CLSID_D2D13DPerspectiveTransform, 1}, - {&CLSID_D2D1Composite, 2} + {&CLSID_D2D12DAffineTransform, 1, 1, 1}, + {&CLSID_D2D13DPerspectiveTransform, 1, 1, 1}, + {&CLSID_D2D1Composite, 2, 1, 0xffffffff} }; static inline struct d2d_effect *impl_from_ID2D1Effect(ID2D1Effect *iface) @@ -207,9 +201,38 @@ static void STDMETHODCALLTYPE d2d_effect_SetInput(ID2D1Effect *iface, UINT32 ind static HRESULT STDMETHODCALLTYPE d2d_effect_SetInputCount(ID2D1Effect *iface, UINT32 count) { - FIXME("iface %p, count %u stub!\n", iface, count); + struct d2d_effect *effect = impl_from_ID2D1Effect(iface); + unsigned int i; - return E_NOTIMPL; + TRACE("iface %p, count %u.\n", iface, count); + + if (count < effect->info->min_inputs || count > effect->info->max_inputs) + return E_INVALIDARG; + if (count == effect->input_count) + return S_OK; + + if (count < effect->input_count) + { + for (i = count; i < effect->input_count; ++i) + { + if (effect->inputs[i]) + ID2D1Image_Release(effect->inputs[i]); + } + effect->input_count = count; + return S_OK; + } + + if (!d2d_array_reserve((void **)&effect->inputs, &effect->inputs_size, + count, sizeof(*effect->inputs))) + { + ERR("Failed to resize inputs array.\n"); + return E_OUTOFMEMORY; + } + + memset(&effect->inputs[effect->input_count], 0, sizeof(*effect->inputs) * (count - effect->input_count)); + effect->input_count = count; + + return S_OK; } static void STDMETHODCALLTYPE d2d_effect_GetInput(ID2D1Effect *iface, UINT32 index, ID2D1Image **input) @@ -326,15 +349,9 @@ HRESULT d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory, const { if (IsEqualGUID(effect_id, builtin_effects[i].clsid)) { - effect->input_count = builtin_effects[i].default_input_count; - - if (!d2d_array_reserve((void **)&effect->inputs, &effect->inputs_size, - effect->input_count, sizeof(*effect->inputs))) - return E_OUTOFMEMORY; - memset(effect->inputs, 0, sizeof(*effect->inputs) * effect->input_count); - + effect->info = &builtin_effects[i]; + d2d_effect_SetInputCount(&effect->ID2D1Effect_iface, effect->info->default_input_count); ID2D1Factory_AddRef(effect->factory = factory); - return S_OK; } } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index a6f7ac88d0d..f655274754e 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9811,10 +9811,8 @@ static void test_effect(BOOL d3d11) winetest_push_context("Input %u", j); hr = ID2D1Effect_SetInputCount(effect, j); if (j < test->min_inputs || j > test->max_inputs) - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); else - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); winetest_pop_context(); } -- 2.25.1

3 4

[PATCH vkd3d 1/3] vkd3d: Introduce a helper function to append descriptor set layouts to the layout array.
by Conor McCarthy 10 Aug '21

10 Aug '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/state.c | 68 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 51 insertions(+), 17 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 5ab0af83..97bb3a55 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -514,10 +514,51 @@ static HRESULT d3d12_root_signature_init_push_constants(struct d3d12_root_signat struct vkd3d_descriptor_set_context { VkDescriptorSetLayoutBinding *current_binding; + VkDescriptorSetLayoutBinding *first_binding; unsigned int descriptor_index; uint32_t descriptor_binding; }; +static bool vkd3d_validate_descriptor_set_count(struct d3d12_device *device, unsigned int set_count) +{ + uint32_t max_count = min(VKD3D_MAX_DESCRIPTOR_SETS, device->vk_info.device_limits.maxBoundDescriptorSets); + + if (set_count > max_count) + { + ERR("Required descriptor set count exceeds maximum allowed count of %u.\n", max_count); + return false; + } + + return true; +} + +static HRESULT vkd3d_create_descriptor_set_layout(struct d3d12_device *device, + VkDescriptorSetLayoutCreateFlags flags, unsigned int binding_count, + const VkDescriptorSetLayoutBinding *bindings, VkDescriptorSetLayout *set_layout); + +static HRESULT d3d12_root_signature_append_descriptor_set_layout(struct d3d12_root_signature *root_signature, + struct vkd3d_descriptor_set_context *context, VkDescriptorSetLayoutCreateFlags flags) +{ + HRESULT hr; + + if (!context->descriptor_binding) + return S_OK; + + if (!vkd3d_validate_descriptor_set_count(root_signature->device, root_signature->vk_set_count + 1)) + return E_INVALIDARG; + + if (FAILED(hr = vkd3d_create_descriptor_set_layout(root_signature->device, + flags, context->descriptor_binding, context->first_binding, + &root_signature->vk_set_layouts[root_signature->vk_set_count]))) + return hr; + ++root_signature->vk_set_count; + + context->current_binding = context->first_binding; + context->descriptor_binding = 0; + + return S_OK; +} + static void d3d12_root_signature_append_vk_binding(struct d3d12_root_signature *root_signature, enum vkd3d_shader_descriptor_type descriptor_type, unsigned int register_space, unsigned int register_idx, bool buffer_descriptor, enum vkd3d_shader_visibility shader_visibility, @@ -906,6 +947,7 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa root_signature->descriptor_mapping = NULL; root_signature->static_sampler_count = 0; root_signature->static_samplers = NULL; + root_signature->device = device; if (desc->Flags & ~(D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT | D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT)) @@ -942,22 +984,18 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa if (!(binding_desc = vkd3d_calloc(info.binding_count, sizeof(*binding_desc)))) goto fail; + context.first_binding = binding_desc; context.current_binding = binding_desc; if (FAILED(hr = d3d12_root_signature_init_root_descriptors(root_signature, desc, &context))) goto fail; /* We use KHR_push_descriptor for root descriptor parameters. */ - if (vk_info->KHR_push_descriptor && context.descriptor_binding) + if (vk_info->KHR_push_descriptor) { - if (FAILED(hr = vkd3d_create_descriptor_set_layout(device, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR, - context.descriptor_binding, binding_desc, &root_signature->vk_set_layouts[0]))) + if (FAILED(hr = d3d12_root_signature_append_descriptor_set_layout(root_signature, + &context, VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR))) goto fail; - ++root_signature->vk_set_count; - - context.current_binding = binding_desc; - context.descriptor_binding = 0; } if (FAILED(hr = d3d12_root_signature_init_push_constants(root_signature, desc, @@ -969,14 +1007,10 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa goto fail; root_signature->main_set = root_signature->vk_set_count; - if (context.descriptor_binding) - { - if (FAILED(hr = vkd3d_create_descriptor_set_layout(device, - 0, context.descriptor_binding, binding_desc, - &root_signature->vk_set_layouts[root_signature->vk_set_count]))) - goto fail; - ++root_signature->vk_set_count; - } + + if (FAILED(hr = d3d12_root_signature_append_descriptor_set_layout(root_signature, &context, 0))) + goto fail; + vkd3d_free(binding_desc); binding_desc = NULL; @@ -988,7 +1022,7 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa if (FAILED(hr = vkd3d_private_store_init(&root_signature->private_store))) goto fail; - d3d12_device_add_ref(root_signature->device = device); + d3d12_device_add_ref(device); return S_OK; -- 2.32.0

2 5

[PATCH 1/3] xinput1_3: Create a new background update thread.
by Rémi Bernon 10 Aug '21

10 Aug '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/xinput1_3/main.c | 53 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index ae2670ba306..63f125ae528 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -119,6 +119,8 @@ static struct xinput_controller controllers[XUSER_MAX_COUNT] = }; static DWORD last_check = 0; +static HANDLE stop_event; +static HANDLE done_event; static BOOL find_opened_device(SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail, int *free_slot) { @@ -294,8 +296,12 @@ failed: return FALSE; } +static BOOL WINAPI start_update_thread_once( INIT_ONCE *once, void *param, void **context ); + static void HID_find_gamepads(void) { + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + char buffer[sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + MAX_PATH * sizeof(WCHAR)]; SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail = (SP_DEVICE_INTERFACE_DETAIL_DATA_W *)buffer; SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; @@ -308,6 +314,8 @@ static void HID_find_gamepads(void) GUID guid; int i; + InitOnceExecuteOnce(&init_once, start_update_thread_once, NULL, NULL); + idx = GetTickCount(); if ((idx - last_check) < 2000) return; @@ -383,9 +391,16 @@ static void controller_destroy(struct xinput_controller *controller) LeaveCriticalSection(&controller->crit); } -static void HID_destroy_gamepads(void) +static void stop_update_thread(void) { int i; + + SetEvent(stop_event); + WaitForSingleObject(done_event, INFINITE); + + CloseHandle(stop_event); + CloseHandle(done_event); + for (i = 0; i < XUSER_MAX_COUNT; i++) controller_destroy(&controllers[i]); } @@ -523,6 +538,40 @@ static void HID_update_state(struct xinput_controller *controller, XINPUT_STATE memcpy(state, &controller->state, sizeof(*state)); } +static DWORD WINAPI hid_update_thread_proc(void *param) +{ + HANDLE events[1]; + DWORD count, ret; + + do + { + count = 0; + events[count++] = stop_event; + } + while ((ret = WaitForMultipleObjectsEx( count, events, FALSE, INFINITE, TRUE )) < count - 1); + + if (ret != count - 1) ERR("update thread exited unexpectedly, ret %u\n", ret); + SetEvent(done_event); + return ret; +} + +static BOOL WINAPI start_update_thread_once( INIT_ONCE *once, void *param, void **context ) +{ + HANDLE thread; + + stop_event = CreateEventA(NULL, FALSE, FALSE, NULL); + if (!stop_event) ERR("failed to create stop event, error %u\n", GetLastError()); + + done_event = CreateEventA(NULL, FALSE, FALSE, NULL); + if (!done_event) ERR("failed to create stop event, error %u\n", GetLastError()); + + thread = CreateThread(NULL, 0, hid_update_thread_proc, NULL, 0, NULL); + if (!thread) ERR("failed to create update thread, error %u\n", GetLastError()); + CloseHandle(thread); + + return TRUE; +} + static BOOL controller_lock(struct xinput_controller *controller) { if (!controller->device) return FALSE; @@ -552,7 +601,7 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) break; case DLL_PROCESS_DETACH: if (reserved) break; - HID_destroy_gamepads(); + stop_update_thread(); break; } return TRUE; -- 2.32.0

1 2

[PATCH] xinput1_3/tests: Add some HID report tests.
by Rémi Bernon 10 Aug '21

10 Aug '21

This adds tests to validate the bogus HID devices exposed native XInput driver. Interactive tests are also included to validate the HID report values, and more specifically the weird combined triggers, which is currently not implemented correctly in Wine. Some third-party libraries, such as SDL, are known to rely on this bogus HID devices and hardcode the expected report structure. This has been tested on Windows 10 with XBox 360 controllers as well as Xbox One S controllers. The latter are detected as 045e:02ea on Linux, but as 045e:02ff on Windows for some reason, and their descriptor seems a little bit different. Their exposed HID device also doesn't seem to work at all and ReadFile never succeeds, so the interactive tests are skipped for these devices. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/xinput1_3/tests/Makefile.in | 2 +- dlls/xinput1_3/tests/xinput.c | 516 +++++++++++++++++++++++++++++++ 2 files changed, 517 insertions(+), 1 deletion(-) diff --git a/dlls/xinput1_3/tests/Makefile.in b/dlls/xinput1_3/tests/Makefile.in index 718b47f21ba..260a8a634e4 100644 --- a/dlls/xinput1_3/tests/Makefile.in +++ b/dlls/xinput1_3/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = xinput1_3.dll -IMPORTS = user32 +IMPORTS = user32 hid setupapi C_SRCS = \ xinput.c diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index a6e2107446c..41769e23ec9 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -20,7 +20,12 @@ #include <windows.h> #include <stdio.h> +#include "winioctl.h" #include "xinput.h" +#include "shlwapi.h" +#include "setupapi.h" +#include "ddk/hidsdi.h" +#include "ddk/hidclass.h" #include "wine/test.h" static DWORD (WINAPI *pXInputGetState)(DWORD, XINPUT_STATE*); @@ -278,6 +283,516 @@ static void test_get_batteryinformation(void) ok(result == ERROR_BAD_ARGUMENTS, "XInputGetBatteryInformation returned (%d)\n", result); } +#define check_member_(file, line, val, exp, fmt, member) \ + ok_(file, line)((val).member == (exp).member, \ + "got " #member " " fmt ", expected " fmt "\n", \ + (val).member, (exp).member) +#define check_member(val, exp, fmt, member) check_member_(__FILE__, __LINE__, val, exp, fmt, member) + +static void check_hid_caps(DWORD index, HANDLE device, PHIDP_PREPARSED_DATA preparsed, + HIDD_ATTRIBUTES *attrs, HIDP_CAPS *hid_caps) +{ + const HIDP_CAPS expect_hid_caps = + { + .Usage = HID_USAGE_GENERIC_GAMEPAD, + .UsagePage = HID_USAGE_PAGE_GENERIC, + .InputReportByteLength = + attrs->VendorID == 0x045e && attrs->ProductID == 0x02ff ? 16 : + 15, + .OutputReportByteLength = 0, + .FeatureReportByteLength = 0, + .NumberLinkCollectionNodes = 4, + .NumberInputButtonCaps = 1, + .NumberInputValueCaps = 6, + .NumberInputDataIndices = + attrs->VendorID == 0x045e && attrs->ProductID == 0x02ff ? 22 : + 16, + .NumberFeatureButtonCaps = 0, + .NumberFeatureValueCaps = 0, + .NumberFeatureDataIndices = 0, + }; + const HIDP_BUTTON_CAPS expect_button_caps[] = + { + { + .UsagePage = HID_USAGE_PAGE_BUTTON, + .BitField = 2, + .LinkUsage = HID_USAGE_GENERIC_GAMEPAD, + .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .IsRange = TRUE, + .IsAbsolute = TRUE, + .Range.UsageMin = 0x01, + .Range.UsageMax = + attrs->VendorID == 0x045e && attrs->ProductID == 0x02ff ? 0x10 : + 0x0a, + .Range.DataIndexMin = 5, + .Range.DataIndexMax = + attrs->VendorID == 0x045e && attrs->ProductID == 0x02ff ? 20 : + 14, + }, + }; + const HIDP_VALUE_CAPS expect_value_caps[] = + { + { + .UsagePage = HID_USAGE_PAGE_GENERIC, + .BitField = 2, + .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .LinkCollection = 1, + .IsAbsolute = TRUE, + .BitSize = 16, + .ReportCount = 1, + .LogicalMax = -1, + .PhysicalMax = -1, + .NotRange.Usage = HID_USAGE_GENERIC_Y, + .NotRange.DataIndex = 0, + }, + { + .UsagePage = HID_USAGE_PAGE_GENERIC, + .BitField = 2, + .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .LinkCollection = 1, + .IsAbsolute = TRUE, + .BitSize = 16, + .ReportCount = 1, + .LogicalMax = -1, + .PhysicalMax = -1, + .NotRange.Usage = HID_USAGE_GENERIC_X, + .NotRange.DataIndex = 1, + }, + { + .UsagePage = HID_USAGE_PAGE_GENERIC, + .BitField = 2, + .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .LinkCollection = 2, + .IsAbsolute = TRUE, + .BitSize = 16, + .ReportCount = 1, + .LogicalMax = -1, + .PhysicalMax = -1, + .NotRange.Usage = HID_USAGE_GENERIC_RY, + .NotRange.DataIndex = 2, + }, + { + .UsagePage = HID_USAGE_PAGE_GENERIC, + .BitField = 2, + .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .LinkCollection = 2, + .IsAbsolute = TRUE, + .BitSize = 16, + .ReportCount = 1, + .LogicalMax = -1, + .PhysicalMax = -1, + .NotRange.Usage = HID_USAGE_GENERIC_RX, + .NotRange.DataIndex = 3, + }, + { + .UsagePage = HID_USAGE_PAGE_GENERIC, + .BitField = 2, + .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .LinkCollection = 3, + .IsAbsolute = TRUE, + .BitSize = 16, + .ReportCount = 1, + .LogicalMax = -1, + .PhysicalMax = -1, + .NotRange.Usage = HID_USAGE_GENERIC_Z, + .NotRange.DataIndex = 4, + }, + { + .UsagePage = HID_USAGE_PAGE_GENERIC, + .BitField = 66, + .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .LinkUsage = HID_USAGE_GENERIC_GAMEPAD, + .IsAbsolute = TRUE, + .HasNull = TRUE, + .BitSize = 4, + .Units = 14, + .ReportCount = 1, + .LogicalMin = 1, + .LogicalMax = 8, + .PhysicalMin = 0x0000, + .PhysicalMax = 0x103b, + .NotRange.Usage = HID_USAGE_GENERIC_HATSWITCH, + .NotRange.DataIndex = + attrs->VendorID == 0x045e && attrs->ProductID == 0x02ff ? 21 : + 15, + }, + }; + static const HIDP_LINK_COLLECTION_NODE expect_collections[] = + { + { + .LinkUsage = HID_USAGE_GENERIC_GAMEPAD, + .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .CollectionType = 1, + .NumberOfChildren = 3, + .FirstChild = 3, + }, + { .LinkUsagePage = HID_USAGE_PAGE_GENERIC, .NextSibling = 0, }, + { .LinkUsagePage = HID_USAGE_PAGE_GENERIC, .NextSibling = 1, }, + { .LinkUsagePage = HID_USAGE_PAGE_GENERIC, .NextSibling = 2, }, + }; + + HIDP_LINK_COLLECTION_NODE collections[16]; + HIDP_BUTTON_CAPS button_caps[16]; + HIDP_VALUE_CAPS value_caps[16]; + XINPUT_CAPABILITIES xi_caps; + char buffer[200] = {0}; + ULONG length, value; + XINPUT_STATE state; + USAGE usages[15]; + NTSTATUS status; + USHORT count; + DWORD i, res; + BOOL ret; + + res = pXInputGetCapabilities(index, 0, &xi_caps); + ok(res == ERROR_SUCCESS, "XInputGetCapabilities %d returned %u\n", index, res); + + res = pXInputGetState(index, &state); + ok(res == ERROR_SUCCESS, "XInputGetState %d returned %u\n", index, res); + + ok(hid_caps->UsagePage == HID_USAGE_PAGE_GENERIC, "unexpected usage page %04x\n", hid_caps->UsagePage); + ok(hid_caps->Usage == HID_USAGE_GENERIC_GAMEPAD, "unexpected usage %04x\n", hid_caps->Usage); + + check_member(*hid_caps, expect_hid_caps, "%04x", Usage); + check_member(*hid_caps, expect_hid_caps, "%04x", UsagePage); + todo_wine + check_member(*hid_caps, expect_hid_caps, "%d", InputReportByteLength); + todo_wine_if(xi_caps.Flags & XINPUT_CAPS_FFB_SUPPORTED) + check_member(*hid_caps, expect_hid_caps, "%d", OutputReportByteLength); + check_member(*hid_caps, expect_hid_caps, "%d", FeatureReportByteLength); + todo_wine + check_member(*hid_caps, expect_hid_caps, "%d", NumberLinkCollectionNodes); + check_member(*hid_caps, expect_hid_caps, "%d", NumberInputButtonCaps); + todo_wine + check_member(*hid_caps, expect_hid_caps, "%d", NumberInputValueCaps); + todo_wine + check_member(*hid_caps, expect_hid_caps, "%d", NumberInputDataIndices); + check_member(*hid_caps, expect_hid_caps, "%d", NumberOutputButtonCaps); + todo_wine_if(xi_caps.Flags & XINPUT_CAPS_FFB_SUPPORTED) + check_member(*hid_caps, expect_hid_caps, "%d", NumberOutputValueCaps); + todo_wine_if(xi_caps.Flags & XINPUT_CAPS_FFB_SUPPORTED) + check_member(*hid_caps, expect_hid_caps, "%d", NumberOutputDataIndices); + check_member(*hid_caps, expect_hid_caps, "%d", NumberFeatureButtonCaps); + check_member(*hid_caps, expect_hid_caps, "%d", NumberFeatureValueCaps); + check_member(*hid_caps, expect_hid_caps, "%d", NumberFeatureDataIndices); + + length = hid_caps->NumberLinkCollectionNodes; + status = HidP_GetLinkCollectionNodes(collections, &length, preparsed); + ok(status == HIDP_STATUS_SUCCESS, "HidP_GetLinkCollectionNodes returned %#x\n", status); + todo_wine + ok(length == ARRAY_SIZE(expect_collections), "got %d collections\n", length); + + for (i = 0; i < min(length, ARRAY_SIZE(expect_collections)); ++i) + { + winetest_push_context("collections[%d]", i); + todo_wine_if(i == 1) + check_member(collections[i], expect_collections[i], "%04x", LinkUsage); + check_member(collections[i], expect_collections[i], "%04x", LinkUsagePage); + check_member(collections[i], expect_collections[i], "%d", Parent); + todo_wine_if(i == 0) + check_member(collections[i], expect_collections[i], "%d", NumberOfChildren); + check_member(collections[i], expect_collections[i], "%d", NextSibling); + todo_wine_if(i == 0) + check_member(collections[i], expect_collections[i], "%d", FirstChild); + check_member(collections[i], expect_collections[i], "%d", CollectionType); + check_member(collections[i], expect_collections[i], "%d", IsAlias); + winetest_pop_context(); + } + + count = hid_caps->NumberInputButtonCaps; + status = HidP_GetButtonCaps(HidP_Input, button_caps, &count, preparsed); + ok(status == HIDP_STATUS_SUCCESS, "HidP_GetButtonCaps returned %#x\n", status); + ok(count == ARRAY_SIZE(expect_button_caps), "got %d button caps\n", count); + + for (i = 0; i < ARRAY_SIZE(expect_button_caps); ++i) + { + winetest_push_context("button_caps[%d]", i); + check_member(button_caps[i], expect_button_caps[i], "%04x", UsagePage); + check_member(button_caps[i], expect_button_caps[i], "%d", ReportID); + check_member(button_caps[i], expect_button_caps[i], "%d", IsAlias); + check_member(button_caps[i], expect_button_caps[i], "%d", BitField); + todo_wine + check_member(button_caps[i], expect_button_caps[i], "%d", LinkCollection); + todo_wine + check_member(button_caps[i], expect_button_caps[i], "%04x", LinkUsage); + check_member(button_caps[i], expect_button_caps[i], "%04x", LinkUsagePage); + check_member(button_caps[i], expect_button_caps[i], "%d", IsRange); + check_member(button_caps[i], expect_button_caps[i], "%d", IsStringRange); + check_member(button_caps[i], expect_button_caps[i], "%d", IsDesignatorRange); + check_member(button_caps[i], expect_button_caps[i], "%d", IsAbsolute); + + if (!button_caps[i].IsRange && !expect_button_caps[i].IsRange) + { + check_member(button_caps[i], expect_button_caps[i], "%04x", NotRange.Usage); + check_member(button_caps[i], expect_button_caps[i], "%d", NotRange.DataIndex); + } + else if (button_caps[i].IsRange && expect_button_caps[i].IsRange) + { + check_member(button_caps[i], expect_button_caps[i], "%04x", Range.UsageMin); + todo_wine + check_member(button_caps[i], expect_button_caps[i], "%04x", Range.UsageMax); + todo_wine + check_member(button_caps[i], expect_button_caps[i], "%d", Range.DataIndexMin); + todo_wine + check_member(button_caps[i], expect_button_caps[i], "%d", Range.DataIndexMax); + } + + if (!button_caps[i].IsRange && !expect_button_caps[i].IsRange) + check_member(button_caps[i], expect_button_caps[i], "%d", NotRange.StringIndex); + else if (button_caps[i].IsStringRange && expect_button_caps[i].IsStringRange) + { + check_member(button_caps[i], expect_button_caps[i], "%d", Range.StringMin); + check_member(button_caps[i], expect_button_caps[i], "%d", Range.StringMax); + } + + if (!button_caps[i].IsDesignatorRange && !expect_button_caps[i].IsDesignatorRange) + check_member(button_caps[i], expect_button_caps[i], "%d", NotRange.DesignatorIndex); + else if (button_caps[i].IsDesignatorRange && expect_button_caps[i].IsDesignatorRange) + { + check_member(button_caps[i], expect_button_caps[i], "%d", Range.DesignatorMin); + check_member(button_caps[i], expect_button_caps[i], "%d", Range.DesignatorMax); + } + winetest_pop_context(); + } + + count = hid_caps->NumberInputValueCaps; + status = HidP_GetValueCaps(HidP_Input, value_caps, &count, preparsed); + ok(status == HIDP_STATUS_SUCCESS, "HidP_GetValueCaps returned %#x\n", status); + todo_wine + ok(count == ARRAY_SIZE(expect_value_caps), "got %d value caps\n", count); + + for (i = 0; i < min(count, ARRAY_SIZE(expect_value_caps)); ++i) + { + winetest_push_context("value_caps[%d]", i); + check_member(value_caps[i], expect_value_caps[i], "%04x", UsagePage); + check_member(value_caps[i], expect_value_caps[i], "%d", ReportID); + check_member(value_caps[i], expect_value_caps[i], "%d", IsAlias); + todo_wine_if(i == 5) + check_member(value_caps[i], expect_value_caps[i], "%d", BitField); + todo_wine_if(i >= 2) + check_member(value_caps[i], expect_value_caps[i], "%d", LinkCollection); + todo_wine + check_member(value_caps[i], expect_value_caps[i], "%d", LinkUsage); + check_member(value_caps[i], expect_value_caps[i], "%d", LinkUsagePage); + check_member(value_caps[i], expect_value_caps[i], "%d", IsRange); + check_member(value_caps[i], expect_value_caps[i], "%d", IsStringRange); + check_member(value_caps[i], expect_value_caps[i], "%d", IsDesignatorRange); + check_member(value_caps[i], expect_value_caps[i], "%d", IsAbsolute); + + todo_wine_if(i == 5) + check_member(value_caps[i], expect_value_caps[i], "%d", HasNull); + todo_wine_if(i == 5) + check_member(value_caps[i], expect_value_caps[i], "%d", BitSize); + check_member(value_caps[i], expect_value_caps[i], "%d", ReportCount); + check_member(value_caps[i], expect_value_caps[i], "%d", UnitsExp); + todo_wine_if(i == 5) + check_member(value_caps[i], expect_value_caps[i], "%d", Units); + todo_wine_if(i == 5) + check_member(value_caps[i], expect_value_caps[i], "%d", LogicalMin); + todo_wine + check_member(value_caps[i], expect_value_caps[i], "%d", LogicalMax); + check_member(value_caps[i], expect_value_caps[i], "%d", PhysicalMin); + todo_wine + check_member(value_caps[i], expect_value_caps[i], "%d", PhysicalMax); + + if (!value_caps[i].IsRange && !expect_value_caps[i].IsRange) + { + todo_wine + check_member(value_caps[i], expect_value_caps[i], "%04x", NotRange.Usage); + todo_wine_if(i == 5) + check_member(value_caps[i], expect_value_caps[i], "%d", NotRange.DataIndex); + } + else if (value_caps[i].IsRange && expect_value_caps[i].IsRange) + { + check_member(value_caps[i], expect_value_caps[i], "%04x", Range.UsageMin); + check_member(value_caps[i], expect_value_caps[i], "%04x", Range.UsageMax); + check_member(value_caps[i], expect_value_caps[i], "%d", Range.DataIndexMin); + check_member(value_caps[i], expect_value_caps[i], "%d", Range.DataIndexMax); + } + + if (!value_caps[i].IsRange && !expect_value_caps[i].IsRange) + check_member(value_caps[i], expect_value_caps[i], "%d", NotRange.StringIndex); + else if (value_caps[i].IsStringRange && expect_value_caps[i].IsStringRange) + { + check_member(value_caps[i], expect_value_caps[i], "%d", Range.StringMin); + check_member(value_caps[i], expect_value_caps[i], "%d", Range.StringMax); + } + + if (!value_caps[i].IsDesignatorRange && !expect_value_caps[i].IsDesignatorRange) + check_member(value_caps[i], expect_value_caps[i], "%d", NotRange.DesignatorIndex); + else if (value_caps[i].IsDesignatorRange && expect_value_caps[i].IsDesignatorRange) + { + check_member(value_caps[i], expect_value_caps[i], "%d", Range.DesignatorMin); + check_member(value_caps[i], expect_value_caps[i], "%d", Range.DesignatorMax); + } + winetest_pop_context(); + } + + status = HidP_InitializeReportForID(HidP_Input, 0, preparsed, buffer, hid_caps->InputReportByteLength); + ok(status == HIDP_STATUS_SUCCESS, "HidP_InitializeReportForID returned %#x\n", status); + + SetLastError(0xdeadbeef); + memset(buffer, 0, sizeof(buffer)); + ret = HidD_GetInputReport(device, buffer, hid_caps->InputReportByteLength); + todo_wine + ok(!ret, "HidD_GetInputReport succeeded\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "HidD_GetInputReport returned error %u\n", GetLastError()); + + if (!winetest_interactive) skip("skipping interactive tests\n"); + /* ReadFile on Xbox One For Windows controller seems to never succeed */ + else if (attrs->VendorID == 0x045e && attrs->ProductID == 0x02ff) skip("skipping interactive tests (Xbox One For Windows)\n"); + else + { + trace("press A button on gamepad %d\n", index); + + SetLastError(0xdeadbeef); + memset(buffer, 0, sizeof(buffer)); + length = hid_caps->InputReportByteLength; + ret = ReadFile(device, buffer, hid_caps->InputReportByteLength, &length, NULL); + ok(ret, "ReadFile failed, last error %u\n", GetLastError()); + ok(length == hid_caps->InputReportByteLength, "ReadFile returned length %u\n", length); + + res = pXInputGetState(index, &state); + ok(res == ERROR_SUCCESS, "XInputGetState returned %#x\n", res); + ok(state.Gamepad.wButtons & XINPUT_GAMEPAD_A, "unexpected button state %#x\n", state.Gamepad.wButtons); + + length = ARRAY_SIZE(usages); + status = HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_BUTTON, 0, usages, &length, preparsed, buffer, hid_caps->InputReportByteLength); + ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsages returned %#x\n", status); + ok(length == 1, "got length %u\n", length); + ok(usages[0] == 1, "got usages[0] %u\n", usages[0]); + + trace("release A on gamepad %d\n", index); + + SetLastError(0xdeadbeef); + memset(buffer, 0, sizeof(buffer)); + length = hid_caps->InputReportByteLength; + ret = ReadFile(device, buffer, hid_caps->InputReportByteLength, &length, NULL); + ok(ret, "ReadFile failed, last error %u\n", GetLastError()); + ok(length == hid_caps->InputReportByteLength, "ReadFile returned length %u\n", length); + + res = pXInputGetState(index, &state); + ok(res == ERROR_SUCCESS, "XInputGetState returned %#x\n", res); + ok(!state.Gamepad.wButtons, "unexpected button state %#x\n", state.Gamepad.wButtons); + + length = ARRAY_SIZE(usages); + status = HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_BUTTON, 0, usages, &length, preparsed, buffer, hid_caps->InputReportByteLength); + todo_wine + ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsages returned %#x\n", status); + ok(length == 0, "got length %u\n", length); + + trace("press both LT and RT on gamepad %d\n", index); + + do + { + SetLastError(0xdeadbeef); + memset(buffer, 0, sizeof(buffer)); + length = hid_caps->InputReportByteLength; + ret = ReadFile(device, buffer, hid_caps->InputReportByteLength, &length, NULL); + ok(ret, "ReadFile failed, last error %u\n", GetLastError()); + ok(length == hid_caps->InputReportByteLength, "ReadFile returned length %u\n", length); + + res = pXInputGetState(index, &state); + ok(res == ERROR_SUCCESS, "XInputGetState returned %#x\n", res); + + value = 0; + status = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, &value, preparsed, buffer, hid_caps->InputReportByteLength); + ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#x\n", status); + ok(value == state.Gamepad.sThumbLX + 32768, "got LX value %d\n", value); + value = 0; + status = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Y, &value, preparsed, buffer, hid_caps->InputReportByteLength); + ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#x\n", status); + ok(value == 32767 - state.Gamepad.sThumbLY, "got LY value %d\n", value); + value = 0; + status = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RX, &value, preparsed, buffer, hid_caps->InputReportByteLength); + ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#x\n", status); + ok(value == state.Gamepad.sThumbRX + 32768, "got LX value %d\n", value); + value = 0; + status = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, &value, preparsed, buffer, hid_caps->InputReportByteLength); + ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#x\n", status); + ok(value == 32767 - state.Gamepad.sThumbRY, "got LY value %d\n", value); + value = 0; + status = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, &value, preparsed, buffer, hid_caps->InputReportByteLength); + ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#x\n", status); + todo_wine + ok(value == 32768 + (state.Gamepad.bLeftTrigger - state.Gamepad.bRightTrigger) * 128, "got Z value %d (RT %d, LT %d)\n", + value, state.Gamepad.bRightTrigger, state.Gamepad.bLeftTrigger); + value = 0; + status = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RZ, &value, preparsed, buffer, hid_caps->InputReportByteLength); + todo_wine + ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetUsageValue returned %#x\n", status); + } while (ret && (state.Gamepad.bRightTrigger != 255 || state.Gamepad.bLeftTrigger != 255)); + } +} + +static BOOL try_open_hid_device(const WCHAR *path, HANDLE *device, PHIDP_PREPARSED_DATA *preparsed, + HIDD_ATTRIBUTES *attrs, HIDP_CAPS *caps) +{ + PHIDP_PREPARSED_DATA preparsed_data = NULL; + HANDLE device_file; + + device_file = CreateFileW(path, FILE_READ_ACCESS | FILE_WRITE_ACCESS, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, NULL); + if (device_file == INVALID_HANDLE_VALUE) return FALSE; + + if (!HidD_GetPreparsedData(device_file, &preparsed_data)) goto failed; + if (!HidD_GetAttributes(device_file, attrs)) goto failed; + if (HidP_GetCaps(preparsed_data, caps) != HIDP_STATUS_SUCCESS) goto failed; + + *device = device_file; + *preparsed = preparsed_data; + return TRUE; + +failed: + CloseHandle(device_file); + HidD_FreePreparsedData(preparsed_data); + return FALSE; +} + +static void test_hid_reports(void) +{ + static const WCHAR prefix[] = L"\\\\?\\HID#VID_0000&PID_0000"; + char buffer[sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + MAX_PATH * sizeof(WCHAR)]; + SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail = (void *)buffer; + SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; + SP_DEVINFO_DATA devinfo = {sizeof(devinfo)}; + PHIDP_PREPARSED_DATA preparsed; + HIDD_ATTRIBUTES attrs; + HIDP_CAPS caps; + HDEVINFO set; + HANDLE device; + UINT32 i = 0, cnt = 0; + GUID hid; + + HidD_GetHidGuid(&hid); + + set = SetupDiGetClassDevsW(&hid, NULL, NULL, DIGCF_DEVICEINTERFACE); + ok(set != INVALID_HANDLE_VALUE, "SetupDiGetClassDevsW failed, error %u\n", GetLastError()); + + while (SetupDiEnumDeviceInterfaces(set, NULL, &hid, i++, &iface)) + { + detail->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W); + if (!SetupDiGetDeviceInterfaceDetailW(set, &iface, detail, sizeof(buffer), NULL, &devinfo)) + continue; + + if (!try_open_hid_device(detail->DevicePath, &device, &preparsed, &attrs, &caps)) + continue; + + if (wcslen(detail->DevicePath) <= wcslen(prefix) || + wcsnicmp(detail->DevicePath + wcslen(prefix), L"&IG_", 4 )) + continue; + + trace("found xinput HID device %s\n", wine_dbgstr_w(detail->DevicePath)); + check_hid_caps(cnt++, device, preparsed, &attrs, &caps); + + CloseHandle(device); + HidD_FreePreparsedData(preparsed); + } + + SetupDiDestroyDeviceInfoList(set); +} + START_TEST(xinput) { struct @@ -320,6 +835,7 @@ START_TEST(xinput) if (!pXInputGetStateEx) pXInputGetStateEx = pXInputGetStateEx_Ordinal; + test_hid_reports(); test_set_state(); test_get_state(); test_get_capabilities(); -- 2.32.0

1 0

[PATCH] include: Fix IRequestDictionary IID
by Andrew Boyarshin 10 Aug '21

10 Aug '21

IRequestDictionary had the wrong UUID specified (IResponse one). Found by using MIDL instead of WIDL to compile Wine headers: duplicated IID caused compilation error in MIDL. Signed-off-by: Andrew Boyarshin <andrew.boyarshin(a)gmail.com> --- dlls/msxml3/tests/domdoc.c | 2 +- include/asptlb.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index df30104a1560..a7890d56f71f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13170,7 +13170,7 @@ static HRESULT WINAPI transformdest_QueryInterface(IUnknown *iface, REFIID riid, IsEqualIID(riid, &IID_IServiceProvider) || IsEqualIID(riid, &IID_IStream) || IsEqualIID(riid, &IID_ISequentialStream) || - IsEqualIID(riid, &IID_IRequestDictionary); + IsEqualIID(riid, &IID_IResponse); todo_wine_if(IsEqualIID(riid, &IID_IXMLDOMDocument)) ok(known_iid, "Unexpected riid %s\n", wine_dbgstr_guid(riid)); diff --git a/include/asptlb.idl b/include/asptlb.idl index b38bc5d1fe9c..07f250702dd6 100644 --- a/include/asptlb.idl +++ b/include/asptlb.idl @@ -23,7 +23,7 @@ import "oaidl.idl"; [ object, dual, - uuid(D97A6DA0-A864-11cf-83BE-00A0C90C2BD8) + uuid(D97A6DA0-A85F-11DF-83AE-00A0C90C2BD8) ] interface IRequestDictionary : IDispatch { -- 2.32.0.windows.1

2 1

[PATCH v2] hid: Validate preparsed data pointer passed in HidP functions.
by Rémi Bernon 10 Aug '21

10 Aug '21

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Power Rangers: Battle for the Grid. 0514:trace:hidp:HidP_GetCaps preparsed_data 000000004C9566B0, caps 000000000010EF00. 0514:trace:hidp:HidP_GetCaps preparsed_data 0000000000000000, caps 000000000010F020. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hid/hidp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 6259e0f56a9..37715ccfbca 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(hidp); static NTSTATUS get_value_caps_range( WINE_HIDP_PREPARSED_DATA *preparsed, HIDP_REPORT_TYPE report_type, ULONG report_len, const struct hid_value_caps **caps, const struct hid_value_caps **caps_end ) { - if (preparsed->magic != HID_MAGIC) return HIDP_STATUS_INVALID_PREPARSED_DATA; + if (!preparsed || preparsed->magic != HID_MAGIC) return HIDP_STATUS_INVALID_PREPARSED_DATA; switch (report_type) { @@ -167,7 +167,7 @@ NTSTATUS WINAPI HidP_GetCaps( PHIDP_PREPARSED_DATA preparsed_data, HIDP_CAPS *ca TRACE( "preparsed_data %p, caps %p.\n", preparsed_data, caps ); - if (preparsed->magic != HID_MAGIC) return HIDP_STATUS_INVALID_PREPARSED_DATA; + if (!preparsed || preparsed->magic != HID_MAGIC) return HIDP_STATUS_INVALID_PREPARSED_DATA; *caps = preparsed->caps; return HIDP_STATUS_SUCCESS; @@ -787,7 +787,7 @@ NTSTATUS WINAPI HidP_GetLinkCollectionNodes( HIDP_LINK_COLLECTION_NODE *nodes, U TRACE( "nodes %p, nodes_len %p, preparsed_data %p.\n", nodes, nodes_len, preparsed_data ); - if (preparsed->magic != HID_MAGIC) return HIDP_STATUS_INVALID_PREPARSED_DATA; + if (!preparsed || preparsed->magic != HID_MAGIC) return HIDP_STATUS_INVALID_PREPARSED_DATA; count = *nodes_len = preparsed->caps.NumberLinkCollectionNodes; if (capacity < count) return HIDP_STATUS_BUFFER_TOO_SMALL; -- 2.32.0

1 1

[PATCH 1/6] hid: Validate preparsed data pointer passed in HidP functions.
by Rémi Bernon 10 Aug '21

10 Aug '21

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Power Rangers: Battle for the Grid. 0514:trace:hidp:HidP_GetCaps preparsed_data 000000004C9566B0, caps 000000000010EF00. 0514:trace:hidp:HidP_GetCaps preparsed_data 0000000000000000, caps 000000000010F020. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hid/hidp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 6259e0f56a9..37715ccfbca 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(hidp); static NTSTATUS get_value_caps_range( WINE_HIDP_PREPARSED_DATA *preparsed, HIDP_REPORT_TYPE report_type, ULONG report_len, const struct hid_value_caps **caps, const struct hid_value_caps **caps_end ) { - if (preparsed->magic != HID_MAGIC) return HIDP_STATUS_INVALID_PREPARSED_DATA; + if (!preparsed || preparsed->magic != HID_MAGIC) return HIDP_STATUS_INVALID_PREPARSED_DATA; switch (report_type) { @@ -167,7 +167,7 @@ NTSTATUS WINAPI HidP_GetCaps( PHIDP_PREPARSED_DATA preparsed_data, HIDP_CAPS *ca TRACE( "preparsed_data %p, caps %p.\n", preparsed_data, caps ); - if (preparsed->magic != HID_MAGIC) return HIDP_STATUS_INVALID_PREPARSED_DATA; + if (!preparsed || preparsed->magic != HID_MAGIC) return HIDP_STATUS_INVALID_PREPARSED_DATA; *caps = preparsed->caps; return HIDP_STATUS_SUCCESS; @@ -787,7 +787,7 @@ NTSTATUS WINAPI HidP_GetLinkCollectionNodes( HIDP_LINK_COLLECTION_NODE *nodes, U TRACE( "nodes %p, nodes_len %p, preparsed_data %p.\n", nodes, nodes_len, preparsed_data ); - if (preparsed->magic != HID_MAGIC) return HIDP_STATUS_INVALID_PREPARSED_DATA; + if (!preparsed || preparsed->magic != HID_MAGIC) return HIDP_STATUS_INVALID_PREPARSED_DATA; count = *nodes_len = preparsed->caps.NumberLinkCollectionNodes; if (capacity < count) return HIDP_STATUS_BUFFER_TOO_SMALL; -- 2.32.0

1 5

[PATCH] hid: Validate pointer passed into GetCaps
by Alistair Leslie-Hughes 10 Aug '21

10 Aug '21

Power Rangers: Battle for the Grid. 0514:trace:hidp:HidP_GetCaps preparsed_data 000000004C9566B0, caps 000000000010EF00. 0514:trace:hidp:HidP_GetCaps preparsed_data 0000000000000000, caps 000000000010F020. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/hid/hidp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 6259e0f56a9..c3a99f0b9d5 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -167,7 +167,7 @@ NTSTATUS WINAPI HidP_GetCaps( PHIDP_PREPARSED_DATA preparsed_data, HIDP_CAPS *ca TRACE( "preparsed_data %p, caps %p.\n", preparsed_data, caps ); - if (preparsed->magic != HID_MAGIC) return HIDP_STATUS_INVALID_PREPARSED_DATA; + if (!preparsed || preparsed->magic != HID_MAGIC) return HIDP_STATUS_INVALID_PREPARSED_DATA; *caps = preparsed->caps; return HIDP_STATUS_SUCCESS; -- 2.30.2

2 1

[PATCH 4/4] iphlpapi: Implement AllocateAndGetIpNetTableFromStack() on top of GetIpNetTable().
by Huw Davies 10 Aug '21

10 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 23 ++++ dlls/iphlpapi/ipstats.c | 193 ---------------------------------- 2 files changed, 23 insertions(+), 193 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 24cfedd2b02..fe2daa0f24d 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2317,6 +2317,29 @@ err: return err; } +/****************************************************************** + * AllocateAndGetIpNetTableFromStack (IPHLPAPI.@) + */ +DWORD WINAPI AllocateAndGetIpNetTableFromStack( MIB_IPNETTABLE **table, BOOL sort, HANDLE heap, DWORD flags ) +{ + DWORD err, size = FIELD_OFFSET(MIB_IPNETTABLE, table[2]), attempt; + + TRACE( "table %p, sort %d, heap %p, flags 0x%08x\n", table, sort, heap, flags ); + + for (attempt = 0; attempt < 5; attempt++) + { + *table = HeapAlloc( heap, flags, size ); + if (!*table) return ERROR_NOT_ENOUGH_MEMORY; + + err = GetIpNetTable( *table, &size, sort ); + if (!err) break; + HeapFree( heap, flags, *table ); + if (err != ERROR_INSUFFICIENT_BUFFER) break; + } + + return err; +} + static void ipnet_row2_fill( MIB_IPNET_ROW2 *row, USHORT fam, void *key, struct nsi_ip_neighbour_rw *rw, struct nsi_ip_neighbour_dynamic *dyn ) { diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 7bb4ff0603e..115bafa6f8e 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -1220,199 +1220,6 @@ static void *append_table_row( HANDLE heap, DWORD flags, void *table, DWORD *tab return table; } -static int compare_ipnet_rows(const void *a, const void *b) -{ - const MIB_IPNETROW *rowA = a; - const MIB_IPNETROW *rowB = b; - - return ntohl(rowA->dwAddr) - ntohl(rowB->dwAddr); -} - - -/****************************************************************** - * AllocateAndGetIpNetTableFromStack (IPHLPAPI.@) - * - * Get the IP-to-physical address mapping table. - * Like GetIpNetTable(), but allocate the returned table from heap. - * - * PARAMS - * ppIpNetTable [Out] pointer into which the MIB_IPNETTABLE is - * allocated and returned. - * bOrder [In] whether to sort the table - * heap [In] heap from which the table is allocated - * flags [In] flags to HeapAlloc - * - * RETURNS - * ERROR_INVALID_PARAMETER if ppIpNetTable is NULL, other error codes - * on failure, NO_ERROR on success. - */ -DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BOOL bOrder, - HANDLE heap, DWORD flags) -{ - MIB_IPNETTABLE *table; - MIB_IPNETROW row; - DWORD ret = NO_ERROR, count = 16, table_size = FIELD_OFFSET( MIB_IPNETTABLE, table[count] ); - - TRACE("table %p, bOrder %d, heap %p, flags 0x%08x\n", ppIpNetTable, bOrder, heap, flags); - - if (!ppIpNetTable) return ERROR_INVALID_PARAMETER; - - if (!(table = HeapAlloc( heap, flags, table_size ))) - return ERROR_OUTOFMEMORY; - - table->dwNumEntries = 0; - -#ifdef __linux__ - { - FILE *fp; - - if ((fp = fopen("/proc/net/arp", "r"))) - { - char buf[512], *ptr; - DWORD atf_flags; - - /* skip header line */ - ptr = fgets(buf, sizeof(buf), fp); - while ((ptr = fgets(buf, sizeof(buf), fp))) - { - memset( &row, 0, sizeof(row) ); - - row.dwAddr = inet_addr(ptr); - while (*ptr && !isspace(*ptr)) ptr++; - strtoul(ptr + 1, &ptr, 16); /* hw type (skip) */ - atf_flags = strtoul(ptr + 1, &ptr, 16); - -#ifdef ATF_COM - if (atf_flags & ATF_COM) row.u.Type = MIB_IPNET_TYPE_DYNAMIC; - else -#endif -#ifdef ATF_PERM - if (atf_flags & ATF_PERM) row.u.Type = MIB_IPNET_TYPE_STATIC; - else -#endif - row.u.Type = MIB_IPNET_TYPE_OTHER; - - while (*ptr && isspace(*ptr)) ptr++; - while (*ptr && !isspace(*ptr)) - { - row.bPhysAddr[row.dwPhysAddrLen++] = strtoul(ptr, &ptr, 16); - if (*ptr) ptr++; - } - while (*ptr && isspace(*ptr)) ptr++; - while (*ptr && !isspace(*ptr)) ptr++; /* mask (skip) */ - while (*ptr && isspace(*ptr)) ptr++; - getInterfaceIndexByName(ptr, &row.dwIndex); - - if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, sizeof(row) ))) - break; - } - fclose(fp); - } - else ret = ERROR_NOT_SUPPORTED; - } -#elif defined(HAVE_SYS_TIHDR_H) && defined(T_OPTMGMT_ACK) - { - void *data; - int fd, len, namelen; - mib2_ipNetToMediaEntry_t *entry; - char name[64]; - - if ((fd = open_streams_mib( NULL )) != -1) - { - if ((data = read_mib_entry( fd, MIB2_IP, MIB2_IP_MEDIA, &len ))) - { - for (entry = data; (char *)(entry + 1) <= (char *)data + len; entry++) - { - row.dwPhysAddrLen = min( entry->ipNetToMediaPhysAddress.o_length, MAXLEN_PHYSADDR ); - memcpy( row.bPhysAddr, entry->ipNetToMediaPhysAddress.o_bytes, row.dwPhysAddrLen ); - row.dwAddr = entry->ipNetToMediaNetAddress; - row.u.Type = entry->ipNetToMediaType; - namelen = min( sizeof(name) - 1, entry->ipNetToMediaIfIndex.o_length ); - memcpy( name, entry->ipNetToMediaIfIndex.o_bytes, namelen ); - name[namelen] = 0; - getInterfaceIndexByName( name, &row.dwIndex ); - if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, sizeof(row) ))) - break; - } - HeapFree( GetProcessHeap(), 0, data ); - } - close( fd ); - } - else ret = ERROR_NOT_SUPPORTED; - } -#elif defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) - { - int mib[] = {CTL_NET, PF_ROUTE, 0, AF_INET, NET_RT_FLAGS, RTF_LLINFO}; - size_t needed; - char *buf = NULL, *lim, *next; - struct rt_msghdr *rtm; - struct sockaddr_inarp *sinarp; - struct sockaddr_dl *sdl; - - if (sysctl (mib, ARRAY_SIZE(mib), NULL, &needed, NULL, 0) == -1) - { - ERR ("failed to get arp table\n"); - ret = ERROR_NOT_SUPPORTED; - goto done; - } - - buf = HeapAlloc (GetProcessHeap (), 0, needed); - if (!buf) - { - ret = ERROR_OUTOFMEMORY; - goto done; - } - - if (sysctl (mib, ARRAY_SIZE(mib), buf, &needed, NULL, 0) == -1) - { - ret = ERROR_NOT_SUPPORTED; - goto done; - } - - lim = buf + needed; - next = buf; - while(next < lim) - { - rtm = (struct rt_msghdr *)next; - sinarp=(struct sockaddr_inarp *)(rtm + 1); - sdl = (struct sockaddr_dl *)((char *)sinarp + ROUNDUP(sinarp->sin_len)); - if(sdl->sdl_alen) /* arp entry */ - { - memset( &row, 0, sizeof(row) ); - row.dwAddr = sinarp->sin_addr.s_addr; - row.dwIndex = sdl->sdl_index; - row.dwPhysAddrLen = min( 8, sdl->sdl_alen ); - memcpy( row.bPhysAddr, &sdl->sdl_data[sdl->sdl_nlen], row.dwPhysAddrLen ); - if(rtm->rtm_rmx.rmx_expire == 0) row.u.Type = MIB_IPNET_TYPE_STATIC; - else if(sinarp->sin_other & SIN_PROXY) row.u.Type = MIB_IPNET_TYPE_OTHER; - else if(rtm->rtm_rmx.rmx_expire != 0) row.u.Type = MIB_IPNET_TYPE_DYNAMIC; - else row.u.Type = MIB_IPNET_TYPE_INVALID; - - if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, sizeof(row) ))) - break; - } - next += rtm->rtm_msglen; - } -done: - HeapFree( GetProcessHeap (), 0, buf ); - } -#else - FIXME( "not implemented\n" ); - ret = ERROR_NOT_SUPPORTED; -#endif - - if (!table) return ERROR_OUTOFMEMORY; - if (!ret) - { - if (bOrder && table->dwNumEntries) - qsort( table->table, table->dwNumEntries, sizeof(row), compare_ipnet_rows ); - *ppIpNetTable = table; - } - else HeapFree( heap, flags, table ); - TRACE( "returning ret %u table %p\n", ret, table ); - return ret; -} - static DWORD get_tcp_table_sizes( TCP_TABLE_CLASS class, DWORD row_count, DWORD *row_size ) { DWORD table_size; -- 2.23.0

1 0

[PATCH 3/4] iphlpapi: Implement GetIpNetTable() on top of nsi.
by Huw Davies 10 Aug '21

10 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 93 +++++++++++++++++++++++++---------- 1 file changed, 67 insertions(+), 26 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 6a9fb3d0914..24cfedd2b02 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2230,50 +2230,91 @@ err: return err; } +static int ipnetrow_cmp( const void *a, const void *b ) +{ + const MIB_IPNETROW *row_a = a; + const MIB_IPNETROW *row_b = b; + + return RtlUlongByteSwap( row_a->dwAddr ) - RtlUlongByteSwap( row_b->dwAddr ); +} + /****************************************************************** * GetIpNetTable (IPHLPAPI.@) * * Get the IP-to-physical address mapping table. * * PARAMS - * pIpNetTable [Out] buffer for mapping table - * pdwSize [In/Out] length of output buffer - * bOrder [In] whether to sort the table + * table [Out] buffer for mapping table + * size [In/Out] length of output buffer + * sort [In] whether to sort the table * * RETURNS * Success: NO_ERROR * Failure: error code from winerror.h * - * NOTES - * If pdwSize is less than required, the function will return - * ERROR_INSUFFICIENT_BUFFER, and *pdwSize will be set to the required byte - * size. - * If bOrder is true, the returned table will be sorted by IP address. */ -DWORD WINAPI GetIpNetTable(PMIB_IPNETTABLE pIpNetTable, PULONG pdwSize, BOOL bOrder) +DWORD WINAPI GetIpNetTable( MIB_IPNETTABLE *table, ULONG *size, BOOL sort ) { - DWORD ret; - PMIB_IPNETTABLE table; + DWORD err, count, needed, i; + struct nsi_ipv4_neighbour_key *keys; + struct nsi_ip_neighbour_rw *rw; + struct nsi_ip_neighbour_dynamic *dyn; - TRACE("pIpNetTable %p, pdwSize %p, bOrder %d\n", pIpNetTable, pdwSize, bOrder); + TRACE( "table %p, size %p, sort %d\n", table, size, sort ); - if (!pdwSize) return ERROR_INVALID_PARAMETER; + if (!size) return ERROR_INVALID_PARAMETER; - ret = AllocateAndGetIpNetTableFromStack( &table, bOrder, GetProcessHeap(), 0 ); - if (!ret) { - DWORD size = FIELD_OFFSET( MIB_IPNETTABLE, table[table->dwNumEntries] ); - if (!pIpNetTable || *pdwSize < size) { - *pdwSize = size; - ret = ERROR_INSUFFICIENT_BUFFER; - } - else { - *pdwSize = size; - memcpy(pIpNetTable, table, size); + err = NsiAllocateAndGetTable( 1, &NPI_MS_IPV4_MODULEID, NSI_IP_NEIGHBOUR_TABLE, (void **)&keys, sizeof(*keys), + (void **)&rw, sizeof(*rw), (void **)&dyn, sizeof(*dyn), + NULL, 0, &count, 0 ); + if (err) return err; + + needed = FIELD_OFFSET( MIB_IPNETTABLE, table[count] ); + + if (!table || *size < needed) + { + *size = needed; + err = ERROR_INSUFFICIENT_BUFFER; + goto err; + } + + table->dwNumEntries = count; + for (i = 0; i < count; i++) + { + MIB_IPNETROW *row = table->table + i; + + ConvertInterfaceLuidToIndex( &keys[i].luid, &row->dwIndex ); + row->dwPhysAddrLen = dyn[i].phys_addr_len; + if (row->dwPhysAddrLen > sizeof(row->bPhysAddr)) row->dwPhysAddrLen = 0; + memcpy( row->bPhysAddr, rw[i].phys_addr, row->dwPhysAddrLen ); + memset( row->bPhysAddr + row->dwPhysAddrLen, 0, + sizeof(row->bPhysAddr) - row->dwPhysAddrLen ); + row->dwAddr = keys[i].addr.WS_s_addr; + switch (dyn->state) + { + case NlnsUnreachable: + case NlnsIncomplete: + row->u.Type = MIB_IPNET_TYPE_INVALID; + break; + case NlnsProbe: + case NlnsDelay: + case NlnsStale: + case NlnsReachable: + row->u.Type = MIB_IPNET_TYPE_DYNAMIC; + break; + case NlnsPermanent: + row->u.Type = MIB_IPNET_TYPE_STATIC; + break; + default: + row->u.Type = MIB_IPNET_TYPE_OTHER; } - HeapFree(GetProcessHeap(), 0, table); } - TRACE("returning %d\n", ret); - return ret; + + if (sort) qsort( table->table, table->dwNumEntries, sizeof(*table->table), ipnetrow_cmp ); + +err: + NsiFreeTable( keys, rw, dyn, NULL ); + return err; } static void ipnet_row2_fill( MIB_IPNET_ROW2 *row, USHORT fam, void *key, struct nsi_ip_neighbour_rw *rw, -- 2.23.0

1 0

[PATCH 2/4] iphlpapi: Implement GetIpNetTable2() on top of nsi.
by Huw Davies 10 Aug '21

10 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 107 ++++++++++++++++++++++++++++++---- dlls/nsi/tests/nsi.c | 2 - 2 files changed, 96 insertions(+), 13 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 2700ecd3172..6a9fb3d0914 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2276,6 +2276,102 @@ DWORD WINAPI GetIpNetTable(PMIB_IPNETTABLE pIpNetTable, PULONG pdwSize, BOOL bOr return ret; } +static void ipnet_row2_fill( MIB_IPNET_ROW2 *row, USHORT fam, void *key, struct nsi_ip_neighbour_rw *rw, + struct nsi_ip_neighbour_dynamic *dyn ) +{ + struct nsi_ipv4_neighbour_key *key4 = (struct nsi_ipv4_neighbour_key *)key; + struct nsi_ipv6_neighbour_key *key6 = (struct nsi_ipv6_neighbour_key *)key; + + if (fam == WS_AF_INET) + { + row->Address.Ipv4.sin_family = fam; + row->Address.Ipv4.sin_port = 0; + row->Address.Ipv4.sin_addr = key4->addr; + memset( &row->Address.Ipv4.sin_zero, 0, sizeof(row->Address.Ipv4.sin_zero) ); + row->InterfaceLuid = key4->luid; + } + else + { + row->Address.Ipv6.sin6_family = fam; + row->Address.Ipv6.sin6_port = 0; + row->Address.Ipv6.sin6_flowinfo = 0; + row->Address.Ipv6.sin6_addr = key6->addr; + row->Address.Ipv6.sin6_scope_id = 0; + row->InterfaceLuid = key6->luid; + } + + ConvertInterfaceLuidToIndex( &row->InterfaceLuid, &row->InterfaceIndex ); + + row->PhysicalAddressLength = dyn->phys_addr_len; + if (row->PhysicalAddressLength > sizeof(row->PhysicalAddress)) + row->PhysicalAddressLength = 0; + memcpy( row->PhysicalAddress, rw->phys_addr, row->PhysicalAddressLength ); + memset( row->PhysicalAddress + row->PhysicalAddressLength, 0, + sizeof(row->PhysicalAddress) - row->PhysicalAddressLength ); + row->State = dyn->state; + row->u.Flags = 0; + row->u.s.IsRouter = dyn->flags.is_router; + row->u.s.IsUnreachable = dyn->flags.is_unreachable; + row->ReachabilityTime.LastReachable = dyn->time; +} + +/****************************************************************** + * GetIpNetTable2 (IPHLPAPI.@) + */ +DWORD WINAPI GetIpNetTable2( ADDRESS_FAMILY family, MIB_IPNET_TABLE2 **table ) +{ + void *key[2] = { NULL, NULL }; + struct nsi_ip_neighbour_rw *rw[2] = { NULL, NULL }; + struct nsi_ip_neighbour_dynamic *dyn[2] = { NULL, NULL }; + static const USHORT fam[2] = { WS_AF_INET, WS_AF_INET6 }; + static const DWORD key_size[2] = { sizeof(struct nsi_ipv4_neighbour_key), sizeof(struct nsi_ipv6_neighbour_key) }; + DWORD err = ERROR_SUCCESS, i, size, count[2] = { 0, 0 }; + + TRACE( "%u, %p\n", family, table ); + + if (!table || (family != WS_AF_INET && family != WS_AF_INET6 && family != WS_AF_UNSPEC)) + return ERROR_INVALID_PARAMETER; + + for (i = 0; i < 2; i++) + { + if (family != WS_AF_UNSPEC && family != fam[i]) continue; + + err = NsiAllocateAndGetTable( 1, ip_module_id( fam[i] ), NSI_IP_NEIGHBOUR_TABLE, key + i, key_size[i], + (void **)rw + i, sizeof(**rw), (void **)dyn + i, sizeof(**dyn), + NULL, 0, count + i, 0 ); + if (err) count[i] = 0; + } + + size = FIELD_OFFSET(MIB_IPNET_TABLE2, Table[ count[0] + count[1] ]); + *table = heap_alloc( size ); + if (!*table) + { + err = ERROR_NOT_ENOUGH_MEMORY; + goto err; + } + + (*table)->NumEntries = count[0] + count[1]; + for (i = 0; i < count[0]; i++) + { + MIB_IPNET_ROW2 *row = (*table)->Table + i; + struct nsi_ipv4_neighbour_key *key4 = (struct nsi_ipv4_neighbour_key *)key[0]; + + ipnet_row2_fill( row, fam[0], key4 + i, rw[0] + i, dyn[0] + i ); + } + + for (i = 0; i < count[1]; i++) + { + MIB_IPNET_ROW2 *row = (*table)->Table + count[0] + i; + struct nsi_ipv6_neighbour_key *key6 = (struct nsi_ipv6_neighbour_key *)key[1]; + + ipnet_row2_fill( row, fam[1], key6 + i, rw[1] + i, dyn[1] + i ); + } + +err: + for (i = 0; i < 2; i++) NsiFreeTable( key[i], rw[i], dyn[i], NULL ); + return err; +} + /* Gets the DNS server list into the list beginning at list. Assumes that * 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, @@ -3559,17 +3655,6 @@ char *WINAPI IPHLP_if_indextoname( NET_IFINDEX index, char *name ) return name; } -/****************************************************************** - * GetIpNetTable2 (IPHLPAPI.@) - */ -DWORD WINAPI GetIpNetTable2(ADDRESS_FAMILY family, PMIB_IPNET_TABLE2 *table) -{ - static int once; - - if (!once++) FIXME("(%u %p): stub\n", family, table); - return ERROR_NOT_SUPPORTED; -} - /****************************************************************** * GetIpInterfaceTable (IPHLPAPI.@) */ diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 7acb7a497fb..f2a247d3333 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -508,9 +508,7 @@ todo_wine_if( family == AF_INET6 ) if (err) goto err; err = GetIpNetTable2( family, &table ); -todo_wine ok( !err, "got %x\n", err ); - if (err) goto err; err = NsiAllocateAndGetTable( 1, mod, NSI_IP_NEIGHBOUR_TABLE, (void **)&key_tbl_2, key_size, NULL, 0, (void **)&dyn_tbl_2, sizeof(*dyn), -- 2.23.0

1 0

[PATCH 1/4] nsiproxy: Implement IPv4 neighbour enumerate_all.
by Huw Davies 10 Aug '21

10 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/tests/nsi.c | 78 +++++++++++++++ dlls/nsiproxy.sys/ip.c | 219 +++++++++++++++++++++++++++++++++++++++++ include/netioapi.h | 2 + include/wine/nsi.h | 34 +++++++ 4 files changed, 333 insertions(+) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 9d12530cb27..7acb7a497fb 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -485,6 +485,82 @@ static void test_ip_unicast( int family ) winetest_pop_context(); } +static void test_ip_neighbour( int family ) +{ + const NPI_MODULEID *mod = (family == AF_INET) ? &NPI_MS_IPV4_MODULEID : &NPI_MS_IPV6_MODULEID; + DWORD err, i, count, count2, attempt; + struct nsi_ipv4_neighbour_key *key_tbl, *key_tbl_2, *key4; + struct nsi_ipv6_neighbour_key *key6; + struct nsi_ip_neighbour_rw *rw_tbl, *rw; + struct nsi_ip_neighbour_dynamic *dyn_tbl, *dyn_tbl_2, *dyn; + MIB_IPNET_TABLE2 *table; + DWORD key_size = (family == AF_INET) ? sizeof(struct nsi_ipv4_neighbour_key) : sizeof(struct nsi_ipv6_neighbour_key); + + winetest_push_context( family == AF_INET ? "AF_INET" : "AF_INET6" ); + + for (attempt = 0; attempt < 5; attempt++) + { + err = NsiAllocateAndGetTable( 1, mod, NSI_IP_NEIGHBOUR_TABLE, (void **)&key_tbl, key_size, + (void **)&rw_tbl, sizeof(*rw), (void **)&dyn_tbl, sizeof(*dyn), + NULL, 0, &count, 0 ); +todo_wine_if( family == AF_INET6 ) + ok( !err, "got %x\n", err ); + if (err) goto err; + + err = GetIpNetTable2( family, &table ); +todo_wine + ok( !err, "got %x\n", err ); + if (err) goto err; + + err = NsiAllocateAndGetTable( 1, mod, NSI_IP_NEIGHBOUR_TABLE, (void **)&key_tbl_2, key_size, + NULL, 0, (void **)&dyn_tbl_2, sizeof(*dyn), + NULL, 0, &count2, 0 ); + ok( !err, "got %x\n", err ); + if (count == count2 && !memcmp( dyn_tbl, dyn_tbl_2, count * sizeof(*dyn) )) break; + NsiFreeTable( key_tbl_2, NULL, dyn_tbl_2, NULL ); + NsiFreeTable( key_tbl, rw_tbl, dyn_tbl, NULL ); + } + + ok( count == table->NumEntries, "%d vs %d\n", count, table->NumEntries ); + + for (i = 0; i < count; i++) + { + MIB_IPNET_ROW2 *row = table->Table + i; + rw = rw_tbl + i; + dyn = dyn_tbl + i; + + if (family == AF_INET) + { + key4 = key_tbl + i; + ok( key4->addr.s_addr == row->Address.Ipv4.sin_addr.s_addr, "%08x vs %08x\n", key4->addr.s_addr, + row->Address.Ipv4.sin_addr.s_addr ); + ok( key4->luid.Value == row->InterfaceLuid.Value, "%s vs %s\n", wine_dbgstr_longlong( key4->luid.Value ), + wine_dbgstr_longlong( row->InterfaceLuid.Value ) ); + ok( key4->luid2.Value == row->InterfaceLuid.Value, "mismatch\n" ); + } + else if (family == AF_INET6) + { + key6 = (struct nsi_ipv6_neighbour_key *)key_tbl + i; + ok( !memcmp( key6->addr.s6_addr, row->Address.Ipv6.sin6_addr.s6_addr, sizeof(IN6_ADDR) ), "mismatch\n" ); + ok( key6->luid.Value == row->InterfaceLuid.Value, "mismatch\n" ); + ok( key6->luid2.Value == row->InterfaceLuid.Value, "mismatch\n" ); + } + + ok( dyn->phys_addr_len == row->PhysicalAddressLength, "mismatch\n" ); + ok( !memcmp( rw->phys_addr, row->PhysicalAddress, dyn->phys_addr_len ), "mismatch\n" ); + ok( dyn->state == row->State, "%x vs %x\n", dyn->state, row->State ); + ok( dyn->flags.is_router == row->IsRouter, "%x vs %x\n", dyn->flags.is_router, row->IsRouter ); + ok( dyn->flags.is_unreachable == row->IsUnreachable, "%x vs %x\n", dyn->flags.is_unreachable, row->IsUnreachable ); + ok( dyn->time == row->ReachabilityTime.LastReachable, "%x vs %x\n", dyn->time, row->ReachabilityTime.LastReachable ); + } + + NsiFreeTable( key_tbl_2, NULL, dyn_tbl_2, NULL ); + NsiFreeTable( key_tbl, rw_tbl, dyn_tbl, NULL ); + +err: + winetest_pop_context(); +} + static void test_ip_forward( int family ) { DWORD rw_sizes[] = { FIELD_OFFSET(struct nsi_ip_forward_rw, unk), @@ -606,6 +682,8 @@ START_TEST( nsi ) test_ip_unicast( AF_INET ); test_ip_unicast( AF_INET6 ); + test_ip_neighbour( AF_INET ); + test_ip_neighbour( AF_INET6 ); test_ip_forward( AF_INET ); test_ip_forward( AF_INET6 ); } diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index cb98c6a5206..9abb51ac678 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -41,10 +41,26 @@ #include <netinet/in.h> #endif +#ifdef HAVE_NETINET_IP_VAR_H +#include <netinet/ip_var.h> +#endif + +#ifdef HAVE_NETINET_IF_ETHER_H +#include <netinet/if_ether.h> +#endif + +#ifdef HAVE_NET_IF_DL_H +#include <net/if_dl.h> +#endif + #ifdef HAVE_IFADDRS_H #include <ifaddrs.h> #endif +#ifdef HAVE_ARPA_INET_H +#include <arpa/inet.h> +#endif + #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -234,6 +250,193 @@ static NTSTATUS ip_unicast_get_all_parameters( const void *key, DWORD key_size, return status; } +struct ipv4_neighbour_data +{ + NET_LUID luid; + DWORD if_index; + struct in_addr addr; + BYTE phys_addr[IF_MAX_PHYS_ADDRESS_LENGTH]; + DWORD state; + USHORT phys_addr_len; + BOOL is_router; + BOOL is_unreachable; +}; + +static void ipv4_neighbour_fill_entry( struct ipv4_neighbour_data *entry, struct nsi_ipv4_neighbour_key *key, struct nsi_ip_neighbour_rw *rw, + struct nsi_ip_neighbour_dynamic *dyn, void *stat ) +{ + USHORT phys_addr_len = entry->phys_addr_len > sizeof(rw->phys_addr) ? 0 : entry->phys_addr_len; + + if (key) + { + key->luid = entry->luid; + key->luid2 = entry->luid; + key->addr.WS_s_addr = entry->addr.s_addr; + key->pad = 0; + } + + if (rw) + { + memcpy( rw->phys_addr, entry->phys_addr, phys_addr_len ); + memset( rw->phys_addr + entry->phys_addr_len, 0, sizeof(rw->phys_addr) - phys_addr_len ); + } + + if (dyn) + { + memset( dyn, 0, sizeof(*dyn) ); + dyn->state = entry->state; + dyn->flags.is_router = entry->is_router; + dyn->flags.is_unreachable = entry->is_unreachable; + dyn->phys_addr_len = phys_addr_len; + } +} + +static NTSTATUS ipv4_neighbour_enumerate_all( void *key_data, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, + void *static_data, DWORD static_size, DWORD_PTR *count ) +{ + DWORD num = 0; + NTSTATUS status = STATUS_SUCCESS; + BOOL want_data = key_size || rw_size || dynamic_size || static_size; + struct ipv4_neighbour_data entry; + + 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 ); + +#ifdef __linux__ + { + char buf[512], *ptr; + DWORD atf_flags; + FILE *fp; + + if (!(fp = fopen( "/proc/net/arp", "r" ))) return STATUS_NOT_SUPPORTED; + + /* skip header line */ + ptr = fgets( buf, sizeof(buf), fp ); + while ((ptr = fgets( buf, sizeof(buf), fp ))) + { + entry.addr.s_addr = inet_addr( ptr ); + while (*ptr && !isspace( *ptr )) ptr++; + strtoul( ptr + 1, &ptr, 16 ); /* hw type (skip) */ + atf_flags = strtoul( ptr + 1, &ptr, 16 ); + + if (atf_flags & ATF_PERM) entry.state = NlnsPermanent; + else if (atf_flags & ATF_COM) entry.state = NlnsReachable; + else entry.state = NlnsStale; + + entry.is_router = 0; + entry.is_unreachable = !(atf_flags & (ATF_PERM | ATF_COM)); + + while (*ptr && isspace( *ptr )) ptr++; + entry.phys_addr_len = 0; + while (*ptr && !isspace( *ptr )) + { + if (entry.phys_addr_len >= sizeof(entry.phys_addr)) + { + entry.phys_addr_len = 0; + while (*ptr && !isspace( *ptr )) ptr++; + break; + } + entry.phys_addr[entry.phys_addr_len++] = strtoul( ptr, &ptr, 16 ); + if (*ptr) ptr++; + } + while (*ptr && isspace( *ptr )) ptr++; + while (*ptr && !isspace( *ptr )) ptr++; /* mask (skip) */ + while (*ptr && isspace( *ptr )) ptr++; + + if (!convert_unix_name_to_luid( ptr, &entry.luid )) continue; + if (!convert_luid_to_index( &entry.luid, &entry.if_index )) continue; + + if (num < *count) + { + 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++; + } + fclose( fp ); + } +#elif defined(HAVE_SYS_SYSCTL_H) + { + int mib[] = { CTL_NET, PF_ROUTE, 0, AF_INET, NET_RT_FLAGS, RTF_LLINFO }, sinarp_len; + size_t needed; + char *buf = NULL, *lim, *next; + struct rt_msghdr *rtm; + struct sockaddr_inarp *sinarp; + struct sockaddr_dl *sdl; + + if (sysctl( mib, ARRAY_SIZE(mib), NULL, &needed, NULL, 0 ) == -1) return STATUS_NOT_SUPPORTED; + + buf = heap_alloc( needed ); + if (!buf) return STATUS_NO_MEMORY; + + if (sysctl( mib, ARRAY_SIZE(mib), buf, &needed, NULL, 0 ) == -1) + { + heap_free( buf ); + return STATUS_NOT_SUPPORTED; + } + + lim = buf + needed; + next = buf; + while (next < lim) + { + rtm = (struct rt_msghdr *)next; + sinarp = (struct sockaddr_inarp *)(rtm + 1); + if (sinarp->sin_len) sinarp_len = (sinarp->sin_len + sizeof(int)-1) & ~(sizeof(int)-1); + else sinarp_len = sizeof(int); + sdl = (struct sockaddr_dl *)((char *)sinarp + sinarp_len); + + if (sdl->sdl_alen) /* arp entry */ + { + entry.addr = sinarp->sin_addr; + entry.if_index = sdl->sdl_index; + if (!convert_index_to_luid( entry.if_index, &entry.luid )) break; + entry.phys_addr_len = min( 8, sdl->sdl_alen ); + if (entry.phys_addr_len > sizeof(entry.phys_addr)) entry.phys_addr_len = 0; + memcpy( entry.phys_addr, &sdl->sdl_data[sdl->sdl_nlen], entry.phys_addr_len ); + if (rtm->rtm_rmx.rmx_expire == 0) entry.state = NlnsPermanent; + else entry.state = NlnsReachable; + entry.is_router = sinarp->sin_other & SIN_ROUTER; + entry.is_unreachable = 0; /* FIXME */ + + if (num < *count) + { + 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++; + } + next += rtm->rtm_msglen; + } + heap_free( buf ); + } +#else + FIXME( "not implemented\n" ); + return STATUS_NOT_IMPLEMENTED; +#endif + + if (!want_data || num <= *count) *count = num; + else status = STATUS_MORE_ENTRIES; + + return status; +} + +static NTSTATUS ipv6_neighbour_enumerate_all( void *key_data, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, + void *static_data, DWORD static_size, DWORD_PTR *count ) +{ + FIXME( "not implemented\n" ); + return STATUS_NOT_IMPLEMENTED; +} + struct ipv4_route_data { NET_LUID luid; @@ -489,6 +692,14 @@ static struct module_table ipv4_tables[] = ip_unicast_enumerate_all, ip_unicast_get_all_parameters, }, + { + NSI_IP_NEIGHBOUR_TABLE, + { + sizeof(struct nsi_ipv4_neighbour_key), sizeof(struct nsi_ip_neighbour_rw), + sizeof(struct nsi_ip_neighbour_dynamic), 0 + }, + ipv4_neighbour_enumerate_all, + }, { NSI_IP_FORWARD_TABLE, { @@ -519,6 +730,14 @@ static struct module_table ipv6_tables[] = ip_unicast_enumerate_all, ip_unicast_get_all_parameters, }, + { + NSI_IP_NEIGHBOUR_TABLE, + { + sizeof(struct nsi_ipv6_neighbour_key), sizeof(struct nsi_ip_neighbour_rw), + sizeof(struct nsi_ip_neighbour_dynamic), 0 + }, + ipv6_neighbour_enumerate_all, + }, { NSI_IP_FORWARD_TABLE, { diff --git a/include/netioapi.h b/include/netioapi.h index 44d877ae3c3..6005e58e216 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -257,6 +257,8 @@ DWORD WINAPI GetIfTable2Ex(MIB_IF_TABLE_LEVEL,MIB_IF_TABLE2**); DWORD WINAPI GetIpForwardEntry2(MIB_IPFORWARD_ROW2*); DWORD WINAPI GetIpForwardTable2(ADDRESS_FAMILY,MIB_IPFORWARD_TABLE2**); DWORD WINAPI GetIpInterfaceTable(ADDRESS_FAMILY,MIB_IPINTERFACE_TABLE**); +DWORD WINAPI GetIpNetEntry2(MIB_IPNET_ROW2*); +DWORD WINAPI GetIpNetTable2(ADDRESS_FAMILY,MIB_IPNET_TABLE2**); DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW*); DWORD WINAPI GetUnicastIpAddressTable(ADDRESS_FAMILY,MIB_UNICASTIPADDRESS_TABLE**); PCHAR WINAPI if_indextoname(NET_IFINDEX,PCHAR); diff --git a/include/wine/nsi.h b/include/wine/nsi.h index dd18c7c7511..437582ad692 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -98,6 +98,7 @@ struct nsi_ndis_ifinfo_static /* Undocumented NSI IP tables */ #define NSI_IP_UNICAST_TABLE 10 +#define NSI_IP_NEIGHBOUR_TABLE 11 #define NSI_IP_FORWARD_TABLE 16 struct nsi_ipv4_unicast_key @@ -134,6 +135,39 @@ struct nsi_ip_unicast_static ULONG64 creation_time; }; +struct nsi_ipv4_neighbour_key +{ + NET_LUID luid; + NET_LUID luid2; + IN_ADDR addr; + DWORD pad; +}; + +struct nsi_ipv6_neighbour_key +{ + NET_LUID luid; + NET_LUID luid2; + IN6_ADDR addr; +}; + +struct nsi_ip_neighbour_rw +{ + BYTE phys_addr[IF_MAX_PHYS_ADDRESS_LENGTH]; +}; + +struct nsi_ip_neighbour_dynamic +{ + DWORD state; + DWORD time; + struct + { + USHORT is_router : 1; + USHORT is_unreachable : 1; + } flags; + USHORT phys_addr_len; + DWORD unk; +}; + struct nsi_ipv4_forward_key { DWORD unk; -- 2.23.0

1 0

[PATCH 7/9] gdi32: Handle metafiles directly in OffsetWindowOrgEx.
by Jacek Caban 10 Aug '21

10 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 22 ---------------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 17 +++++++++++++++++ dlls/gdi32/mapping.c | 26 -------------------------- dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 22 insertions(+), 54 deletions(-)

2 1

[PATCH v2 9/9] gdi32: Use ntgdi name for GetTextCharsetInfo.
by Huw Davies 10 Aug '21

10 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 8 ++++---- dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/uniscribe/shape.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 2e49f19b461..7e087d68db3 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -4205,9 +4205,9 @@ static UINT get_text_charset_info(DC *dc, FONTSIGNATURE *fs, DWORD flags) } /*********************************************************************** - * GetTextCharsetInfo (GDI32.@) + * NtGdiGetTextCharsetInfo (win32u.@) */ -UINT WINAPI GetTextCharsetInfo(HDC hdc, FONTSIGNATURE *fs, DWORD flags) +UINT WINAPI NtGdiGetTextCharsetInfo( HDC hdc, FONTSIGNATURE *fs, DWORD flags ) { UINT ret = DEFAULT_CHARSET; DC *dc = get_dc_ptr(hdc); @@ -6977,7 +6977,7 @@ DWORD WINAPI GetFontLanguageInfo(HDC hdc) DWORD result=0; - GetTextCharsetInfo( hdc, &fontsig, 0 ); + NtGdiGetTextCharsetInfo( hdc, &fontsig, 0 ); /* We detect each flag we return using a bitmask on the Codepage Bitfields */ if( (fontsig.fsCsb[0]&GCP_DBCS_MASK)!=0 ) @@ -8083,7 +8083,7 @@ BOOL WINAPI GetFontResourceInfoW( LPCWSTR str, LPDWORD size, PVOID buffer, DWORD UINT WINAPI GetTextCharset(HDC hdc) { /* MSDN docs say this is equivalent */ - return GetTextCharsetInfo(hdc, NULL, 0); + return NtGdiGetTextCharsetInfo( hdc, NULL, 0 ); } /*********************************************************************** diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 7ff32c58c26..6b8ed856ffa 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -345,7 +345,7 @@ @ stdcall GetTextAlign(long) @ stdcall GetTextCharacterExtra(long) @ stdcall GetTextCharset(long) -@ stdcall GetTextCharsetInfo(long ptr long) +@ stdcall GetTextCharsetInfo(long ptr long) NtGdiGetTextCharsetInfo @ stdcall GetTextColor(long) @ stdcall GetTextExtentExPointA(long str long long ptr ptr ptr) @ stdcall GetTextExtentExPointI(long ptr long long ptr ptr ptr) diff --git a/dlls/gdi32/uniscribe/shape.c b/dlls/gdi32/uniscribe/shape.c index 843d670f1e9..d65476f67b4 100644 --- a/dlls/gdi32/uniscribe/shape.c +++ b/dlls/gdi32/uniscribe/shape.c @@ -23,7 +23,7 @@ #include "windef.h" #include "winbase.h" -#include "wingdi.h" +#include "ntgdi.h" #include "winuser.h" #include "winnls.h" #include "usp10.h" @@ -594,7 +594,7 @@ static OPENTYPE_TAG get_opentype_script(HDC hdc, const SCRIPT_ANALYSIS *psa, /* * fall back to the font charset */ - charset = GetTextCharsetInfo(hdc, NULL, 0x0); + charset = NtGdiGetTextCharsetInfo(hdc, NULL, 0x0); switch (charset) { case ANSI_CHARSET: -- 2.23.0

1 0

[PATCH v2 8/9] gdi32: Remove no longer used driver entry points.
by Huw Davies 10 Aug '21

10 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/dibdrv/dc.c | 14 -------------- dlls/gdi32/driver.c | 12 ------------ dlls/gdi32/enhmfdrv/init.c | 7 ------- dlls/gdi32/font.c | 7 ------- dlls/gdi32/mapping.c | 34 ---------------------------------- dlls/gdi32/mfdrv/init.c | 7 ------- dlls/gdi32/ntgdi_private.h | 6 ------ dlls/gdi32/path.c | 7 ------- dlls/wineandroid.drv/init.c | 7 ------- dlls/winemac.drv/gdi.c | 7 ------- dlls/wineps.drv/init.c | 7 ------- dlls/winex11.drv/init.c | 7 ------- dlls/winex11.drv/xrender.c | 7 ------- include/wine/gdi_driver.h | 9 +-------- 14 files changed, 1 insertion(+), 137 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 467cdb144e6..e12c5ec0751 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -682,8 +682,6 @@ const struct gdi_dc_funcs dib_driver = dibdrv_LineTo, /* pLineTo */ NULL, /* pModifyWorldTransform */ NULL, /* pMoveTo */ - NULL, /* pOffsetViewportOrg */ - NULL, /* pOffsetWindowOrg */ dibdrv_PaintRgn, /* pPaintRgn */ dibdrv_PatBlt, /* pPatBlt */ dibdrv_Pie, /* pPie */ @@ -704,7 +702,6 @@ const struct gdi_dc_funcs dib_driver = dibdrv_SelectBrush, /* pSelectBrush */ NULL, /* pSelectClipPath */ dibdrv_SelectFont, /* pSelectFont */ - NULL, /* pSelectPalette */ dibdrv_SelectPen, /* pSelectPen */ NULL, /* pSetBkColor */ dibdrv_SetBoundsRect, /* pSetBoundsRect */ @@ -715,10 +712,6 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pSetDeviceGammaRamp */ dibdrv_SetPixel, /* pSetPixel */ NULL, /* pSetTextColor */ - NULL, /* pSetViewportExt */ - NULL, /* pSetViewportOrg */ - NULL, /* pSetWindowExt */ - NULL, /* pSetWindowOrg */ NULL, /* pSetWorldTransform */ NULL, /* pStartDoc */ NULL, /* pStartPage */ @@ -1262,8 +1255,6 @@ static const struct gdi_dc_funcs window_driver = windrv_LineTo, /* pLineTo */ NULL, /* pModifyWorldTransform */ NULL, /* pMoveTo */ - NULL, /* pOffsetViewportOrg */ - NULL, /* pOffsetWindowOrg */ windrv_PaintRgn, /* pPaintRgn */ windrv_PatBlt, /* pPatBlt */ windrv_Pie, /* pPie */ @@ -1284,7 +1275,6 @@ static const struct gdi_dc_funcs window_driver = NULL, /* pSelectBrush */ NULL, /* pSelectClipPath */ NULL, /* pSelectFont */ - NULL, /* pSelectPalette */ NULL, /* pSelectPen */ NULL, /* pSetBkColor */ windrv_SetBoundsRect, /* pSetBoundsRect */ @@ -1295,10 +1285,6 @@ static const struct gdi_dc_funcs window_driver = NULL, /* pSetDeviceGammaRamp */ windrv_SetPixel, /* pSetPixel */ NULL, /* pSetTextColor */ - NULL, /* pSetViewportExt */ - NULL, /* pSetViewportOrg */ - NULL, /* pSetWindowExt */ - NULL, /* pSetWindowOrg */ NULL, /* pSetWorldTransform */ NULL, /* pStartDoc */ NULL, /* pStartPage */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 21e066630fc..eb4fd2ae99c 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -751,11 +751,6 @@ static HFONT CDECL nulldrv_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) return font; } -static HPALETTE CDECL nulldrv_SelectPalette( PHYSDEV dev, HPALETTE palette, BOOL bkgnd ) -{ - return palette; -} - static HPEN CDECL nulldrv_SelectPen( PHYSDEV dev, HPEN pen, const struct brush_pattern *pattern ) { return pen; @@ -898,8 +893,6 @@ const struct gdi_dc_funcs null_driver = nulldrv_LineTo, /* pLineTo */ nulldrv_ModifyWorldTransform, /* pModifyWorldTransform */ nulldrv_MoveTo, /* pMoveTo */ - nulldrv_OffsetViewportOrgEx, /* pOffsetViewportOrg */ - nulldrv_OffsetWindowOrgEx, /* pOffsetWindowOrg */ nulldrv_PaintRgn, /* pPaintRgn */ nulldrv_PatBlt, /* pPatBlt */ nulldrv_Pie, /* pPie */ @@ -920,7 +913,6 @@ const struct gdi_dc_funcs null_driver = nulldrv_SelectBrush, /* pSelectBrush */ nulldrv_SelectClipPath, /* pSelectClipPath */ nulldrv_SelectFont, /* pSelectFont */ - nulldrv_SelectPalette, /* pSelectPalette */ nulldrv_SelectPen, /* pSelectPen */ nulldrv_SetBkColor, /* pSetBkColor */ nulldrv_SetBoundsRect, /* pSetBoundsRect */ @@ -931,10 +923,6 @@ const struct gdi_dc_funcs null_driver = nulldrv_SetDeviceGammaRamp, /* pSetDeviceGammaRamp */ nulldrv_SetPixel, /* pSetPixel */ nulldrv_SetTextColor, /* pSetTextColor */ - nulldrv_SetViewportExtEx, /* pSetViewportExt */ - nulldrv_SetViewportOrgEx, /* pSetViewportOrg */ - nulldrv_SetWindowExtEx, /* pSetWindowExt */ - nulldrv_SetWindowOrgEx, /* pSetWindowOrg */ nulldrv_SetWorldTransform, /* pSetWorldTransform */ nulldrv_StartDoc, /* pStartDoc */ nulldrv_StartPage, /* pStartPage */ diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 424f69cd9b4..df34ae57756 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -96,8 +96,6 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_LineTo, /* pLineTo */ EMFDRV_ModifyWorldTransform, /* pModifyWorldTransform */ NULL, /* pMoveTo */ - NULL, /* pOffsetViewportOrgEx */ - NULL, /* pOffsetWindowOrgEx */ NULL, /* pPaintRgn */ EMFDRV_PatBlt, /* pPatBlt */ EMFDRV_Pie, /* pPie */ @@ -118,7 +116,6 @@ static const struct gdi_dc_funcs emfdrv_driver = NULL, /* pSelectBrush */ EMFDRV_SelectClipPath, /* pSelectClipPath */ EMFDRV_SelectFont, /* pSelectFont */ - NULL, /* pSelectPalette */ NULL, /* pSelectPen */ EMFDRV_SetBkColor, /* pSetBkColor */ NULL, /* pSetBoundsRect */ @@ -129,10 +126,6 @@ static const struct gdi_dc_funcs emfdrv_driver = NULL, /* pSetDeviceGammaRamp */ EMFDRV_SetPixel, /* pSetPixel */ EMFDRV_SetTextColor, /* pSetTextColor */ - NULL, /* pSetViewportExtEx */ - NULL, /* pSetViewportOrgEx */ - NULL, /* pSetWindowExtEx */ - NULL, /* pSetWindowOrgEx */ EMFDRV_SetWorldTransform, /* pSetWorldTransform */ NULL, /* pStartDoc */ NULL, /* pStartPage */ diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index b8dc2cc4b1f..2e49f19b461 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3873,8 +3873,6 @@ const struct gdi_dc_funcs font_driver = NULL, /* pLineTo */ NULL, /* pModifyWorldTransform */ NULL, /* pMoveTo */ - NULL, /* pOffsetViewportOrg */ - NULL, /* pOffsetWindowOrg */ NULL, /* pPaintRgn */ NULL, /* pPatBlt */ NULL, /* pPie */ @@ -3895,7 +3893,6 @@ const struct gdi_dc_funcs font_driver = NULL, /* pSelectBrush */ NULL, /* pSelectClipPath */ font_SelectFont, /* pSelectFont */ - NULL, /* pSelectPalette */ NULL, /* pSelectPen */ NULL, /* pSetBkColor */ NULL, /* pSetBoundsRect */ @@ -3906,10 +3903,6 @@ const struct gdi_dc_funcs font_driver = NULL, /* pSetDeviceGammaRamp */ NULL, /* pSetPixel */ NULL, /* pSetTextColor */ - NULL, /* pSetViewportExt */ - NULL, /* pSetViewportOrg */ - NULL, /* pSetWindowExt */ - NULL, /* pSetWindowOrg */ NULL, /* pSetWorldTransform */ NULL, /* pStartDoc */ NULL, /* pStartPage */ diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index 3dcaf3f430f..f21b965bc4b 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -82,20 +82,6 @@ static void MAPPING_FixIsotropic( DC * dc ) } -/*********************************************************************** - * null driver fallback implementations - */ - -BOOL CDECL nulldrv_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) -{ - return TRUE; -} - -BOOL CDECL nulldrv_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) -{ - return TRUE; -} - BOOL set_map_mode( DC *dc, int mode ) { SIZE virtual_size, virtual_res; @@ -155,26 +141,6 @@ BOOL set_map_mode( DC *dc, int mode ) return TRUE; } -BOOL CDECL nulldrv_SetViewportExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) -{ - return TRUE; -} - -BOOL CDECL nulldrv_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) -{ - return TRUE; -} - -BOOL CDECL nulldrv_SetWindowExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) -{ - return TRUE; -} - -BOOL CDECL nulldrv_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) -{ - return TRUE; -} - BOOL CDECL nulldrv_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD mode ) { DC *dc = get_nulldrv_dc( dev ); diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index e6c2a905df8..17bef62018c 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -161,8 +161,6 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pLineTo */ NULL, /* pModifyWorldTransform */ NULL, /* pMoveTo */ - NULL, /* pOffsetViewportOrgEx */ - NULL, /* pOffsetWindowOrgEx */ NULL, /* pPaintRgn */ NULL, /* pPatBlt */ NULL, /* pPie */ @@ -183,7 +181,6 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pSelectBrush */ MFDRV_SelectClipPath, /* pSelectClipPath */ NULL, /* pSelectFont */ - NULL, /* pSelectPalette */ NULL, /* pSelectPen */ MFDRV_SetBkColor, /* pSetBkColor */ MFDRV_SetBoundsRect, /* pSetBoundsRect */ @@ -194,10 +191,6 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pSetDeviceGammaRamp */ NULL, /* pSetPixel */ MFDRV_SetTextColor, /* pSetTextColor */ - NULL, /* pSetViewportExtEx */ - NULL, /* pSetViewportOrgEx */ - NULL, /* pSetWindowExtEx */ - NULL, /* pSetWindowOrgEx */ NULL, /* pSetWorldTransform */ NULL, /* pStartDoc */ NULL, /* pStartPage */ diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 62e6e5101ee..560414b93c9 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -569,8 +569,6 @@ extern BOOL CDECL nulldrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULON void * grad_array, ULONG ngrad, ULONG mode ) DECLSPEC_HIDDEN; extern BOOL CDECL nulldrv_InvertRgn( PHYSDEV dev, HRGN rgn ) DECLSPEC_HIDDEN; extern BOOL CDECL nulldrv_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD mode ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL nulldrv_PolyBezier( PHYSDEV dev, const POINT *points, DWORD count ) DECLSPEC_HIDDEN; extern BOOL CDECL nulldrv_PolyBezierTo( PHYSDEV dev, const POINT *points, DWORD count ) DECLSPEC_HIDDEN; extern BOOL CDECL nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types, DWORD count ) DECLSPEC_HIDDEN; @@ -580,10 +578,6 @@ extern BOOL CDECL nulldrv_SelectClipPath( PHYSDEV dev, INT mode ) DECLSPEC_HIDDE extern INT CDECL nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD width, DWORD height, INT x_src, INT y_src, UINT start, UINT lines, const void *bits, BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_SetViewportExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_SetWindowExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL nulldrv_SetWorldTransform( PHYSDEV dev, const XFORM *xform ) DECLSPEC_HIDDEN; extern BOOL CDECL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 57a93658abd..720b877e65c 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -2134,8 +2134,6 @@ const struct gdi_dc_funcs path_driver = pathdrv_LineTo, /* pLineTo */ NULL, /* pModifyWorldTransform */ pathdrv_MoveTo, /* pMoveTo */ - NULL, /* pOffsetViewportOrg */ - NULL, /* pOffsetWindowOrg */ NULL, /* pPaintRgn */ NULL, /* pPatBlt */ pathdrv_Pie, /* pPie */ @@ -2156,7 +2154,6 @@ const struct gdi_dc_funcs path_driver = NULL, /* pSelectBrush */ NULL, /* pSelectClipPath */ NULL, /* pSelectFont */ - NULL, /* pSelectPalette */ NULL, /* pSelectPen */ NULL, /* pSetBkColor */ NULL, /* pSetBoundsRect */ @@ -2167,10 +2164,6 @@ const struct gdi_dc_funcs path_driver = NULL, /* pSetDeviceGammaRamp */ NULL, /* pSetPixel */ NULL, /* pSetTextColor */ - NULL, /* pSetViewportExt */ - NULL, /* pSetViewportOrg */ - NULL, /* pSetWindowExt */ - NULL, /* pSetWindowOrg */ NULL, /* pSetWorldTransform */ NULL, /* pStartDoc */ NULL, /* pStartPage */ diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index b3d4f945993..474c3089677 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -343,8 +343,6 @@ static const struct gdi_dc_funcs android_drv_funcs = NULL, /* pLineTo */ NULL, /* pModifyWorldTransform */ NULL, /* pMoveTo */ - NULL, /* pOffsetViewportOrg */ - NULL, /* pOffsetWindowOrg */ NULL, /* pPaintRgn */ NULL, /* pPatBlt */ NULL, /* pPie */ @@ -365,7 +363,6 @@ static const struct gdi_dc_funcs android_drv_funcs = NULL, /* pSelectBrush */ NULL, /* pSelectClipPath */ NULL, /* pSelectFont */ - NULL, /* pSelectPalette */ NULL, /* pSelectPen */ NULL, /* pSetBkColor */ NULL, /* pSetBoundsRect */ @@ -376,10 +373,6 @@ static const struct gdi_dc_funcs android_drv_funcs = NULL, /* pSetDeviceGammaRamp */ NULL, /* pSetPixel */ NULL, /* pSetTextColor */ - NULL, /* pSetViewportExt */ - NULL, /* pSetViewportOrg */ - NULL, /* pSetWindowExt */ - NULL, /* pSetWindowOrg */ NULL, /* pSetWorldTransform */ NULL, /* pStartDoc */ NULL, /* pStartPage */ diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index b657afd5943..7c635c200d9 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -323,8 +323,6 @@ static const struct gdi_dc_funcs macdrv_funcs = NULL, /* pLineTo */ NULL, /* pModifyWorldTransform */ NULL, /* pMoveTo */ - NULL, /* pOffsetViewportOrg */ - NULL, /* pOffsetWindowOrg */ NULL, /* pPaintRgn */ NULL, /* pPatBlt */ NULL, /* pPie */ @@ -345,7 +343,6 @@ static const struct gdi_dc_funcs macdrv_funcs = NULL, /* pSelectBrush */ NULL, /* pSelectClipPath */ NULL, /* pSelectFont */ - NULL, /* pSelectPalette */ NULL, /* pSelectPen */ NULL, /* pSetBkColor */ NULL, /* pSetBoundsRect */ @@ -356,10 +353,6 @@ static const struct gdi_dc_funcs macdrv_funcs = macdrv_SetDeviceGammaRamp, /* pSetDeviceGammaRamp */ NULL, /* pSetPixel */ NULL, /* pSetTextColor */ - NULL, /* pSetViewportExt */ - NULL, /* pSetViewportOrg */ - NULL, /* pSetWindowExt */ - NULL, /* pSetWindowOrg */ NULL, /* pSetWorldTransform */ NULL, /* pStartDoc */ NULL, /* pStartPage */ diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index e71e82e092f..673f36749ae 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -837,8 +837,6 @@ static const struct gdi_dc_funcs psdrv_funcs = PSDRV_LineTo, /* pLineTo */ NULL, /* pModifyWorldTransform */ NULL, /* pMoveTo */ - NULL, /* pOffsetViewportOrg */ - NULL, /* pOffsetWindowOrg */ PSDRV_PaintRgn, /* pPaintRgn */ PSDRV_PatBlt, /* pPatBlt */ PSDRV_Pie, /* pPie */ @@ -859,7 +857,6 @@ static const struct gdi_dc_funcs psdrv_funcs = PSDRV_SelectBrush, /* pSelectBrush */ NULL, /* pSelectClipPath */ PSDRV_SelectFont, /* pSelectFont */ - NULL, /* pSelectPalette */ PSDRV_SelectPen, /* pSelectPen */ PSDRV_SetBkColor, /* pSetBkColor */ NULL, /* pSetBoundsRect */ @@ -870,10 +867,6 @@ static const struct gdi_dc_funcs psdrv_funcs = NULL, /* pSetDeviceGammaRamp */ PSDRV_SetPixel, /* pSetPixel */ PSDRV_SetTextColor, /* pSetTextColor */ - NULL, /* pSetViewportExt */ - NULL, /* pSetViewportOrg */ - NULL, /* pSetWindowExt */ - NULL, /* pSetWindowOrg */ NULL, /* pSetWorldTransform */ PSDRV_StartDoc, /* pStartDoc */ PSDRV_StartPage, /* pStartPage */ diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 937286b8601..1c14d62ce3c 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -402,8 +402,6 @@ static const struct gdi_dc_funcs x11drv_funcs = X11DRV_LineTo, /* pLineTo */ NULL, /* pModifyWorldTransform */ NULL, /* pMoveTo */ - NULL, /* pOffsetViewportOrg */ - NULL, /* pOffsetWindowOrg */ X11DRV_PaintRgn, /* pPaintRgn */ X11DRV_PatBlt, /* pPatBlt */ X11DRV_Pie, /* pPie */ @@ -424,7 +422,6 @@ static const struct gdi_dc_funcs x11drv_funcs = X11DRV_SelectBrush, /* pSelectBrush */ NULL, /* pSelectClipPath */ X11DRV_SelectFont, /* pSelectFont */ - NULL, /* pSelectPalette */ X11DRV_SelectPen, /* pSelectPen */ NULL, /* pSetBkColor */ X11DRV_SetBoundsRect, /* pSetBoundsRect */ @@ -435,10 +432,6 @@ static const struct gdi_dc_funcs x11drv_funcs = X11DRV_SetDeviceGammaRamp, /* pSetDeviceGammaRamp */ X11DRV_SetPixel, /* pSetPixel */ NULL, /* pSetTextColor */ - NULL, /* pSetViewportExt */ - NULL, /* pSetViewportOrg */ - NULL, /* pSetWindowExt */ - NULL, /* pSetWindowOrg */ NULL, /* pSetWorldTransform */ NULL, /* pStartDoc */ NULL, /* pStartPage */ diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 3ab576ea8d5..804982d1a3c 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2214,8 +2214,6 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pLineTo */ NULL, /* pModifyWorldTransform */ NULL, /* pMoveTo */ - NULL, /* pOffsetViewportOrg */ - NULL, /* pOffsetWindowOrg */ NULL, /* pPaintRgn */ NULL, /* pPatBlt */ NULL, /* pPie */ @@ -2236,7 +2234,6 @@ static const struct gdi_dc_funcs xrender_funcs = xrenderdrv_SelectBrush, /* pSelectBrush */ NULL, /* pSelectClipPath */ xrenderdrv_SelectFont, /* pSelectFont */ - NULL, /* pSelectPalette */ NULL, /* pSelectPen */ NULL, /* pSetBkColor */ NULL, /* pSetBoundsRect */ @@ -2247,10 +2244,6 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pSetDeviceGammaRamp */ NULL, /* pSetPixel */ NULL, /* pSetTextColor */ - NULL, /* pSetViewportExt */ - NULL, /* pSetViewportOrg */ - NULL, /* pSetWindowExt */ - NULL, /* pSetWindowOrg */ NULL, /* pSetWorldTransform */ NULL, /* pStartDoc */ NULL, /* pStartPage */ diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index ffa730f9105..13aac87887f 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -127,8 +127,6 @@ struct gdi_dc_funcs BOOL (CDECL *pLineTo)(PHYSDEV,INT,INT); BOOL (CDECL *pModifyWorldTransform)(PHYSDEV,const XFORM*,DWORD); BOOL (CDECL *pMoveTo)(PHYSDEV,INT,INT); - BOOL (CDECL *pOffsetViewportOrgEx)(PHYSDEV,INT,INT,POINT*); - BOOL (CDECL *pOffsetWindowOrgEx)(PHYSDEV,INT,INT,POINT*); BOOL (CDECL *pPaintRgn)(PHYSDEV,HRGN); BOOL (CDECL *pPatBlt)(PHYSDEV,struct bitblt_coords*,DWORD); BOOL (CDECL *pPie)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT); @@ -149,7 +147,6 @@ struct gdi_dc_funcs HBRUSH (CDECL *pSelectBrush)(PHYSDEV,HBRUSH,const struct brush_pattern*); BOOL (CDECL *pSelectClipPath)(PHYSDEV,INT); HFONT (CDECL *pSelectFont)(PHYSDEV,HFONT,UINT*); - HPALETTE (CDECL *pSelectPalette)(PHYSDEV,HPALETTE,BOOL); HPEN (CDECL *pSelectPen)(PHYSDEV,HPEN,const struct brush_pattern*); COLORREF (CDECL *pSetBkColor)(PHYSDEV,COLORREF); UINT (CDECL *pSetBoundsRect)(PHYSDEV,RECT*,UINT); @@ -160,10 +157,6 @@ struct gdi_dc_funcs BOOL (CDECL *pSetDeviceGammaRamp)(PHYSDEV,LPVOID); COLORREF (CDECL *pSetPixel)(PHYSDEV,INT,INT,COLORREF); COLORREF (CDECL *pSetTextColor)(PHYSDEV,COLORREF); - BOOL (CDECL *pSetViewportExtEx)(PHYSDEV,INT,INT,SIZE*); - BOOL (CDECL *pSetViewportOrgEx)(PHYSDEV,INT,INT,POINT*); - BOOL (CDECL *pSetWindowExtEx)(PHYSDEV,INT,INT,SIZE*); - BOOL (CDECL *pSetWindowOrgEx)(PHYSDEV,INT,INT,POINT*); BOOL (CDECL *pSetWorldTransform)(PHYSDEV,const XFORM*); INT (CDECL *pStartDoc)(PHYSDEV,const DOCINFOW*); INT (CDECL *pStartPage)(PHYSDEV); @@ -183,7 +176,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 58 +#define WINE_GDI_DRIVER_VERSION 59 #define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */ -- 2.23.0

1 0

[PATCH v2 7/9] gdi32: Handle metafiles directly in OffsetWindowOrgEx.
by Huw Davies 10 Aug '21

10 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 22 ---------------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 17 +++++++++++++++++ dlls/gdi32/mapping.c | 26 -------------------------- dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 22 insertions(+), 54 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 4db80ceb9cd..4e7602f1f38 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -349,28 +349,6 @@ BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD m return ret; } -BOOL CDECL EMFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) -{ - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pOffsetWindowOrgEx ); - EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); - EMRSETWINDOWORGEX emr; - POINT prev; - BOOL ret; - - GetWindowOrgEx( dev->hdc, &prev ); - - emr.emr.iType = EMR_SETWINDOWORGEX; - emr.emr.nSize = sizeof(emr); - emr.ptlOrigin.x = prev.x + x; - emr.ptlOrigin.y = prev.y + y; - - if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; - physDev->modifying_transform++; - ret = next->funcs->pOffsetWindowOrgEx( next, x, y, pt ); - physDev->modifying_transform--; - return ret; -} - BOOL EMFDC_SetMapperFlags( DC_ATTR *dc_attr, DWORD flags ) { EMRSETMAPPERFLAGS emr; diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 23a46ebfc55..7e289dd04c5 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -82,7 +82,6 @@ extern BOOL CDECL EMFDRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, U extern BOOL CDECL EMFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD mode ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index c8d68fbc782..424f69cd9b4 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -97,7 +97,7 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_ModifyWorldTransform, /* pModifyWorldTransform */ NULL, /* pMoveTo */ NULL, /* pOffsetViewportOrgEx */ - EMFDRV_OffsetWindowOrgEx, /* pOffsetWindowOrgEx */ + NULL, /* pOffsetWindowOrgEx */ NULL, /* pPaintRgn */ EMFDRV_PatBlt, /* pPatBlt */ EMFDRV_Pie, /* pPie */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 700632c803d..489f4475736 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -68,6 +68,7 @@ extern BOOL METADC_LineTo( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL METADC_MoveTo( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL METADC_OffsetClipRgn( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL METADC_OffsetViewportOrgEx( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; +extern BOOL METADC_OffsetWindowOrgEx( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL METADC_PaintRgn( HDC hdc, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL METADC_PatBlt( HDC hdc, INT left, INT top, INT width, INT height, DWORD rop ); extern BOOL METADC_Pie( HDC hdc, INT left, INT top, INT right, INT bottom, diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index a0a07bb97be..5e6cd9dbb04 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -501,6 +501,23 @@ BOOL WINAPI SetWindowOrgEx( HDC hdc, INT x, INT y, POINT *point ) return NtGdiComputeXformCoefficients( hdc ); } +/*********************************************************************** + * OffsetWindowOrgEx (GDI32.@) + */ +BOOL WINAPI OffsetWindowOrgEx( HDC hdc, INT x, INT y, POINT *point ) +{ + DC_ATTR *dc_attr; + + if (is_meta_dc( hdc )) return METADC_OffsetWindowOrgEx( hdc, x, y ); + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (point) *point = dc_attr->wnd_org; + dc_attr->wnd_org.x += x; + dc_attr->wnd_org.y += y; + if (dc_attr->emf && !EMFDC_SetWindowOrgEx( dc_attr, dc_attr->wnd_org.x, + dc_attr->wnd_org.y )) return FALSE; + return NtGdiComputeXformCoefficients( hdc ); +} + /*********************************************************************** * GetViewportExtEx (GDI32.@) */ diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index 452d0597835..3dcaf3f430f 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -93,14 +93,6 @@ BOOL CDECL nulldrv_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) BOOL CDECL nulldrv_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) { - DC *dc = get_nulldrv_dc( dev ); - - if (pt) - *pt = dc->attr->wnd_org; - - dc->attr->wnd_org.x += x; - dc->attr->wnd_org.y += y; - DC_UpdateXforms( dc ); return TRUE; } @@ -336,24 +328,6 @@ BOOL WINAPI NtGdiComputeXformCoefficients( HDC hdc ) } -/*********************************************************************** - * OffsetWindowOrgEx (GDI32.@) - */ -BOOL WINAPI OffsetWindowOrgEx( HDC hdc, INT x, INT y, LPPOINT pt ) -{ - BOOL ret = FALSE; - DC * dc = get_dc_ptr( hdc ); - - if (dc) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pOffsetWindowOrgEx ); - ret = physdev->funcs->pOffsetWindowOrgEx( physdev, x, y, pt ); - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * NtGdiScaleViewportExtEx (win32u.@) */ diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index a9147fc9354..6b7b58070b4 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -120,9 +120,9 @@ BOOL METADC_OffsetViewportOrgEx( HDC hdc, INT x, INT y ) return metadc_param2( hdc, META_OFFSETVIEWPORTORG, x, y ); } -BOOL CDECL MFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) +BOOL METADC_OffsetWindowOrgEx( HDC hdc, INT x, INT y ) { - return MFDRV_MetaParam2( dev, META_OFFSETWINDOWORG, x, y ); + return metadc_param2( hdc, META_OFFSETWINDOWORG, x, y ); } BOOL METADC_ScaleViewportExtEx( HDC hdc, INT x_num, INT x_denom, INT y_num, INT y_denom ) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index dbdbc92bd11..e6c2a905df8 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -162,7 +162,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pModifyWorldTransform */ NULL, /* pMoveTo */ NULL, /* pOffsetViewportOrgEx */ - MFDRV_OffsetWindowOrgEx, /* pOffsetWindowOrgEx */ + NULL, /* pOffsetWindowOrgEx */ NULL, /* pPaintRgn */ NULL, /* pPatBlt */ NULL, /* pPie */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 7650c8d54e9..01f4f618432 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -88,7 +88,6 @@ extern BOOL CDECL MFDRV_EndPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_FillRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_FlattenPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_PolyBezier( PHYSDEV dev, const POINT* pt, DWORD count ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_PolyBezierTo( PHYSDEV dev, const POINT* pt, DWORD count ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_RestoreDC( PHYSDEV dev, INT level ) DECLSPEC_HIDDEN; -- 2.23.0

1 0

[PATCH v2 6/9] gdi32: Handle metafiles directly in OffsetViewportOrgEx.
by Huw Davies 10 Aug '21

10 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 22 ---------------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 17 +++++++++++++++++ dlls/gdi32/mapping.c | 25 ------------------------- dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 22 insertions(+), 53 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index e67380d7766..4db80ceb9cd 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -349,28 +349,6 @@ BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD m return ret; } -BOOL CDECL EMFDRV_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) -{ - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pOffsetViewportOrgEx ); - EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); - EMRSETVIEWPORTORGEX emr; - POINT prev; - BOOL ret; - - GetViewportOrgEx( dev->hdc, &prev ); - - emr.emr.iType = EMR_SETVIEWPORTORGEX; - emr.emr.nSize = sizeof(emr); - emr.ptlOrigin.x = prev.x + x; - emr.ptlOrigin.y = prev.y + y; - - if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; - physDev->modifying_transform++; - ret = next->funcs->pOffsetViewportOrgEx( next, x, y, pt ); - physDev->modifying_transform--; - return ret; -} - BOOL CDECL EMFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pOffsetWindowOrgEx ); diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 3af92286d1f..23a46ebfc55 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -82,7 +82,6 @@ extern BOOL CDECL EMFDRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, U extern BOOL CDECL EMFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD mode ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 0b1d2fbb1cf..c8d68fbc782 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -96,7 +96,7 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_LineTo, /* pLineTo */ EMFDRV_ModifyWorldTransform, /* pModifyWorldTransform */ NULL, /* pMoveTo */ - EMFDRV_OffsetViewportOrgEx, /* pOffsetViewportOrgEx */ + NULL, /* pOffsetViewportOrgEx */ EMFDRV_OffsetWindowOrgEx, /* pOffsetWindowOrgEx */ NULL, /* pPaintRgn */ EMFDRV_PatBlt, /* pPatBlt */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index f3ce7b910fa..700632c803d 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -67,6 +67,7 @@ extern BOOL METADC_InvertRgn( HDC hdc, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL METADC_LineTo( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL METADC_MoveTo( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL METADC_OffsetClipRgn( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; +extern BOOL METADC_OffsetViewportOrgEx( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL METADC_PaintRgn( HDC hdc, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL METADC_PatBlt( HDC hdc, INT left, INT top, INT width, INT height, DWORD rop ); extern BOOL METADC_Pie( HDC hdc, INT left, INT top, INT right, INT bottom, diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index f58f93d036d..a0a07bb97be 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -559,6 +559,23 @@ BOOL WINAPI SetViewportOrgEx( HDC hdc, INT x, INT y, POINT *point ) return NtGdiComputeXformCoefficients( hdc ); } +/*********************************************************************** + * OffsetViewportOrgEx (GDI32.@) + */ +BOOL WINAPI OffsetViewportOrgEx( HDC hdc, INT x, INT y, POINT *point ) +{ + DC_ATTR *dc_attr; + + if (is_meta_dc( hdc )) return METADC_OffsetViewportOrgEx( hdc, x, y ); + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (point) *point = dc_attr->vport_org; + dc_attr->vport_org.x += x; + dc_attr->vport_org.y += y; + if (dc_attr->emf && !EMFDC_SetViewportOrgEx( dc_attr, dc_attr->vport_org.x, + dc_attr->vport_org.y )) return FALSE; + return NtGdiComputeXformCoefficients( hdc ); +} + /*********************************************************************** * GetWorldTransform (GDI32.@) */ diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index 6c22349a371..452d0597835 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -88,13 +88,6 @@ static void MAPPING_FixIsotropic( DC * dc ) BOOL CDECL nulldrv_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) { - DC *dc = get_nulldrv_dc( dev ); - - if (pt) *pt = dc->attr->vport_org; - - dc->attr->vport_org.x += x; - dc->attr->vport_org.y += y; - DC_UpdateXforms( dc ); return TRUE; } @@ -343,24 +336,6 @@ BOOL WINAPI NtGdiComputeXformCoefficients( HDC hdc ) } -/*********************************************************************** - * OffsetViewportOrgEx (GDI32.@) - */ -BOOL WINAPI OffsetViewportOrgEx( HDC hdc, INT x, INT y, LPPOINT pt) -{ - BOOL ret = FALSE; - DC * dc = get_dc_ptr( hdc ); - - if (dc) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pOffsetViewportOrgEx ); - ret = physdev->funcs->pOffsetViewportOrgEx( physdev, x, y, pt ); - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * OffsetWindowOrgEx (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index 9818dc0d9d9..a9147fc9354 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -115,9 +115,9 @@ BOOL METADC_SetWindowOrgEx( HDC hdc, INT x, INT y ) return metadc_param2( hdc, META_SETWINDOWORG, x, y ); } -BOOL CDECL MFDRV_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) +BOOL METADC_OffsetViewportOrgEx( HDC hdc, INT x, INT y ) { - return MFDRV_MetaParam2( dev, META_OFFSETVIEWPORTORG, x, y ); + return metadc_param2( hdc, META_OFFSETVIEWPORTORG, x, y ); } BOOL CDECL MFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index d0c277f791d..dbdbc92bd11 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -161,7 +161,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pLineTo */ NULL, /* pModifyWorldTransform */ NULL, /* pMoveTo */ - MFDRV_OffsetViewportOrgEx, /* pOffsetViewportOrgEx */ + NULL, /* pOffsetViewportOrgEx */ MFDRV_OffsetWindowOrgEx, /* pOffsetWindowOrgEx */ NULL, /* pPaintRgn */ NULL, /* pPatBlt */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 2d218f89787..7650c8d54e9 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -88,7 +88,6 @@ extern BOOL CDECL MFDRV_EndPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_FillRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_FlattenPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_PolyBezier( PHYSDEV dev, const POINT* pt, DWORD count ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_PolyBezierTo( PHYSDEV dev, const POINT* pt, DWORD count ) DECLSPEC_HIDDEN; -- 2.23.0

1 0

[PATCH v2 5/9] gdi32: Handle metafiles directly in SetWindowOrgEx.
by Huw Davies 10 Aug '21

10 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 12 ++---------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 17 +++++++++++++++++ dlls/gdi32/mapping.c | 26 -------------------------- dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 25 insertions(+), 42 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 9eae745a350..e67380d7766 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -253,23 +253,15 @@ BOOL EMFDC_SetViewportOrgEx( DC_ATTR *dc_attr, INT x, INT y ) return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } -BOOL CDECL EMFDRV_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) +BOOL EMFDC_SetWindowOrgEx( DC_ATTR *dc_attr, INT x, INT y ) { - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetWindowOrgEx ); - EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); EMRSETWINDOWORGEX emr; - BOOL ret; emr.emr.iType = EMR_SETWINDOWORGEX; emr.emr.nSize = sizeof(emr); emr.ptlOrigin.x = x; emr.ptlOrigin.y = y; - - if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; - physDev->modifying_transform++; - ret = next->funcs->pSetWindowOrgEx( next, x, y, pt ); - physDev->modifying_transform--; - return ret; + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } BOOL EMFDC_ScaleViewportExtEx( DC_ATTR *dc_attr, INT x_num, INT x_denom, INT y_num, INT y_denom ) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 1ae6f17410e..3af92286d1f 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -110,7 +110,6 @@ extern INT CDECL EMFDRV_SetDIBitsToDevice( PHYSDEV dev, INT xDest, INT yDes BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_SetWorldTransform( PHYSDEV dev, const XFORM *xform ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_StretchBlt( PHYSDEV devDst, struct bitblt_coords *dst, PHYSDEV devSrc, struct bitblt_coords *src, DWORD rop ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index e9746368aec..0b1d2fbb1cf 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -132,7 +132,7 @@ static const struct gdi_dc_funcs emfdrv_driver = NULL, /* pSetViewportExtEx */ NULL, /* pSetViewportOrgEx */ NULL, /* pSetWindowExtEx */ - EMFDRV_SetWindowOrgEx, /* pSetWindowOrgEx */ + NULL, /* pSetWindowOrgEx */ EMFDRV_SetWorldTransform, /* pSetWorldTransform */ NULL, /* pStartDoc */ NULL, /* pStartPage */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 4fbb7a7571e..f3ce7b910fa 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -101,6 +101,7 @@ extern BOOL METADC_SetTextJustification( HDC hdc, INT extra, INT breaks ) DECLSP extern BOOL METADC_SetViewportExtEx( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL METADC_SetViewportOrgEx( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL METADC_SetWindowExtEx( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; +extern BOOL METADC_SetWindowOrgEx( HDC, INT x, INT y ) DECLSPEC_HIDDEN; /* enhanced metafiles */ extern BOOL EMFDC_AbortPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; @@ -170,5 +171,6 @@ extern BOOL EMFDC_SetTextJustification( DC_ATTR *dc_attr, INT extra, INT breaks extern BOOL EMFDC_SetViewportExtEx( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetViewportOrgEx( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetWindowExtEx( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_SetWindowOrgEx( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 786edc8ffea..f58f93d036d 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -484,6 +484,23 @@ BOOL WINAPI GetWindowOrgEx( HDC hdc, POINT *point ) return TRUE; } +/*********************************************************************** + * SetWindowOrgEx (GDI32.@) + */ +BOOL WINAPI SetWindowOrgEx( HDC hdc, INT x, INT y, POINT *point ) +{ + DC_ATTR *dc_attr; + + if (is_meta_dc( hdc )) return METADC_SetWindowOrgEx( hdc, x, y ); + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_SetWindowOrgEx( dc_attr, x, y )) return FALSE; + + if (point) *point = dc_attr->wnd_org; + dc_attr->wnd_org.x = x; + dc_attr->wnd_org.y = y; + return NtGdiComputeXformCoefficients( hdc ); +} + /*********************************************************************** * GetViewportExtEx (GDI32.@) */ diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index 5947bd1b8ab..6c22349a371 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -187,14 +187,6 @@ BOOL CDECL nulldrv_SetWindowExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) BOOL CDECL nulldrv_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) { - DC *dc = get_nulldrv_dc( dev ); - - if (pt) - *pt = dc->attr->wnd_org; - - dc->attr->wnd_org.x = x; - dc->attr->wnd_org.y = y; - DC_UpdateXforms( dc ); return TRUE; } @@ -351,24 +343,6 @@ BOOL WINAPI NtGdiComputeXformCoefficients( HDC hdc ) } -/*********************************************************************** - * SetWindowOrgEx (GDI32.@) - */ -BOOL WINAPI SetWindowOrgEx( HDC hdc, INT x, INT y, LPPOINT pt ) -{ - BOOL ret = FALSE; - DC * dc = get_dc_ptr( hdc ); - - if (dc) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetWindowOrgEx ); - ret = physdev->funcs->pSetWindowOrgEx( physdev, x, y, pt ); - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * OffsetViewportOrgEx (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index eb5ad29e421..9818dc0d9d9 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -110,9 +110,9 @@ BOOL METADC_SetWindowExtEx( HDC hdc, INT x, INT y ) return metadc_param2( hdc, META_SETWINDOWEXT, x, y ); } -BOOL CDECL MFDRV_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) +BOOL METADC_SetWindowOrgEx( HDC hdc, INT x, INT y ) { - return MFDRV_MetaParam2( dev, META_SETWINDOWORG, x, y ); + return metadc_param2( hdc, META_SETWINDOWORG, x, y ); } BOOL CDECL MFDRV_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 8a095246d21..d0c277f791d 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -197,7 +197,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pSetViewportExtEx */ NULL, /* pSetViewportOrgEx */ NULL, /* pSetWindowExtEx */ - MFDRV_SetWindowOrgEx, /* pSetWindowOrgEx */ + NULL, /* pSetWindowOrgEx */ NULL, /* pSetWorldTransform */ NULL, /* pStartDoc */ NULL, /* pStartPage */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 4fb0093f956..2d218f89787 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -99,7 +99,6 @@ extern COLORREF CDECL MFDRV_SetBkColor( PHYSDEV dev, COLORREF color ) DECLSPEC_H extern COLORREF CDECL MFDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL MFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL MFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_StretchBlt( PHYSDEV devDst, struct bitblt_coords *dst, PHYSDEV devSrc, struct bitblt_coords *src, DWORD rop ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetDIBitsToDevice( PHYSDEV dev, INT xDest, INT yDest, DWORD cx, -- 2.23.0

1 0

[PATCH v2 4/9] gdi32: Handle metafiles directly in SetWindowExtEx.
by Huw Davies 10 Aug '21

10 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 12 ++--------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 19 +++++++++++++++++ dlls/gdi32/mapping.c | 32 ---------------------------- dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 27 insertions(+), 48 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 5c4440afc17..9eae745a350 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -231,23 +231,15 @@ BOOL EMFDC_SetViewportExtEx( DC_ATTR *dc_attr, INT cx, INT cy ) return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } -BOOL CDECL EMFDRV_SetWindowExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) +BOOL EMFDC_SetWindowExtEx( DC_ATTR *dc_attr, INT cx, INT cy ) { - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetWindowExtEx ); - EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); EMRSETWINDOWEXTEX emr; - BOOL ret; emr.emr.iType = EMR_SETWINDOWEXTEX; emr.emr.nSize = sizeof(emr); emr.szlExtent.cx = cx; emr.szlExtent.cy = cy; - - if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; - physDev->modifying_transform++; - ret = next->funcs->pSetWindowExtEx( next, cx, cy, size ); - physDev->modifying_transform--; - return ret; + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } BOOL EMFDC_SetViewportOrgEx( DC_ATTR *dc_attr, INT x, INT y ) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index a5e310787a1..1ae6f17410e 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -110,7 +110,6 @@ extern INT CDECL EMFDRV_SetDIBitsToDevice( PHYSDEV dev, INT xDest, INT yDes BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_SetWindowExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_SetWorldTransform( PHYSDEV dev, const XFORM *xform ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_StretchBlt( PHYSDEV devDst, struct bitblt_coords *dst, diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index c70af9f7cf5..e9746368aec 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -131,7 +131,7 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_SetTextColor, /* pSetTextColor */ NULL, /* pSetViewportExtEx */ NULL, /* pSetViewportOrgEx */ - EMFDRV_SetWindowExtEx, /* pSetWindowExtEx */ + NULL, /* pSetWindowExtEx */ EMFDRV_SetWindowOrgEx, /* pSetWindowOrgEx */ EMFDRV_SetWorldTransform, /* pSetWorldTransform */ NULL, /* pStartDoc */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 5d6b308e85c..4fbb7a7571e 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -100,6 +100,7 @@ extern BOOL METADC_SetTextAlign( HDC hdc, UINT align ) DECLSPEC_HIDDEN; extern BOOL METADC_SetTextJustification( HDC hdc, INT extra, INT breaks ) DECLSPEC_HIDDEN; extern BOOL METADC_SetViewportExtEx( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL METADC_SetViewportOrgEx( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; +extern BOOL METADC_SetWindowExtEx( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; /* enhanced metafiles */ extern BOOL EMFDC_AbortPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; @@ -168,5 +169,6 @@ extern BOOL EMFDC_SetTextAlign( DC_ATTR *dc_attr, UINT align ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetTextJustification( DC_ATTR *dc_attr, INT extra, INT breaks ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetViewportExtEx( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetViewportOrgEx( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_SetWindowExtEx( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 026fde6a028..786edc8ffea 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -454,6 +454,25 @@ BOOL WINAPI GetWindowExtEx( HDC hdc, SIZE *size ) return TRUE; } +/*********************************************************************** + * SetWindowExtEx (GDI32.@) + */ +BOOL WINAPI SetWindowExtEx( HDC hdc, INT x, INT y, SIZE *size ) +{ + DC_ATTR *dc_attr; + + if (is_meta_dc( hdc )) return METADC_SetWindowExtEx( hdc, x, y ); + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_SetWindowExtEx( dc_attr, x, y )) return FALSE; + + if (size) *size = dc_attr->wnd_ext; + if (dc_attr->map_mode != MM_ISOTROPIC && dc_attr->map_mode != MM_ANISOTROPIC) return TRUE; + if (!x || !y) return FALSE; + dc_attr->wnd_ext.cx = x; + dc_attr->wnd_ext.cy = y; + return NtGdiComputeXformCoefficients( hdc ); +} + /*********************************************************************** * GetWindowOrgEx (GDI32.@) */ diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index 65e47f8e998..5947bd1b8ab 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -182,20 +182,6 @@ BOOL CDECL nulldrv_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) BOOL CDECL nulldrv_SetWindowExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) { - DC *dc = get_nulldrv_dc( dev ); - - if (size) - *size = dc->attr->wnd_ext; - - if (dc->attr->map_mode != MM_ISOTROPIC && dc->attr->map_mode != MM_ANISOTROPIC) return TRUE; - if (!cx || !cy) return FALSE; - dc->attr->wnd_ext.cx = cx; - dc->attr->wnd_ext.cy = cy; - /* The API docs say that you should call SetWindowExtEx before - SetViewportExtEx. This advice does not imply that Windows - doesn't ensure the isotropic mapping after SetWindowExtEx! */ - if (dc->attr->map_mode == MM_ISOTROPIC) MAPPING_FixIsotropic( dc ); - DC_UpdateXforms( dc ); return TRUE; } @@ -365,24 +351,6 @@ BOOL WINAPI NtGdiComputeXformCoefficients( HDC hdc ) } -/*********************************************************************** - * SetWindowExtEx (GDI32.@) - */ -BOOL WINAPI SetWindowExtEx( HDC hdc, INT x, INT y, LPSIZE size ) -{ - BOOL ret = FALSE; - DC * dc = get_dc_ptr( hdc ); - - if (dc) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetWindowExtEx ); - ret = physdev->funcs->pSetWindowExtEx( physdev, x, y, size ); - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * SetWindowOrgEx (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index 16184129b7d..eb5ad29e421 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -105,9 +105,9 @@ BOOL METADC_SetViewportOrgEx( HDC hdc, INT x, INT y ) return metadc_param2( hdc, META_SETVIEWPORTORG, x, y ); } -BOOL CDECL MFDRV_SetWindowExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) +BOOL METADC_SetWindowExtEx( HDC hdc, INT x, INT y ) { - return MFDRV_MetaParam2( dev, META_SETWINDOWEXT, x, y ); + return metadc_param2( hdc, META_SETWINDOWEXT, x, y ); } BOOL CDECL MFDRV_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 959ea48c9e0..8a095246d21 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -196,7 +196,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = MFDRV_SetTextColor, /* pSetTextColor */ NULL, /* pSetViewportExtEx */ NULL, /* pSetViewportOrgEx */ - MFDRV_SetWindowExtEx, /* pSetWindowExtEx */ + NULL, /* pSetWindowExtEx */ MFDRV_SetWindowOrgEx, /* pSetWindowOrgEx */ NULL, /* pSetWorldTransform */ NULL, /* pStartDoc */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 4c9c5534597..4fb0093f956 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -99,7 +99,6 @@ extern COLORREF CDECL MFDRV_SetBkColor( PHYSDEV dev, COLORREF color ) DECLSPEC_H extern COLORREF CDECL MFDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL MFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL MFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_SetWindowExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_StretchBlt( PHYSDEV devDst, struct bitblt_coords *dst, PHYSDEV devSrc, struct bitblt_coords *src, DWORD rop ) DECLSPEC_HIDDEN; -- 2.23.0

1 0

[PATCH v2 3/9] gdi32: Handle metafiles directly in SetViewportOrgEx.
by Huw Davies 10 Aug '21

10 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 12 ++---------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 17 +++++++++++++++++ dlls/gdi32/mapping.c | 26 -------------------------- dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 25 insertions(+), 42 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 13d4a491faa..5c4440afc17 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -250,23 +250,15 @@ BOOL CDECL EMFDRV_SetWindowExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) return ret; } -BOOL CDECL EMFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) +BOOL EMFDC_SetViewportOrgEx( DC_ATTR *dc_attr, INT x, INT y ) { - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetViewportOrgEx ); - EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); EMRSETVIEWPORTORGEX emr; - BOOL ret; emr.emr.iType = EMR_SETVIEWPORTORGEX; emr.emr.nSize = sizeof(emr); emr.ptlOrigin.x = x; emr.ptlOrigin.y = y; - - if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; - physDev->modifying_transform++; - ret = next->funcs->pSetViewportOrgEx( next, x, y, pt ); - physDev->modifying_transform--; - return ret; + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } BOOL CDECL EMFDRV_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index b77c538aa75..a5e310787a1 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -110,7 +110,6 @@ extern INT CDECL EMFDRV_SetDIBitsToDevice( PHYSDEV dev, INT xDest, INT yDes BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_SetWindowExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_SetWorldTransform( PHYSDEV dev, const XFORM *xform ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 6918dd76c9b..c70af9f7cf5 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -130,7 +130,7 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_SetPixel, /* pSetPixel */ EMFDRV_SetTextColor, /* pSetTextColor */ NULL, /* pSetViewportExtEx */ - EMFDRV_SetViewportOrgEx, /* pSetViewportOrgEx */ + NULL, /* pSetViewportOrgEx */ EMFDRV_SetWindowExtEx, /* pSetWindowExtEx */ EMFDRV_SetWindowOrgEx, /* pSetWindowOrgEx */ EMFDRV_SetWorldTransform, /* pSetWorldTransform */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index f74b45a6f98..5d6b308e85c 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -99,6 +99,7 @@ extern BOOL METADC_SetStretchBltMode( HDC hdc, INT mode ) DECLSPEC_HIDDEN; extern BOOL METADC_SetTextAlign( HDC hdc, UINT align ) DECLSPEC_HIDDEN; extern BOOL METADC_SetTextJustification( HDC hdc, INT extra, INT breaks ) DECLSPEC_HIDDEN; extern BOOL METADC_SetViewportExtEx( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; +extern BOOL METADC_SetViewportOrgEx( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; /* enhanced metafiles */ extern BOOL EMFDC_AbortPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; @@ -166,5 +167,6 @@ extern BOOL EMFDC_SetStretchBltMode( DC_ATTR *dc_attr, INT mode ) DECLSPEC_HIDDE extern BOOL EMFDC_SetTextAlign( DC_ATTR *dc_attr, UINT align ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetTextJustification( DC_ATTR *dc_attr, INT extra, INT breaks ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetViewportExtEx( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_SetViewportOrgEx( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 52258a4f71f..026fde6a028 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -506,6 +506,23 @@ BOOL WINAPI GetViewportOrgEx( HDC hdc, POINT *point ) return TRUE; } +/*********************************************************************** + * SetViewportOrgEx (GDI32.@) + */ +BOOL WINAPI SetViewportOrgEx( HDC hdc, INT x, INT y, POINT *point ) +{ + DC_ATTR *dc_attr; + + if (is_meta_dc( hdc )) return METADC_SetViewportOrgEx( hdc, x, y ); + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_SetViewportOrgEx( dc_attr, x, y )) return FALSE; + + if (point) *point = dc_attr->vport_org; + dc_attr->vport_org.x = x; + dc_attr->vport_org.y = y; + return NtGdiComputeXformCoefficients( hdc ); +} + /*********************************************************************** * GetWorldTransform (GDI32.@) */ diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index 29eed8da843..65e47f8e998 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -177,14 +177,6 @@ BOOL CDECL nulldrv_SetViewportExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) BOOL CDECL nulldrv_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) { - DC *dc = get_nulldrv_dc( dev ); - - if (pt) - *pt = dc->attr->vport_org; - - dc->attr->vport_org.x = x; - dc->attr->vport_org.y = y; - DC_UpdateXforms( dc ); return TRUE; } @@ -373,24 +365,6 @@ BOOL WINAPI NtGdiComputeXformCoefficients( HDC hdc ) } -/*********************************************************************** - * SetViewportOrgEx (GDI32.@) - */ -BOOL WINAPI SetViewportOrgEx( HDC hdc, INT x, INT y, LPPOINT pt ) -{ - BOOL ret = FALSE; - DC * dc = get_dc_ptr( hdc ); - - if (dc) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetViewportOrgEx ); - ret = physdev->funcs->pSetViewportOrgEx( physdev, x, y, pt ); - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * SetWindowExtEx (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index 20d12a5ada6..16184129b7d 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -100,9 +100,9 @@ BOOL METADC_SetViewportExtEx( HDC hdc, INT x, INT y ) return metadc_param2( hdc, META_SETVIEWPORTEXT, x, y ); } -BOOL CDECL MFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) +BOOL METADC_SetViewportOrgEx( HDC hdc, INT x, INT y ) { - return MFDRV_MetaParam2( dev, META_SETVIEWPORTORG, x, y ); + return metadc_param2( hdc, META_SETVIEWPORTORG, x, y ); } BOOL CDECL MFDRV_SetWindowExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 7eec8eb9d70..959ea48c9e0 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -195,7 +195,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pSetPixel */ MFDRV_SetTextColor, /* pSetTextColor */ NULL, /* pSetViewportExtEx */ - MFDRV_SetViewportOrgEx, /* pSetViewportOrgEx */ + NULL, /* pSetViewportOrgEx */ MFDRV_SetWindowExtEx, /* pSetWindowExtEx */ MFDRV_SetWindowOrgEx, /* pSetWindowOrgEx */ NULL, /* pSetWorldTransform */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index f478508bc4b..4c9c5534597 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -99,7 +99,6 @@ extern COLORREF CDECL MFDRV_SetBkColor( PHYSDEV dev, COLORREF color ) DECLSPEC_H extern COLORREF CDECL MFDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL MFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL MFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_SetWindowExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_StretchBlt( PHYSDEV devDst, struct bitblt_coords *dst, -- 2.23.0

1 0

[PATCH v2 2/9] gdi32: Handle metafiles directly in SetViewportExtEx.
by Huw Davies 10 Aug '21

10 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 12 ++--------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 19 ++++++++++++++++++ dlls/gdi32/mapping.c | 30 ++++++++-------------------- dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - include/ntgdi.h | 1 + 10 files changed, 36 insertions(+), 38 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 6b843b5a641..13d4a491faa 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -220,23 +220,15 @@ BOOL EMFDC_SetMapMode( DC_ATTR *dc_attr, INT mode ) return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } -BOOL CDECL EMFDRV_SetViewportExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) +BOOL EMFDC_SetViewportExtEx( DC_ATTR *dc_attr, INT cx, INT cy ) { - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetViewportExtEx ); - EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); EMRSETVIEWPORTEXTEX emr; - BOOL ret; emr.emr.iType = EMR_SETVIEWPORTEXTEX; emr.emr.nSize = sizeof(emr); emr.szlExtent.cx = cx; emr.szlExtent.cy = cy; - - if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; - physDev->modifying_transform++; - ret = next->funcs->pSetViewportExtEx( next, cx, cy, size ); - physDev->modifying_transform--; - return ret; + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } BOOL CDECL EMFDRV_SetWindowExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 5b764c523b5..b77c538aa75 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -110,7 +110,6 @@ extern INT CDECL EMFDRV_SetDIBitsToDevice( PHYSDEV dev, INT xDest, INT yDes BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_SetViewportExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_SetWindowExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 0b2a81b4184..6918dd76c9b 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -129,7 +129,7 @@ static const struct gdi_dc_funcs emfdrv_driver = NULL, /* pSetDeviceGammaRamp */ EMFDRV_SetPixel, /* pSetPixel */ EMFDRV_SetTextColor, /* pSetTextColor */ - EMFDRV_SetViewportExtEx, /* pSetViewportExtEx */ + NULL, /* pSetViewportExtEx */ EMFDRV_SetViewportOrgEx, /* pSetViewportOrgEx */ EMFDRV_SetWindowExtEx, /* pSetWindowExtEx */ EMFDRV_SetWindowOrgEx, /* pSetWindowOrgEx */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 0d23b254128..f74b45a6f98 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -98,6 +98,7 @@ extern BOOL METADC_SetROP2( HDC hdc, INT rop ) DECLSPEC_HIDDEN; extern BOOL METADC_SetStretchBltMode( HDC hdc, INT mode ) DECLSPEC_HIDDEN; extern BOOL METADC_SetTextAlign( HDC hdc, UINT align ) DECLSPEC_HIDDEN; extern BOOL METADC_SetTextJustification( HDC hdc, INT extra, INT breaks ) DECLSPEC_HIDDEN; +extern BOOL METADC_SetViewportExtEx( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; /* enhanced metafiles */ extern BOOL EMFDC_AbortPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; @@ -164,5 +165,6 @@ extern BOOL EMFDC_SetROP2( DC_ATTR *dc_attr, INT rop ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetStretchBltMode( DC_ATTR *dc_attr, INT mode ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetTextAlign( DC_ATTR *dc_attr, UINT align ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetTextJustification( DC_ATTR *dc_attr, INT extra, INT breaks ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_SetViewportExtEx( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index fa947d56b79..52258a4f71f 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -476,6 +476,25 @@ BOOL WINAPI GetViewportExtEx( HDC hdc, SIZE *size ) return TRUE; } +/*********************************************************************** + * SetViewportExtEx (GDI32.@) + */ +BOOL WINAPI SetViewportExtEx( HDC hdc, INT x, INT y, LPSIZE size ) +{ + DC_ATTR *dc_attr; + + if (is_meta_dc( hdc )) return METADC_SetViewportExtEx( hdc, x, y ); + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_SetViewportExtEx( dc_attr, x, y )) return FALSE; + + if (size) *size = dc_attr->vport_ext; + if (dc_attr->map_mode != MM_ISOTROPIC && dc_attr->map_mode != MM_ANISOTROPIC) return TRUE; + if (!x || !y) return FALSE; + dc_attr->vport_ext.cx = x; + dc_attr->vport_ext.cy = y; + return NtGdiComputeXformCoefficients( hdc ); +} + /*********************************************************************** * GetViewportOrgEx (GDI32.@) */ diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index d5d82c8aef9..29eed8da843 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -172,17 +172,6 @@ BOOL set_map_mode( DC *dc, int mode ) BOOL CDECL nulldrv_SetViewportExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) { - DC *dc = get_nulldrv_dc( dev ); - - if (size) - *size = dc->attr->vport_ext; - - if (dc->attr->map_mode != MM_ISOTROPIC && dc->attr->map_mode != MM_ANISOTROPIC) return TRUE; - if (!cx || !cy) return FALSE; - dc->attr->vport_ext.cx = cx; - dc->attr->vport_ext.cy = cy; - if (dc->attr->map_mode == MM_ISOTROPIC) MAPPING_FixIsotropic( dc ); - DC_UpdateXforms( dc ); return TRUE; } @@ -370,20 +359,17 @@ void lp_to_dp( DC *dc, POINT *points, INT count ) /*********************************************************************** - * SetViewportExtEx (GDI32.@) + * NtGdiComputeXformCoefficients (win32u.@) */ -BOOL WINAPI SetViewportExtEx( HDC hdc, INT x, INT y, LPSIZE size ) +BOOL WINAPI NtGdiComputeXformCoefficients( HDC hdc ) { - BOOL ret = FALSE; - DC * dc = get_dc_ptr( hdc ); + DC *dc; - if (dc) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetViewportExtEx ); - ret = physdev->funcs->pSetViewportExtEx( physdev, x, y, size ); - release_dc_ptr( dc ); - } - return ret; + if (!(dc = get_dc_ptr( hdc ))) return FALSE; + if (dc->attr->map_mode == MM_ISOTROPIC) MAPPING_FixIsotropic( dc ); + DC_UpdateXforms( dc ); + release_dc_ptr( dc ); + return TRUE; } diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index fe89b0b6d5e..20d12a5ada6 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -95,9 +95,9 @@ BOOL METADC_SetMapMode( HDC hdc, INT mode ) return metadc_param1( hdc, META_SETMAPMODE, mode ); } -BOOL CDECL MFDRV_SetViewportExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) +BOOL METADC_SetViewportExtEx( HDC hdc, INT x, INT y ) { - return MFDRV_MetaParam2( dev, META_SETVIEWPORTEXT, x, y ); + return metadc_param2( hdc, META_SETVIEWPORTEXT, x, y ); } BOOL CDECL MFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 2406f737362..7eec8eb9d70 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -194,7 +194,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pSetDeviceGammaRamp */ NULL, /* pSetPixel */ MFDRV_SetTextColor, /* pSetTextColor */ - MFDRV_SetViewportExtEx, /* pSetViewportExtEx */ + NULL, /* pSetViewportExtEx */ MFDRV_SetViewportOrgEx, /* pSetViewportOrgEx */ MFDRV_SetWindowExtEx, /* pSetWindowExtEx */ MFDRV_SetWindowOrgEx, /* pSetWindowOrgEx */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 74015babb30..f478508bc4b 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -99,7 +99,6 @@ extern COLORREF CDECL MFDRV_SetBkColor( PHYSDEV dev, COLORREF color ) DECLSPEC_H extern COLORREF CDECL MFDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL MFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL MFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_SetViewportExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_SetWindowExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; diff --git a/include/ntgdi.h b/include/ntgdi.h index d2b5576d316..e3600aa8c79 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -153,6 +153,7 @@ BOOL WINAPI NtGdiBeginPath( HDC hdc ); BOOL WINAPI NtGdiCancelDC( HDC hdc ); BOOL WINAPI NtGdiCloseFigure( HDC hdc ); INT WINAPI NtGdiCombineRgn( HRGN dest, HRGN src1, HRGN src2, INT mode ); +BOOL WINAPI NtGdiComputeXformCoefficients( HDC hdc ); HBITMAP WINAPI NtGdiCreateBitmap( INT width, INT height, UINT planes, UINT bpp, const void *bits ); HBRUSH WINAPI NtGdiCreateHatchBrushInternal( INT style, COLORREF color, BOOL pen ); -- 2.23.0

1 0

[PATCH v2 1/9] gdi32: Store virtual resolution and size in DC_ATTR.
by Huw Davies 10 Aug '21

10 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/dc.c | 6 ++---- dlls/gdi32/mapping.c | 12 ++++++------ dlls/gdi32/ntgdi_private.h | 2 -- include/ntgdi.h | 2 ++ 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 3cd3f72d4da..93decc58926 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -428,8 +428,8 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dc->attr->wnd_ext = dcs->attr->wnd_ext; dc->attr->vport_org = dcs->attr->vport_org; dc->attr->vport_ext = dcs->attr->vport_ext; - dc->virtual_res = dcs->virtual_res; - dc->virtual_size = dcs->virtual_size; + dc->attr->virtual_res = dcs->attr->virtual_res; + dc->attr->virtual_size = dcs->attr->virtual_size; if (dcs->hClipRgn) { @@ -550,8 +550,6 @@ INT WINAPI NtGdiSaveDC( HDC hdc ) newdc->xformWorld2Vport = dc->xformWorld2Vport; newdc->xformVport2World = dc->xformVport2World; newdc->vport2WorldValid = dc->vport2WorldValid; - newdc->virtual_res = dc->virtual_res; - newdc->virtual_size = dc->virtual_size; /* Get/SetDCState() don't change hVisRgn field ("Undoc. Windows" p.559). */ diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index 0c440908beb..d5d82c8aef9 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -31,7 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dc); static SIZE get_dc_virtual_size( DC *dc ) { - SIZE ret = dc->virtual_size; + SIZE ret = dc->attr->virtual_size; if (!ret.cx) { @@ -43,7 +43,7 @@ static SIZE get_dc_virtual_size( DC *dc ) static SIZE get_dc_virtual_res( DC *dc ) { - SIZE ret = dc->virtual_res; + SIZE ret = dc->attr->virtual_res; if (!ret.cx) { @@ -630,10 +630,10 @@ BOOL WINAPI NtGdiSetVirtualResolution( HDC hdc, DWORD horz_res, DWORD vert_res, dc = get_dc_ptr( hdc ); if (!dc) return FALSE; - dc->virtual_res.cx = horz_res; - dc->virtual_res.cy = vert_res; - dc->virtual_size.cx = horz_size; - dc->virtual_size.cy = vert_size; + dc->attr->virtual_res.cx = horz_res; + dc->attr->virtual_res.cy = vert_res; + dc->attr->virtual_size.cx = horz_size; + dc->attr->virtual_size.cy = vert_size; release_dc_ptr( dc ); return TRUE; diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index de7ed17369f..62e6e5101ee 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -80,8 +80,6 @@ typedef struct tagDC BOOL bounds_enabled:1; /* bounds tracking is enabled */ BOOL path_open:1; /* path is currently open (only for saved DCs) */ - SIZE virtual_res; /* Initially HORZRES,VERTRES. Changed by SetVirtualResolution */ - SIZE virtual_size; /* Initially HORZSIZE,VERTSIZE. Changed by SetVirtualResolution */ RECT device_rect; /* rectangle for the whole device */ int pixel_format; /* pixel format (for memory DCs) */ UINT aa_flags; /* anti-aliasing flags to pass to GetGlyphOutline for current font */ diff --git a/include/ntgdi.h b/include/ntgdi.h index a1e9c123799..d2b5576d316 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -136,6 +136,8 @@ typedef struct DC_ATTR SIZE wnd_ext; /* window extent */ POINT vport_org; /* viewport origin */ SIZE vport_ext; /* viewport extent */ + SIZE virtual_res; + SIZE virtual_size; void *emf; } DC_ATTR; -- 2.23.0

1 0

[PATCH 1/2] user32/tests: Test delayed clipboard rendering after window destruction.
by Francois Gouget 10 Aug '21

10 Aug '21

If the window does not render the delayed-rendering clipboard formats before it is destroyed, then they should be removed from the clipboard, including the derived formats added by CloseClipboard(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Currently Wine fails to remove the derived formats (e.g. CF_TEXT in the case of CF_UNICODETEXT), and ends up creating circular references in the CloseClipboard() call. In turn this causes GetClipboardData() to go into an infinite recursive loop and to crash. This usually happens in explorer.exe on desktop environments that have a clipboard manager. https://bugs.winehq.org/show_bug.cgi?id=51496 --- dlls/user32/tests/clipboard.c | 42 +++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index f351a6a29a8..8515ba5b88a 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -949,6 +949,48 @@ static void test_synthesized(void) r = CloseClipboard(); ok(r, "gle %d\n", GetLastError()); DestroyWindow( hwnd ); + + /* Check what happens to the delayed rendering clipboard formats when the + * owner window is destroyed. + */ + hwnd = CreateWindowA( "static", NULL, WS_POPUP, 0, 0, 10, 10, 0, 0, 0, NULL ); + SetWindowLongPtrA( hwnd, GWLP_WNDPROC, (LONG_PTR)renderer_winproc ); + + r = open_clipboard(hwnd); + ok(r, "gle %d\n", GetLastError()); + r = EmptyClipboard(); + ok(r, "gle %d\n", GetLastError()); + SetClipboardData( CF_UNICODETEXT, NULL ); + r = CloseClipboard(); + ok(r, "gle %d\n", GetLastError()); + + r = open_clipboard(NULL); + ok(r, "gle %d\n", GetLastError()); + count = CountClipboardFormats(); + ok(count == 4, "count %u\n", count ); + + DestroyWindow( hwnd ); + + /* CF_UNICODETEXT and derivatives, CF_TEXT + CF_OEMTEXT, should be gone */ + count = CountClipboardFormats(); + todo_wine ok(count == 1, "count %u\n", count ); + cf = EnumClipboardFormats( 0 ); + ok(cf == CF_LOCALE, "unexpected clipboard format %u\n", cf); + + r = CloseClipboard(); + ok(r, "gle %d\n", GetLastError()); + + r = open_clipboard(NULL); + ok(r, "gle %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + data = (void*)1; if (broken(1)) /* FIXME Crashes in Wine */ + data = GetClipboardData( CF_TEXT ); + ok(GetLastError() == 0xdeadbeef, "unexpected last error %d\n", GetLastError()); + todo_wine ok(!data, "GetClipboardData() should have returned NULL\n"); + + r = CloseClipboard(); + ok(r, "gle %d\n", GetLastError()); } static DWORD WINAPI clipboard_render_data_thread(void *param) -- 2.20.1

1 1

[PATCH 1/2] oleaut32: Fix handling of hexadecimal/octal numbers in VarParseNumFromStr().
by Francois Gouget 10 Aug '21

10 Aug '21

They are incompatible with decimal numbers and currencies. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/oleaut32/tests/vartest.c | 6 +----- dlls/oleaut32/variant.c | 5 +++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index f6149005179..42e269eccb3 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1654,12 +1654,10 @@ static void test_VarParseNumFromStrEn(void) /* With flag, currency amounts cannot be in hexadecimal */ CONVERT("$&ha", NUMPRS_HEX_OCT|NUMPRS_CURRENCY); - todo_wine EXPECTFAIL; + EXPECTFAIL; CONVERT("&ha$", NUMPRS_HEX_OCT|NUMPRS_CURRENCY); - if (broken(1)) /* FIXME Reenable once Wine is less broken */ EXPECT(1,NUMPRS_HEX_OCT|NUMPRS_CURRENCY,NUMPRS_HEX_OCT,3,4,0); - todo_wine ok(np.dwOutFlags == NUMPRS_HEX_OCT, "Got dwOutFlags=%08x\n", np.dwOutFlags); EXPECTRGB(0,10); EXPECTRGB(1,FAILDIG); @@ -1797,9 +1795,7 @@ static void test_VarParseNumFromStrEn(void) /* With flag, incompatible with NUMPRS_HEX_OCT */ CONVERT("&o1e1", NUMPRS_HEX_OCT|NUMPRS_EXPONENT); - if (broken(1)) /* FIXME Reenable once Wine is less broken */ EXPECT(1,NUMPRS_HEX_OCT|NUMPRS_EXPONENT,NUMPRS_HEX_OCT,3,3,0); - todo_wine ok(np.dwOutFlags == NUMPRS_HEX_OCT, "Got dwOutFlags=%08x\n", np.dwOutFlags); EXPECT2(1,FAILDIG); /* With flag, even if it sort of looks like an exponent */ diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 09c6f9dcad6..a3931bb1280 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1709,7 +1709,7 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla break; } - if (!(pNumprs->dwOutFlags & NUMPRS_DECIMAL)) + if (!(pNumprs->dwOutFlags & (NUMPRS_CURRENCY|NUMPRS_DECIMAL))) { if ((*lpszStr == '&' && (*(lpszStr+1) == 'H' || *(lpszStr+1) == 'h')) && pNumprs->dwInFlags & NUMPRS_HEX_OCT) @@ -1858,7 +1858,7 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla } else if ((*lpszStr == 'e' || *lpszStr == 'E') && pNumprs->dwInFlags & NUMPRS_EXPONENT && - !(pNumprs->dwOutFlags & NUMPRS_EXPONENT)) + !(pNumprs->dwOutFlags & (NUMPRS_HEX_OCT|NUMPRS_CURRENCY|NUMPRS_EXPONENT))) { dwState |= B_PROCESSING_EXPONENT; pNumprs->dwOutFlags |= NUMPRS_EXPONENT; @@ -2006,6 +2006,7 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla pNumprs->dwOutFlags |= NUMPRS_NEG; } else if (pNumprs->dwInFlags & NUMPRS_CURRENCY && + !(pNumprs->dwOutFlags & NUMPRS_HEX_OCT) && wcsncmp(lpszStr, chars.sCurrency, chars.sCurrencyLen) == 0) { pNumprs->dwOutFlags |= NUMPRS_CURRENCY; -- 2.20.1

1 1

[tools] winetest/build-patterns: Allow expanding a test's pattern.
by Francois Gouget 10 Aug '21

10 Aug '21

When some lines are omitted from a test pattern (either because they are reruns or the specific report was explicitly deselected), add a button to toggle showing / hiding them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/build-patterns | 2 +- winetest/patterns.js | 80 +++++++++++++++++++++++++++++++++++++---- winetest/report.css | 4 +++ 3 files changed, 78 insertions(+), 8 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index 474fa1ffc..a11c3de10 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -1243,7 +1243,7 @@ sub write_patterns_list($$$$) my $tooltip = $list->{title} ? " title='$list->{title}'" : ""; $title = "<a href='tests/$testname.html'$tooltip>$testname</a>"; } - print $html "<div class='updownbar'>$title"; + print $html "<div class='updownbar'>$title <a class='expandtest'></a>"; print $html "<div class='ralign'>"; if ($mainpage) { diff --git a/winetest/patterns.js b/winetest/patterns.js index 4876113fa..be583a5f0 100644 --- a/winetest/patterns.js +++ b/winetest/patterns.js @@ -21,6 +21,47 @@ var hide_reruns; var groups; var cbs; +var tests; + +function enableExpandButton(test) +{ + test.domexpand.innerHTML = '[+]'; + test.domexpand.title = "Remove filters"; + test.domexpand.style.display = "inline-block"; +} + +function expandTest(test) +{ + test.patlines.forEach(patline => { + patline.dom.style.display = patline.display; + }); + test.domexpand.innerHTML = '[-]'; + test.domexpand.title = "Apply filters"; + test.domexpand.style.display = "inline-block"; + test.expanded = true; +} + +function reduceTest(test) +{ + test.patlines.forEach(patline => { + if (!patline.cb.checked) + patline.dom.style.display = 'none'; + }); + enableExpandButton(test); +} + +function toggleTest(e) +{ + const domtest = e.target.closest("div.testfile"); + const test = tests[domtest.id]; + if (test) + { + if (e.target.innerHTML == '[+]') + expandTest(test); + else + reduceTest(test); + } +} function refreshPage(changes, rerun_checked) { @@ -49,6 +90,12 @@ function refreshPage(changes, rerun_checked) hide_reruns = rerun_checked; } + for (let key in tests) + { + if (tests[key].expanded) + reduceTest(tests[key]); + } + for (let key in changes) { const cb = cbs[key]; @@ -60,8 +107,11 @@ function refreshPage(changes, rerun_checked) cb.patlines.forEach(patline => { patline.dom.style.display = patline.display; const test = patline.test; - if (++test.linecount == 1 && test.id != "summary") + test.linecount++; + if (test.linecount == 1 && test.id != "summary") test.dom.style.display = test.display; + if (test.linecount == test.patlines.length) + test.domexpand.style.display = "none"; }); } else @@ -69,8 +119,11 @@ function refreshPage(changes, rerun_checked) cb.patlines.forEach(patline => { patline.dom.style.display = "none"; const test = patline.test; - if (--test.linecount == 0 && test.id != "summary") + test.linecount--; + if (test.linecount == 0 && test.id != "summary") test.dom.style.display = "none"; + if (test.linecount == test.patlines.length - 1) + enableExpandButton(test); }); } @@ -138,24 +191,37 @@ function init() domcb.addEventListener('click', toggledReportCB); }); + tests = {}; document.querySelectorAll("div.testfile").forEach(domtest => { + const domexpand = domtest.querySelector("a.expandtest"); + domexpand.addEventListener('click', toggleTest); + const test = { id: domtest.id, dom: domtest, display: domtest.style.display, - linecount: 0 + domexpand: domexpand, + patlines: [], + linecount: 0, + expanded: false }; + tests[domtest.id] = test; domtest.querySelectorAll("div.patline").forEach(domline => { const cb = cbs[domline.getAttribute("data-id")]; if (cb) { - cb.patlines.push({ dom: domline, - display: domline.style.display, - test: test - }); + const patline = { dom: domline, + display: domline.style.display, + cb: cb, + test: test + }; + cb.patlines.push(patline); + test.patlines.push(patline); if (cb.checked) test.linecount++; } }); + if (test.linecount < test.patlines.length) + enableExpandButton(test); }); /* When reloading a page the browser may preserve the checkbox state diff --git a/winetest/report.css b/winetest/report.css index d42e05d8d..be49a0523 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -78,6 +78,10 @@ table.output td { .disabled { color: grey; } +.expandtest { + display: none; + font-family: monospace; +} .pattern { display: inline-block; -- 2.20.1

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel