- wine-devel - winehq.org

[PATCH 5/8] gdi32: Use NtGdiSetDIBitsToDeviceInternal for SetDIBitsToDevice.
by Jacek Caban 13 Aug '21

13 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dib.c | 11 +++++----- dlls/gdi32/enhmfdrv/bitblt.c | 37 +++++++++++++++++++++------------- dlls/gdi32/gdi_private.h | 8 ++++++++ dlls/gdi32/gdidc.c | 22 ++++++++++++++++++++ dlls/gdi32/mfdrv/bitblt.c | 22 ++++++++++---------- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 4 ---- include/ntgdi.h | 5 +++++ 8 files changed, 76 insertions(+), 35 deletions(-)

2 1

[PATCH 4/8] gdi32: Remove no longer used driver entry points.
by Jacek Caban 13 Aug '21

13 Aug '21

2 1

[PATCH 3/8] gdi32: Use NtGdiModifyWorldTransform for SetWorldTransform implementation.
by Jacek Caban 13 Aug '21

13 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 12 ++--------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 2 -- dlls/gdi32/enhmfdrv/init.c | 3 +-- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 12 +++++++++++ dlls/gdi32/mapping.c | 30 ---------------------------- 6 files changed, 16 insertions(+), 44 deletions(-)

2 1

[PATCH 2/8] gdi32: Support MWT_SET in NtGdiModifyWorldTransform.
by Jacek Caban 13 Aug '21

13 Aug '21

It's not defined in public headers, but it's documented in EMF spec. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/mapping.c | 5 +++++ dlls/gdi32/tests/mapping.c | 22 ++++++++++++++++++++++ include/ntgdi.h | 2 ++ 3 files changed, 29 insertions(+)

2 1

[PATCH 1/8] gdi32: Use NtGdiModifyWorldTransform for ModifyWorldTransform.
by Jacek Caban 13 Aug '21

13 Aug '21

Signed-off-by: Jacek Caban <jacek(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 | 12 +++++++ dlls/gdi32/mapping.c | 48 ++++++++++++---------------- include/ntgdi.h | 1 + 7 files changed, 39 insertions(+), 39 deletions(-)

2 1

[PATCH 1/7] winebus.sys: Read irp->IoStatus.Status before leaving the CS.
by Rémi Bernon 13 Aug '21

13 Aug '21

Or we may have a race condition where a pending IRP may be completed after we left the CS but before we read its status. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 001f775e230..b7230cf2e33 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -982,9 +982,9 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) break; } + status = irp->IoStatus.Status; LeaveCriticalSection(&ext->cs); - status = irp->IoStatus.Status; if (status != STATUS_PENDING) IoCompleteRequest(irp, IO_NO_INCREMENT); return status; } -- 2.32.0

1 6

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

13 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 62 +++++++++++++ dlls/iphlpapi/ipstats.c | 161 --------------------------------- dlls/iphlpapi/tests/iphlpapi.c | 4 +- dlls/nsi/tests/nsi.c | 3 - 4 files changed, 64 insertions(+), 166 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 14a2c719b95..b45bcc41724 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2807,6 +2807,68 @@ BOOL WINAPI GetRTTAndHopCount(IPAddr DestIpAddress, PULONG HopCount, ULONG MaxHo return FALSE; } +/****************************************************************** + * GetTcpStatistics (IPHLPAPI.@) + * + * Get the TCP statistics for the local computer. + * + * PARAMS + * stats [Out] buffer for TCP statistics + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + */ +DWORD WINAPI GetTcpStatistics( MIB_TCPSTATS *stats ) +{ + return GetTcpStatisticsEx( stats, WS_AF_INET ); +} + +/****************************************************************** + * GetTcpStatisticsEx (IPHLPAPI.@) + * + * Get the IPv4 and IPv6 TCP statistics for the local computer. + * + * PARAMS + * stats [Out] buffer for TCP statistics + * family [In] specifies whether IPv4 or IPv6 statistics are returned + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + */ +DWORD WINAPI GetTcpStatisticsEx( MIB_TCPSTATS *stats, DWORD family ) +{ + struct nsi_tcp_stats_dynamic dyn; + struct nsi_tcp_stats_static stat; + USHORT key = (USHORT)family; + DWORD err; + + if (!stats || !ip_module_id( family )) return ERROR_INVALID_PARAMETER; + memset( stats, 0, sizeof(*stats) ); + + err = NsiGetAllParameters( 1, &NPI_MS_TCP_MODULEID, NSI_TCP_STATS_TABLE, &key, sizeof(key), NULL, 0, + &dyn, sizeof(dyn), &stat, sizeof(stat) ); + if (err) return err; + + stats->u.RtoAlgorithm = stat.rto_algo; + stats->dwRtoMin = stat.rto_min; + stats->dwRtoMax = stat.rto_max; + stats->dwMaxConn = stat.max_conns; + stats->dwActiveOpens = dyn.active_opens; + stats->dwPassiveOpens = dyn.passive_opens; + stats->dwAttemptFails = dyn.attempt_fails; + stats->dwEstabResets = dyn.est_rsts; + stats->dwCurrEstab = dyn.cur_est; + stats->dwInSegs = (DWORD)dyn.in_segs; + stats->dwOutSegs = (DWORD)dyn.out_segs; + stats->dwRetransSegs = dyn.retrans_segs; + stats->dwInErrs = dyn.in_errs; + stats->dwOutRsts = dyn.out_rsts; + stats->dwNumConns = dyn.num_conns; + + return err; +} /****************************************************************** * GetTcpTable (IPHLPAPI.@) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index c5621b52dd7..ececfcdcecd 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -276,167 +276,6 @@ static void *read_mib_entry( int fd, int level, int name, int *len ) } #endif /* HAVE_SYS_TIHDR_H && T_OPTMGMT_ACK */ -/****************************************************************** - * GetTcpStatisticsEx (IPHLPAPI.@) - * - * Get the IPv4 and IPv6 TCP statistics for the local computer. - * - * PARAMS - * stats [Out] buffer for TCP statistics - * family [In] specifies whether IPv4 or IPv6 statistics are returned - * - * RETURNS - * Success: NO_ERROR - * Failure: error code from winerror.h - */ -DWORD WINAPI GetTcpStatisticsEx(PMIB_TCPSTATS stats, DWORD family) -{ - DWORD ret = ERROR_NOT_SUPPORTED; - - if (!stats) return ERROR_INVALID_PARAMETER; - if (family != WS_AF_INET && family != WS_AF_INET6) return ERROR_INVALID_PARAMETER; - memset( stats, 0, sizeof(*stats) ); - - if (family == WS_AF_INET6) - { - FIXME( "unimplemented for IPv6\n" ); - return ret; - } - -#ifdef __linux__ - { - FILE *fp; - - if ((fp = fopen("/proc/net/snmp", "r"))) - { - static const char hdr[] = "Tcp:"; - MIB_TCPTABLE *tcp_table; - char buf[512], *ptr; - - 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)) - { - ptr += sizeof(hdr); - sscanf( ptr, "%u %u %u %u %u %u %u %u %u %u %u %u %u %u", - &stats->u.dwRtoAlgorithm, - &stats->dwRtoMin, - &stats->dwRtoMax, - &stats->dwMaxConn, - &stats->dwActiveOpens, - &stats->dwPassiveOpens, - &stats->dwAttemptFails, - &stats->dwEstabResets, - &stats->dwCurrEstab, - &stats->dwInSegs, - &stats->dwOutSegs, - &stats->dwRetransSegs, - &stats->dwInErrs, - &stats->dwOutRsts ); - break; - } - } - if (!AllocateAndGetTcpTableFromStack( &tcp_table, FALSE, GetProcessHeap(), 0 )) - { - stats->dwNumConns = tcp_table->dwNumEntries; - HeapFree( GetProcessHeap(), 0, tcp_table ); - } - fclose(fp); - ret = NO_ERROR; - } - } -#elif defined(HAVE_LIBKSTAT) - { - static char tcp[] = "tcp"; - kstat_ctl_t *kc; - kstat_t *ksp; - - if ((kc = kstat_open()) && - (ksp = kstat_lookup( kc, tcp, 0, tcp )) && - kstat_read( kc, ksp, NULL ) != -1 && - ksp->ks_type == KSTAT_TYPE_NAMED) - { - stats->u.dwRtoAlgorithm = kstat_get_ui32( ksp, "rtoAlgorithm" ); - stats->dwRtoMin = kstat_get_ui32( ksp, "rtoMin" ); - stats->dwRtoMax = kstat_get_ui32( ksp, "rtoMax" ); - stats->dwMaxConn = kstat_get_ui32( ksp, "maxConn" ); - stats->dwActiveOpens = kstat_get_ui32( ksp, "activeOpens" ); - stats->dwPassiveOpens = kstat_get_ui32( ksp, "passiveOpens" ); - stats->dwAttemptFails = kstat_get_ui32( ksp, "attemptFails" ); - stats->dwEstabResets = kstat_get_ui32( ksp, "estabResets" ); - stats->dwCurrEstab = kstat_get_ui32( ksp, "currEstab" ); - stats->dwInSegs = kstat_get_ui32( ksp, "inSegs" ); - stats->dwOutSegs = kstat_get_ui32( ksp, "outSegs" ); - stats->dwRetransSegs = kstat_get_ui32( ksp, "retransSegs" ); - stats->dwInErrs = kstat_get_ui32( ksp, "inErrs" ); - stats->dwOutRsts = kstat_get_ui32( ksp, "outRsts" ); - stats->dwNumConns = kstat_get_ui32( ksp, "connTableSize" ); - ret = NO_ERROR; - } - if (kc) kstat_close( kc ); - } -#elif defined(HAVE_SYS_SYSCTL_H) && defined(TCPCTL_STATS) && (defined(HAVE_STRUCT_TCPSTAT_TCPS_CONNATTEMPT) || defined(HAVE_STRUCT_TCP_STATS_TCPS_CONNATTEMPT)) - { -#ifndef TCPTV_MIN /* got removed in Mac OS X for some reason */ -#define TCPTV_MIN 2 -#define TCPTV_REXMTMAX 128 -#endif - int mib[] = {CTL_NET, PF_INET, IPPROTO_TCP, TCPCTL_STATS}; -#define hz 1000 -#if defined(HAVE_STRUCT_TCPSTAT_TCPS_CONNATTEMPT) - struct tcpstat tcp_stat; -#elif defined(HAVE_STRUCT_TCP_STATS_TCPS_CONNATTEMPT) - struct tcp_stats tcp_stat; -#endif - size_t needed = sizeof(tcp_stat); - - if(sysctl(mib, ARRAY_SIZE(mib), &tcp_stat, &needed, NULL, 0) != -1) - { - stats->u.RtoAlgorithm = MIB_TCP_RTO_VANJ; - stats->dwRtoMin = TCPTV_MIN; - stats->dwRtoMax = TCPTV_REXMTMAX; - stats->dwMaxConn = -1; - stats->dwActiveOpens = tcp_stat.tcps_connattempt; - stats->dwPassiveOpens = tcp_stat.tcps_accepts; - stats->dwAttemptFails = tcp_stat.tcps_conndrops; - stats->dwEstabResets = tcp_stat.tcps_drops; - stats->dwCurrEstab = 0; - stats->dwInSegs = tcp_stat.tcps_rcvtotal; - stats->dwOutSegs = tcp_stat.tcps_sndtotal - tcp_stat.tcps_sndrexmitpack; - stats->dwRetransSegs = tcp_stat.tcps_sndrexmitpack; - stats->dwInErrs = tcp_stat.tcps_rcvbadsum + tcp_stat.tcps_rcvbadoff + tcp_stat.tcps_rcvmemdrop + tcp_stat.tcps_rcvshort; - stats->dwOutRsts = tcp_stat.tcps_sndctrl - tcp_stat.tcps_closed; - stats->dwNumConns = tcp_stat.tcps_connects; - ret = NO_ERROR; - } - else ERR ("failed to get tcpstat\n"); - } -#else - FIXME( "unimplemented\n" ); -#endif - return ret; -} - -/****************************************************************** - * GetTcpStatistics (IPHLPAPI.@) - * - * Get the TCP statistics for the local computer. - * - * PARAMS - * stats [Out] buffer for TCP statistics - * - * RETURNS - * Success: NO_ERROR - * Failure: error code from winerror.h - */ -DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS stats) -{ - return GetTcpStatisticsEx(stats, WS_AF_INET); -} - /****************************************************************** * GetUdpStatistics (IPHLPAPI.@) * diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index d439f71069b..5ec2f2eaba2 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -715,8 +715,8 @@ static void testGetTcpStatisticsEx(void) } apiReturn = GetTcpStatisticsEx(&stats, AF_INET6); - todo_wine ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), - "GetTcpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); + ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), + "GetTcpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) { trace( "TCP IPv6 Ex stats:\n" ); diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index fb95ab67d3b..33b4e9e6d97 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -815,9 +815,7 @@ static void test_tcp_stats( int family ) ok( !err, "got %x\n", err ); err = GetTcpStatisticsEx( &table, family ); -todo_wine_if(family == AF_INET6) ok( !err, "got %d\n", err ); - if (err) goto err; err = NsiGetAllParameters( 1, &NPI_MS_TCP_MODULEID, NSI_TCP_STATS_TABLE, &key, sizeof(key), NULL, 0, &dyn2, sizeof(dyn), NULL, 0 ); @@ -847,7 +845,6 @@ todo_wine_if(family == AF_INET6) table.dwOutRsts, dyn.out_rsts, dyn2.out_rsts ); ok( unstable( table.dwNumConns == dyn.num_conns ), "%d vs %d\n", table.dwNumConns, dyn.num_conns ); -err: winetest_pop_context(); } -- 2.23.0

1 0

[PATCH 2/3] nsiproxy: Implement TCP stats get_all_parameters.
by Huw Davies 13 Aug '21

13 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/tests/nsi.c | 59 +++++++++ dlls/nsiproxy.sys/Makefile.in | 3 +- dlls/nsiproxy.sys/nsi.c | 1 + dlls/nsiproxy.sys/nsiproxy_private.h | 1 + dlls/nsiproxy.sys/tcp.c | 190 +++++++++++++++++++++++++++ include/wine/nsi.h | 29 ++++ 6 files changed, 282 insertions(+), 1 deletion(-) create mode 100644 dlls/nsiproxy.sys/tcp.c diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index a21ac897e2c..fb95ab67d3b 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -33,6 +33,11 @@ static int bounded( ULONG64 val, ULONG64 lo, ULONG64 hi ) return lo <= val && val <= hi; } +static int unstable( int val ) +{ + return !winetest_interactive || val; +} + static void test_nsi_api( void ) { DWORD rw_sizes[] = { FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, name2), FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, unk), @@ -795,6 +800,57 @@ static void test_ip_forward( int family ) winetest_pop_context(); } +static void test_tcp_stats( int family ) +{ + DWORD err; + USHORT key = family; + struct nsi_tcp_stats_dynamic dyn, dyn2; + struct nsi_tcp_stats_static stat; + MIB_TCPSTATS table; + + winetest_push_context( family == AF_INET ? "AF_INET" : "AF_INET6" ); + + err = NsiGetAllParameters( 1, &NPI_MS_TCP_MODULEID, NSI_TCP_STATS_TABLE, &key, sizeof(key), NULL, 0, + &dyn, sizeof(dyn), &stat, sizeof(stat) ); + ok( !err, "got %x\n", err ); + + err = GetTcpStatisticsEx( &table, family ); +todo_wine_if(family == AF_INET6) + ok( !err, "got %d\n", err ); + if (err) goto err; + + err = NsiGetAllParameters( 1, &NPI_MS_TCP_MODULEID, NSI_TCP_STATS_TABLE, &key, sizeof(key), NULL, 0, + &dyn2, sizeof(dyn), NULL, 0 ); + ok( !err, "got %x\n", err ); + + ok( table.dwRtoAlgorithm == stat.rto_algo, "%d vs %d\n", table.dwRtoAlgorithm, stat.rto_algo ); + ok( table.dwRtoMin == stat.rto_min, "%d vs %d\n", table.dwRtoMin, stat.rto_min ); + ok( table.dwRtoMax == stat.rto_max, "%d vs %d\n", table.dwRtoMax, stat.rto_max ); + ok( table.dwMaxConn == stat.max_conns, "%d vs %d\n", table.dwMaxConn, stat.max_conns ); + + ok( unstable( table.dwActiveOpens == dyn.active_opens ), "%d vs %d\n", table.dwActiveOpens, dyn.active_opens ); + ok( unstable( table.dwPassiveOpens == dyn.passive_opens ), "%d vs %d\n", table.dwPassiveOpens, dyn.passive_opens ); + ok( bounded( table.dwAttemptFails, dyn.attempt_fails, dyn2.attempt_fails ), "%d vs [%d %d]\n", + table.dwAttemptFails, dyn.attempt_fails, dyn2.attempt_fails ); + ok( bounded( table.dwEstabResets, dyn.est_rsts, dyn2.est_rsts ), "%d vs [%d %d]\n", + table.dwEstabResets, dyn.est_rsts, dyn2.est_rsts ); + ok( unstable( table.dwCurrEstab == dyn.cur_est ), "%d vs %d\n", table.dwCurrEstab, dyn.cur_est ); + ok( bounded( table.dwInSegs, dyn.in_segs, dyn2.in_segs ), "%d vs [%I64d %I64d]\n", + table.dwInSegs, dyn.in_segs, dyn2.in_segs ); + ok( bounded( table.dwOutSegs, dyn.out_segs, dyn2.out_segs ), "%d vs [%I64d %I64d]\n", + table.dwOutSegs, dyn.out_segs, dyn2.out_segs ); + ok( bounded( table.dwRetransSegs, dyn.retrans_segs, dyn2.retrans_segs ), "%d vs [%d %d]\n", + table.dwRetransSegs, dyn.retrans_segs, dyn2.retrans_segs ); + ok( bounded( table.dwInErrs, dyn.in_errs, dyn2.in_errs ), "%d vs [%d %d]\n", + table.dwInErrs, dyn.in_errs, dyn2.in_errs ); + ok( bounded( table.dwOutRsts, dyn.out_rsts, dyn2.out_rsts ), "%d vs [%d %d]\n", + table.dwOutRsts, dyn.out_rsts, dyn2.out_rsts ); + ok( unstable( table.dwNumConns == dyn.num_conns ), "%d vs %d\n", table.dwNumConns, dyn.num_conns ); + +err: + winetest_pop_context(); +} + START_TEST( nsi ) { test_nsi_api(); @@ -814,4 +870,7 @@ START_TEST( nsi ) test_ip_neighbour( AF_INET6 ); test_ip_forward( AF_INET ); test_ip_forward( AF_INET6 ); + + test_tcp_stats( AF_INET ); + test_tcp_stats( AF_INET6 ); } diff --git a/dlls/nsiproxy.sys/Makefile.in b/dlls/nsiproxy.sys/Makefile.in index 07c2738e55b..3f8965236ba 100644 --- a/dlls/nsiproxy.sys/Makefile.in +++ b/dlls/nsiproxy.sys/Makefile.in @@ -6,4 +6,5 @@ C_SRCS = \ device.c \ ip.c \ ndis.c \ - nsi.c + nsi.c \ + tcp.c diff --git a/dlls/nsiproxy.sys/nsi.c b/dlls/nsiproxy.sys/nsi.c index 8e084a076fd..ef57c65ce4d 100644 --- a/dlls/nsiproxy.sys/nsi.c +++ b/dlls/nsiproxy.sys/nsi.c @@ -40,6 +40,7 @@ static const struct module *modules[] = &ndis_module, &ipv4_module, &ipv6_module, + &tcp_module, }; static const struct module_table *get_module_table( const NPI_MODULEID *id, DWORD table ) diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h index 24f40e184a4..17e0189b378 100644 --- a/dlls/nsiproxy.sys/nsiproxy_private.h +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -115,3 +115,4 @@ struct module extern const struct module ndis_module DECLSPEC_HIDDEN; extern const struct module ipv4_module DECLSPEC_HIDDEN; extern const struct module ipv6_module DECLSPEC_HIDDEN; +extern const struct module tcp_module DECLSPEC_HIDDEN; diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c new file mode 100644 index 00000000000..ffac9971316 --- /dev/null +++ b/dlls/nsiproxy.sys/tcp.c @@ -0,0 +1,190 @@ +/* + * nsiproxy.sys tcp module + * + * Copyright 2003, 2006, 2011 Juan Lang + * Copyright 2007 TransGaming Technologies Inc. + * Copyright 2021 Huw Davies + * + * 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 "config.h" +#include <stdarg.h> + +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif + +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif + +#ifdef HAVE_SYS_SOCKETVAR_H +#include <sys/socketvar.h> +#endif + +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif + +#ifdef HAVE_NETINET_TCP_VAR_H +#include <netinet/tcp_var.h> +#endif + +#ifdef HAVE_SYS_SYSCTL_H +#include <sys/sysctl.h> +#endif + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#define USE_WS_PREFIX +#include "winsock2.h" +#include "ifdef.h" +#include "netiodef.h" +#include "ws2ipdef.h" +#include "tcpmib.h" +#include "wine/nsi.h" +#include "wine/debug.h" + +#include "nsiproxy_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(nsi); + +static NTSTATUS tcp_stats_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_tcp_stats_dynamic dyn; + struct nsi_tcp_stats_static stat; + const USHORT *family = key; + + 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 ); + + if (*family != WS_AF_INET && *family != WS_AF_INET6) return STATUS_NOT_SUPPORTED; + + memset( &dyn, 0, sizeof(dyn) ); + memset( &stat, 0, sizeof(stat) ); + +#ifdef __linux__ + { + NTSTATUS status = STATUS_NOT_SUPPORTED; + static const char hdr[] = "Tcp:"; + char buf[512], *ptr; + FILE *fp; + + /* linux merges tcp4 and tcp6 stats, so simply supply that for either family */ + 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_segs, out_segs; + ptr += sizeof(hdr); + sscanf( ptr, "%u %u %u %u %u %u %u %u %u %u %u %u %u %u", + &stat.rto_algo, + &stat.rto_min, + &stat.rto_max, + &stat.max_conns, + &dyn.active_opens, + &dyn.passive_opens, + &dyn.attempt_fails, + &dyn.est_rsts, + &dyn.cur_est, + &in_segs, + &out_segs, + &dyn.retrans_segs, + &dyn.in_errs, + &dyn.out_rsts ); + dyn.in_segs = in_segs; + dyn.out_segs = out_segs; + if (dynamic_data) *(struct nsi_tcp_stats_dynamic *)dynamic_data = dyn; + if (static_data) *(struct nsi_tcp_stats_static *)static_data = stat; + status = STATUS_SUCCESS; + break; + } + } + fclose( fp ); + return status; + } +#elif defined(HAVE_SYS_SYSCTL_H) && defined(TCPCTL_STATS) && (defined(HAVE_STRUCT_TCPSTAT_TCPS_CONNATTEMPT) || defined(HAVE_STRUCT_TCP_STATS_TCPS_CONNATTEMPT)) + { +#ifndef TCPTV_MIN /* got removed in Mac OS X for some reason */ +#define TCPTV_MIN 2 +#define TCPTV_REXMTMAX 128 +#endif + int mib[] = { CTL_NET, PF_INET, IPPROTO_TCP, TCPCTL_STATS }; +#define hz 1000 +#if defined(HAVE_STRUCT_TCPSTAT_TCPS_CONNATTEMPT) + struct tcpstat tcp_stat; +#elif defined(HAVE_STRUCT_TCP_STATS_TCPS_CONNATTEMPT) + struct tcp_stats tcp_stat; +#endif + size_t needed = sizeof(tcp_stat); + + if (sysctl( mib, ARRAY_SIZE(mib), &tcp_stat, &needed, NULL, 0 ) == -1) return STATUS_NOT_SUPPORTED; + + stat.rto_algo = MIB_TCP_RTO_VANJ; + stat.rto_min = TCPTV_MIN; + stat.rto_max = TCPTV_REXMTMAX; + stat.max_conns = -1; + dyn.active_opens = tcp_stat.tcps_connattempt; + dyn.passive_opens = tcp_stat.tcps_accepts; + dyn.attempt_fails = tcp_stat.tcps_conndrops; + dyn.est_rsts = tcp_stat.tcps_drops; + dyn.cur_est = 0; + dyn.pad = 0; + dyn.in_segs = tcp_stat.tcps_rcvtotal; + dyn.out_segs = tcp_stat.tcps_sndtotal - tcp_stat.tcps_sndrexmitpack; + dyn.retrans_segs = tcp_stat.tcps_sndrexmitpack; + dyn.out_rsts = tcp_stat.tcps_sndctrl - tcp_stat.tcps_closed; + dyn.in_errs = tcp_stat.tcps_rcvbadsum + tcp_stat.tcps_rcvbadoff + tcp_stat.tcps_rcvmemdrop + tcp_stat.tcps_rcvshort; + dyn.num_conns = tcp_stat.tcps_connects; + if (dynamic_data) *(struct nsi_tcp_stats_dynamic *)dynamic_data = dyn; + if (static_data) *(struct nsi_tcp_stats_static *)static_data = stat; + return STATUS_SUCCESS; + } +#else + FIXME( "not implemented\n" ); + return STATUS_NOT_IMPLEMENTED; +#endif +} + +static struct module_table tcp_tables[] = +{ + { + NSI_TCP_STATS_TABLE, + { + sizeof(USHORT), 0, + sizeof(struct nsi_tcp_stats_dynamic), sizeof(struct nsi_tcp_stats_static) + }, + NULL, + tcp_stats_get_all_parameters, + }, + { + ~0u + } +}; + +const struct module tcp_module = +{ + &NPI_MS_TCP_MODULEID, + tcp_tables +}; diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 2c72c16aedc..3c92fb81aae 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -292,6 +292,35 @@ struct nsi_ip_forward_static DWORD if_index; }; +/* Undocumented NSI TCP tables */ +#define NSI_TCP_STATS_TABLE 0 + +struct nsi_tcp_stats_dynamic +{ + DWORD active_opens; + DWORD passive_opens; + DWORD attempt_fails; + DWORD est_rsts; + DWORD cur_est; + DWORD pad; /* ? */ + ULONGLONG in_segs; + ULONGLONG out_segs; + DWORD retrans_segs; + DWORD out_rsts; + DWORD in_errs; + DWORD num_conns; + DWORD unk[12]; +}; + +struct nsi_tcp_stats_static +{ + DWORD rto_algo; + DWORD rto_min; + DWORD rto_max; + DWORD max_conns; + DWORD unk; +}; + /* Wine specific ioctl interface */ #define IOCTL_NSIPROXY_WINE_ENUMERATE_ALL CTL_CODE(FILE_DEVICE_NETWORK, 0x400, METHOD_BUFFERED, 0) -- 2.23.0

1 0

[PATCH 1/3] nsiproxy: Add an #ifdef guard for SIN_ROUTER.
by Huw Davies 13 Aug '21

13 Aug '21

It's not defined in FreeBSD. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- Supersedes 211408 dlls/nsiproxy.sys/ip.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index c5d98fa93f2..e2e292f4b59 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -962,7 +962,11 @@ static NTSTATUS ipv4_neighbour_enumerate_all( void *key_data, DWORD key_size, vo 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; +#ifdef SIN_ROUTER entry.is_router = sinarp->sin_other & SIN_ROUTER; +#else + entry.is_router = 0; +#endif entry.is_unreachable = 0; /* FIXME */ if (num < *count) -- 2.23.0

1 0

[PATCH 1/4] include: Add remaining IPv4 socket options
by Alex Henrie 13 Aug '21

13 Aug '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- The same option apparently causes both the hop limit and the time-to-live to be received. --- include/ws2ipdef.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index d5a4dab6ce0..3025a9c6fe9 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -83,6 +83,7 @@ typedef struct _INTERFACE_INFO #define IP_UNBLOCK_SOURCE 18 #define IP_PKTINFO 19 #define IP_HOPLIMIT 21 +#define IP_RECVTTL 21 #define IP_RECEIVE_BROADCAST 22 #define IP_RECVIF 24 #define IP_RECVDSTADDR 25 @@ -91,7 +92,21 @@ typedef struct _INTERFACE_INFO #define IP_DEL_IFLIST 30 #define IP_UNICAST_IF 31 #define IP_RTHDR 32 +#define IP_GET_IFLIST 33 #define IP_RECVRTHDR 38 +#define IP_TCLASS 39 +#define IP_RECVTCLASS 40 +#define IP_RECVTOS 40 +#define IP_ORIGINAL_ARRIVAL_IF 47 +#define IP_ECN 50 +#define IP_PKTINFO_EX 51 +#define IP_WFP_REDIRECT_RECORDS 60 +#define IP_WFP_REDIRECT_CONTEXT 70 +#define IP_MTU_DISCOVER 71 +#define IP_MTU 73 +#define IP_NRT_INTERFACE 74 +#define IP_RECVERR 75 +#define IP_USER_MTU 76 #else #define WS_IP_OPTIONS 1 #define WS_IP_HDRINCL 2 @@ -109,6 +124,7 @@ typedef struct _INTERFACE_INFO #define WS_IP_UNBLOCK_SOURCE 18 #define WS_IP_PKTINFO 19 #define WS_IP_HOPLIMIT 21 +#define WS_IP_RECVTTL 21 #define WS_IP_RECEIVE_BROADCAST 22 #define WS_IP_RECVIF 24 #define WS_IP_RECVDSTADDR 25 @@ -117,7 +133,21 @@ typedef struct _INTERFACE_INFO #define WS_IP_DEL_IFLIST 30 #define WS_IP_UNICAST_IF 31 #define WS_IP_RTHDR 32 +#define WS_IP_GET_IFLIST 33 #define WS_IP_RECVRTHDR 38 +#define WS_IP_TCLASS 39 +#define WS_IP_RECVTCLASS 40 +#define WS_IP_RECVTOS 40 +#define WS_IP_ORIGINAL_ARRIVAL_IF 47 +#define WS_IP_ECN 50 +#define WS_IP_PKTINFO_EX 51 +#define WS_IP_WFP_REDIRECT_RECORDS 60 +#define WS_IP_WFP_REDIRECT_CONTEXT 70 +#define WS_IP_MTU_DISCOVER 71 +#define WS_IP_MTU 73 +#define WS_IP_NRT_INTERFACE 74 +#define WS_IP_RECVERR 75 +#define WS_IP_USER_MTU 76 #endif /* USE_WS_PREFIX */ typedef struct WS(sockaddr_in6) -- 2.32.0

3 8

[PATCH 1/2] ntdll: Make alloc_fs_sel() a hidden symbol.
by Zebediah Figura 13 Aug '21

13 Aug '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/unix/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index d02a7946945..390121726ad 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -92,7 +92,7 @@ WINE_DECLARE_DEBUG_CHANNEL(seh); #include <asm/prctl.h> static inline int arch_prctl( int func, void *ptr ) { return syscall( __NR_arch_prctl, func, ptr ); } -extern int CDECL alloc_fs_sel( int sel, void *base ); +extern int CDECL alloc_fs_sel( int sel, void *base ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( alloc_fs_sel, /* switch to 32-bit stack */ "pushq %rbx\n\t" -- 2.32.0

1 1

[PATCH 1/5] winebus.sys: Return STATUS_SUCCESS from IRP_MN_SURPRISE_REMOVAL.
by Rémi Bernon 12 Aug '21

12 Aug '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 23195dfa75a..713db9c7f27 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -704,6 +704,7 @@ static NTSTATUS pdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) remove_pending_irps(device); ext->removed = TRUE; LeaveCriticalSection(&ext->cs); + status = STATUS_SUCCESS; break; case IRP_MN_REMOVE_DEVICE: -- 2.32.0

2 11

[PATCH 1/3] wined3d: Don't shift geometry for d3d10/11.
by Stefan Dösinger 12 Aug '21

12 Aug '21

This fixes stay lines in World of Tanks' GameFace UI parts. The Metal backend doesn't have an offset like this either. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- Other than fixing the todo_wine in test_fractional_viewport, this also fixes a failure in d3d11's test_depth_bias that happens when viewport_array is not supported. I am not entirely sure what the -1 / 64 in get_projection_matrix was meant for. AFAIU get_projection_matrix isn't called for d3d10+, so the path will be entered for d3d9 when we have ARB_CLIP_CONTROL. In this case we don't need to account for the half pixel offset (hence not setting it to 63/64), and I also don't see a reason to nudge for filling rules in the proj matrix and not by adjusting the values in viewport_miscpart_cc. --- dlls/d3d11/tests/d3d11.c | 1 - dlls/wined3d/state.c | 2 +- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 6073fae26d9..1f797da1646 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -28153,7 +28153,6 @@ static void test_fractional_viewports(void) ok(compare_float(v->x, expected.x, 0) && compare_float(v->y, expected.y, 0), "Got fragcoord {%.8e, %.8e}, expected {%.8e, %.8e} at (%u, %u), offset %.8e.\n", v->x, v->y, expected.x, expected.y, x, y, viewport_offsets[i]); - todo_wine ok(compare_float(v->z, expected.z, 2) && compare_float(v->w, expected.w, 2), "Got texcoord {%.8e, %.8e}, expected {%.8e, %.8e} at (%u, %u), offset %.8e.\n", v->z, v->w, expected.z, expected.w, x, y, viewport_offsets[i]); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8316269afcf..b94c04a79b4 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4233,7 +4233,7 @@ static void viewport_miscpart_cc(struct wined3d_context *context, const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; /* See get_projection_matrix() in utils.c for a discussion about those values. */ float pixel_center_offset = context->d3d_info->wined3d_creation_flags - & WINED3D_PIXEL_CENTER_INTEGER ? 63.0f / 128.0f : -1.0f / 128.0f; + & WINED3D_PIXEL_CENTER_INTEGER ? 63.0f / 128.0f : 0.0f; struct wined3d_viewport vp[WINED3D_MAX_VIEWPORTS]; GLdouble depth_ranges[2 * WINED3D_MAX_VIEWPORTS]; GLfloat viewports[4 * WINED3D_MAX_VIEWPORTS]; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4019dd4d812..69c6f073e96 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5555,7 +5555,7 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w if (!clip_control && d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) center_offset = 63.0f / 64.0f; else - center_offset = -1.0f / 64.0f; + center_offset = 0.0f; if (context->last_was_rhw) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 86eae149306..0bf9e01ba42 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5662,7 +5662,7 @@ static inline void shader_get_position_fixup(const struct wined3d_context *conte if (context->d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) center_offset = 63.0f / 64.0f; else - center_offset = -1.0f / 64.0f; + center_offset = 0.0f; for (i = 0; i < fixup_count; ++i) { -- 2.31.1

5 18

[PATCH v2 1/5] wined3d: Don't consider texture rectangles for buffers.
by Matteo Bruni 12 Aug '21

12 Aug '21

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Flip around the WINED3D_RTYPE_BUFFER check. dlls/wined3d/resource.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index f37c313e023..6215da8ce0f 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -121,26 +121,26 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * if (base_type == WINED3D_GL_RES_TYPE_COUNT) base_type = gl_type; - if (type != WINED3D_RTYPE_BUFFER) + if (type == WINED3D_RTYPE_BUFFER) + break; + + if ((bind_flags & WINED3D_BIND_RENDER_TARGET) + && !(format->flags[gl_type] & WINED3DFMT_FLAG_RENDERTARGET)) { - if ((bind_flags & WINED3D_BIND_RENDER_TARGET) - && !(format->flags[gl_type] & WINED3DFMT_FLAG_RENDERTARGET)) - { - WARN("Format %s cannot be used for render targets.\n", debug_d3dformat(format->id)); - continue; - } - if ((bind_flags & WINED3D_BIND_DEPTH_STENCIL) - && !(format->flags[gl_type] & WINED3DFMT_FLAG_DEPTH_STENCIL)) - { - WARN("Format %s cannot be used for depth/stencil buffers.\n", debug_d3dformat(format->id)); - continue; - } - if ((bind_flags & WINED3D_BIND_SHADER_RESOURCE) - && !(format->flags[gl_type] & WINED3DFMT_FLAG_TEXTURE)) - { - WARN("Format %s cannot be used for texturing.\n", debug_d3dformat(format->id)); - continue; - } + WARN("Format %s cannot be used for render targets.\n", debug_d3dformat(format->id)); + continue; + } + if ((bind_flags & WINED3D_BIND_DEPTH_STENCIL) + && !(format->flags[gl_type] & WINED3DFMT_FLAG_DEPTH_STENCIL)) + { + WARN("Format %s cannot be used for depth/stencil buffers.\n", debug_d3dformat(format->id)); + continue; + } + if ((bind_flags & WINED3D_BIND_SHADER_RESOURCE) + && !(format->flags[gl_type] & WINED3DFMT_FLAG_TEXTURE)) + { + WARN("Format %s cannot be used for texturing.\n", debug_d3dformat(format->id)); + continue; } if (((width & (width - 1)) || (height & (height - 1))) && !d3d_info->texture_npot -- 2.26.3

2 6

[PATCH v2 1/2] oleacc: Check proper UI thread for window focus.
by Connor McAdams 12 Aug '21

12 Aug '21

From: Connor McAdams <conmanx360(a)gmail.com> When RPC is done in a multi-threaded apartment environment, this method may be called in a thread other than the one that the object was created in. To account for this, make sure to check the UI thread the HWND belongs to rather than the one belonging to the current thread. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> --- dlls/oleacc/client.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 3b33be55a21..a726c607109 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -227,6 +227,7 @@ static HRESULT WINAPI Client_get_accRole(IAccessible *iface, VARIANT varID, VARI static HRESULT WINAPI Client_get_accState(IAccessible *iface, VARIANT varID, VARIANT *pvarState) { Client *This = impl_from_Client(iface); + GUITHREADINFO info; LONG style; TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pvarState); @@ -244,7 +245,10 @@ static HRESULT WINAPI Client_get_accState(IAccessible *iface, VARIANT varID, VAR V_I4(pvarState) |= STATE_SYSTEM_UNAVAILABLE; else if(IsWindow(This->hwnd)) V_I4(pvarState) |= STATE_SYSTEM_FOCUSABLE; - if(GetFocus() == This->hwnd) + + info.cbSize = sizeof(info); + if(GetGUIThreadInfo(GetWindowThreadProcessId(This->hwnd, NULL), &info) && + info.hwndFocus == This->hwnd) V_I4(pvarState) |= STATE_SYSTEM_FOCUSED; if(!(style & WS_VISIBLE)) V_I4(pvarState) |= STATE_SYSTEM_INVISIBLE; -- 2.25.1

1 1

[PATCH 1/2] user32: Don't fire EVENT_OBJECT_CREATE for dialog and popup windows upon creation.
by Connor McAdams 12 Aug '21

12 Aug '21

Popup menu and dialog window classes don't have EVENT_OBJECT_CREATE winevents associated with their creation. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/user32/win.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 7c2471d2746..2148c3969d8 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1794,7 +1794,13 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, if (!USER_Driver->pCreateWindow( hwnd )) goto failed; - NotifyWinEvent(EVENT_OBJECT_CREATE, hwnd, OBJID_WINDOW, 0); + /* + * Popup menus and dialog windows don't get an EVENT_OBJECT_CREATE + * WinEvent on their creation. + */ + if (GetClassLongW(hwnd, GCW_ATOM) != POPUPMENU_CLASS_ATOM && + GetClassLongW(hwnd, GCW_ATOM) != DIALOG_CLASS_ATOM) + NotifyWinEvent(EVENT_OBJECT_CREATE, hwnd, OBJID_WINDOW, 0); /* send the size messages */ -- 2.25.1

2 4

[PATCH vkd3d v2 5/5] vkd3d-shader: Make some FIXME messages into proper compiler errors.
by Zebediah Figura 12 Aug '21

12 Aug '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Alternate approach I came up with, that I think I like better. At least I'd like to keep printing messages to the console via FIXME; they're not going to show up otherwise. libs/vkd3d-shader/hlsl.c | 24 +++++++++++++++--- libs/vkd3d-shader/hlsl.h | 9 +++++++ libs/vkd3d-shader/hlsl.y | 32 +++++++++++++----------- libs/vkd3d-shader/hlsl_sm1.c | 10 +++++--- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 5 files changed, 54 insertions(+), 22 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 7f12dd20..6d130358 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -55,6 +55,24 @@ void hlsl_warning(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, va_end(args); } +void hlsl_fixme_(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, const char *fmt, ...) +{ + struct vkd3d_string_buffer *string; + va_list args; + + va_start(args, fmt); + string = hlsl_get_string_buffer(ctx); + vkd3d_string_buffer_printf(string, "Aborting due to not yet implemented feature: "); + vkd3d_string_buffer_vprintf(string, fmt, args); + string->buffer[--string->content_size] = 0; + vkd3d_shader_error(ctx->message_context, &loc, VKD3D_SHADER_ERROR_HLSL_NOT_IMPLEMENTED, "%s", string->buffer); + hlsl_release_string_buffer(ctx, string); + va_end(args); + + if (!ctx->result) + ctx->result = VKD3D_ERROR_NOT_IMPLEMENTED; +} + bool hlsl_add_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, bool local_var) { struct hlsl_scope *scope = ctx->cur_scope; @@ -1031,7 +1049,7 @@ static void dump_ir_constant(struct vkd3d_string_buffer *buffer, const struct hl vkd3d_string_buffer_printf(buffer, "}"); } -static const char *debug_expr_op(const struct hlsl_ir_expr *expr) +const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op) { static const char *const op_names[] = { @@ -1082,14 +1100,14 @@ static const char *debug_expr_op(const struct hlsl_ir_expr *expr) [HLSL_OP3_LERP] = "lerp", }; - return op_names[expr->op]; + return op_names[op]; } static void dump_ir_expr(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_expr *expr) { unsigned int i; - vkd3d_string_buffer_printf(buffer, "%s (", debug_expr_op(expr)); + vkd3d_string_buffer_printf(buffer, "%s (", debug_hlsl_expr_op(expr->op)); for (i = 0; i < 3 && expr->operands[i].node; ++i) { dump_src(buffer, &expr->operands[i]); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 4a4af5d1..1405bef3 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -590,6 +590,7 @@ static inline void hlsl_release_string_buffer(struct hlsl_ctx *ctx, struct vkd3d vkd3d_string_buffer_release(&ctx->string_buffers, buffer); } +const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op); const char *debug_hlsl_type(struct hlsl_ctx *ctx, const struct hlsl_type *type); const char *debug_hlsl_writemask(unsigned int writemask); @@ -651,11 +652,19 @@ struct hlsl_ir_load *hlsl_new_var_load(struct hlsl_ctx *ctx, struct hlsl_ir_var void hlsl_error(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, enum vkd3d_shader_error error, const char *fmt, ...) VKD3D_PRINTF_FUNC(4, 5); +void hlsl_fixme_(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, + const char *fmt, ...) VKD3D_PRINTF_FUNC(3, 4); void hlsl_warning(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, enum vkd3d_shader_error error, const char *fmt, ...) VKD3D_PRINTF_FUNC(4, 5); void hlsl_note(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, enum vkd3d_shader_log_level level, const char *fmt, ...) VKD3D_PRINTF_FUNC(4, 5); +#define hlsl_fixme(ctx, loc, ...) \ + do { \ + FIXME(__VA_ARGS__); \ + hlsl_fixme_(ctx, loc, __VA_ARGS__); \ + } while (0) + void hlsl_push_scope(struct hlsl_ctx *ctx); void hlsl_pop_scope(struct hlsl_ctx *ctx); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index ade78da6..73fc846c 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1213,7 +1213,7 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in { if (lhs->type == HLSL_IR_EXPR && hlsl_ir_expr(lhs)->op == HLSL_OP1_CAST) { - FIXME("Cast on the lhs.\n"); + hlsl_fixme(ctx, lhs->loc, "Cast on the LHS.\n"); vkd3d_free(store); return NULL; } @@ -1223,7 +1223,7 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in unsigned int width, s = swizzle->swizzle; if (lhs->data_type->type == HLSL_CLASS_MATRIX) - FIXME("Assignments with writemasks and matrices on lhs are not supported yet.\n"); + hlsl_fixme(ctx, lhs->loc, "Matrix assignment with a writemask.\n"); if (!invert_swizzle(&s, &writemask, &width)) { @@ -1338,7 +1338,9 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, stru list_add_tail(list, &store->node.entry); } else - FIXME("Initializing with \"mismatched\" fields is not supported yet.\n"); + { + hlsl_fixme(ctx, node->loc, "Implicit cast in structure initializer.\n"); + } } vkd3d_free(initializer->args); @@ -1502,14 +1504,14 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t } if (v->arrays.count) { - FIXME("Initializing arrays is not supported yet.\n"); + hlsl_fixme(ctx, v->loc, "Array initializer.\n"); free_parse_initializer(&v->initializer); vkd3d_free(v); continue; } if (v->initializer.args_count > 1) { - FIXME("Complex initializers are not supported yet.\n"); + hlsl_fixme(ctx, v->loc, "Complex initializer.\n"); free_parse_initializer(&v->initializer); vkd3d_free(v); continue; @@ -1786,7 +1788,7 @@ hlsl_prog: | hlsl_prog declaration_statement { if (!list_empty($2)) - FIXME("Uniform initializer.\n"); + hlsl_fixme(ctx, @2, "Uniform initializer.\n"); hlsl_free_instr_list($2); } | hlsl_prog preproc_directive @@ -2769,7 +2771,7 @@ postfix_expr: } if ($2->type == HLSL_CLASS_MATRIX) - FIXME("Matrix constructors are not supported yet.\n"); + hlsl_fixme(ctx, @2, "Matrix constructor.\n"); sprintf(name, "<constructor-%x>", counter++); if (!(var = hlsl_new_synthetic_var(ctx, name, $2, @2))) @@ -2931,11 +2933,11 @@ shift_expr: add_expr | shift_expr OP_LEFTSHIFT add_expr { - FIXME("Left shift.\n"); + hlsl_fixme(ctx, @$, "Left shift.\n"); } | shift_expr OP_RIGHTSHIFT add_expr { - FIXME("Right shift.\n"); + hlsl_fixme(ctx, @$, "Right shift.\n"); } relational_expr: @@ -2972,42 +2974,42 @@ bitand_expr: equality_expr | bitand_expr '&' equality_expr { - FIXME("Bitwise AND.\n"); + hlsl_fixme(ctx, @$, "Bitwise AND.\n"); } bitxor_expr: bitand_expr | bitxor_expr '^' bitand_expr { - FIXME("Bitwise XOR.\n"); + hlsl_fixme(ctx, @$, "Bitwise XOR.\n"); } bitor_expr: bitxor_expr | bitor_expr '|' bitxor_expr { - FIXME("Bitwise OR.\n"); + hlsl_fixme(ctx, @$, "Bitwise OR.\n"); } logicand_expr: bitor_expr | logicand_expr OP_AND bitor_expr { - FIXME("Logical AND.\n"); + hlsl_fixme(ctx, @$, "Logical AND.\n"); } logicor_expr: logicand_expr | logicor_expr OP_OR logicand_expr { - FIXME("Logical OR.\n"); + hlsl_fixme(ctx, @$, "Logical OR.\n"); } conditional_expr: logicor_expr | logicor_expr '?' expr ':' assignment_expr { - FIXME("Ternary operator.\n"); + hlsl_fixme(ctx, @$, "Ternary operator.\n"); } assignment_expr: diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index 85d54ac2..48a504da 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -606,7 +606,8 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b if (instr->data_type->base_type != HLSL_TYPE_FLOAT) { - FIXME("Non-float operations need to be lowered.\n"); + /* These need to be lowered. */ + hlsl_fixme(ctx, instr->loc, "SM1 non-float expression.\n"); return; } @@ -636,7 +637,7 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b break; default: - FIXME("Unhandled op %u.\n", expr->op); + hlsl_fixme(ctx, instr->loc, "SM1 \"%s\" expression.\n", debug_hlsl_expr_op(expr->op)); break; } } @@ -765,8 +766,9 @@ static void write_sm1_instructions(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b { if (instr->data_type->type == HLSL_CLASS_MATRIX) { - FIXME("Matrix operations need to be lowered.\n"); - break; + /* These need to be lowered. */ + hlsl_fixme(ctx, instr->loc, "SM1 matrix expression.\n"); + continue; } assert(instr->data_type->type == HLSL_CLASS_SCALAR || instr->data_type->type == HLSL_CLASS_VECTOR); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 9948045e..63fe9fc5 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -112,6 +112,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_HLSL_INVALID_RETURN = 5014, VKD3D_SHADER_ERROR_HLSL_OVERLAPPING_RESERVATIONS = 5015, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION = 5016, + VKD3D_SHADER_ERROR_HLSL_NOT_IMPLEMENTED = 5299, VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION = 5300, }; -- 2.32.0

3 2

[PATCH v14] ntdll: Allow renaming a file/directory to a different case of itself.
by Gabriel Ivăncescu 12 Aug '21

12 Aug '21

Renaming a file or directory from e.g. foobar to FooBar (or any other case change) should work, like on Windows, instead of being a no-op. Clobbering an existing file must also respect the new case. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46203 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v14: Rebased. Please let me know if there's other changes it needs. dlls/kernel32/tests/file.c | 4 +- dlls/ntdll/tests/file.c | 4 +- dlls/ntdll/unix/file.c | 58 ++++++++++++++++++++- server/fd.c | 100 +++++++++++++++++++++++++------------ server/protocol.def | 2 + 5 files changed, 130 insertions(+), 38 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index ea0a32f..15bfc13 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2040,7 +2040,7 @@ static void test_MoveFileA(void) ok(hfile != INVALID_HANDLE_VALUE, "FindFirstFileA: failed, error %d\n", GetLastError()); if (hfile != INVALID_HANDLE_VALUE) { - todo_wine ok(!lstrcmpA(strrchr(tempdir, '\\') + 1, find_data.cFileName), + ok(!lstrcmpA(strrchr(tempdir, '\\') + 1, find_data.cFileName), "MoveFile failed to change casing on same file: got %s\n", find_data.cFileName); } CloseHandle(hfile); @@ -2085,7 +2085,7 @@ static void test_MoveFileA(void) ok(hfile != INVALID_HANDLE_VALUE, "FindFirstFileA: failed, error %d\n", GetLastError()); if (hfile != INVALID_HANDLE_VALUE) { - todo_wine ok(!lstrcmpA(strrchr(tempdir, '\\') + 1, find_data.cFileName), + ok(!lstrcmpA(strrchr(tempdir, '\\') + 1, find_data.cFileName), "MoveFile failed to change casing on same directory: got %s\n", find_data.cFileName); } CloseHandle(hfile); diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 19ae5f2..c6178d3 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2315,7 +2315,7 @@ static void test_file_link_information(void) ok(handle != INVALID_HANDLE_VALUE, "FindFirstFileW: failed, error %d\n", GetLastError()); if (handle != INVALID_HANDLE_VALUE) { - todo_wine ok(!lstrcmpW(wcsrchr(newpath, '\\') + 1, find_data.cFileName), + ok(!lstrcmpW(wcsrchr(newpath, '\\') + 1, find_data.cFileName), "Link did not change casing on existing target file: got %s\n", wine_dbgstr_w(find_data.cFileName)); } @@ -2900,7 +2900,7 @@ static void test_file_link_information(void) ok(handle != INVALID_HANDLE_VALUE, "FindFirstFileW: failed, error %d\n", GetLastError()); if (handle != INVALID_HANDLE_VALUE) { - todo_wine ok(!lstrcmpW(wcsrchr(oldpath, '\\') + 1, find_data.cFileName), + ok(!lstrcmpW(wcsrchr(oldpath, '\\') + 1, find_data.cFileName), "Link did not change casing on same file: got %s\n", wine_dbgstr_w(find_data.cFileName)); } diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 712f94e..9bc0905 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3591,6 +3591,52 @@ NTSTATUS WINAPI wine_unix_to_nt_file_name( const char *name, WCHAR *buffer, ULON } +/*********************************************************************** + * get_filename_case + * + * Get the unix filename, with the case from NT name's last component. + */ +static char *get_filename_case( const OBJECT_ATTRIBUTES *attr ) +{ + const WCHAR *p, *nt_filename = attr->ObjectName->Buffer; + int len = attr->ObjectName->Length / sizeof(WCHAR); + char *file_case; + + /* skip the device and prefix (allow slashes for unix namespace) */ + if (!attr->RootDirectory) + { + int pos = get_dos_prefix_len( attr->ObjectName ); + while (pos < len) + { + WCHAR c = nt_filename[pos++]; + if (c == '\\' || c == '/') break; + } + nt_filename += pos; + len -= pos; + } + + /* strip off trailing backslashes */ + for (; len; len--) + if (nt_filename[len - 1] != '\\' && nt_filename[len - 1] != '/') + break; + + /* get the last component */ + for (p = nt_filename + len; p != nt_filename; p--) + if (p[-1] == '\\' || p[-1] == '/') + break; + len -= p - nt_filename; + nt_filename = p; + + if ((file_case = malloc( len * 3 + 1 ))) + { + len = ntdll_wcstoumbs( nt_filename, len, file_case, len * 3, TRUE ); + if (len < 0 || len > MAX_DIR_ENTRY_LEN) len = 0; + file_case[len] = 0; + } + return file_case; +} + + /*********************************************************************** * get_full_path * @@ -4530,8 +4576,8 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, { FILE_RENAME_INFORMATION *info = ptr; UNICODE_STRING name_str, redir; + char *unix_name, *file_case; OBJECT_ATTRIBUTES attr; - char *unix_name; name_str.Buffer = info->FileName; name_str.Length = info->FileNameLength; @@ -4542,20 +4588,24 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, status = nt_to_unix_file_name( &attr, &unix_name, FILE_OPEN_IF ); if (status == STATUS_SUCCESS || status == STATUS_NO_SUCH_FILE) { + file_case = get_filename_case( &attr ); SERVER_START_REQ( set_fd_name_info ) { req->handle = wine_server_obj_handle( handle ); req->rootdir = wine_server_obj_handle( attr.RootDirectory ); req->namelen = attr.ObjectName->Length; + req->caselen = file_case ? strlen( file_case ) : 0; req->link = FALSE; req->replace = info->ReplaceIfExists; wine_server_add_data( req, attr.ObjectName->Buffer, attr.ObjectName->Length ); + wine_server_add_data( req, file_case, req->caselen ); wine_server_add_data( req, unix_name, strlen(unix_name) ); status = wine_server_call( req ); } SERVER_END_REQ; free( unix_name ); + free( file_case ); } free( redir.Buffer ); } @@ -4567,8 +4617,8 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, { FILE_LINK_INFORMATION *info = ptr; UNICODE_STRING name_str, redir; + char *unix_name, *file_case; OBJECT_ATTRIBUTES attr; - char *unix_name; name_str.Buffer = info->FileName; name_str.Length = info->FileNameLength; @@ -4579,20 +4629,24 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, status = nt_to_unix_file_name( &attr, &unix_name, FILE_OPEN_IF ); if (status == STATUS_SUCCESS || status == STATUS_NO_SUCH_FILE) { + file_case = get_filename_case( &attr ); SERVER_START_REQ( set_fd_name_info ) { req->handle = wine_server_obj_handle( handle ); req->rootdir = wine_server_obj_handle( attr.RootDirectory ); req->namelen = attr.ObjectName->Length; + req->caselen = file_case ? strlen( file_case ) : 0; req->link = TRUE; req->replace = info->ReplaceIfExists; wine_server_add_data( req, attr.ObjectName->Buffer, attr.ObjectName->Length ); + wine_server_add_data( req, file_case, req->caselen ); wine_server_add_data( req, unix_name, strlen(unix_name) ); status = wine_server_call( req ); } SERVER_END_REQ; free( unix_name ); + free( file_case ); } free( redir.Buffer ); } diff --git a/server/fd.c b/server/fd.c index b953da2..0cb7729 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2502,11 +2502,14 @@ static void set_fd_disposition( struct fd *fd, int unlink ) /* set new name for the fd */ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, data_size_t len, - struct unicode_str nt_name, int create_link, int replace ) + const char *file_case, data_size_t caselen, struct unicode_str nt_name, + int create_link, int replace ) { + size_t pathlen = 0, filenamelen; struct inode *inode; struct stat st, st2; - char *name; + int different_case; + char *name, *p; if (!fd->inode || !fd->unix_name) { @@ -2540,6 +2543,22 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, da name = combined_name; } + for (p = name; *p;) if (*p++ == '/' && *p) pathlen = p - name; + filenamelen = p - name - pathlen; + for (p = name + pathlen; filenamelen && p[filenamelen - 1] == '/'; filenamelen--) { } + different_case = caselen && (filenamelen != caselen || memcmp( p, file_case, caselen )); + + if (filenamelen < caselen) + { + p = realloc( name, pathlen + caselen + 1 ); + if (!p) + { + set_error( STATUS_NO_MEMORY ); + goto failed; + } + name = p; + } + /* when creating a hard link, source cannot be a dir */ if (create_link && !fstat( fd->unix_fd, &st ) && S_ISDIR( st.st_mode )) { @@ -2552,47 +2571,61 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, da if (!fstat( fd->unix_fd, &st2 ) && st.st_ino == st2.st_ino && st.st_dev == st2.st_dev) { if (create_link && !replace) set_error( STATUS_OBJECT_NAME_COLLISION ); - free( name ); - return; - } + if (!different_case) + { + free( name ); + return; + } - if (!replace) - { - set_error( STATUS_OBJECT_NAME_COLLISION ); - goto failed; + /* creating a link with a different case on itself renames the file */ + create_link = 0; } - - /* can't replace directories or special files */ - if (!S_ISREG( st.st_mode )) + else { - set_error( STATUS_ACCESS_DENIED ); - goto failed; - } + if (!replace) + { + set_error( STATUS_OBJECT_NAME_COLLISION ); + goto failed; + } - /* can't replace an opened file */ - if ((inode = get_inode( st.st_dev, st.st_ino, -1 ))) - { - int is_empty = list_empty( &inode->open ); - release_object( inode ); - if (!is_empty) + /* can't replace directories or special files */ + if (!S_ISREG( st.st_mode )) { set_error( STATUS_ACCESS_DENIED ); goto failed; } - } - /* link() expects that the target doesn't exist */ - /* rename() cannot replace files with directories */ - if (create_link || S_ISDIR( st2.st_mode )) - { - if (unlink( name )) + /* can't replace an opened file */ + if ((inode = get_inode( st.st_dev, st.st_ino, -1 ))) { - file_set_error(); - goto failed; + int is_empty = list_empty( &inode->open ); + release_object( inode ); + if (!is_empty) + { + set_error( STATUS_ACCESS_DENIED ); + goto failed; + } + } + + /* link() expects that the target doesn't exist */ + /* rename() cannot replace files with directories */ + if (create_link || S_ISDIR( st2.st_mode ) || different_case) + { + if (unlink( name )) + { + file_set_error(); + goto failed; + } } } } + if (different_case) + { + memcpy( name + pathlen, file_case, caselen ); + name[pathlen + caselen] = 0; + } + if (create_link) { if (link( fd->unix_name, name )) @@ -2929,16 +2962,19 @@ DECL_HANDLER(set_fd_disp_info) /* set fd name information */ DECL_HANDLER(set_fd_name_info) { + const char *fullname, *file_case; struct fd *fd, *root_fd = NULL; struct unicode_str nt_name; - if (req->namelen > get_req_data_size()) + if (req->namelen > get_req_data_size() || get_req_data_size() - req->namelen < req->caselen) { set_error( STATUS_INVALID_PARAMETER ); return; } nt_name.str = get_req_data(); nt_name.len = (req->namelen / sizeof(WCHAR)) * sizeof(WCHAR); + file_case = (const char *)get_req_data() + req->namelen; + fullname = file_case + req->caselen; if (req->rootdir) { @@ -2952,8 +2988,8 @@ DECL_HANDLER(set_fd_name_info) if ((fd = get_handle_fd_obj( current->process, req->handle, 0 ))) { - set_fd_name( fd, root_fd, (const char *)get_req_data() + req->namelen, - get_req_data_size() - req->namelen, nt_name, req->link, req->replace ); + set_fd_name( fd, root_fd, fullname, (const char *)get_req_data() + get_req_data_size() - fullname, + file_case, req->caselen, nt_name, req->link, req->replace ); release_object( fd ); } if (root_fd) release_object( root_fd ); diff --git a/server/protocol.def b/server/protocol.def index 133d6ad..b7de62f 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3537,9 +3537,11 @@ struct handle_info obj_handle_t handle; /* handle to a file or directory */ obj_handle_t rootdir; /* root directory */ data_size_t namelen; /* length of NT name in bytes */ + data_size_t caselen; /* length of the actual case filename */ int link; /* link instead of renaming */ int replace; /* replace an existing file? */ VARARG(name,unicode_str,namelen); /* NT name */ + VARARG(actual_case,string,caselen); /* new file name's actual case (without path) */ VARARG(filename,string); /* new file name */ @END -- 2.31.1

1 0

[PATCH vkd3d v2 1/6] vkd3d-shader: Implement FTOD instruction.
by Conor McCarthy 12 Aug '21

12 Aug '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- v2: Handle via vkd3d_dxbc_compiler_emit_alu_instruction(). --- libs/vkd3d-shader/dxbc.c | 1 + libs/vkd3d-shader/sm4.h | 1 + libs/vkd3d-shader/spirv.c | 2 ++ libs/vkd3d-shader/trace.c | 1 + libs/vkd3d-shader/vkd3d_shader_private.h | 1 + tests/d3d12.c | 2 +- 6 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index fab19046..0c590563 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -807,6 +807,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = {VKD3D_SM5_OP_DNE, VKD3DSIH_DNE, "u", "dd"}, {VKD3D_SM5_OP_DMOV, VKD3DSIH_DMOV, "d", "d"}, {VKD3D_SM5_OP_DMOVC, VKD3DSIH_DMOVC, "d", "udd"}, + {VKD3D_SM5_OP_FTOD, VKD3DSIH_FTOD, "d", "f"}, {VKD3D_SM5_OP_EVAL_SAMPLE_INDEX, VKD3DSIH_EVAL_SAMPLE_INDEX, "f", "fi"}, {VKD3D_SM5_OP_EVAL_CENTROID, VKD3DSIH_EVAL_CENTROID, "f", "f"}, {VKD3D_SM5_OP_DCL_GS_INSTANCES, VKD3DSIH_DCL_GS_INSTANCES, "", "", diff --git a/libs/vkd3d-shader/sm4.h b/libs/vkd3d-shader/sm4.h index 335f0161..5f4f22db 100644 --- a/libs/vkd3d-shader/sm4.h +++ b/libs/vkd3d-shader/sm4.h @@ -327,6 +327,7 @@ enum vkd3d_sm4_opcode VKD3D_SM5_OP_DNE = 0xc6, VKD3D_SM5_OP_DMOV = 0xc7, VKD3D_SM5_OP_DMOVC = 0xc8, + VKD3D_SM5_OP_FTOD = 0xca, VKD3D_SM5_OP_EVAL_SAMPLE_INDEX = 0xcc, VKD3D_SM5_OP_EVAL_CENTROID = 0xcd, VKD3D_SM5_OP_DCL_GS_INSTANCES = 0xce, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 4e67af49..a50a3099 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6776,6 +6776,7 @@ static SpvOp vkd3d_dxbc_compiler_map_alu_instruction(const struct vkd3d_shader_i {VKD3DSIH_DDIV, SpvOpFDiv}, {VKD3DSIH_DIV, SpvOpFDiv}, {VKD3DSIH_DMUL, SpvOpFMul}, + {VKD3DSIH_FTOD, SpvOpFConvert}, {VKD3DSIH_FTOI, SpvOpConvertFToS}, {VKD3DSIH_FTOU, SpvOpConvertFToU}, {VKD3DSIH_IADD, SpvOpIAdd}, @@ -9528,6 +9529,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_DDIV: case VKD3DSIH_DIV: case VKD3DSIH_DMUL: + case VKD3DSIH_FTOD: case VKD3DSIH_FTOI: case VKD3DSIH_FTOU: case VKD3DSIH_IADD: diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 830a5fc7..8f93e1bd 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -147,6 +147,7 @@ static const char * const shader_opcode_names[] = /* VKD3DSIH_FIRSTBIT_LO */ "firstbit_lo", /* VKD3DSIH_FIRSTBIT_SHI */ "firstbit_shi", /* VKD3DSIH_FRC */ "frc", + /* VKD3DSIH_FTOD */ "ftod", /* VKD3DSIH_FTOI */ "ftoi", /* VKD3DSIH_FTOU */ "ftou", /* VKD3DSIH_GATHER4 */ "gather4", diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 9948045e..7400be51 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -236,6 +236,7 @@ enum vkd3d_shader_opcode VKD3DSIH_FIRSTBIT_LO, VKD3DSIH_FIRSTBIT_SHI, VKD3DSIH_FRC, + VKD3DSIH_FTOD, VKD3DSIH_FTOI, VKD3DSIH_FTOU, VKD3DSIH_GATHER4, diff --git a/tests/d3d12.c b/tests/d3d12.c index 2b1830bd..4c03b81e 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -10032,7 +10032,7 @@ static void test_shader_instructions(void) {&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}, + {&ps_ftod, {.f = {{-2.5f, -2.5f}}}, {.d = {-2.5, 2.5}}, true}, {&ps_dmul, {.d = {{ 1.5, 3.0}}}, {.d = { 4.5, -4.5}}, true}, {&ps_ddiv, {.d = {{ 2.0, 4.0}}}, {.d = { 0.5, 2.0}}, true}, {&ps_ddiv, {.d = {{ 2.0, -4.0}}}, {.d = {-0.5, -2.0}}, true}, -- 2.32.0

2 11

[PATCH v2] user32: Don't set maximized position placement for toplevel windows covering the entire work area.
by Gabriel Ivăncescu 12 Aug '21

12 Aug '21

The game "Imperiums: Greek Wars" depends on this to display its window properly. It also fixes the todo_wine in test_window_placement, along with a few new tests that show exactly the threshold at which the "transition" happens. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/user32/tests/win.c | 54 ++++++++++++++++++++++++++++++++--------- dlls/user32/winpos.c | 39 ++++++++++++++++++++++++++++- 2 files changed, 80 insertions(+), 13 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 228395e..e23ab81 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -11624,8 +11624,9 @@ static void test_IsWindowEnabled(void) static void test_window_placement(void) { - RECT orig = {100, 200, 300, 400}, orig2 = {200, 300, 400, 500}, rect; + RECT orig = {100, 200, 300, 400}, orig2 = {200, 300, 400, 500}, rect, work_rect; WINDOWPLACEMENT wp = {sizeof(wp)}; + MONITORINFO mon_info; HWND hwnd; BOOL ret; @@ -11633,6 +11634,10 @@ static void test_window_placement(void) orig.left, orig.top, orig.right - orig.left, orig.bottom - orig.top, 0, 0, 0, 0); ok(!!hwnd, "failed to create window, error %u\n", GetLastError()); + mon_info.cbSize = sizeof(mon_info); + GetMonitorInfoW(MonitorFromWindow(hwnd, MONITOR_DEFAULTTOPRIMARY), &mon_info); + work_rect = mon_info.rcWork; + ret = GetWindowPlacement(hwnd, &wp); ok(ret, "failed to get window placement, error %u\n", GetLastError()); ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd); @@ -11675,7 +11680,6 @@ static void test_window_placement(void) ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11693,6 +11697,42 @@ todo_wine ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", wine_dbgstr_rect(&wp.rcNormalPosition)); + SetWindowPos(hwnd, 0, work_rect.left, work_rect.top, work_rect.right - work_rect.left, + work_rect.bottom - work_rect.top, SWP_NOZORDER | SWP_NOACTIVATE); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); + ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + + SetWindowPos(hwnd, 0, work_rect.left, work_rect.top, work_rect.right - work_rect.left - 1, + work_rect.bottom - work_rect.top, SWP_NOZORDER | SWP_NOACTIVATE); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); + ok(wp.ptMaxPosition.x == work_rect.left && wp.ptMaxPosition.y == work_rect.top, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + + SetWindowPos(hwnd, 0, work_rect.left, work_rect.top, work_rect.right - work_rect.left, + work_rect.bottom - work_rect.top - 1, SWP_NOZORDER | SWP_NOACTIVATE); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); + ok(wp.ptMaxPosition.x == work_rect.left && wp.ptMaxPosition.y == work_rect.top, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + ShowWindow(hwnd, SW_MINIMIZE); ret = GetWindowPlacement(hwnd, &wp); @@ -11701,7 +11741,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11714,7 +11753,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11727,7 +11765,6 @@ todo_wine ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11745,7 +11782,6 @@ todo_wine ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == 100 && wp.ptMinPosition.y == 100, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig2), "got normal pos %s\n", @@ -11761,7 +11797,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig2), "got normal pos %s\n", @@ -11783,7 +11818,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11804,7 +11838,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == 100 && wp.ptMinPosition.y == 100, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11825,7 +11858,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11839,7 +11871,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11854,7 +11885,6 @@ todo_wine ok(wp.showCmd == SW_NORMAL, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 6e96a4b..f08d6df 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -916,6 +916,42 @@ static POINT get_minimized_pos( HWND hwnd, POINT pt ) return pt; } +static POINT get_maximized_pos( WND *wnd, POINT pos ) +{ + MONITORINFO mon_info; + HMONITOR monitor; + RECT rc_work; + + /* top level windows covering the working area are not set, + to avoid situations where the border style changes and + the window is in the wrong position outside the screen */ + if (!wnd->parent || wnd->parent == GetDesktopWindow()) + { + if (wnd->dwStyle & WS_MAXIMIZE) + { + if ((monitor = MonitorFromWindow( wnd->obj.handle, MONITOR_DEFAULTTOPRIMARY ))) + { + mon_info.cbSize = sizeof(mon_info); + GetMonitorInfoW( monitor, &mon_info ); + rc_work = mon_info.rcMonitor; + + if ((wnd->dwStyle & WS_CAPTION) == WS_CAPTION || !(wnd->dwStyle & (WS_CHILD | WS_POPUP))) + rc_work = mon_info.rcWork; + } + else + SetRect( &rc_work, 0, 0, GetSystemMetrics( SM_CXSCREEN ), GetSystemMetrics( SM_CYSCREEN ) ); + + if (wnd->window_rect.left <= rc_work.left && wnd->window_rect.top <= rc_work.top && + wnd->window_rect.right >= rc_work.right && wnd->window_rect.bottom >= rc_work.bottom) + pos.x = pos.y = -1; + } + else + pos.x = pos.y = -1; + } + + return pos; +} + /*********************************************************************** * WINPOS_MinMaximize @@ -1337,6 +1373,7 @@ BOOL WINAPI GetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *wndpl ) { pWnd->normal_rect = pWnd->window_rect; } + pWnd->max_pos = get_maximized_pos( pWnd, pWnd->max_pos ); wndpl->length = sizeof(*wndpl); if( pWnd->dwStyle & WS_MINIMIZE ) @@ -1425,7 +1462,7 @@ static BOOL WINPOS_SetPlacement( HWND hwnd, const WINDOWPLACEMENT *wndpl, UINT f if (!pWnd || pWnd == WND_OTHER_PROCESS || pWnd == WND_DESKTOP) return FALSE; if (flags & PLACE_MIN) pWnd->min_pos = point_thread_to_win_dpi( hwnd, wp.ptMinPosition ); - if (flags & PLACE_MAX) pWnd->max_pos = point_thread_to_win_dpi( hwnd, wp.ptMaxPosition ); + if (flags & PLACE_MAX) pWnd->max_pos = get_maximized_pos( pWnd, point_thread_to_win_dpi( hwnd, wp.ptMaxPosition ) ); if (flags & PLACE_RECT) pWnd->normal_rect = rect_thread_to_win_dpi( hwnd, wp.rcNormalPosition ); style = pWnd->dwStyle; -- 2.31.1

2 1

[PATCH resend] user32: Don't set maximized position placement for toplevel windows covering the entire work area.
by Gabriel Ivăncescu 12 Aug '21

12 Aug '21

The game "Imperiums: Greek Wars" depends on this to display its window properly. It also fixes the todo_wine in test_window_placement, along with a few new tests that show exactly the threshold at which the "transition" happens. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/user32/tests/win.c | 54 ++++++++++++++++++++++++++++++++--------- dlls/user32/winpos.c | 39 ++++++++++++++++++++++++++++- 2 files changed, 80 insertions(+), 13 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 228395e..dc3ac71 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -11624,8 +11624,9 @@ static void test_IsWindowEnabled(void) static void test_window_placement(void) { - RECT orig = {100, 200, 300, 400}, orig2 = {200, 300, 400, 500}, rect; + RECT orig = {100, 200, 300, 400}, orig2 = {200, 300, 400, 500}, rect, work_rect; WINDOWPLACEMENT wp = {sizeof(wp)}; + MONITORINFO mon_info; HWND hwnd; BOOL ret; @@ -11633,6 +11634,10 @@ static void test_window_placement(void) orig.left, orig.top, orig.right - orig.left, orig.bottom - orig.top, 0, 0, 0, 0); ok(!!hwnd, "failed to create window, error %u\n", GetLastError()); + mon_info.cbSize = sizeof(mon_info); + GetMonitorInfoW(MonitorFromWindow(hwnd, MONITOR_DEFAULTTOPRIMARY), &mon_info); + work_rect = mon_info.rcWork; + ret = GetWindowPlacement(hwnd, &wp); ok(ret, "failed to get window placement, error %u\n", GetLastError()); ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd); @@ -11643,6 +11648,42 @@ static void test_window_placement(void) ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", wine_dbgstr_rect(&wp.rcNormalPosition)); + SetWindowPos(hwnd, 0, work_rect.left, work_rect.top, work_rect.right - work_rect.left, + work_rect.bottom - work_rect.top, SWP_NOZORDER | SWP_NOACTIVATE); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); + ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + + SetWindowPos(hwnd, 0, work_rect.left, work_rect.top, work_rect.right - work_rect.left - 1, + work_rect.bottom - work_rect.top, SWP_NOZORDER | SWP_NOACTIVATE); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); + ok(wp.ptMaxPosition.x == work_rect.left && wp.ptMaxPosition.y == work_rect.top, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + + SetWindowPos(hwnd, 0, work_rect.left, work_rect.top, work_rect.right - work_rect.left, + work_rect.bottom - work_rect.top - 1, SWP_NOZORDER | SWP_NOACTIVATE); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); + ok(wp.ptMaxPosition.x == work_rect.left && wp.ptMaxPosition.y == work_rect.top, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + ShowWindow(hwnd, SW_MINIMIZE); ret = GetWindowPlacement(hwnd, &wp); @@ -11675,7 +11716,6 @@ static void test_window_placement(void) ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11701,7 +11741,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11714,7 +11753,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11727,7 +11765,6 @@ todo_wine ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11745,7 +11782,6 @@ todo_wine ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == 100 && wp.ptMinPosition.y == 100, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig2), "got normal pos %s\n", @@ -11761,7 +11797,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig2), "got normal pos %s\n", @@ -11783,7 +11818,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11804,7 +11838,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == 100 && wp.ptMinPosition.y == 100, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11825,7 +11858,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11839,7 +11871,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11854,7 +11885,6 @@ todo_wine ok(wp.showCmd == SW_NORMAL, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 6e96a4b..f08d6df 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -916,6 +916,42 @@ static POINT get_minimized_pos( HWND hwnd, POINT pt ) return pt; } +static POINT get_maximized_pos( WND *wnd, POINT pos ) +{ + MONITORINFO mon_info; + HMONITOR monitor; + RECT rc_work; + + /* top level windows covering the working area are not set, + to avoid situations where the border style changes and + the window is in the wrong position outside the screen */ + if (!wnd->parent || wnd->parent == GetDesktopWindow()) + { + if (wnd->dwStyle & WS_MAXIMIZE) + { + if ((monitor = MonitorFromWindow( wnd->obj.handle, MONITOR_DEFAULTTOPRIMARY ))) + { + mon_info.cbSize = sizeof(mon_info); + GetMonitorInfoW( monitor, &mon_info ); + rc_work = mon_info.rcMonitor; + + if ((wnd->dwStyle & WS_CAPTION) == WS_CAPTION || !(wnd->dwStyle & (WS_CHILD | WS_POPUP))) + rc_work = mon_info.rcWork; + } + else + SetRect( &rc_work, 0, 0, GetSystemMetrics( SM_CXSCREEN ), GetSystemMetrics( SM_CYSCREEN ) ); + + if (wnd->window_rect.left <= rc_work.left && wnd->window_rect.top <= rc_work.top && + wnd->window_rect.right >= rc_work.right && wnd->window_rect.bottom >= rc_work.bottom) + pos.x = pos.y = -1; + } + else + pos.x = pos.y = -1; + } + + return pos; +} + /*********************************************************************** * WINPOS_MinMaximize @@ -1337,6 +1373,7 @@ BOOL WINAPI GetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *wndpl ) { pWnd->normal_rect = pWnd->window_rect; } + pWnd->max_pos = get_maximized_pos( pWnd, pWnd->max_pos ); wndpl->length = sizeof(*wndpl); if( pWnd->dwStyle & WS_MINIMIZE ) @@ -1425,7 +1462,7 @@ static BOOL WINPOS_SetPlacement( HWND hwnd, const WINDOWPLACEMENT *wndpl, UINT f if (!pWnd || pWnd == WND_OTHER_PROCESS || pWnd == WND_DESKTOP) return FALSE; if (flags & PLACE_MIN) pWnd->min_pos = point_thread_to_win_dpi( hwnd, wp.ptMinPosition ); - if (flags & PLACE_MAX) pWnd->max_pos = point_thread_to_win_dpi( hwnd, wp.ptMaxPosition ); + if (flags & PLACE_MAX) pWnd->max_pos = get_maximized_pos( pWnd, point_thread_to_win_dpi( hwnd, wp.ptMaxPosition ) ); if (flags & PLACE_RECT) pWnd->normal_rect = rect_thread_to_win_dpi( hwnd, wp.rcNormalPosition ); style = pWnd->dwStyle; -- 2.31.1

2 1

[PATCH 2/4] user32/listbox: Fix redraw after LB_SETCOUNT message.
by Akihiro Sagawa 12 Aug '21

12 Aug '21

3ef790b9680cbf38fc93b4902e3ca6c9f57c5422 accidentally dropped updating LBS_DISPLAYCHANGED flag that had been done in LISTBOX_InvalidateItems() if the count value was changed. In fact, the newly added test shows LB_SETCOUNT message always causes WM_DRAWITEM requests regardless of the count value. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51591 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/listbox.c | 2 ++ dlls/user32/tests/listbox.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-)

2 1

[PATCH 4/4] comctl32/listbox: Fix redraw after LB_SETCOUNT message.
by Akihiro Sagawa 12 Aug '21

12 Aug '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/comctl32/listbox.c | 2 ++ dlls/comctl32/tests/listbox.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH 3/4] comctl32/tests: Test pending redraw state with owner-drawn list box.
by Akihiro Sagawa 12 Aug '21

12 Aug '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/comctl32/tests/listbox.c | 50 ++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-)

1 0

[PATCH 1/4] user32/tests: Test pending redraw state with owner-drawn list box.
by Akihiro Sagawa 12 Aug '21

12 Aug '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/listbox.c | 51 ++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-)

1 0

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

12 Aug '21

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

2 1

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

12 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(-)

2 1

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

12 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(-)

2 1

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

12 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(-)

2 1

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

12 Aug '21

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

2 1

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

12 Aug '21

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

2 1

[PATCH v3 1/7] gdi32: Use GetDIBits in emfdrv_stretchblt.
by Jacek Caban 12 Aug '21

12 Aug '21

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

2 1

[PATCH 1/5] hid: Return HIDP_STATUS_SUCCESS even if no usages are found.
by Rémi Bernon 12 Aug '21

12 Aug '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This series should not conflict with the other winebus.sys patches. dlls/hid/hidp.c | 2 -- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 6 ++++++ dlls/xinput1_3/tests/xinput.c | 1 - 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 2690b9b0f27..31f1b85f14a 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -328,7 +328,6 @@ NTSTATUS WINAPI HidP_GetUsages( HIDP_REPORT_TYPE report_type, USAGE usage_page, *usages_len = params.usages - usages; if (status != HIDP_STATUS_SUCCESS) return status; - if (*usages_len == 0) return HIDP_STATUS_USAGE_NOT_FOUND; if (params.usages > params.usages_end) return HIDP_STATUS_BUFFER_TOO_SMALL; return status; } @@ -672,7 +671,6 @@ NTSTATUS WINAPI HidP_GetUsagesEx( HIDP_REPORT_TYPE report_type, USHORT collectio *usages_len = params.usages - usages; if (status != HIDP_STATUS_SUCCESS) return status; - if (*usages_len == 0) return HIDP_STATUS_USAGE_NOT_FOUND; if (params.usages > params.usages_end) return HIDP_STATUS_BUFFER_TOO_SMALL; return status; } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 40f9b8622e3..50e381c8983 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2220,6 +2220,12 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled report, caps.InputReportByteLength); ok(status == HIDP_STATUS_SUCCESS, "HidP_SetUsages returned %#x\n", status); + value = ARRAY_SIZE(usages); + status = HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_KEYBOARD, 0, usages, &value, preparsed_data, + report, caps.InputReportByteLength); + ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsages returned %#x\n", status); + ok(value == 0, "got usage count %d, expected %d\n", value, 2); + usages[0] = 0x9; usages[1] = 0xb; usages[2] = 0xa; diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index 41769e23ec9..0c94bfed982 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -678,7 +678,6 @@ static void check_hid_caps(DWORD index, HANDLE device, PHIDP_PREPARSED_DATA pre 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); -- 2.32.0

2 6

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

12 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(-)

2 2

[PATCH] nsiproxy.sys: Only use SIN_ROUTER when available
by Gerald Pfeifer 12 Aug '21

12 Aug '21

FreeBSD (and others) fall into the non-Linux case that is guarded by HAVE_SYS_SYSCTL_H. Alas not all such systems feature SIN_ROUTER which is used there, so tighten the guard. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/nsiproxy.sys/ip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index 19272861cef..04f5ff3fda5 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -649,7 +649,7 @@ static NTSTATUS ipv4_neighbour_enumerate_all( void *key_data, DWORD key_size, vo } fclose( fp ); } -#elif defined(HAVE_SYS_SYSCTL_H) +#elif defined(HAVE_SYS_SYSCTL_H) && defined(SIN_ROUTER) { int mib[] = { CTL_NET, PF_ROUTE, 0, AF_INET, NET_RT_FLAGS, RTF_LLINFO }, sinarp_len; size_t needed; -- 2.31.1

2 2

[PATCH 6/6] nsiproxy: Don't use the key size to determine the address family as it can be zero.
by Huw Davies 12 Aug '21

12 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/ip.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index ae3e23960de..c5d98fa93f2 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -722,7 +722,7 @@ static void unicast_fill_entry( struct ifaddrs *entry, void *key, struct nsi_ip_ if (stat) stat->creation_time = get_boot_time(); } -static NTSTATUS ip_unicast_enumerate_all( void *key_data, DWORD key_size, void *rw_data, DWORD rw_size, +static NTSTATUS ip_unicast_enumerate_all( int family, 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 ) { @@ -730,7 +730,6 @@ static NTSTATUS ip_unicast_enumerate_all( void *key_data, DWORD key_size, void * NTSTATUS status = STATUS_SUCCESS; BOOL want_data = key_size || rw_size || dynamic_size || static_size; struct ifaddrs *addrs, *entry; - int family = (key_size == sizeof(struct nsi_ipv4_unicast_key)) ? AF_INET : AF_INET6; 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 ); @@ -760,6 +759,22 @@ static NTSTATUS ip_unicast_enumerate_all( void *key_data, DWORD key_size, void * return status; } +static NTSTATUS ipv4_unicast_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 ) +{ + return ip_unicast_enumerate_all( AF_INET, key_data, key_size, rw_data, rw_size, + dynamic_data, dynamic_size, static_data, static_size, count ); +} + +static NTSTATUS ipv6_unicast_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 ) +{ + return ip_unicast_enumerate_all( AF_INET6, key_data, key_size, rw_data, rw_size, + dynamic_data, dynamic_size, static_data, static_size, count ); +} + static NTSTATUS ip_unicast_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 ) @@ -1263,7 +1278,7 @@ static struct module_table ipv4_tables[] = sizeof(struct nsi_ipv4_unicast_key), sizeof(struct nsi_ip_unicast_rw), sizeof(struct nsi_ip_unicast_dynamic), sizeof(struct nsi_ip_unicast_static) }, - ip_unicast_enumerate_all, + ipv4_unicast_enumerate_all, ip_unicast_get_all_parameters, }, { @@ -1328,7 +1343,7 @@ static struct module_table ipv6_tables[] = sizeof(struct nsi_ipv6_unicast_key), sizeof(struct nsi_ip_unicast_rw), sizeof(struct nsi_ip_unicast_dynamic), sizeof(struct nsi_ip_unicast_static) }, - ip_unicast_enumerate_all, + ipv6_unicast_enumerate_all, ip_unicast_get_all_parameters, }, { -- 2.23.0

1 0

[PATCH 5/6] iphlpapi: Implement GetIcmpStatistics() on top of GetIcmpStatisticsEx().
by Huw Davies 12 Aug '21

12 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 41 ++++++++ dlls/iphlpapi/ipstats.c | 170 ---------------------------------- 2 files changed, 41 insertions(+), 170 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 9e484b7e4c2..14a2c719b95 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1495,6 +1495,47 @@ DWORD WINAPI GetFriendlyIfIndex(DWORD IfIndex) return IfIndex; } +static void icmp_stats_ex_to_icmp_stats( MIBICMPSTATS_EX *stats_ex, MIBICMPSTATS *stats ) +{ + stats->dwMsgs = stats_ex->dwMsgs; + stats->dwErrors = stats_ex->dwErrors; + stats->dwDestUnreachs = stats_ex->rgdwTypeCount[ICMP4_DST_UNREACH]; + stats->dwTimeExcds = stats_ex->rgdwTypeCount[ICMP4_TIME_EXCEEDED]; + stats->dwParmProbs = stats_ex->rgdwTypeCount[ICMP4_PARAM_PROB]; + stats->dwSrcQuenchs = stats_ex->rgdwTypeCount[ICMP4_SOURCE_QUENCH]; + stats->dwRedirects = stats_ex->rgdwTypeCount[ICMP4_REDIRECT]; + stats->dwEchos = stats_ex->rgdwTypeCount[ICMP4_ECHO_REQUEST]; + stats->dwEchoReps = stats_ex->rgdwTypeCount[ICMP4_ECHO_REPLY]; + stats->dwTimestamps = stats_ex->rgdwTypeCount[ICMP4_TIMESTAMP_REQUEST]; + stats->dwTimestampReps = stats_ex->rgdwTypeCount[ICMP4_TIMESTAMP_REPLY]; + stats->dwAddrMasks = stats_ex->rgdwTypeCount[ICMP4_MASK_REQUEST]; + stats->dwAddrMaskReps = stats_ex->rgdwTypeCount[ICMP4_MASK_REPLY]; +} + +/****************************************************************** + * GetIcmpStatistics (IPHLPAPI.@) + * + * Get the ICMP statistics for the local computer. + * + * PARAMS + * stats [Out] buffer for ICMP statistics + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + */ +DWORD WINAPI GetIcmpStatistics( MIB_ICMP *stats ) +{ + MIB_ICMP_EX stats_ex; + DWORD err = GetIcmpStatisticsEx( &stats_ex, WS_AF_INET ); + + if (err) return err; + + icmp_stats_ex_to_icmp_stats( &stats_ex.icmpInStats, &stats->stats.icmpInStats ); + icmp_stats_ex_to_icmp_stats( &stats_ex.icmpOutStats, &stats->stats.icmpOutStats ); + return err; +} + /****************************************************************** * GetIcmpStatisticsEx (IPHLPAPI.@) * diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index ff33ed42777..c5621b52dd7 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -276,176 +276,6 @@ static void *read_mib_entry( int fd, int level, int name, int *len ) } #endif /* HAVE_SYS_TIHDR_H && T_OPTMGMT_ACK */ -/****************************************************************** - * GetIcmpStatistics (IPHLPAPI.@) - * - * Get the ICMP statistics for the local computer. - * - * PARAMS - * stats [Out] buffer for ICMP statistics - * - * RETURNS - * Success: NO_ERROR - * Failure: error code from winerror.h - */ -DWORD WINAPI GetIcmpStatistics(PMIB_ICMP stats) -{ - DWORD ret = ERROR_NOT_SUPPORTED; - - if (!stats) return ERROR_INVALID_PARAMETER; - memset( stats, 0, sizeof(MIB_ICMP) ); - -#ifdef __linux__ - { - FILE *fp; - - if ((fp = fopen("/proc/net/snmp", "r"))) - { - static const char hdr[] = "Icmp:"; - char buf[512], *ptr; - - 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)) - { - ptr += sizeof(hdr); - sscanf( ptr, "%u %u %*u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u", - &stats->stats.icmpInStats.dwMsgs, - &stats->stats.icmpInStats.dwErrors, - &stats->stats.icmpInStats.dwDestUnreachs, - &stats->stats.icmpInStats.dwTimeExcds, - &stats->stats.icmpInStats.dwParmProbs, - &stats->stats.icmpInStats.dwSrcQuenchs, - &stats->stats.icmpInStats.dwRedirects, - &stats->stats.icmpInStats.dwEchos, - &stats->stats.icmpInStats.dwEchoReps, - &stats->stats.icmpInStats.dwTimestamps, - &stats->stats.icmpInStats.dwTimestampReps, - &stats->stats.icmpInStats.dwAddrMasks, - &stats->stats.icmpInStats.dwAddrMaskReps, - &stats->stats.icmpOutStats.dwMsgs, - &stats->stats.icmpOutStats.dwErrors, - &stats->stats.icmpOutStats.dwDestUnreachs, - &stats->stats.icmpOutStats.dwTimeExcds, - &stats->stats.icmpOutStats.dwParmProbs, - &stats->stats.icmpOutStats.dwSrcQuenchs, - &stats->stats.icmpOutStats.dwRedirects, - &stats->stats.icmpOutStats.dwEchos, - &stats->stats.icmpOutStats.dwEchoReps, - &stats->stats.icmpOutStats.dwTimestamps, - &stats->stats.icmpOutStats.dwTimestampReps, - &stats->stats.icmpOutStats.dwAddrMasks, - &stats->stats.icmpOutStats.dwAddrMaskReps ); - break; - } - } - fclose(fp); - ret = NO_ERROR; - } - } -#elif defined(HAVE_LIBKSTAT) - { - static char ip[] = "ip", icmp[] = "icmp"; - kstat_ctl_t *kc; - kstat_t *ksp; - - if ((kc = kstat_open()) && - (ksp = kstat_lookup( kc, ip, 0, icmp )) && - kstat_read( kc, ksp, NULL ) != -1 && - ksp->ks_type == KSTAT_TYPE_NAMED) - { - stats->stats.icmpInStats.dwMsgs = kstat_get_ui32( ksp, "inMsgs" ); - stats->stats.icmpInStats.dwErrors = kstat_get_ui32( ksp, "inErrors" ); - stats->stats.icmpInStats.dwDestUnreachs = kstat_get_ui32( ksp, "inDestUnreachs" ); - stats->stats.icmpInStats.dwTimeExcds = kstat_get_ui32( ksp, "inTimeExcds" ); - stats->stats.icmpInStats.dwParmProbs = kstat_get_ui32( ksp, "inParmProbs" ); - stats->stats.icmpInStats.dwSrcQuenchs = kstat_get_ui32( ksp, "inSrcQuenchs" ); - stats->stats.icmpInStats.dwRedirects = kstat_get_ui32( ksp, "inRedirects" ); - stats->stats.icmpInStats.dwEchos = kstat_get_ui32( ksp, "inEchos" ); - stats->stats.icmpInStats.dwEchoReps = kstat_get_ui32( ksp, "inEchoReps" ); - stats->stats.icmpInStats.dwTimestamps = kstat_get_ui32( ksp, "inTimestamps" ); - stats->stats.icmpInStats.dwTimestampReps = kstat_get_ui32( ksp, "inTimestampReps" ); - stats->stats.icmpInStats.dwAddrMasks = kstat_get_ui32( ksp, "inAddrMasks" ); - stats->stats.icmpInStats.dwAddrMaskReps = kstat_get_ui32( ksp, "inAddrMaskReps" ); - stats->stats.icmpOutStats.dwMsgs = kstat_get_ui32( ksp, "outMsgs" ); - stats->stats.icmpOutStats.dwErrors = kstat_get_ui32( ksp, "outErrors" ); - stats->stats.icmpOutStats.dwDestUnreachs = kstat_get_ui32( ksp, "outDestUnreachs" ); - stats->stats.icmpOutStats.dwTimeExcds = kstat_get_ui32( ksp, "outTimeExcds" ); - stats->stats.icmpOutStats.dwParmProbs = kstat_get_ui32( ksp, "outParmProbs" ); - stats->stats.icmpOutStats.dwSrcQuenchs = kstat_get_ui32( ksp, "outSrcQuenchs" ); - stats->stats.icmpOutStats.dwRedirects = kstat_get_ui32( ksp, "outRedirects" ); - stats->stats.icmpOutStats.dwEchos = kstat_get_ui32( ksp, "outEchos" ); - stats->stats.icmpOutStats.dwEchoReps = kstat_get_ui32( ksp, "outEchoReps" ); - stats->stats.icmpOutStats.dwTimestamps = kstat_get_ui32( ksp, "outTimestamps" ); - stats->stats.icmpOutStats.dwTimestampReps = kstat_get_ui32( ksp, "outTimestampReps" ); - stats->stats.icmpOutStats.dwAddrMasks = kstat_get_ui32( ksp, "outAddrMasks" ); - stats->stats.icmpOutStats.dwAddrMaskReps = kstat_get_ui32( ksp, "outAddrMaskReps" ); - ret = NO_ERROR; - } - if (kc) kstat_close( kc ); - } -#elif defined(HAVE_SYS_SYSCTL_H) && defined(ICMPCTL_STATS) && (defined(HAVE_STRUCT_ICMPSTAT_ICPS_INHIST) || defined(HAVE_STRUCT_ICMPSTAT_ICPS_OUTHIST)) - { - int mib[] = {CTL_NET, PF_INET, IPPROTO_ICMP, ICMPCTL_STATS}; - struct icmpstat icmp_stat; - size_t needed = sizeof(icmp_stat); - int i; - - if(sysctl(mib, ARRAY_SIZE(mib), &icmp_stat, &needed, NULL, 0) != -1) - { -#ifdef HAVE_STRUCT_ICMPSTAT_ICPS_INHIST - /*in stats */ - stats->stats.icmpInStats.dwMsgs = icmp_stat.icps_badcode + icmp_stat.icps_checksum + icmp_stat.icps_tooshort + icmp_stat.icps_badlen; - for(i = 0; i <= ICMP_MAXTYPE; i++) - stats->stats.icmpInStats.dwMsgs += icmp_stat.icps_inhist[i]; - - stats->stats.icmpInStats.dwErrors = icmp_stat.icps_badcode + icmp_stat.icps_tooshort + icmp_stat.icps_checksum + icmp_stat.icps_badlen; - - stats->stats.icmpInStats.dwDestUnreachs = icmp_stat.icps_inhist[ICMP_UNREACH]; - stats->stats.icmpInStats.dwTimeExcds = icmp_stat.icps_inhist[ICMP_TIMXCEED]; - stats->stats.icmpInStats.dwParmProbs = icmp_stat.icps_inhist[ICMP_PARAMPROB]; - stats->stats.icmpInStats.dwSrcQuenchs = icmp_stat.icps_inhist[ICMP_SOURCEQUENCH]; - stats->stats.icmpInStats.dwRedirects = icmp_stat.icps_inhist[ICMP_REDIRECT]; - stats->stats.icmpInStats.dwEchos = icmp_stat.icps_inhist[ICMP_ECHO]; - stats->stats.icmpInStats.dwEchoReps = icmp_stat.icps_inhist[ICMP_ECHOREPLY]; - stats->stats.icmpInStats.dwTimestamps = icmp_stat.icps_inhist[ICMP_TSTAMP]; - stats->stats.icmpInStats.dwTimestampReps = icmp_stat.icps_inhist[ICMP_TSTAMPREPLY]; - stats->stats.icmpInStats.dwAddrMasks = icmp_stat.icps_inhist[ICMP_MASKREQ]; - stats->stats.icmpInStats.dwAddrMaskReps = icmp_stat.icps_inhist[ICMP_MASKREPLY]; -#endif - -#ifdef HAVE_STRUCT_ICMPSTAT_ICPS_OUTHIST - /* out stats */ - stats->stats.icmpOutStats.dwMsgs = icmp_stat.icps_oldshort + icmp_stat.icps_oldicmp; - for(i = 0; i <= ICMP_MAXTYPE; i++) - stats->stats.icmpOutStats.dwMsgs += icmp_stat.icps_outhist[i]; - - stats->stats.icmpOutStats.dwErrors = icmp_stat.icps_oldshort + icmp_stat.icps_oldicmp; - - stats->stats.icmpOutStats.dwDestUnreachs = icmp_stat.icps_outhist[ICMP_UNREACH]; - stats->stats.icmpOutStats.dwTimeExcds = icmp_stat.icps_outhist[ICMP_TIMXCEED]; - stats->stats.icmpOutStats.dwParmProbs = icmp_stat.icps_outhist[ICMP_PARAMPROB]; - stats->stats.icmpOutStats.dwSrcQuenchs = icmp_stat.icps_outhist[ICMP_SOURCEQUENCH]; - stats->stats.icmpOutStats.dwRedirects = icmp_stat.icps_outhist[ICMP_REDIRECT]; - stats->stats.icmpOutStats.dwEchos = icmp_stat.icps_outhist[ICMP_ECHO]; - stats->stats.icmpOutStats.dwEchoReps = icmp_stat.icps_outhist[ICMP_ECHOREPLY]; - stats->stats.icmpOutStats.dwTimestamps = icmp_stat.icps_outhist[ICMP_TSTAMP]; - stats->stats.icmpOutStats.dwTimestampReps = icmp_stat.icps_outhist[ICMP_TSTAMPREPLY]; - stats->stats.icmpOutStats.dwAddrMasks = icmp_stat.icps_outhist[ICMP_MASKREQ]; - stats->stats.icmpOutStats.dwAddrMaskReps = icmp_stat.icps_outhist[ICMP_MASKREPLY]; -#endif /* HAVE_STRUCT_ICMPSTAT_ICPS_OUTHIST */ - ret = NO_ERROR; - } - } -#else /* ICMPCTL_STATS */ - FIXME( "unimplemented\n" ); -#endif - return ret; -} - /****************************************************************** * GetTcpStatisticsEx (IPHLPAPI.@) * -- 2.23.0

1 0

[PATCH 4/6] iphlpapi: Implement GetIcmpStatisticsEx() on top of nsi.
by Huw Davies 12 Aug '21

12 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 36 +++++++ dlls/iphlpapi/ipstats.c | 175 ---------------------------------- 2 files changed, 36 insertions(+), 175 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 78f4c582e1a..9e484b7e4c2 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1495,6 +1495,42 @@ DWORD WINAPI GetFriendlyIfIndex(DWORD IfIndex) return IfIndex; } +/****************************************************************** + * GetIcmpStatisticsEx (IPHLPAPI.@) + * + * Get the IPv4 and IPv6 ICMP statistics for the local computer. + * + * PARAMS + * stats [Out] buffer for ICMP statistics + * family [In] specifies whether IPv4 or IPv6 statistics are returned + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + */ +DWORD WINAPI GetIcmpStatisticsEx( MIB_ICMP_EX *stats, DWORD family ) +{ + const NPI_MODULEID *mod = ip_module_id( family ); + struct nsi_ip_icmpstats_dynamic dyn; + DWORD err; + + if (!stats || !mod) return ERROR_INVALID_PARAMETER; + memset( stats, 0, sizeof(*stats) ); + + err = NsiGetAllParameters( 1, mod, NSI_IP_ICMPSTATS_TABLE, NULL, 0, NULL, 0, + &dyn, sizeof(dyn), NULL, 0 ); + if (err) return err; + + stats->icmpInStats.dwMsgs = dyn.in_msgs; + stats->icmpInStats.dwErrors = dyn.in_errors; + memcpy( stats->icmpInStats.rgdwTypeCount, dyn.in_type_counts, sizeof( dyn.in_type_counts ) ); + stats->icmpOutStats.dwMsgs = dyn.out_msgs; + stats->icmpOutStats.dwErrors = dyn.out_errors; + memcpy( stats->icmpOutStats.rgdwTypeCount, dyn.out_type_counts, sizeof( dyn.out_type_counts ) ); + + return ERROR_SUCCESS; +} + static void if_row_fill( MIB_IFROW *row, struct nsi_ndis_ifinfo_rw *rw, struct nsi_ndis_ifinfo_dynamic *dyn, struct nsi_ndis_ifinfo_static *stat ) { diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 7d0011a1231..ff33ed42777 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -446,181 +446,6 @@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP stats) return ret; } -/****************************************************************** - * GetIcmpStatisticsEx (IPHLPAPI.@) - * - * Get the IPv4 and IPv6 ICMP statistics for the local computer. - * - * PARAMS - * stats [Out] buffer for ICMP statistics - * family [In] specifies whether IPv4 or IPv6 statistics are returned - * - * RETURNS - * Success: NO_ERROR - * Failure: error code from winerror.h - */ -DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX stats, DWORD family) -{ - DWORD ret = ERROR_NOT_SUPPORTED; - MIB_ICMP ipv4stats; - - if (!stats) return ERROR_INVALID_PARAMETER; - if (family != WS_AF_INET && family != WS_AF_INET6) return ERROR_INVALID_PARAMETER; - memset( stats, 0, sizeof(MIB_ICMP_EX) ); - - if (family == WS_AF_INET6) - { -#ifdef __linux__ - { - FILE *fp; - - if ((fp = fopen("/proc/net/snmp6", "r"))) - { - struct icmpstatstruct{ - const char *name; - DWORD pos; - }; - static const struct icmpstatstruct icmpinstatlist[] = { - { "Icmp6InDestUnreachs", ICMP6_DST_UNREACH }, - { "Icmp6InPktTooBigs", ICMP6_PACKET_TOO_BIG }, - { "Icmp6InTimeExcds", ICMP6_TIME_EXCEEDED }, - { "Icmp6InParmProblems", ICMP6_PARAM_PROB }, - { "Icmp6InEchos", ICMP6_ECHO_REQUEST }, - { "Icmp6InEchoReplies", ICMP6_ECHO_REPLY }, - { "Icmp6InGroupMembQueries", ICMP6_MEMBERSHIP_QUERY }, - { "Icmp6InGroupMembResponses", ICMP6_MEMBERSHIP_REPORT }, - { "Icmp6InGroupMembReductions", ICMP6_MEMBERSHIP_REDUCTION }, - { "Icmp6InRouterSolicits", ND_ROUTER_SOLICIT }, - { "Icmp6InRouterAdvertisements", ND_ROUTER_ADVERT }, - { "Icmp6InNeighborSolicits", ND_NEIGHBOR_SOLICIT }, - { "Icmp6InNeighborAdvertisements", ND_NEIGHBOR_ADVERT }, - { "Icmp6InRedirects", ND_REDIRECT }, - { "Icmp6InMLDv2Reports", ICMP6_V2_MEMBERSHIP_REPORT }, - }; - static const struct icmpstatstruct icmpoutstatlist[] = { - { "Icmp6OutDestUnreachs", ICMP6_DST_UNREACH }, - { "Icmp6OutPktTooBigs", ICMP6_PACKET_TOO_BIG }, - { "Icmp6OutTimeExcds", ICMP6_TIME_EXCEEDED }, - { "Icmp6OutParmProblems", ICMP6_PARAM_PROB }, - { "Icmp6OutEchos", ICMP6_ECHO_REQUEST }, - { "Icmp6OutEchoReplies", ICMP6_ECHO_REPLY }, - { "Icmp6OutGroupMembQueries", ICMP6_MEMBERSHIP_QUERY }, - { "Icmp6OutGroupMembResponses", ICMP6_MEMBERSHIP_REPORT }, - { "Icmp6OutGroupMembReductions", ICMP6_MEMBERSHIP_REDUCTION }, - { "Icmp6OutRouterSolicits", ND_ROUTER_SOLICIT }, - { "Icmp6OutRouterAdvertisements", ND_ROUTER_ADVERT }, - { "Icmp6OutNeighborSolicits", ND_NEIGHBOR_SOLICIT }, - { "Icmp6OutNeighborAdvertisements", ND_NEIGHBOR_ADVERT }, - { "Icmp6OutRedirects", ND_REDIRECT }, - { "Icmp6OutMLDv2Reports", ICMP6_V2_MEMBERSHIP_REPORT }, - }; - char buf[512], *ptr, *value; - DWORD res, i; - - while ((ptr = fgets(buf, sizeof(buf), fp))) - { - if (!(value = strchr(buf, ' '))) - continue; - - /* terminate the valuename */ - ptr = value - 1; - *(ptr + 1) = '\0'; - - /* and strip leading spaces from value */ - value += 1; - while (*value==' ') value++; - if ((ptr = strchr(value, '\n'))) - *ptr='\0'; - - if (!_strnicmp(buf, "Icmp6InMsgs", -1)) - { - if (sscanf(value, "%d", &res)) stats->icmpInStats.dwMsgs = res; - continue; - } - - if (!_strnicmp(buf, "Icmp6InErrors", -1)) - { - if (sscanf(value, "%d", &res)) stats->icmpInStats.dwErrors = res; - continue; - } - - for (i = 0; i < ARRAY_SIZE(icmpinstatlist); i++) - { - if (!_strnicmp(buf, icmpinstatlist[i].name, -1)) - { - if (sscanf(value, "%d", &res)) - stats->icmpInStats.rgdwTypeCount[icmpinstatlist[i].pos] = res; - break; - } - } - - if (!_strnicmp(buf, "Icmp6OutMsgs", -1)) - { - if (sscanf(value, "%d", &res)) stats->icmpOutStats.dwMsgs = res; - continue; - } - - if (!_strnicmp(buf, "Icmp6OutErrors", -1)) - { - if (sscanf(value, "%d", &res)) stats->icmpOutStats.dwErrors = res; - continue; - } - - for (i = 0; i < ARRAY_SIZE(icmpoutstatlist); i++) - { - if (!_strnicmp(buf, icmpoutstatlist[i].name, -1)) - { - if (sscanf(value, "%d", &res)) - stats->icmpOutStats.rgdwTypeCount[icmpoutstatlist[i].pos] = res; - break; - } - } - - } - fclose(fp); - ret = NO_ERROR; - } - } -#else - FIXME( "unimplemented for IPv6\n" ); -#endif - return ret; - } - - ret = GetIcmpStatistics(&ipv4stats); - if (!ret) - { - stats->icmpInStats.dwMsgs = ipv4stats.stats.icmpInStats.dwMsgs; - stats->icmpInStats.dwErrors = ipv4stats.stats.icmpInStats.dwErrors; - stats->icmpInStats.rgdwTypeCount[ICMP4_DST_UNREACH] = ipv4stats.stats.icmpInStats.dwDestUnreachs; - stats->icmpInStats.rgdwTypeCount[ICMP4_SOURCE_QUENCH] = ipv4stats.stats.icmpInStats.dwSrcQuenchs; - stats->icmpInStats.rgdwTypeCount[ICMP4_REDIRECT] = ipv4stats.stats.icmpInStats.dwRedirects; - stats->icmpInStats.rgdwTypeCount[ICMP4_ECHO_REQUEST] = ipv4stats.stats.icmpInStats.dwEchos; - stats->icmpInStats.rgdwTypeCount[ICMP4_ECHO_REPLY] = ipv4stats.stats.icmpInStats.dwEchoReps; - stats->icmpInStats.rgdwTypeCount[ICMP4_TIME_EXCEEDED] = ipv4stats.stats.icmpInStats.dwTimeExcds; - stats->icmpInStats.rgdwTypeCount[ICMP4_PARAM_PROB] = ipv4stats.stats.icmpInStats.dwParmProbs; - stats->icmpInStats.rgdwTypeCount[ICMP4_TIMESTAMP_REQUEST] = ipv4stats.stats.icmpInStats.dwTimestamps; - stats->icmpInStats.rgdwTypeCount[ICMP4_TIMESTAMP_REPLY] = ipv4stats.stats.icmpInStats.dwTimestampReps; - stats->icmpInStats.rgdwTypeCount[ICMP4_MASK_REQUEST] = ipv4stats.stats.icmpInStats.dwAddrMasks; - stats->icmpInStats.rgdwTypeCount[ICMP4_MASK_REPLY] = ipv4stats.stats.icmpInStats.dwAddrMaskReps; - - stats->icmpOutStats.dwMsgs = ipv4stats.stats.icmpOutStats.dwMsgs; - stats->icmpOutStats.dwErrors = ipv4stats.stats.icmpOutStats.dwErrors; - stats->icmpOutStats.rgdwTypeCount[ICMP4_DST_UNREACH] = ipv4stats.stats.icmpOutStats.dwDestUnreachs; - stats->icmpOutStats.rgdwTypeCount[ICMP4_SOURCE_QUENCH] = ipv4stats.stats.icmpOutStats.dwSrcQuenchs; - stats->icmpOutStats.rgdwTypeCount[ICMP4_REDIRECT] = ipv4stats.stats.icmpOutStats.dwRedirects; - stats->icmpOutStats.rgdwTypeCount[ICMP4_ECHO_REQUEST] = ipv4stats.stats.icmpOutStats.dwEchos; - stats->icmpOutStats.rgdwTypeCount[ICMP4_ECHO_REPLY] = ipv4stats.stats.icmpOutStats.dwEchoReps; - stats->icmpOutStats.rgdwTypeCount[ICMP4_TIME_EXCEEDED] = ipv4stats.stats.icmpOutStats.dwTimeExcds; - stats->icmpOutStats.rgdwTypeCount[ICMP4_PARAM_PROB] = ipv4stats.stats.icmpOutStats.dwParmProbs; - stats->icmpOutStats.rgdwTypeCount[ICMP4_TIMESTAMP_REQUEST] = ipv4stats.stats.icmpOutStats.dwTimestamps; - stats->icmpOutStats.rgdwTypeCount[ICMP4_TIMESTAMP_REPLY] = ipv4stats.stats.icmpOutStats.dwTimestampReps; - stats->icmpOutStats.rgdwTypeCount[ICMP4_MASK_REQUEST] = ipv4stats.stats.icmpOutStats.dwAddrMasks; - stats->icmpOutStats.rgdwTypeCount[ICMP4_MASK_REPLY] = ipv4stats.stats.icmpOutStats.dwAddrMaskReps; - } - return ret; -} - /****************************************************************** * GetTcpStatisticsEx (IPHLPAPI.@) * -- 2.23.0

1 0

[PATCH 3/6] nsiproxy: Implement IPv6 icmpstats get_all_parameters on linux.
by Huw Davies 12 Aug '21

12 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/tests/nsi.c | 1 - dlls/nsiproxy.sys/ip.c | 135 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 135 insertions(+), 1 deletion(-) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 3b1e757fa23..a21ac897e2c 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -456,7 +456,6 @@ static void test_ip_icmpstats( int family ) winetest_push_context( family == AF_INET ? "AF_INET" : "AF_INET6" ); err = NsiGetAllParameters( 1, mod, NSI_IP_ICMPSTATS_TABLE, NULL, 0, NULL, 0, &nsi_stats, sizeof(nsi_stats), NULL, 0 ); -todo_wine_if( family == AF_INET6) ok( !err, "got %d\n", err ); if (err) goto err; diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index 8b7b41a291c..ae3e23960de 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -355,6 +355,132 @@ static NTSTATUS ipv4_icmpstats_get_all_parameters( const void *key, DWORD key_si #endif } +static NTSTATUS ipv6_icmpstats_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_icmpstats_dynamic dyn; + + 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) ); + +#ifdef __linux__ + { + struct data + { + const char *name; + DWORD pos; + }; + static const struct data in_list[] = + { + { "Icmp6InDestUnreachs", ICMP6_DST_UNREACH }, + { "Icmp6InPktTooBigs", ICMP6_PACKET_TOO_BIG }, + { "Icmp6InTimeExcds", ICMP6_TIME_EXCEEDED }, + { "Icmp6InParmProblems", ICMP6_PARAM_PROB }, + { "Icmp6InEchos", ICMP6_ECHO_REQUEST }, + { "Icmp6InEchoReplies", ICMP6_ECHO_REPLY }, + { "Icmp6InGroupMembQueries", ICMP6_MEMBERSHIP_QUERY }, + { "Icmp6InGroupMembResponses", ICMP6_MEMBERSHIP_REPORT }, + { "Icmp6InGroupMembReductions", ICMP6_MEMBERSHIP_REDUCTION }, + { "Icmp6InRouterSolicits", ND_ROUTER_SOLICIT }, + { "Icmp6InRouterAdvertisements", ND_ROUTER_ADVERT }, + { "Icmp6InNeighborSolicits", ND_NEIGHBOR_SOLICIT }, + { "Icmp6InNeighborAdvertisements", ND_NEIGHBOR_ADVERT }, + { "Icmp6InRedirects", ND_REDIRECT }, + { "Icmp6InMLDv2Reports", ICMP6_V2_MEMBERSHIP_REPORT }, + }; + static const struct data out_list[] = + { + { "Icmp6OutDestUnreachs", ICMP6_DST_UNREACH }, + { "Icmp6OutPktTooBigs", ICMP6_PACKET_TOO_BIG }, + { "Icmp6OutTimeExcds", ICMP6_TIME_EXCEEDED }, + { "Icmp6OutParmProblems", ICMP6_PARAM_PROB }, + { "Icmp6OutEchos", ICMP6_ECHO_REQUEST }, + { "Icmp6OutEchoReplies", ICMP6_ECHO_REPLY }, + { "Icmp6OutGroupMembQueries", ICMP6_MEMBERSHIP_QUERY }, + { "Icmp6OutGroupMembResponses", ICMP6_MEMBERSHIP_REPORT }, + { "Icmp6OutGroupMembReductions", ICMP6_MEMBERSHIP_REDUCTION }, + { "Icmp6OutRouterSolicits", ND_ROUTER_SOLICIT }, + { "Icmp6OutRouterAdvertisements", ND_ROUTER_ADVERT }, + { "Icmp6OutNeighborSolicits", ND_NEIGHBOR_SOLICIT }, + { "Icmp6OutNeighborAdvertisements", ND_NEIGHBOR_ADVERT }, + { "Icmp6OutRedirects", ND_REDIRECT }, + { "Icmp6OutMLDv2Reports", ICMP6_V2_MEMBERSHIP_REPORT }, + }; + char buf[512], *ptr, *value; + DWORD res, 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 */ + ptr = value - 1; + *(ptr + 1) = '\0'; + + /* and strip leading spaces from value */ + value += 1; + while (*value == ' ') value++; + if ((ptr = strchr( value, '\n' ))) *ptr='\0'; + + if (!_strnicmp( buf, "Icmp6InMsgs", -1 )) + { + if (sscanf( value, "%d", &res )) dyn.in_msgs = res; + continue; + } + + if (!_strnicmp( buf, "Icmp6InErrors", -1 )) + { + if (sscanf( value, "%d", &res )) dyn.in_errors = res; + continue; + } + + for (i = 0; i < ARRAY_SIZE(in_list); i++) + { + if (!_strnicmp( buf, in_list[i].name, -1 )) + { + if (sscanf( value, "%d", &res )) + dyn.in_type_counts[in_list[i].pos] = res; + break; + } + } + + if (!_strnicmp( buf, "Icmp6OutMsgs", -1 )) + { + if (sscanf( value, "%d", &res )) dyn.out_msgs = res; + continue; + } + + if (!_strnicmp( buf, "Icmp6OutErrors", -1 )) + { + if (sscanf( value, "%d", &res )) dyn.out_errors = res; + continue; + } + + for (i = 0; i < ARRAY_SIZE(out_list); i++) + { + if (!_strnicmp( buf, out_list[i].name, -1 )) + { + if (sscanf( value, "%d", &res )) + dyn.out_type_counts[out_list[i].pos] = res; + break; + } + } + } + fclose( fp ); + if (dynamic_data) *(struct nsi_ip_icmpstats_dynamic *)dynamic_data = dyn; + return STATUS_SUCCESS; + } +#else + FIXME( "not implemented\n" ); + return STATUS_NOT_IMPLEMENTED; +#endif +} + 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 ) { @@ -1178,6 +1304,15 @@ static struct module_table ipv6_tables[] = NULL, ipv6_cmpt_get_all_parameters, }, + { + NSI_IP_ICMPSTATS_TABLE, + { + 0, 0, + sizeof(struct nsi_ip_icmpstats_dynamic), 0 + }, + NULL, + ipv6_icmpstats_get_all_parameters, + }, { NSI_IP_IPSTATS_TABLE, { -- 2.23.0

1 0

[PATCH 2/6] nsiproxy: Implement IPv4 icmpstats get_all_parameters.
by Huw Davies 12 Aug '21

12 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/tests/nsi.c | 44 +++++++++++++ dlls/nsiproxy.sys/ip.c | 141 +++++++++++++++++++++++++++++++++++++++++ include/wine/nsi.h | 11 ++++ 3 files changed, 196 insertions(+) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 7d9d8e12bac..3b1e757fa23 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -446,6 +446,48 @@ err: winetest_pop_context(); } +static void test_ip_icmpstats( int family ) +{ + const NPI_MODULEID *mod = (family == AF_INET) ? &NPI_MS_IPV4_MODULEID : &NPI_MS_IPV6_MODULEID; + struct nsi_ip_icmpstats_dynamic nsi_stats, nsi_stats2; + MIB_ICMP_EX table; + DWORD err, i; + + winetest_push_context( family == AF_INET ? "AF_INET" : "AF_INET6" ); + + err = NsiGetAllParameters( 1, mod, NSI_IP_ICMPSTATS_TABLE, NULL, 0, NULL, 0, &nsi_stats, sizeof(nsi_stats), NULL, 0 ); +todo_wine_if( family == AF_INET6) + ok( !err, "got %d\n", err ); + if (err) goto err; + + err = GetIcmpStatisticsEx( &table, family ); + ok( !err, "got %d\n", err ); + if (err) goto err; + + err = NsiGetAllParameters( 1, mod, NSI_IP_ICMPSTATS_TABLE, NULL, 0, NULL, 0, &nsi_stats2, sizeof(nsi_stats2), NULL, 0 ); + ok( !err, "got %d\n", err ); + + ok( bounded( table.icmpInStats.dwMsgs, nsi_stats.in_msgs, nsi_stats2.in_msgs ), + "%d vs [%d %d]\n", table.icmpInStats.dwMsgs, nsi_stats.in_msgs, nsi_stats2.in_msgs ); + ok( bounded( table.icmpInStats.dwErrors, nsi_stats.in_errors, nsi_stats2.in_errors ), + "%d vs [%d %d]\n", table.icmpInStats.dwErrors, nsi_stats.in_errors, nsi_stats2.in_errors ); + ok( bounded( table.icmpOutStats.dwMsgs, nsi_stats.out_msgs, nsi_stats2.out_msgs ), + "%d vs [%d %d]\n", table.icmpOutStats.dwMsgs, nsi_stats.out_msgs, nsi_stats2.out_msgs ); + ok( bounded( table.icmpOutStats.dwErrors, nsi_stats.out_errors, nsi_stats2.out_errors ), + "%d vs [%d %d]\n", table.icmpOutStats.dwErrors, nsi_stats.out_errors, nsi_stats2.out_errors ); + for (i = 0; i < ARRAY_SIZE(nsi_stats.in_type_counts); i++) + { + winetest_push_context( "%d", i ); + ok( bounded( table.icmpInStats.rgdwTypeCount[i], nsi_stats.in_type_counts[i], nsi_stats2.in_type_counts[i] ), + "%d vs [%d %d]\n", table.icmpInStats.rgdwTypeCount[i], nsi_stats.in_type_counts[i], nsi_stats2.in_type_counts[i] ); + ok( bounded( table.icmpOutStats.rgdwTypeCount[i], nsi_stats.out_type_counts[i], nsi_stats2.out_type_counts[i] ), + "%d vs [%d %d]\n", table.icmpOutStats.rgdwTypeCount[i], nsi_stats.out_type_counts[i], nsi_stats2.out_type_counts[i] ); + winetest_pop_context(); + } +err: + winetest_pop_context(); +} + static void test_ip_ipstats( int family ) { @@ -763,6 +805,8 @@ START_TEST( nsi ) test_ip_cmpt( AF_INET ); test_ip_cmpt( AF_INET6 ); + test_ip_icmpstats( AF_INET ); + test_ip_icmpstats( 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 19272861cef..8b7b41a291c 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_H +#include <netinet/ip.h> +#endif + +#ifdef HAVE_NETINET_IN_SYSTM_H +#include <netinet/in_systm.h> +#endif + +#ifdef HAVE_NETINET_IP_ICMP_H +#include <netinet/ip_icmp.h> +#endif + #ifdef HAVE_NETINET_IP_VAR_H #include <netinet/ip_var.h> #endif +#ifdef HAVE_NETINET_ICMP_VAR_H +#include <netinet/icmp_var.h> +#endif + #ifdef HAVE_NETINET_IF_ETHER_H #include <netinet/if_ether.h> #endif @@ -76,6 +92,7 @@ #include "ws2ipdef.h" #include "nldef.h" #include "ifdef.h" +#include "ipmib.h" #include "netiodef.h" #include "wine/heap.h" #include "wine/nsi.h" @@ -223,6 +240,121 @@ static NTSTATUS ipv6_cmpt_get_all_parameters( const void *key, DWORD key_size, v dynamic_data, dynamic_size, static_data, static_size ); } +static NTSTATUS ipv4_icmpstats_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_icmpstats_dynamic dyn; + + 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) ); + +#ifdef __linux__ + { + NTSTATUS status = STATUS_NOT_SUPPORTED; + static const char hdr[] = "Icmp:"; + 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 )) + { + ptr += sizeof(hdr); + sscanf( ptr, "%u %u %*u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u", + &dyn.in_msgs, + &dyn.in_errors, + &dyn.in_type_counts[ICMP4_DST_UNREACH], + &dyn.in_type_counts[ICMP4_TIME_EXCEEDED], + &dyn.in_type_counts[ICMP4_PARAM_PROB], + &dyn.in_type_counts[ICMP4_SOURCE_QUENCH], + &dyn.in_type_counts[ICMP4_REDIRECT], + &dyn.in_type_counts[ICMP4_ECHO_REQUEST], + &dyn.in_type_counts[ICMP4_ECHO_REPLY], + &dyn.in_type_counts[ICMP4_TIMESTAMP_REQUEST], + &dyn.in_type_counts[ICMP4_TIMESTAMP_REPLY], + &dyn.in_type_counts[ICMP4_MASK_REQUEST], + &dyn.in_type_counts[ICMP4_MASK_REPLY], + &dyn.out_msgs, + &dyn.out_errors, + &dyn.out_type_counts[ICMP4_DST_UNREACH], + &dyn.out_type_counts[ICMP4_TIME_EXCEEDED], + &dyn.out_type_counts[ICMP4_PARAM_PROB], + &dyn.out_type_counts[ICMP4_SOURCE_QUENCH], + &dyn.out_type_counts[ICMP4_REDIRECT], + &dyn.out_type_counts[ICMP4_ECHO_REQUEST], + &dyn.out_type_counts[ICMP4_ECHO_REPLY], + &dyn.out_type_counts[ICMP4_TIMESTAMP_REQUEST], + &dyn.out_type_counts[ICMP4_TIMESTAMP_REPLY], + &dyn.out_type_counts[ICMP4_MASK_REQUEST], + &dyn.out_type_counts[ICMP4_MASK_REPLY] ); + status = STATUS_SUCCESS; + if (dynamic_data) *(struct nsi_ip_icmpstats_dynamic *)dynamic_data = dyn; + break; + } + } + fclose( fp ); + return status; + } +#elif defined(HAVE_SYS_SYSCTL_H) && defined(ICMPCTL_STATS) + { + int mib[] = { CTL_NET, PF_INET, IPPROTO_ICMP, ICMPCTL_STATS }; + struct icmpstat icmp_stat; + size_t needed = sizeof(icmp_stat); + int i; + + if (sysctl( mib, ARRAY_SIZE(mib), &icmp_stat, &needed, NULL, 0 ) == -1) return STATUS_NOT_SUPPORTED; + + dyn.in_msgs = icmp_stat.icps_badcode + icmp_stat.icps_checksum + icmp_stat.icps_tooshort + icmp_stat.icps_badlen; + for (i = 0; i <= ICMP_MAXTYPE; i++) + dyn.in_msgs += icmp_stat.icps_inhist[i]; + + dyn.in_errors = icmp_stat.icps_badcode + icmp_stat.icps_tooshort + icmp_stat.icps_checksum + icmp_stat.icps_badlen; + + dyn.in_type_counts[ICMP4_DST_UNREACH] = icmp_stat.icps_inhist[ICMP_UNREACH]; + dyn.in_type_counts[ICMP4_TIME_EXCEEDED] = icmp_stat.icps_inhist[ICMP_TIMXCEED]; + dyn.in_type_counts[ICMP4_PARAM_PROB] = icmp_stat.icps_inhist[ICMP_PARAMPROB]; + dyn.in_type_counts[ICMP4_SOURCE_QUENCH] = icmp_stat.icps_inhist[ICMP_SOURCEQUENCH]; + dyn.in_type_counts[ICMP4_REDIRECT] = icmp_stat.icps_inhist[ICMP_REDIRECT]; + dyn.in_type_counts[ICMP4_ECHO_REQUEST] = icmp_stat.icps_inhist[ICMP_ECHO]; + dyn.in_type_counts[ICMP4_ECHO_REPLY] = icmp_stat.icps_inhist[ICMP_ECHOREPLY]; + dyn.in_type_counts[ICMP4_TIMESTAMP_REQUEST] = icmp_stat.icps_inhist[ICMP_TSTAMP]; + dyn.in_type_counts[ICMP4_TIMESTAMP_REPLY] = icmp_stat.icps_inhist[ICMP_TSTAMPREPLY]; + dyn.in_type_counts[ICMP4_MASK_REQUEST] = icmp_stat.icps_inhist[ICMP_MASKREQ]; + dyn.in_type_counts[ICMP4_MASK_REPLY] = icmp_stat.icps_inhist[ICMP_MASKREPLY]; + + dyn.out_msgs = icmp_stat.icps_oldshort + icmp_stat.icps_oldicmp; + for (i = 0; i <= ICMP_MAXTYPE; i++) + dyn.out_msgs += icmp_stat.icps_outhist[i]; + + dyn.out_errors = icmp_stat.icps_oldshort + icmp_stat.icps_oldicmp; + + dyn.out_type_counts[ICMP4_DST_UNREACH] = icmp_stat.icps_outhist[ICMP_UNREACH]; + dyn.out_type_counts[ICMP4_TIME_EXCEEDED] = icmp_stat.icps_outhist[ICMP_TIMXCEED]; + dyn.out_type_counts[ICMP4_PARAM_PROB] = icmp_stat.icps_outhist[ICMP_PARAMPROB]; + dyn.out_type_counts[ICMP4_SOURCE_QUENCH] = icmp_stat.icps_outhist[ICMP_SOURCEQUENCH]; + dyn.out_type_counts[ICMP4_REDIRECT] = icmp_stat.icps_outhist[ICMP_REDIRECT]; + dyn.out_type_counts[ICMP4_ECHO_REQUEST] = icmp_stat.icps_outhist[ICMP_ECHO]; + dyn.out_type_counts[ICMP4_ECHO_REPLY] = icmp_stat.icps_outhist[ICMP_ECHOREPLY]; + dyn.out_type_counts[ICMP4_TIMESTAMP_REQUEST] = icmp_stat.icps_outhist[ICMP_TSTAMP]; + dyn.out_type_counts[ICMP4_TIMESTAMP_REPLY] = icmp_stat.icps_outhist[ICMP_TSTAMPREPLY]; + dyn.out_type_counts[ICMP4_MASK_REQUEST] = icmp_stat.icps_outhist[ICMP_MASKREQ]; + dyn.out_type_counts[ICMP4_MASK_REPLY] = icmp_stat.icps_outhist[ICMP_MASKREPLY]; + if (dynamic_data) *(struct nsi_ip_icmpstats_dynamic *)dynamic_data = dyn; + return STATUS_SUCCESS; + } +#else + FIXME( "not implemented\n" ); + return STATUS_NOT_IMPLEMENTED; +#endif +} + 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 ) { @@ -981,6 +1113,15 @@ static struct module_table ipv4_tables[] = NULL, ipv4_cmpt_get_all_parameters, }, + { + NSI_IP_ICMPSTATS_TABLE, + { + 0, 0, + sizeof(struct nsi_ip_icmpstats_dynamic), 0 + }, + NULL, + ipv4_icmpstats_get_all_parameters, + }, { NSI_IP_IPSTATS_TABLE, { diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 6a90f5f1203..2c72c16aedc 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_COMPARTMENT_TABLE 2 +#define NSI_IP_ICMPSTATS_TABLE 3 #define NSI_IP_IPSTATS_TABLE 6 #define NSI_IP_UNICAST_TABLE 10 #define NSI_IP_NEIGHBOUR_TABLE 11 @@ -119,6 +120,16 @@ struct nsi_ip_cmpt_dynamic DWORD num_addrs; }; +struct nsi_ip_icmpstats_dynamic +{ + DWORD in_msgs; + DWORD in_errors; + DWORD in_type_counts[256]; + DWORD out_msgs; + DWORD out_errors; + DWORD out_type_counts[256]; +}; + struct nsi_ip_ipstats_dynamic { DWORD unk[4]; -- 2.23.0

1 0

[PATCH 1/6] iphlpapi: Update the echo request and reply counts.
by Huw Davies 12 Aug '21

12 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/ipstats.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 8335e4871c1..7d0011a1231 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -312,7 +312,7 @@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP stats) if (!_strnicmp(buf, hdr, sizeof(hdr) - 1)) { ptr += sizeof(hdr); - sscanf( ptr, "%u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u", + sscanf( ptr, "%u %u %*u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u", &stats->stats.icmpInStats.dwMsgs, &stats->stats.icmpInStats.dwErrors, &stats->stats.icmpInStats.dwDestUnreachs, @@ -320,6 +320,7 @@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP stats) &stats->stats.icmpInStats.dwParmProbs, &stats->stats.icmpInStats.dwSrcQuenchs, &stats->stats.icmpInStats.dwRedirects, + &stats->stats.icmpInStats.dwEchos, &stats->stats.icmpInStats.dwEchoReps, &stats->stats.icmpInStats.dwTimestamps, &stats->stats.icmpInStats.dwTimestampReps, @@ -332,6 +333,7 @@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP stats) &stats->stats.icmpOutStats.dwParmProbs, &stats->stats.icmpOutStats.dwSrcQuenchs, &stats->stats.icmpOutStats.dwRedirects, + &stats->stats.icmpOutStats.dwEchos, &stats->stats.icmpOutStats.dwEchoReps, &stats->stats.icmpOutStats.dwTimestamps, &stats->stats.icmpOutStats.dwTimestampReps, @@ -594,6 +596,7 @@ DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX stats, DWORD family) stats->icmpInStats.rgdwTypeCount[ICMP4_SOURCE_QUENCH] = ipv4stats.stats.icmpInStats.dwSrcQuenchs; stats->icmpInStats.rgdwTypeCount[ICMP4_REDIRECT] = ipv4stats.stats.icmpInStats.dwRedirects; stats->icmpInStats.rgdwTypeCount[ICMP4_ECHO_REQUEST] = ipv4stats.stats.icmpInStats.dwEchos; + stats->icmpInStats.rgdwTypeCount[ICMP4_ECHO_REPLY] = ipv4stats.stats.icmpInStats.dwEchoReps; stats->icmpInStats.rgdwTypeCount[ICMP4_TIME_EXCEEDED] = ipv4stats.stats.icmpInStats.dwTimeExcds; stats->icmpInStats.rgdwTypeCount[ICMP4_PARAM_PROB] = ipv4stats.stats.icmpInStats.dwParmProbs; stats->icmpInStats.rgdwTypeCount[ICMP4_TIMESTAMP_REQUEST] = ipv4stats.stats.icmpInStats.dwTimestamps; @@ -607,6 +610,7 @@ DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX stats, DWORD family) stats->icmpOutStats.rgdwTypeCount[ICMP4_SOURCE_QUENCH] = ipv4stats.stats.icmpOutStats.dwSrcQuenchs; stats->icmpOutStats.rgdwTypeCount[ICMP4_REDIRECT] = ipv4stats.stats.icmpOutStats.dwRedirects; stats->icmpOutStats.rgdwTypeCount[ICMP4_ECHO_REQUEST] = ipv4stats.stats.icmpOutStats.dwEchos; + stats->icmpOutStats.rgdwTypeCount[ICMP4_ECHO_REPLY] = ipv4stats.stats.icmpOutStats.dwEchoReps; stats->icmpOutStats.rgdwTypeCount[ICMP4_TIME_EXCEEDED] = ipv4stats.stats.icmpOutStats.dwTimeExcds; stats->icmpOutStats.rgdwTypeCount[ICMP4_PARAM_PROB] = ipv4stats.stats.icmpOutStats.dwParmProbs; stats->icmpOutStats.rgdwTypeCount[ICMP4_TIMESTAMP_REQUEST] = ipv4stats.stats.icmpOutStats.dwTimestamps; -- 2.23.0

1 0

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

12 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 v2 6/7] gdi32: Use NtGdiAlphaBlend for GdiAlphaBlend.
by Jacek Caban 12 Aug '21

12 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 v2 4/7] gdi32: Use NtGdiStretchBlt for StretchBlt.
by Jacek Caban 12 Aug '21

12 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 v2 3/7] gdi32: Use GetDIBits instead of GetObject in MFDRV_StretchBlt.
by Jacek Caban 12 Aug '21

12 Aug '21

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

1 0

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

12 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 v2 1/7] gdi32: Use GetDIBits in emfdrv_stretchblt.
by Jacek Caban 12 Aug '21

12 Aug '21

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

1 0

[PATCH 1/2] d3d10/effect: Get rid of unnecessary cast in ID3D10EffectPass::GetDesc().
by Nikolay Sivov 12 Aug '21

12 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 15b71aab1b7..64dd9ac9312 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3559,33 +3559,33 @@ static BOOL STDMETHODCALLTYPE d3d10_effect_pass_IsValid(ID3D10EffectPass *iface) static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetDesc(ID3D10EffectPass *iface, D3D10_PASS_DESC *desc) { - struct d3d10_effect_pass *This = impl_from_ID3D10EffectPass(iface); + struct d3d10_effect_pass *pass = impl_from_ID3D10EffectPass(iface); struct d3d10_effect_shader_variable *s; FIXME("iface %p, desc %p partial stub!\n", iface, desc); - if(This == &null_pass) + if (pass == &null_pass) { WARN("Null pass specified\n"); return E_FAIL; } - if(!desc) + if (!desc) { WARN("Invalid argument specified\n"); return E_INVALIDARG; } + s = &impl_from_ID3D10EffectShaderVariable(pass->vs.pShaderVariable)->u.shader; + memset(desc, 0, sizeof(*desc)); - desc->Name = This->name; - s = &impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)This->vs.pShaderVariable)->u.shader; + desc->Name = pass->name; desc->pIAInputSignature = (BYTE *)s->input_signature.signature; desc->IAInputSignatureSize = s->input_signature.signature_size; - - desc->StencilRef = This->stencil_ref; - desc->SampleMask = This->sample_mask; - memcpy(desc->BlendFactor, This->blend_factor, 4 * sizeof(float)); + desc->StencilRef = pass->stencil_ref; + desc->SampleMask = pass->sample_mask; + memcpy(desc->BlendFactor, pass->blend_factor, 4 * sizeof(float)); return S_OK; } -- 2.30.2

1 1

[PATCH v2] msxml3: use XSD regex quantifier format S{0, m} instead of S{, m}
by Damjan Jovanovic 12 Aug '21

12 Aug '21

S{,m} is invalid in libxml2 2.9.11 and later, and was never valid in the XSD specification or any XML implementation tested. We should only use S{0,m} for our internal XSD schema used in XDR validation. Try 2 adds a test. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51358 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/msxml3/datatypes.xsd | 4 ++-- dlls/msxml3/tests/schema.c | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-)

2 1

[PATCH vkd3d 1/5] vkd3d-shader: Use a designated initializer in debug_expr_op().
by Zebediah Figura 11 Aug '21

11 Aug '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 103 +++++++++++++++++---------------------- 1 file changed, 46 insertions(+), 57 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index e4070572..9f50d2fc 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1033,64 +1033,53 @@ static void dump_ir_constant(struct vkd3d_string_buffer *buffer, const struct hl static const char *debug_expr_op(const struct hlsl_ir_expr *expr) { - static const char * const op_names[] = + static const char *const op_names[] = { - "~", - "!", - "-", - "abs", - "sign", - "rcp", - "rsq", - "sqrt", - "nrm", - "exp2", - "log2", - - "cast", - - "fract", - - "sin", - "cos", - "sin_reduced", - "cos_reduced", - - "dsx", - "dsy", - - "sat", - - "+", - "*", - "/", - - "%", - - "<", - ">", - "<=", - ">=", - "==", - "!=", - - "&&", - "||", - - "<<", - ">>", - "&", - "|", - "^", - - "dot", - "crs", - "min", - "max", - - "pow", - - "lerp", + [HLSL_IR_UNOP_ABS] = "abs", + [HLSL_IR_UNOP_BIT_NOT] = "~", + [HLSL_IR_UNOP_CAST] = "cast", + [HLSL_IR_UNOP_COS] = "cos", + [HLSL_IR_UNOP_COS_REDUCED] = "cos_reduced", + [HLSL_IR_UNOP_DSX] = "dsx", + [HLSL_IR_UNOP_DSY] = "dsy", + [HLSL_IR_UNOP_EXP2] = "exp2", + [HLSL_IR_UNOP_FRACT] = "fract", + [HLSL_IR_UNOP_LOG2] = "log2", + [HLSL_IR_UNOP_LOGIC_NOT] = "!", + [HLSL_IR_UNOP_NEG] = "-", + [HLSL_IR_UNOP_NRM] = "nrm", + [HLSL_IR_UNOP_RCP] = "rcp", + [HLSL_IR_UNOP_RSQ] = "rsq", + [HLSL_IR_UNOP_SAT] = "sat", + [HLSL_IR_UNOP_SIGN] = "sign", + [HLSL_IR_UNOP_SIN] = "sin", + [HLSL_IR_UNOP_SIN_REDUCED] = "sin_reduced", + [HLSL_IR_UNOP_SQRT] = "sqrt", + + [HLSL_IR_BINOP_ADD] = "+", + [HLSL_IR_BINOP_BIT_AND] = "&", + [HLSL_IR_BINOP_BIT_OR] = "|", + [HLSL_IR_BINOP_BIT_XOR] = "^", + [HLSL_IR_BINOP_CRS] = "crs", + [HLSL_IR_BINOP_DIV] = "/", + [HLSL_IR_BINOP_DOT] = "dot", + [HLSL_IR_BINOP_EQUAL] = "==", + [HLSL_IR_BINOP_GEQUAL] = ">=", + [HLSL_IR_BINOP_GREATER] = ">", + [HLSL_IR_BINOP_LEQUAL] = "<=", + [HLSL_IR_BINOP_LESS] = "<", + [HLSL_IR_BINOP_LOGIC_AND] = "&&", + [HLSL_IR_BINOP_LOGIC_OR] = "||", + [HLSL_IR_BINOP_LSHIFT] = "<<", + [HLSL_IR_BINOP_MAX] = "max", + [HLSL_IR_BINOP_MIN] = "min", + [HLSL_IR_BINOP_MOD] = "%", + [HLSL_IR_BINOP_MUL] = "*", + [HLSL_IR_BINOP_NEQUAL] = "!=", + [HLSL_IR_BINOP_POW] = "pow", + [HLSL_IR_BINOP_RSHIFT] = ">>", + + [HLSL_IR_TEROP_LERP] = "lerp", }; return op_names[expr->op]; -- 2.32.0

1 4

[PATCH] oleacc: Check proper UI thread for window focus.
by Connor McAdams 11 Aug '21

11 Aug '21

From: Connor McAdams <conmanx360(a)gmail.com> When RPC is done in a multi-threaded apartment environment, this method may be called in a thread other than the one that the object was created in. To account for this, make sure to check the UI thread the HWND belongs to rather than the one belonging to the current thread. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> --- dlls/oleacc/client.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 3b33be55a21..a726c607109 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -227,6 +227,7 @@ static HRESULT WINAPI Client_get_accRole(IAccessible *iface, VARIANT varID, VARI static HRESULT WINAPI Client_get_accState(IAccessible *iface, VARIANT varID, VARIANT *pvarState) { Client *This = impl_from_Client(iface); + GUITHREADINFO info; LONG style; TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pvarState); @@ -244,7 +245,10 @@ static HRESULT WINAPI Client_get_accState(IAccessible *iface, VARIANT varID, VAR V_I4(pvarState) |= STATE_SYSTEM_UNAVAILABLE; else if(IsWindow(This->hwnd)) V_I4(pvarState) |= STATE_SYSTEM_FOCUSABLE; - if(GetFocus() == This->hwnd) + + info.cbSize = sizeof(info); + if(GetGUIThreadInfo(GetWindowThreadProcessId(This->hwnd, NULL), &info) && + info.hwndFocus == This->hwnd) V_I4(pvarState) |= STATE_SYSTEM_FOCUSED; if(!(style & WS_VISIBLE)) V_I4(pvarState) |= STATE_SYSTEM_INVISIBLE; -- 2.25.1

2 2

[PATCH 1/5] wined3d: Added wined3d_view_load_location() helper.
by Jan Sikorski 11 Aug '21

11 Aug '21

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/view.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 0adb0a115dc..665661e39b1 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -332,6 +332,25 @@ static void wined3d_view_invalidate_location(struct wined3d_resource *resource, wined3d_texture_invalidate_location(texture, sub_resource_idx, location); } +static void wined3d_view_load_location(struct wined3d_resource *resource, + const struct wined3d_view_desc *desc, struct wined3d_context *context, DWORD location) +{ + unsigned int i, sub_resource_idx, layer_count; + struct wined3d_texture *texture; + + if (resource->type == WINED3D_RTYPE_BUFFER) + { + wined3d_buffer_load_location(buffer_from_resource(resource), context, location); + return; + } + + texture = texture_from_resource(resource); + sub_resource_idx = desc->u.texture.layer_idx * texture->level_count + desc->u.texture.level_idx; + layer_count = resource->type != WINED3D_RTYPE_TEXTURE_3D ? desc->u.texture.layer_count : 1; + for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) + wined3d_texture_load_location(texture, sub_resource_idx, context, location); +} + ULONG CDECL wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view *view) { ULONG refcount = InterlockedIncrement(&view->refcount); -- 2.30.2

2 14

[PATCH v2 vkd3d] vkd3d-shader: Skip generating SM1 array operations.
by Matteo Bruni 11 Aug '21

11 Aug '21

Eventually they will be split or otherwise transformed before getting here. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Report a compiler error (and fail compilation). libs/vkd3d-shader/hlsl_sm1.c | 6 ++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 7 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index 8ea663dc..c13f0a2e 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -768,6 +768,12 @@ static void write_sm1_instructions(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b FIXME("Matrix operations need to be lowered.\n"); break; } + if (instr->data_type->type == HLSL_CLASS_ARRAY) + { + hlsl_error(ctx, instr->loc, VKD3D_SHADER_ERROR_HLSL_COMPILER_ERROR, + "Compiler error, array operations need to be lowered."); + break; + } assert(instr->data_type->type == HLSL_CLASS_SCALAR || instr->data_type->type == HLSL_CLASS_VECTOR); } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index b64c4b10..4ea6f88d 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -112,6 +112,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_HLSL_INVALID_RETURN = 5014, VKD3D_SHADER_ERROR_HLSL_OVERLAPPING_RESERVATIONS = 5015, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION = 5016, + VKD3D_SHADER_ERROR_HLSL_COMPILER_ERROR = 5299, VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION = 5300, }; -- 2.26.3

3 2

[PATCH 1/2] d3dcompiler: Improve d3d10_shader_reflection_GetDesc() to return missing stats.
by Nikolay Sivov 11 Aug '21

11 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dcompiler_43/reflection.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index bd064793587..8b893fe76db 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -124,6 +124,7 @@ struct d3dcompiler_shader_reflection UINT gs_max_output_vertex_count; D3D_PRIMITIVE input_primitive; UINT cut_instruction_count; + UINT def_count; UINT dcl_count; UINT static_flow_control_count; UINT float_instruction_count; @@ -138,6 +139,7 @@ struct d3dcompiler_shader_reflection UINT texture_bias_instructions; UINT texture_gradient_instructions; UINT dynamic_flow_control_count; + UINT macro_instruction_count; UINT c_control_points; D3D_TESSELLATOR_OUTPUT_PRIMITIVE hs_output_primitive; D3D_TESSELLATOR_PARTITIONING hs_partitioning; @@ -1098,7 +1100,8 @@ static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, c r->temp_register_count = read_dword(&ptr); TRACE("TempRegisterCount: %u\n", r->temp_register_count); - skip_dword_unknown(&ptr, 1); + r->def_count = read_dword(&ptr); + TRACE("DefCount: %u\n", r->def_count); r->dcl_count = read_dword(&ptr); TRACE("DclCount: %u\n", r->dcl_count); @@ -1118,7 +1121,8 @@ static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, c r->dynamic_flow_control_count = read_dword(&ptr); TRACE("DynamicFlowControlCount: %u\n", r->dynamic_flow_control_count); - skip_dword_unknown(&ptr, 1); + r->macro_instruction_count = read_dword(&ptr); + TRACE("MacroInstructionCount: %u\n", r->macro_instruction_count); r->temp_array_count = read_dword(&ptr); TRACE("TempArrayCount: %u\n", r->temp_array_count); @@ -1917,7 +1921,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetDesc(ID3D10ShaderRef { struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D10ShaderReflection(iface); - FIXME("iface %p, desc %p partial stub!\n", iface, desc); + TRACE("iface %p, desc %p.\n", iface, desc); if (!desc) { @@ -1935,7 +1939,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetDesc(ID3D10ShaderRef desc->InstructionCount = reflection->instruction_count; desc->TempRegisterCount = reflection->temp_register_count; desc->TempArrayCount = reflection->temp_array_count; - desc->DefCount = 0; + desc->DefCount = reflection->def_count; desc->DclCount = reflection->dcl_count; desc->TextureNormalInstructions = reflection->texture_normal_instructions; desc->TextureLoadInstructions = reflection->texture_load_instructions; @@ -1947,7 +1951,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetDesc(ID3D10ShaderRef desc->UintInstructionCount = reflection->uint_instruction_count; desc->StaticFlowControlCount = reflection->static_flow_control_count; desc->DynamicFlowControlCount = reflection->dynamic_flow_control_count; - desc->MacroInstructionCount = 0; + desc->MacroInstructionCount = reflection->macro_instruction_count; desc->ArrayInstructionCount = reflection->array_instruction_count; desc->CutInstructionCount = reflection->cut_instruction_count; desc->EmitInstructionCount = reflection->emit_instruction_count; -- 2.30.2

2 4

[PATCH 1/4] d3dx10: Add a stub sprite object.
by Nikolay Sivov 11 Aug '21

11 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx10_43/Makefile.in | 3 +- dlls/d3dx10_43/d3dx10_43.spec | 2 +- dlls/d3dx10_43/sprite.c | 202 ++++++++++++++++++++++++++++++++++ include/d3dx10core.h | 1 + 4 files changed, 206 insertions(+), 2 deletions(-) create mode 100644 dlls/d3dx10_43/sprite.c diff --git a/dlls/d3dx10_43/Makefile.in b/dlls/d3dx10_43/Makefile.in index 1fae34191ee..6d74f586841 100644 --- a/dlls/d3dx10_43/Makefile.in +++ b/dlls/d3dx10_43/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dx10_43.dll IMPORTLIB = d3dx10 -IMPORTS = d3d10_1 d3dcompiler dxguid +IMPORTS = d3d10_1 d3dcompiler dxguid uuid DELAYIMPORTS = windowscodecs EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native @@ -9,6 +9,7 @@ C_SRCS = \ async.c \ compiler.c \ d3dx10_43_main.c \ + sprite.c \ texture.c RC_SRCS = version.rc diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index a00b3402a5a..99b142f34d5 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -41,7 +41,7 @@ @ stub D3DX10CreateShaderResourceViewFromResourceA(ptr long str ptr ptr ptr ptr) @ stub D3DX10CreateShaderResourceViewFromResourceW(ptr long wstr ptr ptr ptr ptr) @ stub D3DX10CreateSkinInfo(ptr) -@ stub D3DX10CreateSprite(ptr long ptr) +@ stdcall D3DX10CreateSprite(ptr long ptr) @ stub D3DX10CreateTextureFromFileA(ptr str ptr ptr ptr ptr) @ stub D3DX10CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr) @ stdcall D3DX10CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr) diff --git a/dlls/d3dx10_43/sprite.c b/dlls/d3dx10_43/sprite.c new file mode 100644 index 00000000000..6c1ef732ec0 --- /dev/null +++ b/dlls/d3dx10_43/sprite.c @@ -0,0 +1,202 @@ +/* + * 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 + * + */ + +#define COBJMACROS +#include "d3dx10.h" + +#include "wine/debug.h" +#include "wine/heap.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + +#define D3DERR_INVALIDCALL 0x8876086c + +struct d3dx10_sprite +{ + ID3DX10Sprite ID3DX10Sprite_iface; + LONG refcount; + + ID3D10Device *device; +}; + +static inline struct d3dx10_sprite *impl_from_ID3DX10Sprite(ID3DX10Sprite *iface) +{ + return CONTAINING_RECORD(iface, struct d3dx10_sprite, ID3DX10Sprite_iface); +} + +static HRESULT WINAPI d3dx10_sprite_QueryInterface(ID3DX10Sprite *iface, REFIID riid, void **out) +{ + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); + + if (IsEqualGUID(riid, &IID_ID3DX10Sprite) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI d3dx10_sprite_AddRef(ID3DX10Sprite *iface) +{ + struct d3dx10_sprite *sprite = impl_from_ID3DX10Sprite(iface); + ULONG refcount = InterlockedIncrement(&sprite->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI d3dx10_sprite_Release(ID3DX10Sprite *iface) +{ + struct d3dx10_sprite *sprite = impl_from_ID3DX10Sprite(iface); + ULONG refcount = InterlockedDecrement(&sprite->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + { + ID3D10Device_Release(sprite->device); + heap_free(sprite); + } + + return refcount; +} + +static HRESULT WINAPI d3dx10_sprite_Begin(ID3DX10Sprite *iface, UINT flags) +{ + FIXME("%p, %#x.\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx10_sprite_DrawSpritesBuffered(ID3DX10Sprite *iface, D3DX10_SPRITE *sprites, UINT count) +{ + FIXME("%p, %p, %u.\n", iface, sprites, count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx10_sprite_Flush(ID3DX10Sprite *iface) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx10_sprite_DrawSpritesImmediate(ID3DX10Sprite *iface, D3DX10_SPRITE *sprites, + UINT count, UINT size, UINT flags) +{ + FIXME("%p, %p, %u, %u, %#x.\n", iface, sprites, count, size, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx10_sprite_End(ID3DX10Sprite *iface) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx10_sprite_GetViewTransform(ID3DX10Sprite *iface, D3DXMATRIX *transform) +{ + FIXME("%p, %p.\n", iface, transform); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx10_sprite_SetViewTransform(ID3DX10Sprite *iface, D3DXMATRIX *transform) +{ + FIXME("%p, %p.\n", iface, transform); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx10_sprite_GetProjectionTransform(ID3DX10Sprite *iface, D3DXMATRIX *transform) +{ + FIXME("%p, %p.\n", iface, transform); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx10_sprite_SetProjectionTransform(ID3DX10Sprite *iface, D3DXMATRIX *transform) +{ + FIXME("%p, %p.\n", iface, transform); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx10_sprite_GetDevice(ID3DX10Sprite *iface, ID3D10Device **device) +{ + struct d3dx10_sprite *sprite = impl_from_ID3DX10Sprite(iface); + + TRACE("%p, %p.\n", iface, device); + + *device = sprite->device; + ID3D10Device_AddRef(*device); + + return S_OK; +} + +static const ID3DX10SpriteVtbl d3dx10_sprite_vtbl = +{ + d3dx10_sprite_QueryInterface, + d3dx10_sprite_AddRef, + d3dx10_sprite_Release, + d3dx10_sprite_Begin, + d3dx10_sprite_DrawSpritesBuffered, + d3dx10_sprite_Flush, + d3dx10_sprite_DrawSpritesImmediate, + d3dx10_sprite_End, + d3dx10_sprite_GetViewTransform, + d3dx10_sprite_SetViewTransform, + d3dx10_sprite_GetProjectionTransform, + d3dx10_sprite_SetProjectionTransform, + d3dx10_sprite_GetDevice, +}; + +HRESULT WINAPI D3DX10CreateSprite(ID3D10Device *device, UINT size, ID3DX10Sprite **sprite) +{ + struct d3dx10_sprite *object; + + TRACE("device %p, size %u, sprite %p.\n", device, size, sprite); + + if (!device || !sprite) + return D3DERR_INVALIDCALL; + + *sprite = NULL; + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->ID3DX10Sprite_iface.lpVtbl = &d3dx10_sprite_vtbl; + object->refcount = 1; + object->device = device; + ID3D10Device_AddRef(device); + + *sprite = &object->ID3DX10Sprite_iface; + + return S_OK; +} diff --git a/include/d3dx10core.h b/include/d3dx10core.h index d794fa028d7..dbbe4b02e10 100644 --- a/include/d3dx10core.h +++ b/include/d3dx10core.h @@ -289,3 +289,4 @@ HRESULT WINAPI D3DX10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVE ID3D10Device **device); typedef interface ID3D10Device1 ID3D10Device1; HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **device1); +HRESULT WINAPI D3DX10CreateSprite(ID3D10Device *device, UINT size, ID3DX10Sprite **sprite); -- 2.30.2

3 5

[PATCH] d3dx11/tests: Add some tests for D3DX11GetImageInfoFromMemory().
by Nikolay Sivov 11 Aug '21

11 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Duplicates existing tests from d3dx9. dlls/d3dx11_43/tests/d3dx11.c | 595 ++++++++++++++++++++++++++++++++++ 1 file changed, 595 insertions(+) diff --git a/dlls/d3dx11_43/tests/d3dx11.c b/dlls/d3dx11_43/tests/d3dx11.c index 06924877da4..fe33089a541 100644 --- a/dlls/d3dx11_43/tests/d3dx11.c +++ b/dlls/d3dx11_43/tests/d3dx11.c @@ -23,6 +23,233 @@ #include "wine/test.h" #include "wine/heap.h" +#ifndef MAKEFOURCC +#define MAKEFOURCC(ch0, ch1, ch2, ch3) \ + ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ + ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 )) +#endif + +/* 1x1 bmp (1 bpp) */ +static const unsigned char bmp_1bpp[] = +{ + 0x42,0x4d,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x28,0x00, + 0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x00, + 0x00,0x00,0x04,0x00,0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x02,0x00, + 0x00,0x00,0x02,0x00,0x00,0x00,0xf1,0xf2,0xf3,0x80,0xf4,0xf5,0xf6,0x81,0x00,0x00, + 0x00,0x00 +}; + +/* 1x1 bmp (2 bpp) */ +static const unsigned char bmp_2bpp[] = +{ + 0x42,0x4d,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x28,0x00, + 0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x02,0x00,0x00,0x00, + 0x00,0x00,0x04,0x00,0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x02,0x00, + 0x00,0x00,0x02,0x00,0x00,0x00,0xf1,0xf2,0xf3,0x80,0xf4,0xf5,0xf6,0x81,0x00,0x00, + 0x00,0x00 +}; + +/* 1x1 bmp (4 bpp) */ +static const unsigned char bmp_4bpp[] = +{ + 0x42,0x4d,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x28,0x00, + 0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x04,0x00,0x00,0x00, + 0x00,0x00,0x04,0x00,0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x02,0x00, + 0x00,0x00,0x02,0x00,0x00,0x00,0xf1,0xf2,0xf3,0x80,0xf4,0xf5,0xf6,0x81,0x00,0x00, + 0x00,0x00 +}; + +/* 1x1 bmp (8 bpp) */ +static const unsigned char bmp_8bpp[] = +{ + 0x42,0x4d,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x28,0x00, + 0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x08,0x00,0x00,0x00, + 0x00,0x00,0x04,0x00,0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x02,0x00, + 0x00,0x00,0x02,0x00,0x00,0x00,0xf1,0xf2,0xf3,0x80,0xf4,0xf5,0xf6,0x81,0x00,0x00, + 0x00,0x00 +}; + +/* 2x2 bmp (32 bpp XRGB) */ +static const unsigned char bmp_32bpp_xrgb[] = +{ + 0x42,0x4d,0x46,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x36,0x00,0x00,0x00,0x28,0x00, + 0x00,0x00,0x02,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x01,0x00,0x20,0x00,0x00,0x00, + 0x00,0x00,0x10,0x00,0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0xa0,0xb0,0xc0,0x00,0xa1,0xb1,0xc1,0x00,0xa2,0xb2, + 0xc2,0x00,0xa3,0xb3,0xc3,0x00 +}; + +/* 2x2 bmp (32 bpp ARGB) */ +static const unsigned char bmp_32bpp_argb[] = +{ + 0x42,0x4d,0x46,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x36,0x00,0x00,0x00,0x28,0x00, + 0x00,0x00,0x02,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x01,0x00,0x20,0x00,0x00,0x00, + 0x00,0x00,0x10,0x00,0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0xa0,0xb0,0xc0,0x00,0xa1,0xb1,0xc1,0x00,0xa2,0xb2, + 0xc2,0x00,0xa3,0xb3,0xc3,0x01 +}; + +static const unsigned char png_grayscale[] = +{ + 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, + 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x08, 0x00, + 0x00, 0x00, 0x00, 0x3a, 0x7e, 0x9b, 0x55, 0x00, 0x00, 0x00, 0x0a, 0x49, 0x44, + 0x41, 0x54, 0x08, 0xd7, 0x63, 0xf8, 0x0f, 0x00, 0x01, 0x01, 0x01, 0x00, 0x1b, + 0xb6, 0xee, 0x56, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, + 0x60, 0x82 +}; + +/* 2x2 24-bit dds, 2 mipmaps */ +static const unsigned char dds_24bit[] = +{ + 0x44,0x44,0x53,0x20,0x7c,0x00,0x00,0x00,0x07,0x10,0x0a,0x00,0x02,0x00,0x00,0x00, + 0x02,0x00,0x00,0x00,0x0c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00, + 0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x00,0x00,0xff,0x00, + 0x00,0xff,0x00,0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x10,0x40,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff +}; + +/* 2x2 16-bit dds, no mipmaps */ +static const unsigned char dds_16bit[] = +{ + 0x44,0x44,0x53,0x20,0x7c,0x00,0x00,0x00,0x07,0x10,0x08,0x00,0x02,0x00,0x00,0x00, + 0x02,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00, + 0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x7c,0x00,0x00, + 0xe0,0x03,0x00,0x00,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0xff,0x7f,0xff,0x7f,0xff,0x7f,0xff,0x7f +}; + +/* 16x4 8-bit dds */ +static const unsigned char dds_8bit[] = +{ + 0x44,0x44,0x53,0x20,0x7c,0x00,0x00,0x00,0x0f,0x10,0x00,0x00,0x04,0x00,0x00,0x00, + 0x10,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00, + 0x47,0x49,0x4d,0x50,0x2d,0x44,0x44,0x53,0x5a,0x09,0x03,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00, + 0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0x8c,0xcd,0x12,0xff, + 0x78,0x01,0x14,0xff,0x50,0xcd,0x12,0xff,0x00,0x3d,0x8c,0xff,0x02,0x00,0x00,0xff, + 0x47,0x00,0x00,0xff,0xda,0x07,0x02,0xff,0x50,0xce,0x12,0xff,0xea,0x11,0x01,0xff, + 0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x08,0x3d,0x8c,0xff,0x08,0x01,0x00,0xff, + 0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x60,0xcc,0x12,0xff, + 0xa1,0xb2,0xd4,0xff,0xda,0x07,0x02,0xff,0x47,0x00,0x00,0xff,0x00,0x00,0x00,0xff, + 0x50,0xce,0x12,0xff,0x00,0x00,0x14,0xff,0xa8,0xcc,0x12,0xff,0x3c,0xb2,0xd4,0xff, + 0xda,0x07,0x02,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x01,0xff, + 0x21,0x00,0x00,0xff,0xd8,0xcb,0x12,0xff,0x54,0xcd,0x12,0xff,0x8b,0x4f,0xd5,0xff, + 0x00,0x04,0xda,0xff,0x00,0x00,0x00,0xff,0x3d,0x04,0x91,0xff,0x70,0xce,0x18,0xff, + 0xb4,0xcc,0x12,0xff,0x6b,0x4e,0xd5,0xff,0xb0,0xcc,0x12,0xff,0x00,0x00,0x00,0xff, + 0xc8,0x05,0x91,0xff,0x98,0xc7,0xcc,0xff,0x7c,0xcd,0x12,0xff,0x51,0x05,0x91,0xff, + 0x48,0x07,0x14,0xff,0x6d,0x05,0x91,0xff,0x00,0x07,0xda,0xff,0xa0,0xc7,0xcc,0xff, + 0x00,0x07,0xda,0xff,0x3a,0x77,0xd5,0xff,0xda,0x07,0x02,0xff,0x7c,0x94,0xd4,0xff, + 0xe0,0xce,0xd6,0xff,0x0a,0x80,0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff, + 0x78,0x9a,0xab,0xff,0xde,0x08,0x18,0xff,0xda,0x07,0x02,0xff,0x30,0x00,0x00,0xff, + 0x00,0x00,0x00,0xff,0x50,0xce,0x12,0xff,0x8c,0xcd,0x12,0xff,0xd0,0xb7,0xd8,0xff, + 0x00,0x00,0x00,0xff,0x60,0x32,0xd9,0xff,0x30,0xc1,0x1a,0xff,0xa8,0xcd,0x12,0xff, + 0xa4,0xcd,0x12,0xff,0xc0,0x1d,0x4b,0xff,0x46,0x71,0x0e,0xff,0xc0,0x1d,0x4b,0xff, + 0x09,0x87,0xd4,0xff,0x00,0x00,0x00,0xff,0xf6,0x22,0x00,0xff,0x64,0xcd,0x12,0xff, + 0x00,0x00,0x00,0xff,0xca,0x1d,0x4b,0xff,0x09,0x87,0xd4,0xff,0xaa,0x02,0x05,0xff, + 0x82,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0xc0,0x1d,0x4b,0xff, + 0xcd,0xab,0xba,0xff,0x00,0x00,0x00,0xff,0xa4,0xcd,0x12,0xff,0xc0,0x1d,0x4b,0xff, + 0xd4,0xcd,0x12,0xff,0xa6,0x4c,0xd5,0xff,0x00,0xf0,0xfd,0xff,0xd4,0xcd,0x12,0xff, + 0xf4,0x4c,0xd5,0xff,0x90,0xcd,0x12,0xff,0xc2,0x4c,0xd5,0xff,0x82,0x00,0x00,0xff, + 0xaa,0x02,0x05,0xff,0x88,0xd4,0xba,0xff,0x14,0x00,0x00,0xff,0x01,0x00,0x00,0xff, + 0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x10,0x00,0x00,0xff,0x00,0x00,0x00,0xff, + 0x0c,0x08,0x13,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff, + 0xd0,0xcd,0x12,0xff,0xc6,0x84,0xf1,0xff,0x7c,0x84,0xf1,0xff,0x20,0x20,0xf5,0xff, + 0x00,0x00,0x0a,0xff,0xf0,0xb0,0x94,0xff,0x64,0x6c,0xf1,0xff,0x85,0x6c,0xf1,0xff, + 0x8b,0x4f,0xd5,0xff,0x00,0x04,0xda,0xff,0x88,0xd4,0xba,0xff,0x82,0x00,0x00,0xff, + 0x39,0xde,0xd4,0xff,0x10,0x50,0xd5,0xff,0xaa,0x02,0x05,0xff,0x00,0x00,0x00,0xff, + 0x4f,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x5c,0xce,0x12,0xff,0x00,0x00,0x00,0xff, + 0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x5c,0xce,0x12,0xff, + 0xaa,0x02,0x05,0xff,0x4c,0xce,0x12,0xff,0x39,0xe6,0xd4,0xff,0x00,0x00,0x00,0xff, + 0x82,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x5b,0xe6,0xd4,0xff,0x00,0x00,0x00,0xff, + 0x00,0x00,0x00,0xff,0x68,0x50,0xcd,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff, + 0x00,0x00,0x00,0xff,0x10,0x00,0x00,0xff,0xe3,0xea,0x90,0xff,0x5c,0xce,0x12,0xff, + 0x18,0x00,0x00,0xff,0x88,0xd4,0xba,0xff,0x82,0x00,0x00,0xff,0x00,0x00,0x00,0xff, + 0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, + 0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, + 0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, + 0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01 +}; + +/* 4x4 cube map dds */ +static const unsigned char dds_cube_map[] = +{ + 0x44,0x44,0x53,0x20,0x7c,0x00,0x00,0x00,0x07,0x10,0x08,0x00,0x04,0x00,0x00,0x00, + 0x04,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00, + 0x04,0x00,0x00,0x00,0x44,0x58,0x54,0x35,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x10,0x00,0x00, + 0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50, + 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50, + 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50, + 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50, + 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50, + 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50 +}; + +/* 4x4x2 volume map dds, 2 mipmaps */ +static const unsigned char dds_volume_map[] = +{ + 0x44,0x44,0x53,0x20,0x7c,0x00,0x00,0x00,0x07,0x10,0x8a,0x00,0x04,0x00,0x00,0x00, + 0x04,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x03,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00, + 0x04,0x00,0x00,0x00,0x44,0x58,0x54,0x33,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x10,0x40,0x00, + 0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50, + 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50, + 0xff,0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x2f,0x7e,0xcf,0x79,0x01,0x54,0x5c,0x5c, + 0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x84,0xef,0x7b,0xaa,0xab,0xab,0xab +}; + +/* invalid image file */ +static const unsigned char noimage[4] = +{ + 0x11,0x22,0x33,0x44 +}; + static WCHAR temp_dir[MAX_PATH]; static BOOL create_file(const WCHAR *filename, const char *data, unsigned int size, WCHAR *out_path) @@ -404,10 +631,378 @@ static void test_D3DX11CompileFromFile(void) delete_directory(L"include"); } +/* dds_header.flags */ +#define DDS_CAPS 0x00000001 +#define DDS_HEIGHT 0x00000002 +#define DDS_WIDTH 0x00000004 +#define DDS_PITCH 0x00000008 +#define DDS_PIXELFORMAT 0x00001000 +#define DDS_MIPMAPCOUNT 0x00020000 +#define DDS_LINEARSIZE 0x00080000 + +/* dds_header.caps */ +#define DDSCAPS_ALPHA 0x00000002 +#define DDS_CAPS_TEXTURE 0x00001000 + +/* dds_pixel_format.flags */ +#define DDS_PF_ALPHA 0x00000001 +#define DDS_PF_ALPHA_ONLY 0x00000002 +#define DDS_PF_FOURCC 0x00000004 +#define DDS_PF_RGB 0x00000040 +#define DDS_PF_LUMINANCE 0x00020000 +#define DDS_PF_BUMPLUMINANCE 0x00040000 +#define DDS_PF_BUMPDUDV 0x00080000 + +struct dds_pixel_format +{ + DWORD size; + DWORD flags; + DWORD fourcc; + DWORD bpp; + DWORD rmask; + DWORD gmask; + DWORD bmask; + DWORD amask; +}; + +struct dds_header +{ + DWORD size; + DWORD flags; + DWORD height; + DWORD width; + DWORD pitch_or_linear_size; + DWORD depth; + DWORD miplevels; + DWORD reserved[11]; + struct dds_pixel_format pixel_format; + DWORD caps; + DWORD caps2; + DWORD caps3; + DWORD caps4; + DWORD reserved2; +}; + +/* fills dds_header with reasonable default values */ +static void fill_dds_header(struct dds_header *header) +{ + memset(header, 0, sizeof(*header)); + + header->size = sizeof(*header); + header->flags = DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT; + header->height = 4; + header->width = 4; + header->pixel_format.size = sizeof(header->pixel_format); + /* X8R8G8B8 */ + header->pixel_format.flags = DDS_PF_RGB; + header->pixel_format.fourcc = 0; + header->pixel_format.bpp = 32; + header->pixel_format.rmask = 0xff0000; + header->pixel_format.gmask = 0x00ff00; + header->pixel_format.bmask = 0x0000ff; + header->pixel_format.amask = 0; + header->caps = DDS_CAPS_TEXTURE; +} + +#define check_dds_pixel_format(flags, fourcc, bpp, rmask, gmask, bmask, amask, format) \ + check_dds_pixel_format_(__LINE__, flags, fourcc, bpp, rmask, gmask, bmask, amask, format) +static void check_dds_pixel_format_(unsigned int line, DWORD flags, DWORD fourcc, DWORD bpp, + DWORD rmask, DWORD gmask, DWORD bmask, DWORD amask, DXGI_FORMAT expected_format) +{ + D3DX11_IMAGE_INFO info; + HRESULT hr; + struct + { + DWORD magic; + struct dds_header header; + BYTE data[256]; + } dds; + + dds.magic = MAKEFOURCC('D','D','S',' '); + fill_dds_header(&dds.header); + dds.header.pixel_format.flags = flags; + dds.header.pixel_format.fourcc = fourcc; + dds.header.pixel_format.bpp = bpp; + dds.header.pixel_format.rmask = rmask; + dds.header.pixel_format.gmask = gmask; + dds.header.pixel_format.bmask = bmask; + dds.header.pixel_format.amask = amask; + memset(dds.data, 0, sizeof(dds.data)); + + hr = D3DX11GetImageInfoFromMemory(&dds, sizeof(dds), NULL, &info, NULL); + ok_(__FILE__, line)(hr == S_OK, "Unexpected hr %#x for pixel format %#x.\n", hr, expected_format); + if (SUCCEEDED(hr)) + { + ok_(__FILE__, line)(info.Format == expected_format, "Unexpected format %#x, expected %#x\n", + info.Format, expected_format); + } +} + +static void test_D3DX11GetImageInfoFromMemory(void) +{ + D3DX11_IMAGE_INFO info; + HRESULT hr; + + if (!strcmp(winetest_platform, "wine")) + { + skip("Skipping D3DX11GetImageInfoFromMemory() tests.\n"); + return; + } + + hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, sizeof(bmp_1bpp), NULL, &info, NULL); + ok(hr == S_OK, "Unexpected hr %#x.", hr); + + hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, sizeof(bmp_1bpp) + 5, NULL, &info, NULL); /* too large size */ + ok(hr == S_OK, "Unexpected hr %#x.", hr); + + hr = D3DX11GetImageInfoFromMemory(noimage, sizeof(noimage), NULL, NULL, NULL); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hr = D3DX11GetImageInfoFromMemory(noimage, sizeof(noimage), NULL, &info, NULL); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, sizeof(bmp_1bpp) - 1, NULL, &info, NULL); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hr = D3DX11GetImageInfoFromMemory(bmp_1bpp + 1, sizeof(bmp_1bpp) - 1, NULL, &info, NULL); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, 0, NULL, &info, NULL); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, 0, NULL, NULL, NULL); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hr = D3DX11GetImageInfoFromMemory(noimage, 0, NULL, &info, NULL); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hr = D3DX11GetImageInfoFromMemory(noimage, 0, NULL, NULL, NULL); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hr = D3DX11GetImageInfoFromMemory(noimage, 0, NULL, &info, NULL); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hr = D3DX11GetImageInfoFromMemory(NULL, 4, NULL, NULL, NULL); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hr = D3DX11GetImageInfoFromMemory(NULL, 4, NULL, &info, NULL); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hr = D3DX11GetImageInfoFromMemory(NULL, 0, NULL, NULL, NULL); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + /* test BMP support */ + hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, sizeof(bmp_1bpp), NULL, &info, NULL); + ok(hr == S_OK, "Unexpected hr %#x.", hr); + ok(info.Width == 1, "Unexpected width %u.\n", info.Width); + ok(info.Height == 1, "Unexpected height %u.\n", info.Height); + ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth); + ok(info.ArraySize == 1, "Unexpected array size %u.\n", info.ArraySize); + ok(info.MipLevels == 1, "Unexpected miplevels %u\n", info.MipLevels); + ok(info.MiscFlags == 0, "Unexpected misc flags %#x\n", info.MiscFlags); + ok(info.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Unexpected format %#x.\n", info.Format); + ok(info.ResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE2D, "Unexpected resource type %#x.\n", info.ResourceDimension); + ok(info.ImageFileFormat == D3DX11_IFF_BMP, "Unexpected image file format %#x.\n", info.ImageFileFormat); + + hr = D3DX11GetImageInfoFromMemory(bmp_2bpp, sizeof(bmp_2bpp), NULL, &info, NULL); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hr = D3DX11GetImageInfoFromMemory(bmp_4bpp, sizeof(bmp_4bpp), NULL, &info, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(info.Width == 1, "Unexpected width %u.\n", info.Width); + ok(info.Height == 1, "Unexpected height %u.\n", info.Height); + ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth); + ok(info.ArraySize == 1, "Unexpected array size %u.\n", info.ArraySize); + ok(info.MipLevels == 1, "Unexpected miplevels %u\n", info.MipLevels); + ok(info.MiscFlags == 0, "Unexpected misc flags %#x\n", info.MiscFlags); + ok(info.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Unexpected format %#x.\n", info.Format); + ok(info.ResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE2D, "Unexpected resource type %#x.\n", info.ResourceDimension); + ok(info.ImageFileFormat == D3DX11_IFF_BMP, "Unexpected image file format %#x.\n", info.ImageFileFormat); + + hr = D3DX11GetImageInfoFromMemory(bmp_8bpp, sizeof(bmp_8bpp), NULL, &info, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(info.Width == 1, "Unexpected width %u.\n", info.Width); + ok(info.Height == 1, "Unexpected height %u.\n", info.Height); + ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth); + ok(info.ArraySize == 1, "Unexpected array size %u.\n", info.ArraySize); + ok(info.MipLevels == 1, "Unexpected miplevels %u\n", info.MipLevels); + ok(info.MiscFlags == 0, "Unexpected misc flags %#x\n", info.MiscFlags); + ok(info.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Unexpected format %#x.\n", info.Format); + ok(info.ResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE2D, "Unexpected resource type %#x.\n", info.ResourceDimension); + ok(info.ImageFileFormat == D3DX11_IFF_BMP, "Unexpected image file format %#x.\n", info.ImageFileFormat); + + hr = D3DX11GetImageInfoFromMemory(bmp_32bpp_xrgb, sizeof(bmp_32bpp_xrgb), NULL, &info, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(info.Width == 2, "Unexpected width %u.\n", info.Width); + ok(info.Height == 2, "Unexpected height %u.\n", info.Height); + ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth); + ok(info.ArraySize == 1, "Unexpected array size %u.\n", info.ArraySize); + ok(info.MipLevels == 1, "Unexpected miplevels %u\n", info.MipLevels); + ok(info.MiscFlags == 0, "Unexpected misc flags %#x\n", info.MiscFlags); + ok(info.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Unexpected format %#x.\n", info.Format); + ok(info.ResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE2D, "Unexpected resource type %#x.\n", info.ResourceDimension); + ok(info.ImageFileFormat == D3DX11_IFF_BMP, "Unexpected image file format %#x.\n", info.ImageFileFormat); + + hr = D3DX11GetImageInfoFromMemory(bmp_32bpp_argb, sizeof(bmp_32bpp_argb), NULL, &info, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(info.Width == 2, "Unexpected width %u.\n", info.Width); + ok(info.Height == 2, "Unexpected height %u.\n", info.Height); + ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth); + ok(info.ArraySize == 1, "Unexpected array size %u.\n", info.ArraySize); + ok(info.MipLevels == 1, "Unexpected miplevels %u\n", info.MipLevels); + ok(info.MiscFlags == 0, "Unexpected misc flags %#x\n", info.MiscFlags); + ok(info.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Unexpected format %#x.\n", info.Format); + ok(info.ResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE2D, "Unexpected resource type %#x.\n", info.ResourceDimension); + ok(info.ImageFileFormat == D3DX11_IFF_BMP, "Unexpected image file format %#x.\n", info.ImageFileFormat); + + /* Grayscale PNG */ + hr = D3DX11GetImageInfoFromMemory(png_grayscale, sizeof(png_grayscale), NULL, &info, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(info.Width == 1, "Unexpected width %u.\n", info.Width); + ok(info.Height == 1, "Unexpected height %u.\n", info.Height); + ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth); + ok(info.ArraySize == 1, "Unexpected array size %u.\n", info.ArraySize); + ok(info.MipLevels == 1, "Unexpected miplevels %u\n", info.MipLevels); + ok(info.MiscFlags == 0, "Unexpected misc flags %#x\n", info.MiscFlags); + ok(info.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Unexpected format %#x.\n", info.Format); + ok(info.ResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE2D, "Unexpected resource type %#x.\n", info.ResourceDimension); + ok(info.ImageFileFormat == D3DX11_IFF_PNG, "Unexpected image file format %#x.\n", info.ImageFileFormat); + + /* test DDS support */ + hr = D3DX11GetImageInfoFromMemory(dds_24bit, sizeof(dds_24bit), NULL, &info, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(info.Width == 2, "Unexpected width %u.\n", info.Width); + ok(info.Height == 2, "Unexpected height %u.\n", info.Height); + ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth); + ok(info.ArraySize == 1, "Unexpected array size %u.\n", info.ArraySize); + ok(info.MipLevels == 2, "Unexpected miplevels %u\n", info.MipLevels); + ok(info.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Unexpected format %#x.\n", info.Format); + ok(info.ResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE2D, "Unexpected resource type %#x.\n", info.ResourceDimension); + ok(info.ImageFileFormat == D3DX11_IFF_DDS, "Unexpected image file format %#x.\n", info.ImageFileFormat); + + hr = D3DX11GetImageInfoFromMemory(dds_24bit, sizeof(dds_24bit) - 1, NULL, &info, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(info.Width == 2, "Unexpected width %u.\n", info.Width); + ok(info.Height == 2, "Unexpected height %u.\n", info.Height); + ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth); + ok(info.ArraySize == 1, "Unexpected array size %u.\n", info.ArraySize); + ok(info.MipLevels == 2, "Unexpected miplevels %u\n", info.MipLevels); + ok(info.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Unexpected format %#x.\n", info.Format); + ok(info.ResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE2D, "Unexpected resource type %#x.\n", info.ResourceDimension); + ok(info.ImageFileFormat == D3DX11_IFF_DDS, "Unexpected image file format %#x.\n", info.ImageFileFormat); + + hr = D3DX11GetImageInfoFromMemory(dds_16bit, sizeof(dds_16bit), NULL, &info, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(info.Width == 2, "Unexpected width %u.\n", info.Width); + ok(info.Height == 2, "Unexpected height %u.\n", info.Height); + ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth); + ok(info.ArraySize == 1, "Unexpected array size %u.\n", info.ArraySize); + ok(info.MipLevels == 1, "Unexpected miplevels %u\n", info.MipLevels); + ok(info.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Unexpected format %#x.\n", info.Format); + ok(info.ResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE2D, "Unexpected resource type %#x.\n", info.ResourceDimension); + ok(info.ImageFileFormat == D3DX11_IFF_DDS, "Unexpected image file format %#x.\n", info.ImageFileFormat); + + memset(&info, 0, sizeof(info)); + hr = D3DX11GetImageInfoFromMemory(dds_16bit, sizeof(dds_16bit) - 1, NULL, &info, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(info.Width == 2, "Unexpected width %u.\n", info.Width); + ok(info.Height == 2, "Unexpected height %u.\n", info.Height); + ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth); + ok(info.ArraySize == 1, "Unexpected array size %u.\n", info.ArraySize); + ok(info.MipLevels == 1, "Unexpected miplevels %u\n", info.MipLevels); + ok(info.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Unexpected format %#x.\n", info.Format); + ok(info.ResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE2D, "Unexpected resource type %#x.\n", info.ResourceDimension); + ok(info.ImageFileFormat == D3DX11_IFF_DDS, "Unexpected image file format %#x.\n", info.ImageFileFormat); + + memset(&info, 0, sizeof(info)); + hr = D3DX11GetImageInfoFromMemory(dds_8bit, sizeof(dds_8bit), NULL, &info, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(info.Width == 16, "Unexpected width %u.\n", info.Width); + ok(info.Height == 4, "Unexpected height %u.\n", info.Height); + ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth); + ok(info.ArraySize == 1, "Unexpected array size %u.\n", info.ArraySize); + ok(info.MipLevels == 1, "Unexpected miplevels %u\n", info.MipLevels); + ok(info.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Unexpected format %#x.\n", info.Format); + ok(info.ResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE2D, "Unexpected resource type %#x.\n", info.ResourceDimension); + ok(info.ImageFileFormat == D3DX11_IFF_DDS, "Unexpected image file format %#x.\n", info.ImageFileFormat); + + hr = D3DX11GetImageInfoFromMemory(dds_cube_map, sizeof(dds_cube_map), NULL, &info, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(info.Width == 4, "Unexpected width %u.\n", info.Width); + ok(info.Height == 4, "Unexpected height %u.\n", info.Height); + ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth); + ok(info.ArraySize == 6, "Unexpected array size %u.\n", info.ArraySize); + ok(info.MipLevels == 1, "Unexpected miplevels %u\n", info.MipLevels); + ok(info.Format == DXGI_FORMAT_BC3_UNORM, "Unexpected format %#x.\n", info.Format); + ok(info.ResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE2D, "Unexpected resource type %#x.\n", info.ResourceDimension); + ok(info.ImageFileFormat == D3DX11_IFF_DDS, "Unexpected image file format %#x.\n", info.ImageFileFormat); + + hr = D3DX11GetImageInfoFromMemory(dds_cube_map, sizeof(dds_cube_map) - 1, NULL, &info, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(info.Width == 4, "Unexpected width %u.\n", info.Width); + ok(info.Height == 4, "Unexpected height %u.\n", info.Height); + ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth); + ok(info.ArraySize == 6, "Unexpected array size %u.\n", info.ArraySize); + ok(info.MipLevels == 1, "Unexpected miplevels %u\n", info.MipLevels); + ok(info.Format == DXGI_FORMAT_BC3_UNORM, "Unexpected format %#x.\n", info.Format); + ok(info.ResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE2D, "Unexpected resource type %#x.\n", info.ResourceDimension); + ok(info.ImageFileFormat == D3DX11_IFF_DDS, "Unexpected image file format %#x.\n", info.ImageFileFormat); + + hr = D3DX11GetImageInfoFromMemory(dds_volume_map, sizeof(dds_volume_map), NULL, &info, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(info.Width == 4, "Unexpected width %u.\n", info.Width); + ok(info.Height == 4, "Unexpected height %u.\n", info.Height); + ok(info.Depth == 2, "Unexpected depth %u.\n", info.Depth); + ok(info.ArraySize == 1, "Unexpected array size %u.\n", info.ArraySize); + ok(info.MipLevels == 3, "Unexpected miplevels %u\n", info.MipLevels); + ok(info.Format == DXGI_FORMAT_BC2_UNORM, "Unexpected format %#x.\n", info.Format); + ok(info.ResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE3D, "Unexpected resource type %#x.\n", info.ResourceDimension); + ok(info.ImageFileFormat == D3DX11_IFF_DDS, "Unexpected image file format %#x.\n", info.ImageFileFormat); + + hr = D3DX11GetImageInfoFromMemory(dds_volume_map, sizeof(dds_volume_map) - 1, NULL, &info, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(info.Width == 4, "Unexpected width %u.\n", info.Width); + ok(info.Height == 4, "Unexpected height %u.\n", info.Height); + ok(info.Depth == 2, "Unexpected depth %u.\n", info.Depth); + ok(info.ArraySize == 1, "Unexpected array size %u.\n", info.ArraySize); + ok(info.MipLevels == 3, "Unexpected miplevels %u\n", info.MipLevels); + ok(info.Format == DXGI_FORMAT_BC2_UNORM, "Unexpected format %#x.\n", info.Format); + ok(info.ResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE3D, "Unexpected resource type %#x.\n", info.ResourceDimension); + ok(info.ImageFileFormat == D3DX11_IFF_DDS, "Unexpected image file format %#x.\n", info.ImageFileFormat); + + check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('D','X','T','1'), 0, 0, 0, 0, 0, DXGI_FORMAT_BC1_UNORM); + check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('D','X','T','2'), 0, 0, 0, 0, 0, DXGI_FORMAT_BC2_UNORM); + check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('D','X','T','3'), 0, 0, 0, 0, 0, DXGI_FORMAT_BC2_UNORM); + check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('D','X','T','4'), 0, 0, 0, 0, 0, DXGI_FORMAT_BC3_UNORM); + check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('D','X','T','5'), 0, 0, 0, 0, 0, DXGI_FORMAT_BC3_UNORM); + check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('R','G','B','G'), 0, 0, 0, 0, 0, DXGI_FORMAT_R8G8_B8G8_UNORM); + check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('G','R','G','B'), 0, 0, 0, 0, 0, DXGI_FORMAT_G8R8_G8B8_UNORM); + check_dds_pixel_format(DDS_PF_RGB, 0, 16, 0xf800, 0x07e0, 0x001f, 0, DXGI_FORMAT_R8G8B8A8_UNORM); + check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 16, 0x7c00, 0x03e0, 0x001f, 0x8000, DXGI_FORMAT_R8G8B8A8_UNORM); + check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 16, 0x0f00, 0x00f0, 0x000f, 0xf000, DXGI_FORMAT_R8G8B8A8_UNORM); + check_dds_pixel_format(DDS_PF_RGB, 0, 8, 0xe0, 0x1c, 0x03, 0, DXGI_FORMAT_R8G8B8A8_UNORM); + check_dds_pixel_format(DDS_PF_ALPHA_ONLY, 0, 8, 0, 0, 0, 0xff, DXGI_FORMAT_A8_UNORM); + check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 16, 0x00e0, 0x001c, 0x0003, 0xff00, DXGI_FORMAT_R8G8B8A8_UNORM); + check_dds_pixel_format(DDS_PF_RGB, 0, 16, 0xf00, 0x0f0, 0x00f, 0, DXGI_FORMAT_R8G8B8A8_UNORM); + check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x3ff00000, 0x000ffc00, 0x000003ff, 0xc0000000, DXGI_FORMAT_R10G10B10A2_UNORM); + check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x000003ff, 0x000ffc00, 0x3ff00000, 0xc0000000, DXGI_FORMAT_R10G10B10A2_UNORM); + check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000, DXGI_FORMAT_R8G8B8A8_UNORM); + check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000, DXGI_FORMAT_R8G8B8A8_UNORM); + check_dds_pixel_format(DDS_PF_RGB, 0, 32, 0xff0000, 0x00ff00, 0x0000ff, 0, DXGI_FORMAT_R8G8B8A8_UNORM); + check_dds_pixel_format(DDS_PF_RGB, 0, 32, 0x0000ff, 0x00ff00, 0xff0000, 0, DXGI_FORMAT_R8G8B8A8_UNORM); + check_dds_pixel_format(DDS_PF_RGB, 0, 24, 0xff0000, 0x00ff00, 0x0000ff, 0, DXGI_FORMAT_R8G8B8A8_UNORM); + check_dds_pixel_format(DDS_PF_RGB, 0, 32, 0x0000ffff, 0xffff0000, 0, 0, DXGI_FORMAT_R16G16_UNORM); + check_dds_pixel_format(DDS_PF_LUMINANCE, 0, 8, 0xff, 0, 0, 0, DXGI_FORMAT_R8G8B8A8_UNORM); + check_dds_pixel_format(DDS_PF_LUMINANCE, 0, 16, 0xffff, 0, 0, 0, DXGI_FORMAT_R16G16B16A16_UNORM); + check_dds_pixel_format(DDS_PF_LUMINANCE | DDS_PF_ALPHA, 0, 16, 0x00ff, 0, 0, 0xff00, DXGI_FORMAT_R8G8B8A8_UNORM); + check_dds_pixel_format(DDS_PF_LUMINANCE | DDS_PF_ALPHA, 0, 8, 0x0f, 0, 0, 0xf0, DXGI_FORMAT_R8G8B8A8_UNORM); +} + START_TEST(d3dx11) { test_D3DX11CreateAsyncMemoryLoader(); test_D3DX11CreateAsyncFileLoader(); test_D3DX11CreateAsyncResourceLoader(); test_D3DX11CompileFromFile(); + test_D3DX11GetImageInfoFromMemory(); } -- 2.30.2

2 1

[PATCH] d3dx9: Implement getting/setting line width.
by Nikolay Sivov 11 Aug '21

11 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx9_36/line.c | 19 +++++++++++++++---- dlls/d3dx9_36/tests/line.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/line.c b/dlls/d3dx9_36/line.c index 7b2e3b5428f..647eb1b5b2a 100644 --- a/dlls/d3dx9_36/line.c +++ b/dlls/d3dx9_36/line.c @@ -29,6 +29,7 @@ struct d3dx9_line IDirect3DDevice9 *device; IDirect3DStateBlock9 *state; + float width; }; static inline struct d3dx9_line *impl_from_ID3DXLine(ID3DXLine *iface) @@ -192,16 +193,25 @@ static float WINAPI d3dx9_line_GetPatternScale(ID3DXLine *iface) static HRESULT WINAPI d3dx9_line_SetWidth(ID3DXLine *iface, float width) { - FIXME("iface %p, width %.8e stub!\n", iface, width); + struct d3dx9_line *line = impl_from_ID3DXLine(iface); - return E_NOTIMPL; + TRACE("iface %p, width %.8e.\n", iface, width); + + if (width <= 0.0f) + return D3DERR_INVALIDCALL; + + line->width = width; + + return D3D_OK; } static float WINAPI d3dx9_line_GetWidth(ID3DXLine *iface) { - FIXME("iface %p stub!\n", iface); + struct d3dx9_line *line = impl_from_ID3DXLine(iface); - return 1.0f; + TRACE("iface %p.\n", iface); + + return line->width; } static HRESULT WINAPI d3dx9_line_SetAntialias(ID3DXLine *iface, BOOL antialias) @@ -306,6 +316,7 @@ HRESULT WINAPI D3DXCreateLine(struct IDirect3DDevice9 *device, struct ID3DXLine object->ref = 1; object->device = device; IDirect3DDevice9_AddRef(device); + object->width = 1.0f; *line = &object->ID3DXLine_iface; diff --git a/dlls/d3dx9_36/tests/line.c b/dlls/d3dx9_36/tests/line.c index ae8d07e0623..d89ae160ba5 100644 --- a/dlls/d3dx9_36/tests/line.c +++ b/dlls/d3dx9_36/tests/line.c @@ -115,6 +115,38 @@ static void test_create_line(IDirect3DDevice9* device) ok(ref == 0, "Got %x references to line %p, expected 0\n", ref, line); } +static void test_line_width(IDirect3DDevice9* device) +{ + ID3DXLine *line = NULL; + ULONG refcount; + float width; + HRESULT hr; + + hr = D3DXCreateLine(device, &line); + ok(hr == D3D_OK, "Failed to create a line, hr %#x.\n", hr); + + width = ID3DXLine_GetWidth(line); + ok(width == 1.0f, "Unexpected line width %.8e.\n", width); + + hr = ID3DXLine_SetWidth(line, 0.0f); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + width = ID3DXLine_GetWidth(line); + ok(width == 1.0f, "Unexpected line width %.8e.\n", width); + + hr = ID3DXLine_SetWidth(line, -1.0f); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + width = ID3DXLine_GetWidth(line); + ok(width == 1.0f, "Unexpected line width %.8e.\n", width); + + hr = ID3DXLine_SetWidth(line, 10.0f); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + width = ID3DXLine_GetWidth(line); + ok(width == 10.0f, "Unexpected line width %.8e.\n", width); + + refcount = ID3DXLine_Release(line); + ok(!refcount, "Got %u references to line.\n", refcount); +} + START_TEST(line) { HWND wnd; @@ -148,6 +180,7 @@ START_TEST(line) } test_create_line(device); + test_line_width(device); IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d); -- 2.30.2

2 1

[PATCH] d2d1: Add D2D1Crop.
by Ziqing Hui 11 Aug '21

11 Aug '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- We add D2D1Crop defines to Wine now for Axure 9 [1]. It would fail on d2d_device_context_CreateEffect() without adding D2D1Crop to builtin_effects. [1] https://www.axure.com/release-history/rp9 dlls/d2d1/effect.c | 3 ++- dlls/d2d1/tests/d2d1.c | 1 + include/d2d1effects.idl | 8 ++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 5f334d19f71..0c33f956826 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -24,7 +24,8 @@ static const struct d2d_effect_info builtin_effects[] = { {&CLSID_D2D12DAffineTransform, 1, 1, 1}, {&CLSID_D2D13DPerspectiveTransform, 1, 1, 1}, - {&CLSID_D2D1Composite, 2, 1, 0xffffffff} + {&CLSID_D2D1Composite, 2, 1, 0xffffffff}, + {&CLSID_D2D1Crop, 1, 1, 1}, }; static inline struct d2d_effect *impl_from_ID2D1Effect(ID2D1Effect *iface) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 343a2363e14..cd58d642ce1 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9707,6 +9707,7 @@ static void test_effect(BOOL d3d11) {&CLSID_D2D12DAffineTransform, 1, 1, 1}, {&CLSID_D2D13DPerspectiveTransform, 1, 1, 1}, {&CLSID_D2D1Composite, 2, 1, 0xffffffff}, + {&CLSID_D2D1Crop, 1, 1, 1}, }; if (!init_test_context(&ctx, d3d11)) diff --git a/include/d2d1effects.idl b/include/d2d1effects.idl index 4154276345b..9bd0b7012ad 100644 --- a/include/d2d1effects.idl +++ b/include/d2d1effects.idl @@ -19,6 +19,7 @@ cpp_quote("DEFINE_GUID(CLSID_D2D12DAffineTransform, 0x6aa97485,0x6354,0x4cfc,0x90,0x8c,0xe4,0xa7,0x4f,0x62,0xc9,0x6c);") cpp_quote("DEFINE_GUID(CLSID_D2D13DPerspectiveTransform, 0xc2844d0b,0x3d86,0x46e7,0x85,0xba,0x52,0x6c,0x92,0x40,0xf3,0xfb);") cpp_quote("DEFINE_GUID(CLSID_D2D1Composite, 0x48fc9f51,0xf6ac,0x48f1,0x8b,0x58,0x3b,0x28,0xac,0x46,0xf7,0x6d);") +cpp_quote("DEFINE_GUID(CLSID_D2D1Crop, 0xe23f7110,0x0e9a,0x4324,0xaf,0x47,0x6a,0x2c,0x0c,0x46,0xf3,0x5b);") typedef enum D2D1_BORDER_MODE { @@ -75,3 +76,10 @@ typedef enum D2D1_COMPOSITE_PROP D2D1_COMPOSITE_PROP_MODE = 0x0, D2D1_COMPOSITE_PROP_FORCE_DWORD = 0xffffffff } D2D1_COMPOSITE_PROP; + +typedef enum D2D1_CROP_PROP +{ + D2D1_CROP_PROP_RECT = 0x0, + D2D1_CROP_PROP_BORDER_MODE = 0x1, + D2D1_CROP_PROP_FORCE_DWORD = 0xffffffff +} D2D1_CROP_PROP; -- 2.25.1

2 1

[PATCH vkd3d 1/5] vkd3d-shader: Fold constant casts from int to float.
by Zebediah Figura 11 Aug '21

11 Aug '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 7e3e4d77..398be349 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -371,6 +371,11 @@ static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi switch (arg1->node.data_type->base_type) { + case HLSL_TYPE_INT: + for (i = 0; i < dimx; ++i) + res->value.f[i] = arg1->value.i[i]; + break; + case HLSL_TYPE_UINT: for (i = 0; i < dimx; ++i) res->value.f[i] = arg1->value.u[i]; -- 2.32.0

5 19

[PATCH 1/7] gdi32: Use GetDIBits 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 | 79 ++++++++++++------------------------ 1 file changed, 25 insertions(+), 54 deletions(-)

2 2

[PATCH] d3dx10: Forward D3DX10CreateEffectFromFileA() to D3DX10CreateEffectFromFileW().
by Nikolay Sivov 11 Aug '21

11 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx10_43/compiler.c | 30 ++++++++++++++++++++++++++++++ dlls/d3dx10_43/d3dx10_43_main.c | 13 ------------- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx10_43/compiler.c b/dlls/d3dx10_43/compiler.c index 932bdadea1a..01377f6c0da 100644 --- a/dlls/d3dx10_43/compiler.c +++ b/dlls/d3dx10_43/compiler.c @@ -18,6 +18,7 @@ */ #include "wine/debug.h" +#include "wine/heap.h" #define COBJMACROS @@ -93,3 +94,32 @@ HRESULT WINAPI D3DX10CreateEffectFromFileW(const WCHAR *filename, const D3D10_SH return hr; } + +HRESULT WINAPI D3DX10CreateEffectFromFileA(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) +{ + WCHAR *filenameW; + HRESULT hr; + int len; + + TRACE("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", + debugstr_a(filename), defines, include, debugstr_a(profile), hlslflags, fxflags, + device, effectpool, pump, effect, errors, hresult); + + if (!filename) + return E_INVALIDARG; + + len = MultiByteToWideChar(CP_ACP, 0, filename, -1, NULL, 0); + if (!(filenameW = heap_alloc(len * sizeof(*filenameW)))) + return E_OUTOFMEMORY; + MultiByteToWideChar(CP_ACP, 0, filename, -1, filenameW, len); + + hr = D3DX10CreateEffectFromFileW(filenameW, defines, include, profile, hlslflags, fxflags, device, + effectpool, pump, effect, errors, hresult); + heap_free(filenameW); + + return hr; +} diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 2c53924ac20..42f29ad6239 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -48,19 +48,6 @@ BOOL WINAPI D3DX10CheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) return FALSE; } -HRESULT WINAPI D3DX10CreateEffectFromFileA(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("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", - 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.30.2

1 0

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

11 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 82 +++++++++++ dlls/iphlpapi/ipstats.c | 252 ---------------------------------- dlls/nsi/tests/nsi.c | 4 - 3 files changed, 82 insertions(+), 256 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index fe2daa0f24d..78f4c582e1a 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2436,6 +2436,88 @@ err: return err; } +/****************************************************************** + * GetIpStatistics (IPHLPAPI.@) + * + * Get the IP statistics for the local computer. + * + * PARAMS + * stats [Out] buffer for IP statistics + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + */ +DWORD WINAPI GetIpStatistics( MIB_IPSTATS *stats ) +{ + return GetIpStatisticsEx( stats, WS_AF_INET ); +} + +/****************************************************************** + * GetIpStatisticsEx (IPHLPAPI.@) + * + * Get the IPv4 and IPv6 statistics for the local computer. + * + * PARAMS + * stats [Out] buffer for IP statistics + * family [In] specifies whether IPv4 or IPv6 statistics are returned + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + */ +DWORD WINAPI GetIpStatisticsEx( MIB_IPSTATS *stats, DWORD family ) +{ + struct nsi_ip_ipstats_dynamic dyn; + struct nsi_ip_ipstats_static stat; + struct nsi_ip_cmpt_rw cmpt_rw; + struct nsi_ip_cmpt_dynamic cmpt_dyn; + const NPI_MODULEID *mod; + DWORD err, cmpt = 1; + + TRACE( "%p %d\n", stats, family ); + + if (!stats) return ERROR_INVALID_PARAMETER; + mod = ip_module_id( family ); + if (!mod) return ERROR_INVALID_PARAMETER; + + memset( stats, 0, sizeof(*stats) ); + + err = NsiGetAllParameters( 1, mod, NSI_IP_IPSTATS_TABLE, NULL, 0, NULL, 0, + &dyn, sizeof(dyn), &stat, sizeof(stat) ); + if (err) return err; + + err = NsiGetAllParameters( 1, mod, NSI_IP_COMPARTMENT_TABLE, &cmpt, sizeof(cmpt), &cmpt_rw, sizeof(cmpt_rw), + &cmpt_dyn, sizeof(cmpt_dyn), NULL, 0 ); + if (err) return err; + + stats->u.Forwarding = cmpt_rw.not_forwarding + 1; + stats->dwDefaultTTL = cmpt_rw.default_ttl; + stats->dwInReceives = dyn.in_recv; + stats->dwInHdrErrors = dyn.in_hdr_errs; + stats->dwInAddrErrors = dyn.in_addr_errs; + stats->dwForwDatagrams = dyn.fwd_dgrams; + stats->dwInUnknownProtos = dyn.in_unk_protos; + stats->dwInDiscards = dyn.in_discards; + stats->dwInDelivers = dyn.in_delivers; + stats->dwOutRequests = dyn.out_reqs; + stats->dwRoutingDiscards = dyn.routing_discards; + stats->dwOutDiscards = dyn.out_discards; + stats->dwOutNoRoutes = dyn.out_no_routes; + stats->dwReasmTimeout = stat.reasm_timeout; + stats->dwReasmReqds = dyn.reasm_reqds; + stats->dwReasmOks = dyn.reasm_oks; + stats->dwReasmFails = dyn.reasm_fails; + stats->dwFragOks = dyn.frag_oks; + stats->dwFragFails = dyn.frag_fails; + stats->dwFragCreates = dyn.frag_creates; + stats->dwNumIf = cmpt_dyn.num_ifs; + stats->dwNumAddr = cmpt_dyn.num_addrs; + stats->dwNumRoutes = cmpt_dyn.num_routes; + + 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, diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 115bafa6f8e..8335e4871c1 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -617,258 +617,6 @@ DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX stats, DWORD family) return ret; } -/****************************************************************** - * GetIpStatisticsEx (IPHLPAPI.@) - * - * Get the IPv4 and IPv6 statistics for the local computer. - * - * PARAMS - * stats [Out] buffer for IP statistics - * family [In] specifies whether IPv4 or IPv6 statistics are returned - * - * RETURNS - * Success: NO_ERROR - * Failure: error code from winerror.h - */ -DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS stats, DWORD family) -{ - DWORD ret = ERROR_NOT_SUPPORTED; - MIB_IPFORWARDTABLE *fwd_table; - - if (!stats) return ERROR_INVALID_PARAMETER; - if (family != WS_AF_INET && family != WS_AF_INET6) return ERROR_INVALID_PARAMETER; - memset( stats, 0, sizeof(*stats) ); - - stats->dwNumIf = stats->dwNumAddr = get_interface_indices( FALSE, NULL ); - if (!AllocateAndGetIpForwardTableFromStack( &fwd_table, FALSE, GetProcessHeap(), 0 )) - { - stats->dwNumRoutes = fwd_table->dwNumEntries; - HeapFree( GetProcessHeap(), 0, fwd_table ); - } - - if (family == WS_AF_INET6) - { -#ifdef __linux__ - { - FILE *fp; - - if ((fp = fopen("/proc/net/snmp6", "r"))) - { - struct { - const char *name; - DWORD *elem; - } ipstatlist[] = { - { "Ip6InReceives", &stats->dwInReceives }, - { "Ip6InHdrErrors", &stats->dwInHdrErrors }, - { "Ip6InAddrErrors", &stats->dwInAddrErrors }, - { "Ip6OutForwDatagrams", &stats->dwForwDatagrams }, - { "Ip6InUnknownProtos", &stats->dwInUnknownProtos }, - { "Ip6InDiscards", &stats->dwInDiscards }, - { "Ip6InDelivers", &stats->dwInDelivers }, - { "Ip6OutRequests", &stats->dwOutRequests }, - { "Ip6OutDiscards", &stats->dwOutDiscards }, - { "Ip6OutNoRoutes", &stats->dwOutNoRoutes }, - { "Ip6ReasmTimeout", &stats->dwReasmTimeout }, - { "Ip6ReasmReqds", &stats->dwReasmReqds }, - { "Ip6ReasmOKs", &stats->dwReasmOks }, - { "Ip6ReasmFails", &stats->dwReasmFails }, - { "Ip6FragOKs", &stats->dwFragOks }, - { "Ip6FragFails", &stats->dwFragFails }, - { "Ip6FragCreates", &stats->dwFragCreates }, - /* hmm, no routingDiscards, defaultTTL and forwarding? */ - }; - char buf[512], *ptr, *value; - DWORD res, i; - - while ((ptr = fgets(buf, sizeof(buf), fp))) - { - if (!(value = strchr(buf, ' '))) - continue; - - /* terminate the valuename */ - ptr = value - 1; - *(ptr + 1) = '\0'; - - /* and strip leading spaces from value */ - value += 1; - 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) && sscanf(value, "%d", &res)) - *ipstatlist[i].elem = res; - } - fclose(fp); - ret = NO_ERROR; - } - } -#else - FIXME( "unimplemented for IPv6\n" ); -#endif - return ret; - } - -#ifdef __linux__ - { - FILE *fp; - - if ((fp = fopen("/proc/net/snmp", "r"))) - { - static const char hdr[] = "Ip:"; - char buf[512], *ptr; - - 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)) - { - ptr += sizeof(hdr); - sscanf( ptr, "%u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u", - &stats->u.dwForwarding, - &stats->dwDefaultTTL, - &stats->dwInReceives, - &stats->dwInHdrErrors, - &stats->dwInAddrErrors, - &stats->dwForwDatagrams, - &stats->dwInUnknownProtos, - &stats->dwInDiscards, - &stats->dwInDelivers, - &stats->dwOutRequests, - &stats->dwOutDiscards, - &stats->dwOutNoRoutes, - &stats->dwReasmTimeout, - &stats->dwReasmReqds, - &stats->dwReasmOks, - &stats->dwReasmFails, - &stats->dwFragOks, - &stats->dwFragFails, - &stats->dwFragCreates ); - /* hmm, no routingDiscards */ - break; - } - } - fclose(fp); - ret = NO_ERROR; - } - } -#elif defined(HAVE_LIBKSTAT) - { - static char ip[] = "ip"; - kstat_ctl_t *kc; - kstat_t *ksp; - - if ((kc = kstat_open()) && - (ksp = kstat_lookup( kc, ip, 0, ip )) && - kstat_read( kc, ksp, NULL ) != -1 && - ksp->ks_type == KSTAT_TYPE_NAMED) - { - stats->u.dwForwarding = kstat_get_ui32( ksp, "forwarding" ); - stats->dwDefaultTTL = kstat_get_ui32( ksp, "defaultTTL" ); - stats->dwInReceives = kstat_get_ui32( ksp, "inReceives" ); - stats->dwInHdrErrors = kstat_get_ui32( ksp, "inHdrErrors" ); - stats->dwInAddrErrors = kstat_get_ui32( ksp, "inAddrErrors" ); - stats->dwForwDatagrams = kstat_get_ui32( ksp, "forwDatagrams" ); - stats->dwInUnknownProtos = kstat_get_ui32( ksp, "inUnknownProtos" ); - stats->dwInDiscards = kstat_get_ui32( ksp, "inDiscards" ); - stats->dwInDelivers = kstat_get_ui32( ksp, "inDelivers" ); - stats->dwOutRequests = kstat_get_ui32( ksp, "outRequests" ); - stats->dwRoutingDiscards = kstat_get_ui32( ksp, "routingDiscards" ); - stats->dwOutDiscards = kstat_get_ui32( ksp, "outDiscards" ); - stats->dwOutNoRoutes = kstat_get_ui32( ksp, "outNoRoutes" ); - stats->dwReasmTimeout = kstat_get_ui32( ksp, "reasmTimeout" ); - stats->dwReasmReqds = kstat_get_ui32( ksp, "reasmReqds" ); - stats->dwReasmOks = kstat_get_ui32( ksp, "reasmOKs" ); - stats->dwReasmFails = kstat_get_ui32( ksp, "reasmFails" ); - stats->dwFragOks = kstat_get_ui32( ksp, "fragOKs" ); - stats->dwFragFails = kstat_get_ui32( ksp, "fragFails" ); - stats->dwFragCreates = kstat_get_ui32( ksp, "fragCreates" ); - ret = NO_ERROR; - } - if (kc) kstat_close( kc ); - } -#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}; - int ip_ttl, ip_forwarding; -#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) - { - ERR ("failed to get ipstat\n"); - return ERROR_NOT_SUPPORTED; - } - - needed = sizeof(ip_ttl); - if (sysctlbyname ("net.inet.ip.ttl", &ip_ttl, &needed, NULL, 0) == -1) - { - ERR ("failed to get ip Default TTL\n"); - return ERROR_NOT_SUPPORTED; - } - - needed = sizeof(ip_forwarding); - if (sysctlbyname ("net.inet.ip.forwarding", &ip_forwarding, &needed, NULL, 0) == -1) - { - ERR ("failed to get ip forwarding\n"); - return ERROR_NOT_SUPPORTED; - } - - /* ip.forwarding is 0 or 1 on BSD */ - stats->u.dwForwarding = ip_forwarding+1; - stats->dwDefaultTTL = ip_ttl; - stats->dwInReceives = ip_stat.ips_total; - stats->dwInHdrErrors = 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 */ - stats->dwInAddrErrors = ip_stat.ips_cantforward + ip_stat.ips_badaddr + ip_stat.ips_notmember; - stats->dwForwDatagrams = ip_stat.ips_forward; - stats->dwInUnknownProtos = ip_stat.ips_noproto; - stats->dwInDiscards = ip_stat.ips_fragdropped; - stats->dwInDelivers = ip_stat.ips_delivered; - stats->dwOutRequests = ip_stat.ips_localout; - /*stats->dwRoutingDiscards = 0;*/ /* FIXME */ - stats->dwOutDiscards = ip_stat.ips_odropped; - stats->dwOutNoRoutes = ip_stat.ips_noroute; - stats->dwReasmTimeout = ip_stat.ips_fragtimeout; - stats->dwReasmReqds = ip_stat.ips_fragments; - stats->dwReasmOks = ip_stat.ips_reassembled; - stats->dwReasmFails = ip_stat.ips_fragments - ip_stat.ips_reassembled; - stats->dwFragOks = ip_stat.ips_fragmented; - stats->dwFragFails = ip_stat.ips_cantfrag; - stats->dwFragCreates = ip_stat.ips_ofragments; - ret = NO_ERROR; - } -#else - FIXME( "unimplemented for IPv4\n" ); -#endif - return ret; -} - -/****************************************************************** - * GetIpStatistics (IPHLPAPI.@) - * - * Get the IP statistics for the local computer. - * - * PARAMS - * stats [Out] buffer for IP statistics - * - * RETURNS - * Success: NO_ERROR - * Failure: error code from winerror.h - */ -DWORD WINAPI GetIpStatistics(PMIB_IPSTATS stats) -{ - return GetIpStatisticsEx(stats, WS_AF_INET); -} - /****************************************************************** * GetTcpStatisticsEx (IPHLPAPI.@) * diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 598e7124afd..7d9d8e12bac 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -436,14 +436,10 @@ static void test_ip_cmpt( int 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: -- 2.23.0

1 0

[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

[PATCH 9/9] gdi32: Use ntgdi name for GetTextCharsetInfo.
by Jacek Caban 09 Aug '21

09 Aug '21

Signed-off-by: Jacek Caban <jacek(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(-)

1 0

[PATCH 8/9] gdi32: Remove no longer used driver entry points.
by Jacek Caban 09 Aug '21

09 Aug '21

1 0

[PATCH 6/9] gdi32: Handle metafiles directly in OffsetViewportOrgEx.
by Jacek Caban 09 Aug '21

09 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 | 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(-)

1 0

[PATCH 5/9] gdi32: Handle metafiles directly in SetWindowOrgEx.
by Jacek Caban 09 Aug '21

09 Aug '21

Signed-off-by: Jacek Caban <jacek(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(-)

1 0

[PATCH 4/9] gdi32: Handle metafiles directly in SetWindowExtEx.
by Jacek Caban 09 Aug '21

09 Aug '21

Signed-off-by: Jacek Caban <jacek(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(-)

1 0

[PATCH 3/9] gdi32: Handle metafiles directly in SetViewportOrgEx.
by Jacek Caban 09 Aug '21

09 Aug '21

Signed-off-by: Jacek Caban <jacek(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(-)

1 0

[PATCH 2/9] gdi32: Handle metafiles directly in SetViewportExtEx.
by Jacek Caban 09 Aug '21

09 Aug '21

1 0

[PATCH 1/9] gdi32: Store virtual resolution and size in DC_ATTR.
by Jacek Caban 09 Aug '21

09 Aug '21

Signed-off-by: Jacek Caban <jacek(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(-)

1 0

[PATCH] user32: When converting strings from A->W, ignore handles/resources
by Fabian Maurer 09 Aug '21

09 Aug '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51583 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/tests/msg.c | 3 +++ dlls/user32/winproc.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9867e319d58..5ea05b156d6 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5991,6 +5991,9 @@ static void test_setwindowpos(void) expect(winY, rc.bottom); DestroyWindow(hwnd); + + /* Test invalid text with WM_SETTEXT. This must not crash. */ + SendMessageA(GetDesktopWindow(), WM_SETTEXT, 0, (LPARAM)55); } static void invisible_parent_tests(void) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index f83d8b61a63..f4cf9f6e748 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -494,6 +494,8 @@ LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UINT msg, case LB_ADDFILE: case EM_REPLACESEL: if (!lParam) ret = callback( hwnd, msg, wParam, lParam, result, arg ); + else if (IS_INTRESOURCE(lParam)) /* Check for handles/IDs similar to DEFWND_SetTextA */ + return 0; else { WCHAR *ptr, buffer[512]; -- 2.32.0

3 3

[PATCH 1/2] conhost: Use correct size when storing font FaceName in the registry
by Hugh McMaster 09 Aug '21

09 Aug '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/conhost/window.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 4033eefa313..5881ad9c3ad 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -303,7 +303,8 @@ static void save_registry_key( HKEY key, const struct console_config *config ) val = config->edition_mode; RegSetValueExW( key, L"EditionMode", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); - RegSetValueExW( key, L"FaceName", 0, REG_SZ, (BYTE *)&config->face_name, sizeof(config->face_name) ); + RegSetValueExW( key, L"FaceName", 0, REG_SZ, (BYTE *)&config->face_name, + (lstrlenW(config->face_name) + 1) * sizeof(WCHAR) ); val = config->font_pitch_family; RegSetValueExW( key, L"FontPitchFamily", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); -- 2.32.0

2 4

[PATCH] server: Fix the parameter size check for IOCTL_AFD_EVENT_SELECT.
by Zebediah Figura 09 Aug '21

09 Aug '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- server/sock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 2660cf2dee0..27477200ed0 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2420,7 +2420,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { const struct afd_event_select_params_64 *params = get_req_data(); - if (get_req_data_size() < sizeof(params)) + if (get_req_data_size() < sizeof(*params)) { set_error( STATUS_INVALID_PARAMETER ); return 1; @@ -2433,7 +2433,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { const struct afd_event_select_params_32 *params = get_req_data(); - if (get_req_data_size() < sizeof(params)) + if (get_req_data_size() < sizeof(*params)) { set_error( STATUS_INVALID_PARAMETER ); return 1; -- 2.30.2

1 0

[PATCH] jscript: Also add function name to its detached scope in ES5 mode.
by Paul Gofman 09 Aug '21

09 Aug '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/jscript/engine.c | 4 ++++ dlls/mshtml/tests/es5.js | 29 +++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index cb9ea5cd9ac..47b4e56e8e4 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -573,6 +573,7 @@ HRESULT jsval_strict_equal(jsval_t lval, jsval_t rval, BOOL *ret) static HRESULT detach_scope(script_ctx_t *ctx, call_frame_t *frame, scope_chain_t *scope) { + function_code_t *func = frame->function; unsigned int i, index; HRESULT hres; @@ -591,6 +592,9 @@ static HRESULT detach_scope(script_ctx_t *ctx, call_frame_t *frame, scope_chain_ scope->obj = to_disp(scope->jsobj); } + if (scope == frame->base_scope && func->name && ctx->version >= SCRIPTLANGUAGEVERSION_ES5) + jsdisp_propput_name(scope->jsobj, func->name, jsval_obj(jsdisp_addref(frame->function_instance))); + index = scope->scope_index; for(i = 0; i < frame->function->local_scopes[index].locals_cnt; i++) { diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index e57aed5ca35..81c06a4145e 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1447,6 +1447,35 @@ sync_test("functions scope", function() { val = with_function(); ok(val == 8, "val != 8"); ok(w == 9, "w != 9"); + + var func, func_outer, ret; + var o = new Object(); + + func_outer = function e() + { + function func_inner() + { + ok(typeof e == "function", "typeof e == " + typeof e); + ret = e + } + func = func_inner + } + func_outer(); + func(); + ok(ret === func_outer, "ret != func_outer"); + + func_outer = function f(f) + { + function func_inner() + { + ok(typeof f == "object", "typeof f == " + typeof f); + ret = f + } + func = func_inner + } + func_outer(o); + func(); + ok(ret === o, "ret != o"); }); sync_test("console", function() { -- 2.31.1

3 2

[PATCH] kernel32/tests: Fix rounding error when calculating console font size
by Hugh McMaster 09 Aug '21

09 Aug '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- dlls/kernel32/tests/console.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 6ee00aa49a6..bd5cad428bc 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3579,8 +3579,8 @@ static void test_GetConsoleFontSize(HANDLE std_output) ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); GetClientRect(GetConsoleWindow(), &r); GetConsoleScreenBufferInfo(std_output, &csbi); - font_width = (r.right - r.left + 1) / csbi.srWindow.Right; - font_height = (r.bottom - r.top + 1) / csbi.srWindow.Bottom; + font_width = (r.right - r.left) / (csbi.srWindow.Right - csbi.srWindow.Left + 1); + font_height = (r.bottom - r.top) / (csbi.srWindow.Bottom - csbi.srWindow.Top + 1); ok(c.X == font_width, "got %d, expected %d\n", c.X, font_width); ok(c.Y == font_height, "got %d, expected %d\n", c.Y, font_height); -- 2.32.0

2 1

[PATCH] msi: Set first dialog as parent in subsequent dialogs
by Fabian Maurer 09 Aug '21

09 Aug '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51576 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/msi/dialog.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 703f9d43957..144d7308b3f 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -139,6 +139,7 @@ typedef struct static DWORD uiThreadId; static HWND hMsiHiddenWindow; +static HANDLE hPrevious = NULL; static LPWSTR msi_get_window_text( HWND hwnd ) { @@ -3881,6 +3882,8 @@ static LRESULT WINAPI MSIDialog_WndProc( HWND hwnd, UINT msg, return SendMessageW( (HWND) lParam, WM_CTLCOLORSTATIC, wParam, lParam ); case WM_DESTROY: + if (dialog->hwnd == hPrevious) + hPrevious = NULL; dialog->hwnd = NULL; return 0; case WM_NOTIFY: @@ -3919,13 +3922,16 @@ static UINT dialog_run_message_loop( msi_dialog *dialog ) hwnd = CreateWindowW( L"MsiDialogCloseClass", dialog->name, style, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - NULL, NULL, NULL, dialog ); + hPrevious, NULL, NULL, dialog ); if( !hwnd ) { ERR("Failed to create dialog %s\n", debugstr_w( dialog->name )); return ERROR_FUNCTION_FAILED; } + if (!hPrevious) + hPrevious = hwnd; + ShowWindow( hwnd, SW_SHOW ); /* UpdateWindow( hwnd ); - and causes the transparent static controls not to paint */ -- 2.32.0

2 2

[PATCH] include: add AV1 support to dxva.h
by Steve Lhomme 09 Aug '21

09 Aug '21

Based on the DXVA AV1 specs https://www.microsoft.com/en-us/download/details.aspx?id=101577 The structures and the associated define are available in Windows SDK since at least 10.0.20231.0. The GUIDs were present in previous SDKs as well. --- include/dxva.h | 279 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 279 insertions(+) diff --git a/include/dxva.h b/include/dxva.h index 4f18f2e60da..b474bd87111 100644 --- a/include/dxva.h +++ b/include/dxva.h @@ -563,6 +563,285 @@ typedef struct _DXVA_Status_VPx USHORT wNumMbsAffected; } DXVA_Status_VPx, *LPDXVA_Status_VPx; + +#define _DIRECTX_AV1_VA_ + +/* AV1 decoder GUIDs */ +DEFINE_GUID(DXVA_ModeAV1_VLD_Profile0, 0xb8be4ccb, 0xcf53, 0x46ba, 0x8d, 0x59, 0xd6, 0xb8, 0xa6, 0xda, 0x5d, 0x2a); +DEFINE_GUID(DXVA_ModeAV1_VLD_Profile1, 0x6936ff0f, 0x45b1, 0x4163, 0x9c, 0xc1, 0x64, 0x6e, 0xf6, 0x94, 0x61, 0x08); +DEFINE_GUID(DXVA_ModeAV1_VLD_Profile2, 0x0c5f2aa1, 0xe541, 0x4089, 0xbb, 0x7b, 0x98, 0x11, 0x0a, 0x19, 0xd7, 0xc8); +DEFINE_GUID(DXVA_ModeAV1_VLD_12bit_Profile2, 0x17127009, 0xa00f, 0x4ce1, 0x99, 0x4e, 0xbf, 0x40, 0x81, 0xf6, 0xf3, 0xf0); +DEFINE_GUID(DXVA_ModeAV1_VLD_12bit_Profile2_420, 0x2d80bed6, 0x9cac, 0x4835, 0x9e, 0x91, 0x32, 0x7b, 0xbc, 0x4f, 0x9e, 0xe8); + +/* AV1 picture entry data structure */ +typedef struct _DXVA_PicEntry_AV1 { + UINT width; + UINT height; + + // Global motion parameters + INT wmmat[6]; + union { + struct { + UCHAR wminvalid : 1; + UCHAR wmtype : 2; + UCHAR Reserved : 5; + }; + UCHAR GlobalMotionFlags; + }; + UCHAR Index; + USHORT Reserved16Bits; +} DXVA_PicEntry_AV1, *LPDXVA_PicEntry_AV1; + +/* AV1 picture parameters data structure */ +typedef struct _DXVA_PicParams_AV1 { + UINT width; + UINT height; + + UINT max_width; + UINT max_height; + + UCHAR CurrPicTextureIndex; + UCHAR superres_denom; + UCHAR bitdepth; + UCHAR seq_profile; + + // Tiles: + struct { + UCHAR cols; + UCHAR rows; + USHORT context_update_id; + USHORT widths[64]; + USHORT heights[64]; + } tiles; + + // Coding Tools + union { + struct { + UINT use_128x128_superblock : 1; + UINT intra_edge_filter : 1; + UINT interintra_compound : 1; + UINT masked_compound : 1; + UINT warped_motion : 1; + UINT dual_filter : 1; + UINT jnt_comp : 1; + UINT screen_content_tools : 1; + UINT integer_mv : 1; + UINT cdef : 1; + UINT restoration : 1; + UINT film_grain : 1; + UINT intrabc : 1; + UINT high_precision_mv : 1; + UINT switchable_motion_mode : 1; + UINT filter_intra : 1; + UINT disable_frame_end_update_cdf : 1; + UINT disable_cdf_update : 1; + UINT reference_mode : 1; + UINT skip_mode : 1; + UINT reduced_tx_set : 1; + UINT superres : 1; + UINT tx_mode : 2; + UINT use_ref_frame_mvs : 1; + UINT enable_ref_frame_mvs : 1; + UINT reference_frame_update : 1; + UINT Reserved : 5; + }; + UINT32 CodingParamToolFlags; + } coding; + + // Format & Picture Info flags + union { + struct { + UCHAR frame_type : 2; + UCHAR show_frame : 1; + UCHAR showable_frame : 1; + UCHAR subsampling_x : 1; + UCHAR subsampling_y : 1; + UCHAR mono_chrome : 1; + UCHAR Reserved : 1; + }; + UCHAR FormatAndPictureInfoFlags; + } format; + + // References + UCHAR primary_ref_frame; + UCHAR order_hint; + UCHAR order_hint_bits; + + DXVA_PicEntry_AV1 frame_refs[7]; + UCHAR RefFrameMapTextureIndex[8]; + + // Loop filter parameters + struct { + UCHAR filter_level[2]; + UCHAR filter_level_u; + UCHAR filter_level_v; + + UCHAR sharpness_level; + union { + struct { + UCHAR mode_ref_delta_enabled : 1; + UCHAR mode_ref_delta_update : 1; + UCHAR delta_lf_multi : 1; + UCHAR delta_lf_present : 1; + UCHAR Reserved : 4; + }; + UCHAR ControlFlags; + } DUMMYUNIONNAME; + CHAR ref_deltas[8]; + CHAR mode_deltas[2]; + UCHAR delta_lf_res; + UCHAR frame_restoration_type[3]; + USHORT log2_restoration_unit_size[3]; + UINT16 Reserved16Bits; + } loop_filter; + + // Quantization + struct { + union { + struct { + UCHAR delta_q_present : 1; + UCHAR delta_q_res : 2; + UCHAR Reserved : 5; + }; + UCHAR ControlFlags; + } DUMMYUNIONNAME; + + UCHAR base_qindex; + CHAR y_dc_delta_q; + CHAR u_dc_delta_q; + CHAR v_dc_delta_q; + CHAR u_ac_delta_q; + CHAR v_ac_delta_q; + // using_qmatrix: + UCHAR qm_y; + UCHAR qm_u; + UCHAR qm_v; + UINT16 Reserved16Bits; + } quantization; + + // Cdef parameters + struct { + union { + struct { + UCHAR damping : 2; + UCHAR bits : 2; + UCHAR Reserved : 4; + }; + UCHAR ControlFlags; + } DUMMYUNIONNAME; + + union { + struct { + UCHAR primary : 6; + UCHAR secondary : 2; + }; + UCHAR combined; + } y_strengths[8]; + + union { + struct { + UCHAR primary : 6; + UCHAR secondary : 2; + }; + UCHAR combined; + } uv_strengths[8]; + + } cdef; + + UCHAR interp_filter; + + // Segmentation + struct { + union { + struct { + UCHAR enabled : 1; + UCHAR update_map : 1; + UCHAR update_data : 1; + UCHAR temporal_update : 1; + UCHAR Reserved : 4; + }; + UCHAR ControlFlags; + } DUMMYUNIONNAME; + UCHAR Reserved24Bits[3]; + + union { + struct { + UCHAR alt_q : 1; + UCHAR alt_lf_y_v : 1; + UCHAR alt_lf_y_h : 1; + UCHAR alt_lf_u : 1; + UCHAR alt_lf_v : 1; + UCHAR ref_frame : 1; + UCHAR skip : 1; + UCHAR globalmv : 1; + }; + UCHAR mask; + } feature_mask[8]; + + SHORT feature_data[8][8]; + + } segmentation; + + struct { + union { + struct { + USHORT apply_grain : 1; + USHORT scaling_shift_minus8 : 2; + USHORT chroma_scaling_from_luma : 1; + USHORT ar_coeff_lag : 2; + USHORT ar_coeff_shift_minus6 : 2; + USHORT grain_scale_shift : 2; + USHORT overlap_flag : 1; + USHORT clip_to_restricted_range : 1; + USHORT matrix_coeff_is_identity : 1; + USHORT Reserved : 3; + }; + USHORT ControlFlags; + } DUMMYUNIONNAME; + + USHORT grain_seed; + UCHAR scaling_points_y[14][2]; + UCHAR num_y_points; + UCHAR scaling_points_cb[10][2]; + UCHAR num_cb_points; + UCHAR scaling_points_cr[10][2]; + UCHAR num_cr_points; + UCHAR ar_coeffs_y[24]; + UCHAR ar_coeffs_cb[25]; + UCHAR ar_coeffs_cr[25]; + UCHAR cb_mult; + UCHAR cb_luma_mult; + UCHAR cr_mult; + UCHAR cr_luma_mult; + UCHAR Reserved8Bits; + SHORT cb_offset; + SHORT cr_offset; + } film_grain; + + UINT Reserved32Bits; + UINT StatusReportFeedbackNumber; +} DXVA_PicParams_AV1, *LPDXVA_PicParams_AV1; + +/* AV1 tile data structure */ +typedef struct _DXVA_Tile_AV1 { + UINT DataOffset; + UINT DataSize; + USHORT row; + USHORT column; + USHORT Reserved16Bits; + UCHAR anchor_frame; + UCHAR Reserved8Bits; +} DXVA_Tile_AV1, *LPDXVA_Tile_AV1; + +typedef struct _DXVA_Status_AV1 { + UINT StatusReportFeedbackNumber; + DXVA_PicEntry_AV1 CurrPic; + UCHAR bBufType; + UCHAR bStatus; + UCHAR bReserved8Bits; + USHORT wNumMbsAffected; +} DXVA_Status_AV1, *LPDXVA_Status_AV1; + #include <poppack.h> typedef enum _DXVA_VideoChromaSubsampling -- 2.26.2

4 7

[PATCH v4 1/5] d2d1: Implement d2d_effect_GetInputCount().
by Ziqing Hui 09 Aug '21

09 Aug '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v4: Call d2d_array_reserve() before factory. memset() "effect->input_count" inputs. dlls/d2d1/d2d1_private.h | 5 ++++- dlls/d2d1/device.c | 8 +++++++- dlls/d2d1/effect.c | 25 +++++++++++++++++++++---- dlls/d2d1/tests/d2d1.c | 2 +- 4 files changed, 33 insertions(+), 7 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index ce99e7c3432..48d15dfcf22 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -572,9 +572,12 @@ struct d2d_effect LONG refcount; ID2D1Factory *factory; + ID2D1Image **inputs; + size_t inputs_size; + size_t input_count; }; -void d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory) DECLSPEC_HIDDEN; +HRESULT d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory) DECLSPEC_HIDDEN; static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 0647bc57fc3..d8704f1b43b 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1887,13 +1887,19 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateEffect(ID2D1DeviceCont { struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); struct d2d_effect *object; + HRESULT hr; FIXME("iface %p, effect_id %s, effect %p stub!\n", iface, debugstr_guid(effect_id), effect); if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - d2d_effect_init(object, context->factory); + if (FAILED(hr = d2d_effect_init(object, context->factory))) + { + WARN("Failed to initialize effect, hr %#x.\n", hr); + heap_free(object); + return hr; + } TRACE("Created effect %p.\n", object); *effect = &object->ID2D1Effect_iface; diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 40dd2187953..acf83ab1b02 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -25,6 +25,12 @@ static inline struct d2d_effect *impl_from_ID2D1Effect(ID2D1Effect *iface) return CONTAINING_RECORD(iface, struct d2d_effect, ID2D1Effect_iface); } +static void d2d_effect_cleanup(struct d2d_effect *effect) +{ + heap_free(effect->inputs); + ID2D1Factory_Release(effect->factory); +} + static HRESULT STDMETHODCALLTYPE d2d_effect_QueryInterface(ID2D1Effect *iface, REFIID iid, void **out) { struct d2d_effect *effect = impl_from_ID2D1Effect(iface); @@ -72,7 +78,7 @@ static ULONG STDMETHODCALLTYPE d2d_effect_Release(ID2D1Effect *iface) if (!refcount) { - ID2D1Factory_Release(effect->factory); + d2d_effect_cleanup(effect); heap_free(effect); } @@ -183,9 +189,11 @@ static void STDMETHODCALLTYPE d2d_effect_GetInput(ID2D1Effect *iface, UINT32 ind static UINT32 STDMETHODCALLTYPE d2d_effect_GetInputCount(ID2D1Effect *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_effect *effect = impl_from_ID2D1Effect(iface); - return 0; + TRACE("iface %p.\n", iface); + + return effect->input_count; } static void STDMETHODCALLTYPE d2d_effect_GetOutput(ID2D1Effect *iface, ID2D1Image **output) @@ -269,10 +277,19 @@ static const ID2D1ImageVtbl d2d_effect_image_vtbl = d2d_effect_image_GetFactory, }; -void d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory) +HRESULT d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory) { effect->ID2D1Effect_iface.lpVtbl = &d2d_effect_vtbl; effect->ID2D1Image_iface.lpVtbl = &d2d_effect_image_vtbl; effect->refcount = 1; + + effect->input_count = 1; + 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); + ID2D1Factory_AddRef(effect->factory = factory); + + return S_OK; } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 146952d7418..64d9765e866 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9802,7 +9802,7 @@ static void test_effect(BOOL d3d11) } input_count = ID2D1Effect_GetInputCount(effect); - todo_wine + todo_wine_if(test->default_input_count != 1) ok (input_count == test->default_input_count, "Got unexpected input count %u, expected %u.\n", input_count, test->default_input_count); -- 2.25.1

4 12

[PATCH vkd3d v2 1/2] build: Make the default symbol visibility "hidden".
by Zebediah Figura 09 Aug '21

09 Aug '21

We tag far fewer symbols this way. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: Move definitions to the header files. configure.ac | 1 + include/private/vkd3d_blob.h | 2 +- include/private/vkd3d_common.h | 2 +- include/private/vkd3d_debug.h | 19 +- include/private/vkd3d_memory.h | 3 +- include/private/vkd3d_utf8.h | 2 +- include/vkd3d.h | 48 ++--- include/vkd3d_shader.h | 41 +++-- include/vkd3d_utils.h | 35 ++-- include/vkd3d_windows.h | 17 +- libs/vkd3d-common/debug.c | 2 +- libs/vkd3d-shader/hlsl.h | 111 ++++++------ libs/vkd3d-shader/preproc.h | 12 +- libs/vkd3d-shader/vkd3d_shader_private.h | 80 ++++----- libs/vkd3d/vkd3d_private.h | 216 +++++++++++------------ 15 files changed, 286 insertions(+), 305 deletions(-) diff --git a/configure.ac b/configure.ac index 8a448e60..0ff159e3 100644 --- a/configure.ac +++ b/configure.ac @@ -54,6 +54,7 @@ AC_SUBST([VKD3D_CFLAGS]) AS_IF([test "x${GCC}" = "xyes"], [VKD3D_CFLAGS="-Wall -pipe" VKD3D_CHECK_CFLAGS([-std=c99]) + VKD3D_CHECK_CFLAGS([-fvisibility=hidden]) VKD3D_CHECK_CFLAGS([-Wdeclaration-after-statement]) VKD3D_CHECK_CFLAGS([-Wimplicit-fallthrough]) VKD3D_CHECK_CFLAGS([-Winit-self]) diff --git a/include/private/vkd3d_blob.h b/include/private/vkd3d_blob.h index e78d3916..0f48e876 100644 --- a/include/private/vkd3d_blob.h +++ b/include/private/vkd3d_blob.h @@ -22,6 +22,6 @@ #include "vkd3d_windows.h" #include "vkd3d_d3dcommon.h" -HRESULT vkd3d_blob_create(void *buffer, SIZE_T size, ID3D10Blob **blob) DECLSPEC_HIDDEN; +HRESULT vkd3d_blob_create(void *buffer, SIZE_T size, ID3D10Blob **blob); #endif /* __VKD3D_BLOB_H */ diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 5aeca58e..57b0ad20 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -214,6 +214,6 @@ static inline void vkd3d_parse_version(const char *version, int *major, int *min *minor = atoi(version); } -HRESULT hresult_from_vkd3d_result(int vkd3d_result) DECLSPEC_HIDDEN; +HRESULT hresult_from_vkd3d_result(int vkd3d_result); #endif /* __VKD3D_COMMON_H */ diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index c37c841a..a206a92b 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -44,15 +44,14 @@ enum vkd3d_dbg_level VKD3D_DBG_LEVEL_TRACE, }; -enum vkd3d_dbg_level vkd3d_dbg_get_level(void) DECLSPEC_HIDDEN; +enum vkd3d_dbg_level vkd3d_dbg_get_level(void); -void vkd3d_dbg_printf(enum vkd3d_dbg_level level, const char *function, - const char *fmt, ...) VKD3D_PRINTF_FUNC(3, 4) DECLSPEC_HIDDEN; +void vkd3d_dbg_printf(enum vkd3d_dbg_level level, const char *function, const char *fmt, ...) VKD3D_PRINTF_FUNC(3, 4); -const char *vkd3d_dbg_sprintf(const char *fmt, ...) VKD3D_PRINTF_FUNC(1, 2) DECLSPEC_HIDDEN; -const char *vkd3d_dbg_vsprintf(const char *fmt, va_list args) DECLSPEC_HIDDEN; -const char *debugstr_a(const char *str) DECLSPEC_HIDDEN; -const char *debugstr_w(const WCHAR *wstr, size_t wchar_size) DECLSPEC_HIDDEN; +const char *vkd3d_dbg_sprintf(const char *fmt, ...) VKD3D_PRINTF_FUNC(1, 2); +const char *vkd3d_dbg_vsprintf(const char *fmt, va_list args); +const char *debugstr_a(const char *str); +const char *debugstr_w(const WCHAR *wstr, size_t wchar_size); #define VKD3D_DBG_LOG(level) \ do { \ @@ -103,7 +102,7 @@ static inline const char *debugstr_guid(const GUID *guid) guid->Data4[5], guid->Data4[6], guid->Data4[7]); } -unsigned int vkd3d_env_var_as_uint(const char *name, unsigned int default_value) DECLSPEC_HIDDEN; +unsigned int vkd3d_env_var_as_uint(const char *name, unsigned int default_value); struct vkd3d_debug_option { @@ -111,8 +110,8 @@ struct vkd3d_debug_option uint64_t flag; }; -bool vkd3d_debug_list_has_member(const char *string, const char *member) DECLSPEC_HIDDEN; +bool vkd3d_debug_list_has_member(const char *string, const char *member); uint64_t vkd3d_parse_debug_options(const char *string, - const struct vkd3d_debug_option *options, unsigned int option_count) DECLSPEC_HIDDEN; + const struct vkd3d_debug_option *options, unsigned int option_count); #endif /* __VKD3D_DEBUG_H */ diff --git a/include/private/vkd3d_memory.h b/include/private/vkd3d_memory.h index bd56d30a..f6846d66 100644 --- a/include/private/vkd3d_memory.h +++ b/include/private/vkd3d_memory.h @@ -65,7 +65,6 @@ static inline char *vkd3d_strdup(const char *string) return ptr; } -bool vkd3d_array_reserve(void **elements, size_t *capacity, - size_t element_count, size_t element_size) DECLSPEC_HIDDEN; +bool vkd3d_array_reserve(void **elements, size_t *capacity, size_t element_count, size_t element_size); #endif /* __VKD3D_MEMORY_H */ diff --git a/include/private/vkd3d_utf8.h b/include/private/vkd3d_utf8.h index ab32884b..ccb9e17e 100644 --- a/include/private/vkd3d_utf8.h +++ b/include/private/vkd3d_utf8.h @@ -21,6 +21,6 @@ #include "vkd3d_common.h" -char *vkd3d_strdup_w_utf8(const WCHAR *wstr, size_t wchar_size) DECLSPEC_HIDDEN; +char *vkd3d_strdup_w_utf8(const WCHAR *wstr, size_t wchar_size); #endif /* __VKD3D_UTF8_H */ diff --git a/include/vkd3d.h b/include/vkd3d.h index 0ef81053..1bb87b4a 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -153,44 +153,50 @@ struct vkd3d_image_resource_create_info D3D12_RESOURCE_STATES present_state; }; +#if defined(__GNUC__) && !defined(__MINGW32__) +# define VKD3D_API __attribute__((visibility("default"))) +#else +# define VKD3D_API +#endif + #ifndef VKD3D_NO_PROTOTYPES -HRESULT vkd3d_create_instance(const struct vkd3d_instance_create_info *create_info, +VKD3D_API HRESULT vkd3d_create_instance(const struct vkd3d_instance_create_info *create_info, struct vkd3d_instance **instance); -ULONG vkd3d_instance_decref(struct vkd3d_instance *instance); -VkInstance vkd3d_instance_get_vk_instance(struct vkd3d_instance *instance); -ULONG vkd3d_instance_incref(struct vkd3d_instance *instance); +VKD3D_API ULONG vkd3d_instance_decref(struct vkd3d_instance *instance); +VKD3D_API VkInstance vkd3d_instance_get_vk_instance(struct vkd3d_instance *instance); +VKD3D_API ULONG vkd3d_instance_incref(struct vkd3d_instance *instance); -HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, +VKD3D_API HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, REFIID iid, void **device); -IUnknown *vkd3d_get_device_parent(ID3D12Device *device); -VkDevice vkd3d_get_vk_device(ID3D12Device *device); -VkPhysicalDevice vkd3d_get_vk_physical_device(ID3D12Device *device); -struct vkd3d_instance *vkd3d_instance_from_device(ID3D12Device *device); +VKD3D_API IUnknown *vkd3d_get_device_parent(ID3D12Device *device); +VKD3D_API VkDevice vkd3d_get_vk_device(ID3D12Device *device); +VKD3D_API VkPhysicalDevice vkd3d_get_vk_physical_device(ID3D12Device *device); +VKD3D_API struct vkd3d_instance *vkd3d_instance_from_device(ID3D12Device *device); -uint32_t vkd3d_get_vk_queue_family_index(ID3D12CommandQueue *queue); -VkQueue vkd3d_acquire_vk_queue(ID3D12CommandQueue *queue); -void vkd3d_release_vk_queue(ID3D12CommandQueue *queue); +VKD3D_API uint32_t vkd3d_get_vk_queue_family_index(ID3D12CommandQueue *queue); +VKD3D_API VkQueue vkd3d_acquire_vk_queue(ID3D12CommandQueue *queue); +VKD3D_API void vkd3d_release_vk_queue(ID3D12CommandQueue *queue); -HRESULT vkd3d_create_image_resource(ID3D12Device *device, +VKD3D_API HRESULT vkd3d_create_image_resource(ID3D12Device *device, const struct vkd3d_image_resource_create_info *create_info, ID3D12Resource **resource); -ULONG vkd3d_resource_decref(ID3D12Resource *resource); -ULONG vkd3d_resource_incref(ID3D12Resource *resource); +VKD3D_API ULONG vkd3d_resource_decref(ID3D12Resource *resource); +VKD3D_API ULONG vkd3d_resource_incref(ID3D12Resource *resource); -HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *desc, +VKD3D_API HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob); -HRESULT vkd3d_create_root_signature_deserializer(const void *data, SIZE_T data_size, +VKD3D_API HRESULT vkd3d_create_root_signature_deserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer); -VkFormat vkd3d_get_vk_format(DXGI_FORMAT format); +VKD3D_API VkFormat vkd3d_get_vk_format(DXGI_FORMAT format); /* 1.1 */ -DXGI_FORMAT vkd3d_get_dxgi_format(VkFormat format); +VKD3D_API DXGI_FORMAT vkd3d_get_dxgi_format(VkFormat format); /* 1.2 */ -HRESULT vkd3d_serialize_versioned_root_signature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, +VKD3D_API HRESULT vkd3d_serialize_versioned_root_signature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, ID3DBlob **blob, ID3DBlob **error_blob); -HRESULT vkd3d_create_versioned_root_signature_deserializer(const void *data, SIZE_T data_size, +VKD3D_API HRESULT vkd3d_create_versioned_root_signature_deserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer); #endif /* VKD3D_NO_PROTOTYPES */ diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index b0412d30..24f99fb9 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1340,6 +1340,12 @@ static inline uint32_t vkd3d_shader_create_swizzle(enum vkd3d_shader_swizzle_com | ((w & VKD3D_SHADER_SWIZZLE_MASK) << VKD3D_SHADER_SWIZZLE_SHIFT(3)); } +#if defined(__GNUC__) && !defined(__MINGW32__) +# define VKD3D_SHADER_API __attribute__((visibility("default"))) +#else +# define VKD3D_SHADER_API +#endif + #ifndef VKD3D_SHADER_NO_PROTOTYPES /** @@ -1353,7 +1359,7 @@ static inline uint32_t vkd3d_shader_create_swizzle(enum vkd3d_shader_swizzle_com * string is null-terminated and UTF-8 encoded. This may be a pointer to static * data in libvkd3d-shader; it should not be freed. */ -const char *vkd3d_shader_get_version(unsigned int *major, unsigned int *minor); +VKD3D_SHADER_API const char *vkd3d_shader_get_version(unsigned int *major, unsigned int *minor); /** * Returns the source types supported, with any target type, by * vkd3d_shader_compile(). @@ -1368,7 +1374,7 @@ const char *vkd3d_shader_get_version(unsigned int *major, unsigned int *minor); * vkd3d-shader. This array may be a pointer to static data in libvkd3d-shader; * it should not be freed. */ -const enum vkd3d_shader_source_type *vkd3d_shader_get_supported_source_types(unsigned int *count); +VKD3D_SHADER_API const enum vkd3d_shader_source_type *vkd3d_shader_get_supported_source_types(unsigned int *count); /** * Returns the target types supported, with the given source type, by * vkd3d_shader_compile(). @@ -1382,7 +1388,7 @@ const enum vkd3d_shader_source_type *vkd3d_shader_get_supported_source_types(uns * vkd3d-shader. This array may be a pointer to static data in libvkd3d-shader; * it should not be freed. */ -const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( +VKD3D_SHADER_API const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( enum vkd3d_shader_source_type source_type, unsigned int *count); /** @@ -1428,7 +1434,7 @@ const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( * * \return A member of \ref vkd3d_result. */ -int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, +VKD3D_SHADER_API int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages); /** * Free shader messages allocated by another vkd3d-shader function, such as @@ -1437,7 +1443,7 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, * \param messages Messages to free. This pointer is optional and may be NULL, * in which case no action will be taken. */ -void vkd3d_shader_free_messages(char *messages); +VKD3D_SHADER_API void vkd3d_shader_free_messages(char *messages); /** * Free shader code allocated by another vkd3d-shader function, such as * vkd3d_shader_compile(). @@ -1447,7 +1453,7 @@ void vkd3d_shader_free_messages(char *messages); * * \param code Code to free. */ -void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); +VKD3D_SHADER_API void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); /** * Convert a byte code description of a shader root signature to a structural @@ -1479,7 +1485,7 @@ void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); * * \return A member of \ref vkd3d_result. */ -int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, +VKD3D_SHADER_API int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_versioned_root_signature_desc *root_signature, char **messages); /** * Free a structural representation of a shader root signature allocated by @@ -1491,7 +1497,8 @@ int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, * * \param root_signature Signature description to free. */ -void vkd3d_shader_free_root_signature(struct vkd3d_shader_versioned_root_signature_desc *root_signature); +VKD3D_SHADER_API void vkd3d_shader_free_root_signature( + struct vkd3d_shader_versioned_root_signature_desc *root_signature); /** * Convert a structural description of a shader root signature to a byte code @@ -1516,7 +1523,8 @@ void vkd3d_shader_free_root_signature(struct vkd3d_shader_versioned_root_signatu * * \return A member of \ref vkd3d_result. */ -int vkd3d_shader_serialize_root_signature(const struct vkd3d_shader_versioned_root_signature_desc *root_signature, +VKD3D_SHADER_API int vkd3d_shader_serialize_root_signature( + const struct vkd3d_shader_versioned_root_signature_desc *root_signature, struct vkd3d_shader_code *dxbc, char **messages); /** * Convert a structural representation of a root signature to a different @@ -1538,7 +1546,7 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_shader_versioned_ro * * \return A member of \ref vkd3d_result. */ -int vkd3d_shader_convert_root_signature(struct vkd3d_shader_versioned_root_signature_desc *dst, +VKD3D_SHADER_API int vkd3d_shader_convert_root_signature(struct vkd3d_shader_versioned_root_signature_desc *dst, enum vkd3d_shader_root_signature_version version, const struct vkd3d_shader_versioned_root_signature_desc *src); /** @@ -1565,7 +1573,7 @@ int vkd3d_shader_convert_root_signature(struct vkd3d_shader_versioned_root_signa * * \return A member of \ref vkd3d_result. */ -int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char **messages); +VKD3D_SHADER_API int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char **messages); /** * Free members of struct vkd3d_shader_scan_descriptor_info() allocated by * vkd3d_shader_scan(). @@ -1575,7 +1583,8 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char * * \param scan_descriptor_info Descriptor information to free. */ -void vkd3d_shader_free_scan_descriptor_info(struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info); +VKD3D_SHADER_API void vkd3d_shader_free_scan_descriptor_info( + struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info); /** * Read the input signature of a compiled shader, returning a structural @@ -1601,7 +1610,7 @@ void vkd3d_shader_free_scan_descriptor_info(struct vkd3d_shader_scan_descriptor_ * * \return A member of \ref vkd3d_result. */ -int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, +VKD3D_SHADER_API int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_signature *signature, char **messages); /** * Find a single element of a parsed input signature. @@ -1622,7 +1631,7 @@ int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, * NULL if no such element was found. If not NULL, the return value points into * the \a signature parameter and should not be explicitly freed. */ -struct vkd3d_shader_signature_element *vkd3d_shader_find_signature_element( +VKD3D_SHADER_API struct vkd3d_shader_signature_element *vkd3d_shader_find_signature_element( const struct vkd3d_shader_signature *signature, const char *semantic_name, unsigned int semantic_index, unsigned int stream_index); /** @@ -1634,7 +1643,7 @@ struct vkd3d_shader_signature_element *vkd3d_shader_find_signature_element( * * \param signature Signature description to free. */ -void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature); +VKD3D_SHADER_API void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature); /* 1.3 */ @@ -1662,7 +1671,7 @@ void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature * * \since 1.3 */ -int vkd3d_shader_preprocess(const struct vkd3d_shader_compile_info *compile_info, +VKD3D_SHADER_API int vkd3d_shader_preprocess(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages); #endif /* VKD3D_SHADER_NO_PROTOTYPES */ diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h index a694de6c..ea310a0e 100644 --- a/include/vkd3d_utils.h +++ b/include/vkd3d_utils.h @@ -34,37 +34,44 @@ extern "C" { #define VKD3D_WAIT_FAILED (~0u) #define VKD3D_INFINITE (~0u) +#if defined(__GNUC__) && !defined(__MINGW32__) +# define VKD3D_UTILS_API __attribute__((visibility("default"))) +#else +# define VKD3D_UTILS_API +#endif + /* 1.0 */ -HANDLE vkd3d_create_event(void); -HRESULT vkd3d_signal_event(HANDLE event); -unsigned int vkd3d_wait_event(HANDLE event, unsigned int milliseconds); -void vkd3d_destroy_event(HANDLE event); +VKD3D_UTILS_API HANDLE vkd3d_create_event(void); +VKD3D_UTILS_API HRESULT vkd3d_signal_event(HANDLE event); +VKD3D_UTILS_API unsigned int vkd3d_wait_event(HANDLE event, unsigned int milliseconds); +VKD3D_UTILS_API void vkd3d_destroy_event(HANDLE event); #define D3D12CreateDevice(a, b, c, d) D3D12CreateDeviceVKD3D(a, b, c, d, VKD3D_UTILS_API_VERSION) -HRESULT WINAPI D3D12CreateRootSignatureDeserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer); -HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug); -HRESULT WINAPI D3D12SerializeRootSignature(const D3D12_ROOT_SIGNATURE_DESC *desc, +VKD3D_UTILS_API HRESULT WINAPI D3D12CreateRootSignatureDeserializer( + const void *data, SIZE_T data_size, REFIID iid, void **deserializer); +VKD3D_UTILS_API HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug); +VKD3D_UTILS_API HRESULT WINAPI D3D12SerializeRootSignature(const D3D12_ROOT_SIGNATURE_DESC *desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob); /* 1.2 */ -HRESULT WINAPI D3D12CreateDeviceVKD3D(IUnknown *adapter, D3D_FEATURE_LEVEL feature_level, +VKD3D_UTILS_API HRESULT WINAPI D3D12CreateDeviceVKD3D(IUnknown *adapter, D3D_FEATURE_LEVEL feature_level, REFIID iid, void **device, enum vkd3d_api_version api_version); -HRESULT WINAPI D3D12CreateVersionedRootSignatureDeserializer(const void *data, +VKD3D_UTILS_API HRESULT WINAPI D3D12CreateVersionedRootSignatureDeserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer); -HRESULT WINAPI D3D12SerializeVersionedRootSignature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, +VKD3D_UTILS_API HRESULT WINAPI D3D12SerializeVersionedRootSignature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, ID3DBlob **blob, ID3DBlob **error_blob); /* 1.3 */ -HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filename, +VKD3D_UTILS_API HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, const char *target, UINT flags, UINT effect_flags, ID3DBlob **shader, ID3DBlob **error_messages); -HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filename, +VKD3D_UTILS_API HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, const char *target, UINT flags, UINT effect_flags, UINT secondary_flags, const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader, ID3DBlob **error_messages); -HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3D10Blob **blob); -HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename, +VKD3D_UTILS_API HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3D10Blob **blob); +VKD3D_UTILS_API HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, ID3DBlob **shader, ID3DBlob **error_messages); diff --git a/include/vkd3d_windows.h b/include/vkd3d_windows.h index 7d8a8b19..24dad10d 100644 --- a/include/vkd3d_windows.h +++ b/include/vkd3d_windows.h @@ -132,18 +132,18 @@ typedef GUID IID; # ifdef INITGUID # ifndef __cplusplus # define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - const GUID name DECLSPEC_HIDDEN; \ + const GUID name; \ const GUID name = \ { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 }} # else # define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - EXTERN_C const GUID name DECLSPEC_HIDDEN; \ + EXTERN_C const GUID name; \ EXTERN_C const GUID name = \ { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 }} # endif # else # define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - EXTERN_C const GUID name DECLSPEC_HIDDEN; + EXTERN_C const GUID name; # endif /* INITGUID */ /* __uuidof emulation */ @@ -251,17 +251,6 @@ typedef struct SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES; #endif /* _WIN32 */ -/* Define DECLSPEC_HIDDEN */ -#ifndef DECLSPEC_HIDDEN -# if defined(__MINGW32__) -# define DECLSPEC_HIDDEN -# elif defined(__GNUC__) -# define DECLSPEC_HIDDEN __attribute__((visibility("hidden"))) -# else -# define DECLSPEC_HIDDEN -# endif -#endif /* DECLSPEC_HIDDEN */ - /* Define min() & max() macros */ #ifndef NOMINMAX # ifndef min diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index 5e49cf10..dcf53fa9 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -31,7 +31,7 @@ #define VKD3D_DEBUG_BUFFER_COUNT 64 #define VKD3D_DEBUG_BUFFER_SIZE 512 -extern const char *vkd3d_dbg_env_name DECLSPEC_HIDDEN; +extern const char *vkd3d_dbg_env_name; static const char *debug_level_names[] = { diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 54273ac6..aede3a55 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -601,91 +601,84 @@ static inline void hlsl_release_string_buffer(struct hlsl_ctx *ctx, struct vkd3d vkd3d_string_buffer_release(&ctx->string_buffers, buffer); } -const char *debug_hlsl_type(struct hlsl_ctx *ctx, const struct hlsl_type *type) DECLSPEC_HIDDEN; -const char *debug_hlsl_writemask(unsigned int writemask) DECLSPEC_HIDDEN; +const char *debug_hlsl_type(struct hlsl_ctx *ctx, const struct hlsl_type *type); +const char *debug_hlsl_writemask(unsigned int writemask); -struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const struct hlsl_type *type) DECLSPEC_HIDDEN; -struct vkd3d_string_buffer *hlsl_modifiers_to_string(struct hlsl_ctx *ctx, unsigned int modifiers) DECLSPEC_HIDDEN; -const char *hlsl_node_type_to_string(enum hlsl_ir_node_type type) DECLSPEC_HIDDEN; +struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const struct hlsl_type *type); +struct vkd3d_string_buffer *hlsl_modifiers_to_string(struct hlsl_ctx *ctx, unsigned int modifiers); +const char *hlsl_node_type_to_string(enum hlsl_ir_node_type type); -void hlsl_add_function(struct hlsl_ctx *ctx, char *name, struct hlsl_ir_function_decl *decl, - bool intrinsic) DECLSPEC_HIDDEN; -bool hlsl_add_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, bool local_var) DECLSPEC_HIDDEN; +void hlsl_add_function(struct hlsl_ctx *ctx, char *name, struct hlsl_ir_function_decl *decl, bool intrinsic); +bool hlsl_add_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, bool local_var); -void hlsl_dump_function(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl *func) DECLSPEC_HIDDEN; +void hlsl_dump_function(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl *func); -int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, - struct vkd3d_shader_code *out) DECLSPEC_HIDDEN; +int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out); -void hlsl_free_instr(struct hlsl_ir_node *node) DECLSPEC_HIDDEN; -void hlsl_free_instr_list(struct list *list) DECLSPEC_HIDDEN; -void hlsl_free_type(struct hlsl_type *type) DECLSPEC_HIDDEN; -void hlsl_free_var(struct hlsl_ir_var *decl) DECLSPEC_HIDDEN; +void hlsl_free_instr(struct hlsl_ir_node *node); +void hlsl_free_instr_list(struct list *list); +void hlsl_free_type(struct hlsl_type *type); +void hlsl_free_var(struct hlsl_ir_var *decl); -bool hlsl_get_function(struct hlsl_ctx *ctx, const char *name) DECLSPEC_HIDDEN; -struct hlsl_ir_function_decl *hlsl_get_func_decl(struct hlsl_ctx *ctx, const char *name) DECLSPEC_HIDDEN; -struct hlsl_type *hlsl_get_type(struct hlsl_scope *scope, const char *name, bool recursive) DECLSPEC_HIDDEN; -struct hlsl_ir_var *hlsl_get_var(struct hlsl_scope *scope, const char *name) DECLSPEC_HIDDEN; +bool hlsl_get_function(struct hlsl_ctx *ctx, const char *name); +struct hlsl_ir_function_decl *hlsl_get_func_decl(struct hlsl_ctx *ctx, const char *name); +struct hlsl_type *hlsl_get_type(struct hlsl_scope *scope, const char *name, bool recursive); +struct hlsl_ir_var *hlsl_get_var(struct hlsl_scope *scope, const char *name); -struct hlsl_type *hlsl_new_array_type(struct hlsl_ctx *ctx, struct hlsl_type *basic_type, - unsigned int array_size) DECLSPEC_HIDDEN; +struct hlsl_type *hlsl_new_array_type(struct hlsl_ctx *ctx, struct hlsl_type *basic_type, unsigned int array_size); struct hlsl_ir_node *hlsl_new_binary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, - struct hlsl_ir_node *arg2) DECLSPEC_HIDDEN; + struct hlsl_ir_node *arg2); struct hlsl_buffer *hlsl_new_buffer(struct hlsl_ctx *ctx, enum hlsl_buffer_type type, const char *name, - const struct hlsl_reg_reservation *reservation, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; + const struct hlsl_reg_reservation *reservation, struct vkd3d_shader_location loc); struct hlsl_ir_expr *hlsl_new_cast(struct hlsl_ctx *ctx, struct hlsl_ir_node *node, struct hlsl_type *type, - struct vkd3d_shader_location *loc) DECLSPEC_HIDDEN; -struct hlsl_ir_expr *hlsl_new_copy(struct hlsl_ctx *ctx, struct hlsl_ir_node *node) DECLSPEC_HIDDEN; + struct vkd3d_shader_location *loc); +struct hlsl_ir_expr *hlsl_new_copy(struct hlsl_ctx *ctx, struct hlsl_ir_node *node); struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hlsl_type *return_type, - struct list *parameters, const struct hlsl_semantic *semantic, - struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; -struct hlsl_ir_if *hlsl_new_if(struct hlsl_ctx *ctx, struct hlsl_ir_node *condition, - struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; -struct hlsl_ir_jump *hlsl_new_jump(struct hlsl_ctx *ctx, enum hlsl_ir_jump_type type, - struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; + struct list *parameters, const struct hlsl_semantic *semantic, struct vkd3d_shader_location loc); +struct hlsl_ir_if *hlsl_new_if(struct hlsl_ctx *ctx, struct hlsl_ir_node *condition, struct vkd3d_shader_location loc); +struct hlsl_ir_jump *hlsl_new_jump(struct hlsl_ctx *ctx, enum hlsl_ir_jump_type type, struct vkd3d_shader_location loc); struct hlsl_ir_load *hlsl_new_load(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, struct hlsl_ir_node *offset, - struct hlsl_type *type, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; -struct hlsl_ir_loop *hlsl_new_loop(struct hlsl_ctx *ctx, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; -struct hlsl_ir_store *hlsl_new_simple_store(struct hlsl_ctx *ctx, struct hlsl_ir_var *lhs, - struct hlsl_ir_node *rhs) DECLSPEC_HIDDEN; + struct hlsl_type *type, struct vkd3d_shader_location loc); +struct hlsl_ir_loop *hlsl_new_loop(struct hlsl_ctx *ctx, struct vkd3d_shader_location loc); +struct hlsl_ir_store *hlsl_new_simple_store(struct hlsl_ctx *ctx, struct hlsl_ir_var *lhs, struct hlsl_ir_node *rhs); struct hlsl_ir_store *hlsl_new_store(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, struct hlsl_ir_node *offset, - struct hlsl_ir_node *rhs, unsigned int writemask, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; -struct hlsl_type *hlsl_new_struct_type(struct hlsl_ctx *ctx, const char *name, struct list *fields) DECLSPEC_HIDDEN; + struct hlsl_ir_node *rhs, unsigned int writemask, struct vkd3d_shader_location loc); +struct hlsl_type *hlsl_new_struct_type(struct hlsl_ctx *ctx, const char *name, struct list *fields); struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned int components, - struct hlsl_ir_node *val, struct vkd3d_shader_location *loc) DECLSPEC_HIDDEN; + struct hlsl_ir_node *val, struct vkd3d_shader_location *loc); struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char *name, struct hlsl_type *type, - const struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; + const struct vkd3d_shader_location loc); struct hlsl_type *hlsl_new_type(struct hlsl_ctx *ctx, const char *name, enum hlsl_type_class type_class, - enum hlsl_base_type base_type, unsigned dimx, unsigned dimy) DECLSPEC_HIDDEN; + enum hlsl_base_type base_type, unsigned dimx, unsigned dimy); struct hlsl_ir_constant *hlsl_new_uint_constant(struct hlsl_ctx *ctx, unsigned int n, - const struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; + const struct vkd3d_shader_location loc); struct hlsl_ir_node *hlsl_new_unary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, - struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; + struct vkd3d_shader_location loc); struct hlsl_ir_var *hlsl_new_var(struct hlsl_ctx *ctx, const char *name, struct hlsl_type *type, const struct vkd3d_shader_location loc, const struct hlsl_semantic *semantic, unsigned int modifiers, - const struct hlsl_reg_reservation *reg_reservation) DECLSPEC_HIDDEN; + const struct hlsl_reg_reservation *reg_reservation); struct hlsl_ir_load *hlsl_new_var_load(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, - const struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; + const struct vkd3d_shader_location loc); -void hlsl_error(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, enum vkd3d_shader_error error, - const char *fmt, ...) VKD3D_PRINTF_FUNC(4, 5) DECLSPEC_HIDDEN; -void hlsl_warning(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, enum vkd3d_shader_error error, - const char *fmt, ...) VKD3D_PRINTF_FUNC(4, 5) DECLSPEC_HIDDEN; -void hlsl_note(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, enum vkd3d_shader_log_level level, - const char *fmt, ...) VKD3D_PRINTF_FUNC(4, 5) DECLSPEC_HIDDEN; +void hlsl_error(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, + enum vkd3d_shader_error error, const char *fmt, ...) VKD3D_PRINTF_FUNC(4, 5); +void hlsl_warning(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, + enum vkd3d_shader_error error, const char *fmt, ...) VKD3D_PRINTF_FUNC(4, 5); +void hlsl_note(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, + enum vkd3d_shader_log_level level, const char *fmt, ...) VKD3D_PRINTF_FUNC(4, 5); -void hlsl_push_scope(struct hlsl_ctx *ctx) DECLSPEC_HIDDEN; -void hlsl_pop_scope(struct hlsl_ctx *ctx) DECLSPEC_HIDDEN; +void hlsl_push_scope(struct hlsl_ctx *ctx); +void hlsl_pop_scope(struct hlsl_ctx *ctx); -bool hlsl_scope_add_type(struct hlsl_scope *scope, struct hlsl_type *type) DECLSPEC_HIDDEN; +bool hlsl_scope_add_type(struct hlsl_scope *scope, struct hlsl_type *type); struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old, - unsigned int default_majority, unsigned int modifiers) DECLSPEC_HIDDEN; -unsigned int hlsl_type_component_count(struct hlsl_type *type) DECLSPEC_HIDDEN; -unsigned int hlsl_type_get_sm4_offset(const struct hlsl_type *type, unsigned int offset) DECLSPEC_HIDDEN; -bool hlsl_type_is_void(const struct hlsl_type *type) DECLSPEC_HIDDEN; -bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2) DECLSPEC_HIDDEN; + unsigned int default_majority, unsigned int modifiers); +unsigned int hlsl_type_component_count(struct hlsl_type *type); +unsigned int hlsl_type_get_sm4_offset(const struct hlsl_type *type, unsigned int offset); +bool hlsl_type_is_void(const struct hlsl_type *type); +bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2); -int hlsl_lexer_compile(struct hlsl_ctx *ctx, const struct vkd3d_shader_code *hlsl) DECLSPEC_HIDDEN; +int hlsl_lexer_compile(struct hlsl_ctx *ctx, const struct vkd3d_shader_code *hlsl); #endif diff --git a/libs/vkd3d-shader/preproc.h b/libs/vkd3d-shader/preproc.h index 15d173a4..e1cb75e1 100644 --- a/libs/vkd3d-shader/preproc.h +++ b/libs/vkd3d-shader/preproc.h @@ -131,13 +131,13 @@ struct preproc_ctx }; bool preproc_add_macro(struct preproc_ctx *ctx, const struct vkd3d_shader_location *loc, char *name, char **arg_names, - size_t arg_count, const struct vkd3d_shader_location *body_loc, struct vkd3d_string_buffer *body) DECLSPEC_HIDDEN; -void preproc_close_include(struct preproc_ctx *ctx, const struct vkd3d_shader_code *code) DECLSPEC_HIDDEN; -struct preproc_macro *preproc_find_macro(struct preproc_ctx *ctx, const char *name) DECLSPEC_HIDDEN; -void preproc_free_macro(struct preproc_macro *macro) DECLSPEC_HIDDEN; -bool preproc_push_include(struct preproc_ctx *ctx, char *filename, const struct vkd3d_shader_code *code) DECLSPEC_HIDDEN; + size_t arg_count, const struct vkd3d_shader_location *body_loc, struct vkd3d_string_buffer *body); +void preproc_close_include(struct preproc_ctx *ctx, const struct vkd3d_shader_code *code); +struct preproc_macro *preproc_find_macro(struct preproc_ctx *ctx, const char *name); +void preproc_free_macro(struct preproc_macro *macro); +bool preproc_push_include(struct preproc_ctx *ctx, char *filename, const struct vkd3d_shader_code *code); void preproc_warning(struct preproc_ctx *ctx, const struct vkd3d_shader_location *loc, - enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(4, 5) DECLSPEC_HIDDEN; + enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(4, 5); static inline struct preproc_file *preproc_get_top_file(struct preproc_ctx *ctx) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 85859e84..cd3cd49d 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -858,20 +858,20 @@ static inline bool vkd3d_shader_register_is_output(const struct vkd3d_shader_reg return reg->type == VKD3DSPR_OUTPUT || reg->type == VKD3DSPR_COLOROUT; } -void vkd3d_shader_trace(void *data) DECLSPEC_HIDDEN; +void vkd3d_shader_trace(void *data); -const char *shader_get_type_prefix(enum vkd3d_shader_type type) DECLSPEC_HIDDEN; +const char *shader_get_type_prefix(enum vkd3d_shader_type type); struct vkd3d_shader_message_context; void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, - const struct vkd3d_shader_signature *output_signature, struct vkd3d_shader_message_context *message_context) DECLSPEC_HIDDEN; -void shader_sm4_free(void *data) DECLSPEC_HIDDEN; + const struct vkd3d_shader_signature *output_signature, struct vkd3d_shader_message_context *message_context); +void shader_sm4_free(void *data); void shader_sm4_read_header(void *data, const DWORD **ptr, - struct vkd3d_shader_version *shader_version) DECLSPEC_HIDDEN; + struct vkd3d_shader_version *shader_version); void shader_sm4_read_instruction(void *data, const DWORD **ptr, - struct vkd3d_shader_instruction *ins) DECLSPEC_HIDDEN; -bool shader_sm4_is_end(void *data, const DWORD **ptr) DECLSPEC_HIDDEN; + struct vkd3d_shader_instruction *ins); +bool shader_sm4_is_end(void *data, const DWORD **ptr); struct vkd3d_string_buffer { @@ -887,20 +887,18 @@ struct vkd3d_string_buffer_cache }; enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, - const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out) DECLSPEC_HIDDEN; -void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; -struct vkd3d_string_buffer *vkd3d_string_buffer_get(struct vkd3d_string_buffer_cache *list) DECLSPEC_HIDDEN; -void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; -void vkd3d_string_buffer_cache_cleanup(struct vkd3d_string_buffer_cache *list) DECLSPEC_HIDDEN; -void vkd3d_string_buffer_cache_init(struct vkd3d_string_buffer_cache *list) DECLSPEC_HIDDEN; -int vkd3d_string_buffer_printf(struct vkd3d_string_buffer *buffer, - const char *format, ...) VKD3D_PRINTF_FUNC(2, 3) DECLSPEC_HIDDEN; -void vkd3d_string_buffer_release(struct vkd3d_string_buffer_cache *list, - struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out); +void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer); +struct vkd3d_string_buffer *vkd3d_string_buffer_get(struct vkd3d_string_buffer_cache *list); +void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer); +void vkd3d_string_buffer_cache_cleanup(struct vkd3d_string_buffer_cache *list); +void vkd3d_string_buffer_cache_init(struct vkd3d_string_buffer_cache *list); +int vkd3d_string_buffer_printf(struct vkd3d_string_buffer *buffer, const char *format, ...) VKD3D_PRINTF_FUNC(2, 3); +void vkd3d_string_buffer_release(struct vkd3d_string_buffer_cache *list, struct vkd3d_string_buffer *buffer); #define vkd3d_string_buffer_trace(buffer) \ vkd3d_string_buffer_trace_(buffer, __FUNCTION__) -void vkd3d_string_buffer_trace_(const struct vkd3d_string_buffer *buffer, const char *function) DECLSPEC_HIDDEN; -int vkd3d_string_buffer_vprintf(struct vkd3d_string_buffer *buffer, const char *format, va_list args) DECLSPEC_HIDDEN; +void vkd3d_string_buffer_trace_(const struct vkd3d_string_buffer *buffer, const char *function); +int vkd3d_string_buffer_vprintf(struct vkd3d_string_buffer *buffer, const char *format, va_list args); struct vkd3d_bytecode_buffer { @@ -909,8 +907,8 @@ struct vkd3d_bytecode_buffer int status; }; -size_t bytecode_put_bytes(struct vkd3d_bytecode_buffer *buffer, const void *bytes, size_t size) DECLSPEC_HIDDEN; -void set_u32(struct vkd3d_bytecode_buffer *buffer, size_t offset, uint32_t value) DECLSPEC_HIDDEN; +size_t bytecode_put_bytes(struct vkd3d_bytecode_buffer *buffer, const void *bytes, size_t size); +void set_u32(struct vkd3d_bytecode_buffer *buffer, size_t offset, uint32_t value); static inline size_t put_u32(struct vkd3d_bytecode_buffer *buffer, uint32_t value) { @@ -944,53 +942,51 @@ struct vkd3d_shader_message_context struct vkd3d_string_buffer messages; }; -void vkd3d_shader_message_context_cleanup(struct vkd3d_shader_message_context *context) DECLSPEC_HIDDEN; -bool vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context, - char **out) DECLSPEC_HIDDEN; +void vkd3d_shader_message_context_cleanup(struct vkd3d_shader_message_context *context); +bool vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context, char **out); void vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, - enum vkd3d_shader_log_level log_level) DECLSPEC_HIDDEN; + enum vkd3d_shader_log_level log_level); void vkd3d_shader_message_context_trace_messages_(const struct vkd3d_shader_message_context *context, - const char *function) DECLSPEC_HIDDEN; + const char *function); #define vkd3d_shader_message_context_trace_messages(context) \ vkd3d_shader_message_context_trace_messages_(context, __FUNCTION__) void vkd3d_shader_error(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, - enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(4, 5) DECLSPEC_HIDDEN; + enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(4, 5); void vkd3d_shader_verror(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, - enum vkd3d_shader_error error, const char *format, va_list args) DECLSPEC_HIDDEN; + enum vkd3d_shader_error error, const char *format, va_list args); void vkd3d_shader_vnote(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, - enum vkd3d_shader_log_level level, const char *format, va_list args) DECLSPEC_HIDDEN; + enum vkd3d_shader_log_level level, const char *format, va_list args); void vkd3d_shader_vwarning(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, - enum vkd3d_shader_error error, const char *format, va_list args) DECLSPEC_HIDDEN; + enum vkd3d_shader_error error, const char *format, va_list args); -void vkd3d_shader_dump_shader(enum vkd3d_shader_type type, const struct vkd3d_shader_code *shader) DECLSPEC_HIDDEN; +void vkd3d_shader_dump_shader(enum vkd3d_shader_type type, const struct vkd3d_shader_code *shader); int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, - struct vkd3d_shader_message_context *message_context, const char *source_name, - struct vkd3d_shader_desc *desc) DECLSPEC_HIDDEN; -void free_shader_desc(struct vkd3d_shader_desc *desc) DECLSPEC_HIDDEN; + struct vkd3d_shader_message_context *message_context, const char *source_name, struct vkd3d_shader_desc *desc); +void free_shader_desc(struct vkd3d_shader_desc *desc); int shader_parse_input_signature(const void *dxbc, size_t dxbc_length, - struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_signature *signature) DECLSPEC_HIDDEN; + struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_signature *signature); struct vkd3d_dxbc_compiler; struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader_version *shader_version, const struct vkd3d_shader_desc *shader_desc, const struct vkd3d_shader_compile_info *compile_info, const struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info, - struct vkd3d_shader_message_context *message_context) DECLSPEC_HIDDEN; + struct vkd3d_shader_message_context *message_context); int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_instruction *instruction) DECLSPEC_HIDDEN; + const struct vkd3d_shader_instruction *instruction); int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv) DECLSPEC_HIDDEN; -void vkd3d_dxbc_compiler_destroy(struct vkd3d_dxbc_compiler *compiler) DECLSPEC_HIDDEN; + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv); +void vkd3d_dxbc_compiler_destroy(struct vkd3d_dxbc_compiler *compiler); -void vkd3d_compute_dxbc_checksum(const void *dxbc, size_t size, uint32_t checksum[4]) DECLSPEC_HIDDEN; +void vkd3d_compute_dxbc_checksum(const void *dxbc, size_t size, uint32_t checksum[4]); int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, - struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context) DECLSPEC_HIDDEN; + struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context); int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d_shader_compile_info *compile_info, - struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context) DECLSPEC_HIDDEN; + struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context); static inline enum vkd3d_shader_component_type vkd3d_component_type_from_data_type( enum vkd3d_data_type data_type) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index deb8ee99..0fa51a2f 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -84,9 +84,9 @@ struct vkd3d_vk_device_procs }; #undef DECLARE_VK_PFN -HRESULT hresult_from_errno(int rc) DECLSPEC_HIDDEN; -HRESULT hresult_from_vk_result(VkResult vr) DECLSPEC_HIDDEN; -HRESULT hresult_from_vkd3d_result(int vkd3d_result) DECLSPEC_HIDDEN; +HRESULT hresult_from_errno(int rc); +HRESULT hresult_from_vk_result(VkResult vr); +HRESULT hresult_from_vkd3d_result(int vkd3d_result); struct vkd3d_vulkan_info { @@ -163,8 +163,8 @@ union vkd3d_thread_handle }; HRESULT vkd3d_create_thread(struct vkd3d_instance *instance, - PFN_vkd3d_thread thread_main, void *data, union vkd3d_thread_handle *thread) DECLSPEC_HIDDEN; -HRESULT vkd3d_join_thread(struct vkd3d_instance *instance, union vkd3d_thread_handle *thread) DECLSPEC_HIDDEN; + PFN_vkd3d_thread thread_main, void *data, union vkd3d_thread_handle *thread); +HRESULT vkd3d_join_thread(struct vkd3d_instance *instance, union vkd3d_thread_handle *thread); struct vkd3d_waiting_fence { @@ -200,10 +200,8 @@ struct vkd3d_fence_worker struct d3d12_device *device; }; -HRESULT vkd3d_fence_worker_start(struct vkd3d_fence_worker *worker, - struct d3d12_device *device) DECLSPEC_HIDDEN; -HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, - struct d3d12_device *device) DECLSPEC_HIDDEN; +HRESULT vkd3d_fence_worker_start(struct vkd3d_fence_worker *worker, struct d3d12_device *device); +HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, struct d3d12_device *device); struct vkd3d_gpu_va_allocation { @@ -232,11 +230,9 @@ struct vkd3d_gpu_va_allocator }; D3D12_GPU_VIRTUAL_ADDRESS vkd3d_gpu_va_allocator_allocate(struct vkd3d_gpu_va_allocator *allocator, - size_t alignment, size_t size, void *ptr) DECLSPEC_HIDDEN; -void *vkd3d_gpu_va_allocator_dereference(struct vkd3d_gpu_va_allocator *allocator, - D3D12_GPU_VIRTUAL_ADDRESS address) DECLSPEC_HIDDEN; -void vkd3d_gpu_va_allocator_free(struct vkd3d_gpu_va_allocator *allocator, - D3D12_GPU_VIRTUAL_ADDRESS address) DECLSPEC_HIDDEN; + size_t alignment, size_t size, void *ptr); +void *vkd3d_gpu_va_allocator_dereference(struct vkd3d_gpu_va_allocator *allocator, D3D12_GPU_VIRTUAL_ADDRESS address); +void vkd3d_gpu_va_allocator_free(struct vkd3d_gpu_va_allocator *allocator, D3D12_GPU_VIRTUAL_ADDRESS address); struct vkd3d_render_pass_key { @@ -258,12 +254,10 @@ struct vkd3d_render_pass_cache size_t render_passes_size; }; -void vkd3d_render_pass_cache_cleanup(struct vkd3d_render_pass_cache *cache, - struct d3d12_device *device) DECLSPEC_HIDDEN; -HRESULT vkd3d_render_pass_cache_find(struct vkd3d_render_pass_cache *cache, - struct d3d12_device *device, const struct vkd3d_render_pass_key *key, - VkRenderPass *vk_render_pass) DECLSPEC_HIDDEN; -void vkd3d_render_pass_cache_init(struct vkd3d_render_pass_cache *cache) DECLSPEC_HIDDEN; +void vkd3d_render_pass_cache_cleanup(struct vkd3d_render_pass_cache *cache, struct d3d12_device *device); +HRESULT vkd3d_render_pass_cache_find(struct vkd3d_render_pass_cache *cache, struct d3d12_device *device, + const struct vkd3d_render_pass_key *key, VkRenderPass *vk_render_pass); +void vkd3d_render_pass_cache_init(struct vkd3d_render_pass_cache *cache); struct vkd3d_private_store { @@ -318,12 +312,10 @@ static inline void vkd3d_private_store_destroy(struct vkd3d_private_store *store pthread_mutex_destroy(&store->mutex); } -HRESULT vkd3d_get_private_data(struct vkd3d_private_store *store, - const GUID *tag, unsigned int *out_size, void *out) DECLSPEC_HIDDEN; +HRESULT vkd3d_get_private_data(struct vkd3d_private_store *store, const GUID *tag, unsigned int *out_size, void *out); HRESULT vkd3d_set_private_data(struct vkd3d_private_store *store, - const GUID *tag, unsigned int data_size, const void *data) DECLSPEC_HIDDEN; -HRESULT vkd3d_set_private_data_interface(struct vkd3d_private_store *store, - const GUID *tag, const IUnknown *object) DECLSPEC_HIDDEN; + const GUID *tag, unsigned int data_size, const void *data); +HRESULT vkd3d_set_private_data_interface(struct vkd3d_private_store *store, const GUID *tag, const IUnknown *object); struct vkd3d_signaled_semaphore { @@ -363,8 +355,8 @@ struct d3d12_fence struct vkd3d_private_store private_store; }; -HRESULT d3d12_fence_create(struct d3d12_device *device, - uint64_t initial_value, D3D12_FENCE_FLAGS flags, struct d3d12_fence **fence) DECLSPEC_HIDDEN; +HRESULT d3d12_fence_create(struct d3d12_device *device, uint64_t initial_value, + D3D12_FENCE_FLAGS flags, struct d3d12_fence **fence); /* ID3D12Heap */ struct d3d12_heap @@ -388,8 +380,8 @@ struct d3d12_heap }; HRESULT d3d12_heap_create(struct d3d12_device *device, const D3D12_HEAP_DESC *desc, - const struct d3d12_resource *resource, struct d3d12_heap **heap) DECLSPEC_HIDDEN; -struct d3d12_heap *unsafe_impl_from_ID3D12Heap(ID3D12Heap *iface) DECLSPEC_HIDDEN; + const struct d3d12_resource *resource, struct d3d12_heap **heap); +struct d3d12_heap *unsafe_impl_from_ID3D12Heap(ID3D12Heap *iface); #define VKD3D_RESOURCE_PUBLIC_FLAGS \ (VKD3D_RESOURCE_INITIAL_STATE_TRANSITION | VKD3D_RESOURCE_PRESENT_STATE_TRANSITION) @@ -437,29 +429,29 @@ static inline bool d3d12_resource_is_texture(const struct d3d12_resource *resour return resource->desc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER; } -bool d3d12_resource_is_cpu_accessible(const struct d3d12_resource *resource) DECLSPEC_HIDDEN; -HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc, struct d3d12_device *device) DECLSPEC_HIDDEN; +bool d3d12_resource_is_cpu_accessible(const struct d3d12_resource *resource); +HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc, struct d3d12_device *device); HRESULT d3d12_committed_resource_create(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, - const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) DECLSPEC_HIDDEN; + const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource); HRESULT d3d12_placed_resource_create(struct d3d12_device *device, struct d3d12_heap *heap, uint64_t heap_offset, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, - const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) DECLSPEC_HIDDEN; + const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource); HRESULT d3d12_reserved_resource_create(struct d3d12_device *device, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, - const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) DECLSPEC_HIDDEN; -struct d3d12_resource *unsafe_impl_from_ID3D12Resource(ID3D12Resource *iface) DECLSPEC_HIDDEN; + const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource); +struct d3d12_resource *unsafe_impl_from_ID3D12Resource(ID3D12Resource *iface); HRESULT vkd3d_allocate_buffer_memory(struct d3d12_device *device, VkBuffer vk_buffer, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, - VkDeviceMemory *vk_memory, uint32_t *vk_memory_type, VkDeviceSize *vk_memory_size) DECLSPEC_HIDDEN; + VkDeviceMemory *vk_memory, uint32_t *vk_memory_type, VkDeviceSize *vk_memory_size); HRESULT vkd3d_create_buffer(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, - const D3D12_RESOURCE_DESC *desc, VkBuffer *vk_buffer) DECLSPEC_HIDDEN; + const D3D12_RESOURCE_DESC *desc, VkBuffer *vk_buffer); HRESULT vkd3d_get_image_allocation_info(struct d3d12_device *device, - const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_ALLOCATION_INFO *allocation_info) DECLSPEC_HIDDEN; + const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_ALLOCATION_INFO *allocation_info); enum vkd3d_view_type { @@ -497,8 +489,8 @@ struct vkd3d_view } info; }; -void vkd3d_view_decref(struct vkd3d_view *view, struct d3d12_device *device) DECLSPEC_HIDDEN; -void vkd3d_view_incref(struct vkd3d_view *view) DECLSPEC_HIDDEN; +void vkd3d_view_decref(struct vkd3d_view *view, struct d3d12_device *device); +void vkd3d_view_incref(struct vkd3d_view *view); struct vkd3d_texture_view_desc { @@ -513,9 +505,9 @@ struct vkd3d_texture_view_desc }; bool vkd3d_create_buffer_view(struct d3d12_device *device, VkBuffer vk_buffer, const struct vkd3d_format *format, - VkDeviceSize offset, VkDeviceSize size, struct vkd3d_view **view) DECLSPEC_HIDDEN; + VkDeviceSize offset, VkDeviceSize size, struct vkd3d_view **view); bool vkd3d_create_texture_view(struct d3d12_device *device, VkImage vk_image, - const struct vkd3d_texture_view_desc *desc, struct vkd3d_view **view) DECLSPEC_HIDDEN; + const struct vkd3d_texture_view_desc *desc, struct vkd3d_view **view); struct d3d12_desc { @@ -538,25 +530,22 @@ static inline struct d3d12_desc *d3d12_desc_from_gpu_handle(D3D12_GPU_DESCRIPTOR return (struct d3d12_desc *)(intptr_t)gpu_handle.ptr; } -void d3d12_desc_copy(struct d3d12_desc *dst, const struct d3d12_desc *src, - struct d3d12_device *device) DECLSPEC_HIDDEN; +void d3d12_desc_copy(struct d3d12_desc *dst, const struct d3d12_desc *src, struct d3d12_device *device); void d3d12_desc_create_cbv(struct d3d12_desc *descriptor, - struct d3d12_device *device, const D3D12_CONSTANT_BUFFER_VIEW_DESC *desc) DECLSPEC_HIDDEN; + struct d3d12_device *device, const D3D12_CONSTANT_BUFFER_VIEW_DESC *desc); void d3d12_desc_create_srv(struct d3d12_desc *descriptor, struct d3d12_device *device, struct d3d12_resource *resource, - const D3D12_SHADER_RESOURCE_VIEW_DESC *desc) DECLSPEC_HIDDEN; + const D3D12_SHADER_RESOURCE_VIEW_DESC *desc); void d3d12_desc_create_uav(struct d3d12_desc *descriptor, struct d3d12_device *device, struct d3d12_resource *resource, struct d3d12_resource *counter_resource, - const D3D12_UNORDERED_ACCESS_VIEW_DESC *desc) DECLSPEC_HIDDEN; -void d3d12_desc_create_sampler(struct d3d12_desc *sampler, - struct d3d12_device *device, const D3D12_SAMPLER_DESC *desc) DECLSPEC_HIDDEN; -void d3d12_desc_write_atomic(struct d3d12_desc *dst, const struct d3d12_desc *src, - struct d3d12_device *device) DECLSPEC_HIDDEN; + const D3D12_UNORDERED_ACCESS_VIEW_DESC *desc); +void d3d12_desc_create_sampler(struct d3d12_desc *sampler, struct d3d12_device *device, const D3D12_SAMPLER_DESC *desc); +void d3d12_desc_write_atomic(struct d3d12_desc *dst, const struct d3d12_desc *src, struct d3d12_device *device); bool vkd3d_create_raw_buffer_view(struct d3d12_device *device, - D3D12_GPU_VIRTUAL_ADDRESS gpu_address, VkBufferView *vk_buffer_view) DECLSPEC_HIDDEN; + D3D12_GPU_VIRTUAL_ADDRESS gpu_address, VkBufferView *vk_buffer_view); HRESULT vkd3d_create_static_sampler(struct d3d12_device *device, - const D3D12_STATIC_SAMPLER_DESC *desc, VkSampler *vk_sampler) DECLSPEC_HIDDEN; + const D3D12_STATIC_SAMPLER_DESC *desc, VkSampler *vk_sampler); struct d3d12_rtv_desc { @@ -576,7 +565,7 @@ static inline struct d3d12_rtv_desc *d3d12_rtv_desc_from_cpu_handle(D3D12_CPU_DE } void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_device *device, - struct d3d12_resource *resource, const D3D12_RENDER_TARGET_VIEW_DESC *desc) DECLSPEC_HIDDEN; + struct d3d12_resource *resource, const D3D12_RENDER_TARGET_VIEW_DESC *desc); struct d3d12_dsv_desc { @@ -596,7 +585,7 @@ static inline struct d3d12_dsv_desc *d3d12_dsv_desc_from_cpu_handle(D3D12_CPU_DE } void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_device *device, - struct d3d12_resource *resource, const D3D12_DEPTH_STENCIL_VIEW_DESC *desc) DECLSPEC_HIDDEN; + struct d3d12_resource *resource, const D3D12_DEPTH_STENCIL_VIEW_DESC *desc); /* ID3D12DescriptorHeap */ struct d3d12_descriptor_heap @@ -614,7 +603,7 @@ struct d3d12_descriptor_heap }; HRESULT d3d12_descriptor_heap_create(struct d3d12_device *device, - const D3D12_DESCRIPTOR_HEAP_DESC *desc, struct d3d12_descriptor_heap **descriptor_heap) DECLSPEC_HIDDEN; + const D3D12_DESCRIPTOR_HEAP_DESC *desc, struct d3d12_descriptor_heap **descriptor_heap); /* ID3D12QueryHeap */ struct d3d12_query_heap @@ -631,9 +620,9 @@ struct d3d12_query_heap uint64_t availability_mask[]; }; -HRESULT d3d12_query_heap_create(struct d3d12_device *device, const D3D12_QUERY_HEAP_DESC *desc, - struct d3d12_query_heap **heap) DECLSPEC_HIDDEN; -struct d3d12_query_heap *unsafe_impl_from_ID3D12QueryHeap(ID3D12QueryHeap *iface) DECLSPEC_HIDDEN; +HRESULT d3d12_query_heap_create(struct d3d12_device *device, + const D3D12_QUERY_HEAP_DESC *desc, struct d3d12_query_heap **heap); +struct d3d12_query_heap *unsafe_impl_from_ID3D12QueryHeap(ID3D12QueryHeap *iface); /* A Vulkan query has to be issued at least one time before the result is * available. In D3D12 it is legal to get query reults for not issued queries. @@ -734,11 +723,11 @@ struct d3d12_root_signature }; HRESULT d3d12_root_signature_create(struct d3d12_device *device, const void *bytecode, - size_t bytecode_length, struct d3d12_root_signature **root_signature) DECLSPEC_HIDDEN; -struct d3d12_root_signature *unsafe_impl_from_ID3D12RootSignature(ID3D12RootSignature *iface) DECLSPEC_HIDDEN; + size_t bytecode_length, struct d3d12_root_signature **root_signature); +struct d3d12_root_signature *unsafe_impl_from_ID3D12RootSignature(ID3D12RootSignature *iface); int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_versioned_root_signature_desc *desc) DECLSPEC_HIDDEN; + struct vkd3d_shader_versioned_root_signature_desc *desc); struct d3d12_graphics_pipeline_state { @@ -837,13 +826,12 @@ static inline bool d3d12_pipeline_state_has_unknown_dsv_format(struct d3d12_pipe } HRESULT d3d12_pipeline_state_create_compute(struct d3d12_device *device, - const D3D12_COMPUTE_PIPELINE_STATE_DESC *desc, struct d3d12_pipeline_state **state) DECLSPEC_HIDDEN; + const D3D12_COMPUTE_PIPELINE_STATE_DESC *desc, struct d3d12_pipeline_state **state); HRESULT d3d12_pipeline_state_create_graphics(struct d3d12_device *device, - const D3D12_GRAPHICS_PIPELINE_STATE_DESC *desc, struct d3d12_pipeline_state **state) DECLSPEC_HIDDEN; + const D3D12_GRAPHICS_PIPELINE_STATE_DESC *desc, struct d3d12_pipeline_state **state); VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_state *state, - D3D12_PRIMITIVE_TOPOLOGY topology, const uint32_t *strides, VkFormat dsv_format, - VkRenderPass *vk_render_pass) DECLSPEC_HIDDEN; -struct d3d12_pipeline_state *unsafe_impl_from_ID3D12PipelineState(ID3D12PipelineState *iface) DECLSPEC_HIDDEN; + D3D12_PRIMITIVE_TOPOLOGY topology, const uint32_t *strides, VkFormat dsv_format, VkRenderPass *vk_render_pass); +struct d3d12_pipeline_state *unsafe_impl_from_ID3D12PipelineState(ID3D12PipelineState *iface); struct vkd3d_buffer { @@ -903,7 +891,7 @@ struct d3d12_command_allocator }; HRESULT d3d12_command_allocator_create(struct d3d12_device *device, - D3D12_COMMAND_LIST_TYPE type, struct d3d12_command_allocator **allocator) DECLSPEC_HIDDEN; + D3D12_COMMAND_LIST_TYPE type, struct d3d12_command_allocator **allocator); struct vkd3d_push_descriptor { @@ -995,7 +983,7 @@ struct d3d12_command_list HRESULT d3d12_command_list_create(struct d3d12_device *device, UINT node_mask, D3D12_COMMAND_LIST_TYPE type, ID3D12CommandAllocator *allocator_iface, - ID3D12PipelineState *initial_pipeline_state, struct d3d12_command_list **list) DECLSPEC_HIDDEN; + ID3D12PipelineState *initial_pipeline_state, struct d3d12_command_list **list); struct vkd3d_queue { @@ -1022,12 +1010,11 @@ struct vkd3d_queue VkSemaphore old_vk_semaphores[VKD3D_MAX_VK_SYNC_OBJECTS]; }; -VkQueue vkd3d_queue_acquire(struct vkd3d_queue *queue) DECLSPEC_HIDDEN; -HRESULT vkd3d_queue_create(struct d3d12_device *device, - uint32_t family_index, const VkQueueFamilyProperties *properties, - struct vkd3d_queue **queue) DECLSPEC_HIDDEN; -void vkd3d_queue_destroy(struct vkd3d_queue *queue, struct d3d12_device *device) DECLSPEC_HIDDEN; -void vkd3d_queue_release(struct vkd3d_queue *queue) DECLSPEC_HIDDEN; +VkQueue vkd3d_queue_acquire(struct vkd3d_queue *queue); +HRESULT vkd3d_queue_create(struct d3d12_device *device, uint32_t family_index, + const VkQueueFamilyProperties *properties, struct vkd3d_queue **queue); +void vkd3d_queue_destroy(struct vkd3d_queue *queue, struct d3d12_device *device); +void vkd3d_queue_release(struct vkd3d_queue *queue); /* ID3D12CommandQueue */ struct d3d12_command_queue @@ -1048,7 +1035,7 @@ struct d3d12_command_queue }; HRESULT d3d12_command_queue_create(struct d3d12_device *device, - const D3D12_COMMAND_QUEUE_DESC *desc, struct d3d12_command_queue **queue) DECLSPEC_HIDDEN; + const D3D12_COMMAND_QUEUE_DESC *desc, struct d3d12_command_queue **queue); /* ID3D12CommandSignature */ struct d3d12_command_signature @@ -1063,9 +1050,9 @@ struct d3d12_command_signature struct vkd3d_private_store private_store; }; -HRESULT d3d12_command_signature_create(struct d3d12_device *device, const D3D12_COMMAND_SIGNATURE_DESC *desc, - struct d3d12_command_signature **signature) DECLSPEC_HIDDEN; -struct d3d12_command_signature *unsafe_impl_from_ID3D12CommandSignature(ID3D12CommandSignature *iface) DECLSPEC_HIDDEN; +HRESULT d3d12_command_signature_create(struct d3d12_device *device, + const D3D12_COMMAND_SIGNATURE_DESC *desc, struct d3d12_command_signature **signature); +struct d3d12_command_signature *unsafe_impl_from_ID3D12CommandSignature(ID3D12CommandSignature *iface); /* NULL resources */ struct vkd3d_null_resources @@ -1083,10 +1070,8 @@ struct vkd3d_null_resources VkDeviceMemory vk_2d_storage_image_memory; }; -HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, - struct d3d12_device *device) DECLSPEC_HIDDEN; -void vkd3d_destroy_null_resources(struct vkd3d_null_resources *null_resources, - struct d3d12_device *device) DECLSPEC_HIDDEN; +HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, struct d3d12_device *device); +void vkd3d_destroy_null_resources(struct vkd3d_null_resources *null_resources, struct d3d12_device *device); struct vkd3d_format_compatibility_list { @@ -1124,8 +1109,8 @@ struct vkd3d_uav_clear_state struct vkd3d_uav_clear_pipelines pipelines_uint; }; -HRESULT vkd3d_uav_clear_state_init(struct vkd3d_uav_clear_state *state, struct d3d12_device *device) DECLSPEC_HIDDEN; -void vkd3d_uav_clear_state_cleanup(struct vkd3d_uav_clear_state *state, struct d3d12_device *device) DECLSPEC_HIDDEN; +HRESULT vkd3d_uav_clear_state_init(struct vkd3d_uav_clear_state *state, struct d3d12_device *device); +void vkd3d_uav_clear_state_cleanup(struct vkd3d_uav_clear_state *state, struct d3d12_device *device); /* ID3D12Device */ struct d3d12_device @@ -1181,13 +1166,12 @@ struct d3d12_device }; HRESULT d3d12_device_create(struct vkd3d_instance *instance, - const struct vkd3d_device_create_info *create_info, struct d3d12_device **device) DECLSPEC_HIDDEN; -struct vkd3d_queue *d3d12_device_get_vkd3d_queue(struct d3d12_device *device, - D3D12_COMMAND_LIST_TYPE type) DECLSPEC_HIDDEN; -bool d3d12_device_is_uma(struct d3d12_device *device, bool *coherent) DECLSPEC_HIDDEN; + const struct vkd3d_device_create_info *create_info, struct d3d12_device **device); +struct vkd3d_queue *d3d12_device_get_vkd3d_queue(struct d3d12_device *device, D3D12_COMMAND_LIST_TYPE type); +bool d3d12_device_is_uma(struct d3d12_device *device, bool *coherent); void d3d12_device_mark_as_removed(struct d3d12_device *device, HRESULT reason, - const char *message, ...) VKD3D_PRINTF_FUNC(3, 4) DECLSPEC_HIDDEN; -struct d3d12_device *unsafe_impl_from_ID3D12Device(ID3D12Device *iface) DECLSPEC_HIDDEN; + const char *message, ...) VKD3D_PRINTF_FUNC(3, 4); +struct d3d12_device *unsafe_impl_from_ID3D12Device(ID3D12Device *iface); static inline HRESULT d3d12_device_query_interface(struct d3d12_device *device, REFIID iid, void **object) { @@ -1262,15 +1246,14 @@ static inline bool vkd3d_format_is_compressed(const struct vkd3d_format *format) void vkd3d_format_copy_data(const struct vkd3d_format *format, const uint8_t *src, unsigned int src_row_pitch, unsigned int src_slice_pitch, uint8_t *dst, unsigned int dst_row_pitch, - unsigned int dst_slice_pitch, unsigned int w, unsigned int h, unsigned int d) DECLSPEC_HIDDEN; + unsigned int dst_slice_pitch, unsigned int w, unsigned int h, unsigned int d); const struct vkd3d_format *vkd3d_get_format(const struct d3d12_device *device, - DXGI_FORMAT dxgi_format, bool depth_stencil) DECLSPEC_HIDDEN; -const struct vkd3d_format *vkd3d_find_uint_format(const struct d3d12_device *device, - DXGI_FORMAT dxgi_format) DECLSPEC_HIDDEN; + DXGI_FORMAT dxgi_format, bool depth_stencil); +const struct vkd3d_format *vkd3d_find_uint_format(const struct d3d12_device *device, DXGI_FORMAT dxgi_format); -HRESULT vkd3d_init_format_info(struct d3d12_device *device) DECLSPEC_HIDDEN; -void vkd3d_cleanup_format_info(struct d3d12_device *device) DECLSPEC_HIDDEN; +HRESULT vkd3d_init_format_info(struct d3d12_device *device); +void vkd3d_cleanup_format_info(struct d3d12_device *device); static inline const struct vkd3d_format *vkd3d_format_from_d3d12_resource_desc( const struct d3d12_device *device, const D3D12_RESOURCE_DESC *desc, DXGI_FORMAT view_format) @@ -1318,24 +1301,23 @@ static inline unsigned int vkd3d_compute_workgroup_count(unsigned int thread_cou return (thread_count + workgroup_size - 1) / workgroup_size; } -VkCompareOp vk_compare_op_from_d3d12(D3D12_COMPARISON_FUNC op) DECLSPEC_HIDDEN; -VkSampleCountFlagBits vk_samples_from_dxgi_sample_desc(const DXGI_SAMPLE_DESC *desc) DECLSPEC_HIDDEN; -VkSampleCountFlagBits vk_samples_from_sample_count(unsigned int sample_count) DECLSPEC_HIDDEN; +VkCompareOp vk_compare_op_from_d3d12(D3D12_COMPARISON_FUNC op); +VkSampleCountFlagBits vk_samples_from_dxgi_sample_desc(const DXGI_SAMPLE_DESC *desc); +VkSampleCountFlagBits vk_samples_from_sample_count(unsigned int sample_count); -bool is_valid_feature_level(D3D_FEATURE_LEVEL feature_level) DECLSPEC_HIDDEN; +bool is_valid_feature_level(D3D_FEATURE_LEVEL feature_level); -bool is_valid_resource_state(D3D12_RESOURCE_STATES state) DECLSPEC_HIDDEN; -bool is_write_resource_state(D3D12_RESOURCE_STATES state) DECLSPEC_HIDDEN; +bool is_valid_resource_state(D3D12_RESOURCE_STATES state); +bool is_write_resource_state(D3D12_RESOURCE_STATES state); -HRESULT return_interface(void *iface, REFIID iface_iid, - REFIID requested_iid, void **object) DECLSPEC_HIDDEN; +HRESULT return_interface(void *iface, REFIID iface_iid, REFIID requested_iid, void **object); -const char *debug_d3d12_box(const D3D12_BOX *box) DECLSPEC_HIDDEN; -const char *debug_d3d12_shader_component_mapping(unsigned int mapping) DECLSPEC_HIDDEN; -const char *debug_vk_extent_3d(VkExtent3D extent) DECLSPEC_HIDDEN; -const char *debug_vk_memory_heap_flags(VkMemoryHeapFlags flags) DECLSPEC_HIDDEN; -const char *debug_vk_memory_property_flags(VkMemoryPropertyFlags flags) DECLSPEC_HIDDEN; -const char *debug_vk_queue_flags(VkQueueFlags flags) DECLSPEC_HIDDEN; +const char *debug_d3d12_box(const D3D12_BOX *box); +const char *debug_d3d12_shader_component_mapping(unsigned int mapping); +const char *debug_vk_extent_3d(VkExtent3D extent); +const char *debug_vk_memory_heap_flags(VkMemoryHeapFlags flags); +const char *debug_vk_memory_property_flags(VkMemoryPropertyFlags flags); +const char *debug_vk_queue_flags(VkQueueFlags flags); static inline void debug_ignored_node_mask(unsigned int mask) { @@ -1344,15 +1326,15 @@ static inline void debug_ignored_node_mask(unsigned int mask) } HRESULT vkd3d_load_vk_global_procs(struct vkd3d_vk_global_procs *procs, - PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr) DECLSPEC_HIDDEN; + PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr); HRESULT vkd3d_load_vk_instance_procs(struct vkd3d_vk_instance_procs *procs, - const struct vkd3d_vk_global_procs *global_procs, VkInstance instance) DECLSPEC_HIDDEN; + const struct vkd3d_vk_global_procs *global_procs, VkInstance instance); HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs, - const struct vkd3d_vk_instance_procs *parent_procs, VkDevice device) DECLSPEC_HIDDEN; + const struct vkd3d_vk_instance_procs *parent_procs, VkDevice device); extern const char vkd3d_build[]; -bool vkd3d_get_program_name(char program_name[PATH_MAX]) DECLSPEC_HIDDEN; +bool vkd3d_get_program_name(char program_name[PATH_MAX]); static inline void vkd3d_set_thread_name(const char *name) { @@ -1364,9 +1346,9 @@ static inline void vkd3d_set_thread_name(const char *name) } VkResult vkd3d_set_vk_object_name_utf8(struct d3d12_device *device, uint64_t vk_object, - VkDebugReportObjectTypeEXT vk_object_type, const char *name) DECLSPEC_HIDDEN; + VkDebugReportObjectTypeEXT vk_object_type, const char *name); HRESULT vkd3d_set_vk_object_name(struct d3d12_device *device, uint64_t vk_object, - VkDebugReportObjectTypeEXT vk_object_type, const WCHAR *name) DECLSPEC_HIDDEN; + VkDebugReportObjectTypeEXT vk_object_type, const WCHAR *name); static inline void vk_prepend_struct(void *header, void *structure) { -- 2.32.0

5 7

[PATCH vkd3d 1/4] vkd3d-shader: Implement DMAX instruction.
by Conor McCarthy 09 Aug '21

09 Aug '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 1 + libs/vkd3d-shader/sm4.h | 1 + libs/vkd3d-shader/spirv.c | 2 ++ libs/vkd3d-shader/trace.c | 1 + libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 9da89a4a..584ece93 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -798,6 +798,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = {VKD3D_SM5_OP_SYNC, VKD3DSIH_SYNC, "", "", shader_sm5_read_sync}, {VKD3D_SM5_OP_DADD, VKD3DSIH_DADD, "d", "dd"}, + {VKD3D_SM5_OP_DMAX, VKD3DSIH_DMAX, "d", "dd"}, {VKD3D_SM5_OP_DEQ, VKD3DSIH_DEQ, "u", "dd"}, {VKD3D_SM5_OP_DGE, VKD3DSIH_DGE, "u", "dd"}, {VKD3D_SM5_OP_DLT, VKD3DSIH_DLT, "u", "dd"}, diff --git a/libs/vkd3d-shader/sm4.h b/libs/vkd3d-shader/sm4.h index c94a73d4..e4d21467 100644 --- a/libs/vkd3d-shader/sm4.h +++ b/libs/vkd3d-shader/sm4.h @@ -318,6 +318,7 @@ enum vkd3d_sm4_opcode VKD3D_SM5_OP_IMM_ATOMIC_UMIN = 0xbd, VKD3D_SM5_OP_SYNC = 0xbe, VKD3D_SM5_OP_DADD = 0xbf, + VKD3D_SM5_OP_DMAX = 0xc0, VKD3D_SM5_OP_DEQ = 0xc3, VKD3D_SM5_OP_DGE = 0xc4, VKD3D_SM5_OP_DLT = 0xc5, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 3a1f1969..a94a38a6 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6843,6 +6843,7 @@ static enum GLSLstd450 vkd3d_dxbc_compiler_map_ext_glsl_instruction( } glsl_insts[] = { + {VKD3DSIH_DMAX, GLSLstd450NMax}, {VKD3DSIH_EXP, GLSLstd450Exp2}, {VKD3DSIH_FIRSTBIT_HI, GLSLstd450FindUMsb}, {VKD3DSIH_FIRSTBIT_LO, GLSLstd450FindILsb}, @@ -9532,6 +9533,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_XOR: vkd3d_dxbc_compiler_emit_alu_instruction(compiler, instruction); break; + case VKD3DSIH_DMAX: case VKD3DSIH_EXP: case VKD3DSIH_FIRSTBIT_HI: case VKD3DSIH_FIRSTBIT_LO: diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index d9306d6b..0da29a8f 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -108,6 +108,7 @@ static const char * const shader_opcode_names[] = /* VKD3DSIH_DGE */ "dge", /* VKD3DSIH_DIV */ "div", /* VKD3DSIH_DLT */ "dlt", + /* VKD3DSIH_DMAX */ "dmax", /* VKD3DSIH_DMOV */ "dmov", /* VKD3DSIH_DNE */ "dne", /* VKD3DSIH_DP2 */ "dp2", diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 85859e84..f7762ef2 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -197,6 +197,7 @@ enum vkd3d_shader_opcode VKD3DSIH_DGE, VKD3DSIH_DIV, VKD3DSIH_DLT, + VKD3DSIH_DMAX, VKD3DSIH_DMOV, VKD3DSIH_DNE, VKD3DSIH_DP2, -- 2.32.0

2 7

[PATCH v1] mmdevapi: Implement AEV_GetMasterVolumeLevelScalar and AEV_SetMasterVolumeLevelScalar methods.
by Haidong Yu 09 Aug '21

09 Aug '21

3 2

[PATCH 5/5] gdi32: Handle metafiles directly in RealizePalette.
by Jacek Caban 09 Aug '21

09 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 11 +++++ dlls/gdi32/metafile.c | 2 +- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/mfdrv/objects.c | 19 ++------ dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/palette.c | 20 --------- dlls/gdi32/tests/metafile.c | 81 ++++++++++++++++++++++++++++++++++ 9 files changed, 98 insertions(+), 40 deletions(-)

2 1

[PATCH 4/5] gdi32: Handle metafiles directly in SelectPalette.
by Jacek Caban 09 Aug '21

09 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/enhmfdrv/objects.c | 18 ++++++++---------- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 18 ++++++++++++++++++ dlls/gdi32/metafile.c | 2 +- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/mfdrv/objects.c | 20 +++++++++----------- dlls/gdi32/palette.c | 28 ++-------------------------- 10 files changed, 42 insertions(+), 52 deletions(-)

2 1

[PATCH 3/5] gdi32: Handle EMFs directly in SelectObject.
by Jacek Caban 09 Aug '21

09 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 2 - dlls/gdi32/enhmfdrv/init.c | 4 +- dlls/gdi32/enhmfdrv/objects.c | 90 +++++++------ dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/objects.c | 3 + dlls/gdi32/tests/metafile.c | 191 +++++++++++++++++++++++++++ 6 files changed, 247 insertions(+), 44 deletions(-)

2 1

[PATCH 2/5] gdi32: Handle metafiles directly in SelectObject.
by Jacek Caban 09 Aug '21

09 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 2 +- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/mfdrv/init.c | 11 ++- dlls/gdi32/mfdrv/metafiledrv.h | 7 +- dlls/gdi32/mfdrv/objects.c | 81 ++++++++++++------ dlls/gdi32/objects.c | 2 + dlls/gdi32/tests/metafile.c | 151 +++++++++++++++++++++++++++++++++ include/ntgdi.h | 1 + 8 files changed, 219 insertions(+), 37 deletions(-)

2 1

[PATCH 1/5] gdi32: Handle deletion of objects associated with metafile without accessing kernel objects.
by Jacek Caban 09 Aug '21

09 Aug '21

2 1

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

09 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 19 +++- dlls/d3d10/tests/effect.c | 181 ++++++++++++++++--------------------- 3 files changed, 95 insertions(+), 106 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 8d48231d971..fc4d50004af 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -188,6 +188,7 @@ struct d3d10_effect_variable char *name; char *semantic; + char *value; DWORD buffer_offset; DWORD annotation_count; DWORD flag; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 86ef50aac01..18aed7b52de 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, &a->value)) + { + 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; @@ -2744,6 +2760,7 @@ static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v) heap_free(v->name); heap_free(v->semantic); + heap_free(v->value); if (v->annotations) { for (i = 0; i < v->annotation_count; ++i) 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

1 2

[PATCH 1/5] xinput1_3: Consistently name struct xinput_controller variable.
by Rémi Bernon 09 Aug '21

09 Aug '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/xinput1_3/main.c | 134 +++++++++++++++++++++--------------------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index 248f8f796e5..25f3b0f0407 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -240,18 +240,18 @@ static BOOL VerifyGamepad(PHIDP_PREPARSED_DATA preparsed, XINPUT_CAPABILITIES *x return TRUE; } -static DWORD HID_set_state(struct xinput_controller *device, XINPUT_VIBRATION *state) +static DWORD HID_set_state(struct xinput_controller *controller, XINPUT_VIBRATION *state) { - struct hid_platform_private *private = device->platform_private; + struct hid_platform_private *private = controller->platform_private; char *output_report_buf = private->output_report_buf; ULONG output_report_len = private->caps.OutputReportByteLength; - if (device->caps.Flags & XINPUT_CAPS_FFB_SUPPORTED) + if (controller->caps.Flags & XINPUT_CAPS_FFB_SUPPORTED) { - device->vibration.wLeftMotorSpeed = state->wLeftMotorSpeed; - device->vibration.wRightMotorSpeed = state->wRightMotorSpeed; + controller->vibration.wLeftMotorSpeed = state->wLeftMotorSpeed; + controller->vibration.wRightMotorSpeed = state->wRightMotorSpeed; - if (device->enabled) + if (controller->enabled) { memset(output_report_buf, 0, output_report_len); output_report_buf[0] = /* report id */ 0; @@ -395,16 +395,16 @@ static void HID_find_gamepads(void) LeaveCriticalSection(&xinput_crit); } -static void remove_gamepad(struct xinput_controller *device) +static void remove_gamepad(struct xinput_controller *controller) { - EnterCriticalSection(&device->crit); + EnterCriticalSection(&controller->crit); - if (device->platform_private) + if (controller->platform_private) { - struct hid_platform_private *private = device->platform_private; + struct hid_platform_private *private = controller->platform_private; - controller_disable(device); - device->platform_private = NULL; + controller_disable(controller); + controller->platform_private = NULL; CloseHandle(private->device); free(private->input_report_buf[0]); @@ -414,7 +414,7 @@ static void remove_gamepad(struct xinput_controller *device) free(private); } - LeaveCriticalSection(&device->crit); + LeaveCriticalSection(&controller->crit); } static void HID_destroy_gamepads(void) @@ -433,9 +433,9 @@ static BYTE scale_byte(LONG value, const struct axis_info *axis) return (((ULONGLONG)(value - axis->min)) * 0xff) / axis->range; } -static void HID_update_state(struct xinput_controller *device, XINPUT_STATE *state) +static void HID_update_state(struct xinput_controller *controller, XINPUT_STATE *state) { - struct hid_platform_private *private = device->platform_private; + struct hid_platform_private *private = controller->platform_private; int i; char **report_buf = private->input_report_buf, *tmp; ULONG report_len = private->caps.InputReportByteLength; @@ -445,14 +445,14 @@ static void HID_update_state(struct xinput_controller *device, XINPUT_STATE *sta ULONG button_length, hat_value; LONG value; - if (!device->enabled) return; + if (!controller->enabled) return; if (!HidD_GetInputReport(private->device, report_buf[0], report_len)) { if (GetLastError() == ERROR_ACCESS_DENIED || GetLastError() == ERROR_INVALID_HANDLE) { EnterCriticalSection(&xinput_crit); - remove_gamepad(device); + remove_gamepad(controller); LeaveCriticalSection(&xinput_crit); } else ERR("Failed to get input report, HidD_GetInputReport failed with error %u\n", GetLastError()); @@ -461,27 +461,27 @@ static void HID_update_state(struct xinput_controller *device, XINPUT_STATE *sta if (memcmp(report_buf[0], report_buf[1], report_len) != 0) { - device->state.dwPacketNumber++; + controller->state.dwPacketNumber++; button_length = ARRAY_SIZE(buttons); status = HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_BUTTON, 0, buttons, &button_length, private->preparsed, report_buf[0], report_len); if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetUsages HID_USAGE_PAGE_BUTTON returned %#x\n", status); - device->state.Gamepad.wButtons = 0; + controller->state.Gamepad.wButtons = 0; for (i = 0; i < button_length; i++) { switch (buttons[i]) { - case 1: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_A; break; - case 2: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_B; break; - case 3: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_X; break; - case 4: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_Y; break; - case 5: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_LEFT_SHOULDER; break; - case 6: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_RIGHT_SHOULDER; break; - case 7: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_BACK; break; - case 8: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_START; break; - case 9: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_LEFT_THUMB; break; - case 10: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_RIGHT_THUMB; break; - case 11: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_GUIDE; break; + case 1: controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_A; break; + case 2: controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_B; break; + case 3: controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_X; break; + case 4: controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_Y; break; + case 5: controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_LEFT_SHOULDER; break; + case 6: controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_RIGHT_SHOULDER; break; + case 7: controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_BACK; break; + case 8: controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_START; break; + case 9: controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_LEFT_THUMB; break; + case 10: controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_RIGHT_THUMB; break; + case 11: controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_GUIDE; break; } } @@ -496,81 +496,81 @@ static void HID_update_state(struct xinput_controller *device, XINPUT_STATE *sta case 0: break; case 1: - device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_UP; + controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_UP; break; case 2: - device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_UP | XINPUT_GAMEPAD_DPAD_RIGHT; + controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_UP | XINPUT_GAMEPAD_DPAD_RIGHT; break; case 3: - device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_RIGHT; + controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_RIGHT; break; case 4: - device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_RIGHT | XINPUT_GAMEPAD_DPAD_DOWN; + controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_RIGHT | XINPUT_GAMEPAD_DPAD_DOWN; break; case 5: - device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_DOWN; + controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_DOWN; break; case 6: - device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_DOWN | XINPUT_GAMEPAD_DPAD_LEFT; + controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_DOWN | XINPUT_GAMEPAD_DPAD_LEFT; break; case 7: - device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_LEFT; + controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_LEFT; break; case 8: - device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_LEFT | XINPUT_GAMEPAD_DPAD_UP; + controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_LEFT | XINPUT_GAMEPAD_DPAD_UP; break; } } status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, &value, private->preparsed, report_buf[0], report_len); if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetScaledUsageValue HID_USAGE_PAGE_GENERIC / HID_USAGE_GENERIC_X returned %#x\n", status); - else device->state.Gamepad.sThumbLX = scale_short(value, &private->lx); + else controller->state.Gamepad.sThumbLX = scale_short(value, &private->lx); status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Y, &value, private->preparsed, report_buf[0], report_len); if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetScaledUsageValue HID_USAGE_PAGE_GENERIC / HID_USAGE_GENERIC_Y returned %#x\n", status); - else device->state.Gamepad.sThumbLY = -scale_short(value, &private->ly) - 1; + else controller->state.Gamepad.sThumbLY = -scale_short(value, &private->ly) - 1; status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RX, &value, private->preparsed, report_buf[0], report_len); if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetScaledUsageValue HID_USAGE_PAGE_GENERIC / HID_USAGE_GENERIC_RX returned %#x\n", status); - else device->state.Gamepad.sThumbRX = scale_short(value, &private->rx); + else controller->state.Gamepad.sThumbRX = scale_short(value, &private->rx); status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, &value, private->preparsed, report_buf[0], report_len); if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetScaledUsageValue HID_USAGE_PAGE_GENERIC / HID_USAGE_GENERIC_RY returned %#x\n", status); - else device->state.Gamepad.sThumbRY = -scale_short(value, &private->ry) - 1; + else controller->state.Gamepad.sThumbRY = -scale_short(value, &private->ry) - 1; status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RZ, &value, private->preparsed, report_buf[0], report_len); if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetScaledUsageValue HID_USAGE_PAGE_GENERIC / HID_USAGE_GENERIC_RZ returned %#x\n", status); - else device->state.Gamepad.bRightTrigger = scale_byte(value, &private->rtrigger); + else controller->state.Gamepad.bRightTrigger = scale_byte(value, &private->rtrigger); status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, &value, private->preparsed, report_buf[0], report_len); if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetScaledUsageValue HID_USAGE_PAGE_GENERIC / HID_USAGE_GENERIC_Z returned %#x\n", status); - else device->state.Gamepad.bLeftTrigger = scale_byte(value, &private->ltrigger); + else controller->state.Gamepad.bLeftTrigger = scale_byte(value, &private->ltrigger); } tmp = report_buf[0]; report_buf[0] = report_buf[1]; report_buf[1] = tmp; - memcpy(state, &device->state, sizeof(*state)); + memcpy(state, &controller->state, sizeof(*state)); } -static BOOL verify_and_lock_device(struct xinput_controller *device) +static BOOL verify_and_lock_device(struct xinput_controller *controller) { - if (!device->platform_private) return FALSE; + if (!controller->platform_private) return FALSE; - EnterCriticalSection(&device->crit); + EnterCriticalSection(&controller->crit); - if (!device->platform_private) + if (!controller->platform_private) { - LeaveCriticalSection(&device->crit); + LeaveCriticalSection(&controller->crit); return FALSE; } return TRUE; } -static void unlock_device(struct xinput_controller *device) +static void unlock_device(struct xinput_controller *controller) { - LeaveCriticalSection(&device->crit); + LeaveCriticalSection(&controller->crit); } BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) @@ -768,7 +768,7 @@ static BOOL trigger_is_on(const BYTE value) static DWORD check_for_keystroke(const DWORD index, XINPUT_KEYSTROKE *keystroke) { - struct xinput_controller *device = &controllers[index]; + struct xinput_controller *controller = &controllers[index]; const XINPUT_GAMEPAD *cur; DWORD ret = ERROR_EMPTY; int i; @@ -795,26 +795,26 @@ static DWORD check_for_keystroke(const DWORD index, XINPUT_KEYSTROKE *keystroke) /* note: guide button does not send an event */ }; - if (!verify_and_lock_device(device)) return ERROR_DEVICE_NOT_CONNECTED; + if (!verify_and_lock_device(controller)) return ERROR_DEVICE_NOT_CONNECTED; - cur = &device->state.Gamepad; + cur = &controller->state.Gamepad; /*** buttons ***/ for (i = 0; i < ARRAY_SIZE(buttons); ++i) { - if ((cur->wButtons & buttons[i].mask) ^ (device->last_keystroke.wButtons & buttons[i].mask)) + if ((cur->wButtons & buttons[i].mask) ^ (controller->last_keystroke.wButtons & buttons[i].mask)) { keystroke->VirtualKey = buttons[i].vk; keystroke->Unicode = 0; /* unused */ if (cur->wButtons & buttons[i].mask) { keystroke->Flags = XINPUT_KEYSTROKE_KEYDOWN; - device->last_keystroke.wButtons |= buttons[i].mask; + controller->last_keystroke.wButtons |= buttons[i].mask; } else { keystroke->Flags = XINPUT_KEYSTROKE_KEYUP; - device->last_keystroke.wButtons &= ~buttons[i].mask; + controller->last_keystroke.wButtons &= ~buttons[i].mask; } keystroke->UserIndex = index; keystroke->HidCode = 0; @@ -824,45 +824,45 @@ static DWORD check_for_keystroke(const DWORD index, XINPUT_KEYSTROKE *keystroke) } /*** triggers ***/ - if (trigger_is_on(cur->bLeftTrigger) ^ trigger_is_on(device->last_keystroke.bLeftTrigger)) + if (trigger_is_on(cur->bLeftTrigger) ^ trigger_is_on(controller->last_keystroke.bLeftTrigger)) { keystroke->VirtualKey = VK_PAD_LTRIGGER; keystroke->Unicode = 0; /* unused */ keystroke->Flags = trigger_is_on(cur->bLeftTrigger) ? XINPUT_KEYSTROKE_KEYDOWN : XINPUT_KEYSTROKE_KEYUP; keystroke->UserIndex = index; keystroke->HidCode = 0; - device->last_keystroke.bLeftTrigger = cur->bLeftTrigger; + controller->last_keystroke.bLeftTrigger = cur->bLeftTrigger; ret = ERROR_SUCCESS; goto done; } - if (trigger_is_on(cur->bRightTrigger) ^ trigger_is_on(device->last_keystroke.bRightTrigger)) + if (trigger_is_on(cur->bRightTrigger) ^ trigger_is_on(controller->last_keystroke.bRightTrigger)) { keystroke->VirtualKey = VK_PAD_RTRIGGER; keystroke->Unicode = 0; /* unused */ keystroke->Flags = trigger_is_on(cur->bRightTrigger) ? XINPUT_KEYSTROKE_KEYDOWN : XINPUT_KEYSTROKE_KEYUP; keystroke->UserIndex = index; keystroke->HidCode = 0; - device->last_keystroke.bRightTrigger = cur->bRightTrigger; + controller->last_keystroke.bRightTrigger = cur->bRightTrigger; ret = ERROR_SUCCESS; goto done; } /*** joysticks ***/ ret = check_joystick_keystroke(index, keystroke, &cur->sThumbLX, &cur->sThumbLY, - &device->last_keystroke.sThumbLX, - &device->last_keystroke.sThumbLY, VK_PAD_LTHUMB_UP); + &controller->last_keystroke.sThumbLX, + &controller->last_keystroke.sThumbLY, VK_PAD_LTHUMB_UP); if (ret == ERROR_SUCCESS) goto done; ret = check_joystick_keystroke(index, keystroke, &cur->sThumbRX, &cur->sThumbRY, - &device->last_keystroke.sThumbRX, - &device->last_keystroke.sThumbRY, VK_PAD_RTHUMB_UP); + &controller->last_keystroke.sThumbRX, + &controller->last_keystroke.sThumbRY, VK_PAD_RTHUMB_UP); if (ret == ERROR_SUCCESS) goto done; done: - unlock_device(device); + unlock_device(controller); return ret; } -- 2.32.0

1 4

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

09 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/ifenum.c | 671 +--------------------------------- dlls/iphlpapi/ifenum.h | 42 --- dlls/iphlpapi/iphlpapi_main.c | 647 ++++++++++++-------------------- 3 files changed, 233 insertions(+), 1127 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index 8108c7ff8c2..9cb576f86fd 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -122,7 +122,7 @@ static BOOL isLoopbackInterface(int fd, const char *name) /* The comments say MAX_ADAPTER_NAME is required, but really only IF_NAMESIZE * bytes are necessary. */ -char *getInterfaceNameByIndex(IF_INDEX index, char *name) +static char *getInterfaceNameByIndex(IF_INDEX index, char *name) { return if_indextoname(index, name); } @@ -146,7 +146,7 @@ DWORD getInterfaceIndexByName(const char *name, IF_INDEX *index) return ret; } -BOOL isIfIndexLoopback(ULONG idx) +static BOOL isIfIndexLoopback(ULONG idx) { BOOL ret = FALSE; char name[IFNAMSIZ]; @@ -394,670 +394,3 @@ DWORD get_interface_indices( BOOL skip_loopback, InterfaceIndexTable **table ) } #endif -static DWORD getInterfaceBCastAddrByName(const char *name) -{ - DWORD ret = INADDR_ANY; - - if (name) { - int fd = socket(PF_INET, SOCK_DGRAM, 0); - - if (fd != -1) { - struct ifreq ifr; - - lstrcpynA(ifr.ifr_name, name, IFNAMSIZ); - if (ioctl(fd, SIOCGIFBRDADDR, &ifr) == 0) - memcpy(&ret, ifr.ifr_addr.sa_data + 2, sizeof(DWORD)); - close(fd); - } - } - return ret; -} - -static DWORD getInterfaceMaskByName(const char *name) -{ - DWORD ret = INADDR_NONE; - - if (name) { - int fd = socket(PF_INET, SOCK_DGRAM, 0); - - if (fd != -1) { - struct ifreq ifr; - - lstrcpynA(ifr.ifr_name, name, IFNAMSIZ); - if (ioctl(fd, SIOCGIFNETMASK, &ifr) == 0) - memcpy(&ret, ifr.ifr_addr.sa_data + 2, sizeof(DWORD)); - close(fd); - } - } - return ret; -} - -#if defined (SIOCGIFHWADDR) && defined (HAVE_STRUCT_IFREQ_IFR_HWADDR) -static DWORD getInterfacePhysicalByName(const char *name, PDWORD len, PBYTE addr, - PDWORD type) -{ - DWORD ret; - int fd; - - if (!name || !len || !addr || !type) - return ERROR_INVALID_PARAMETER; - - fd = socket(PF_INET, SOCK_DGRAM, 0); - if (fd != -1) { - struct ifreq ifr; - - memset(&ifr, 0, sizeof(struct ifreq)); - lstrcpynA(ifr.ifr_name, name, IFNAMSIZ); - if ((ioctl(fd, SIOCGIFHWADDR, &ifr))) - ret = ERROR_INVALID_DATA; - else { - unsigned int addrLen; - - switch (ifr.ifr_hwaddr.sa_family) - { -#ifdef ARPHRD_LOOPBACK - case ARPHRD_LOOPBACK: - addrLen = 0; - *type = MIB_IF_TYPE_LOOPBACK; - break; -#endif -#ifdef ARPHRD_ETHER - case ARPHRD_ETHER: - addrLen = ETH_ALEN; - *type = MIB_IF_TYPE_ETHERNET; - break; -#endif -#ifdef ARPHRD_FDDI - case ARPHRD_FDDI: - addrLen = ETH_ALEN; - *type = MIB_IF_TYPE_FDDI; - break; -#endif -#ifdef ARPHRD_IEEE802 - case ARPHRD_IEEE802: /* 802.2 Ethernet && Token Ring, guess TR? */ - addrLen = ETH_ALEN; - *type = MIB_IF_TYPE_TOKENRING; - break; -#endif -#ifdef ARPHRD_IEEE802_TR - case ARPHRD_IEEE802_TR: /* also Token Ring? */ - addrLen = ETH_ALEN; - *type = MIB_IF_TYPE_TOKENRING; - break; -#endif -#ifdef ARPHRD_SLIP - case ARPHRD_SLIP: - addrLen = 0; - *type = MIB_IF_TYPE_SLIP; - break; -#endif -#ifdef ARPHRD_PPP - case ARPHRD_PPP: - addrLen = 0; - *type = MIB_IF_TYPE_PPP; - break; -#endif - default: - addrLen = 0; - *type = MIB_IF_TYPE_OTHER; - } - if (addrLen > *len) { - ret = ERROR_INSUFFICIENT_BUFFER; - *len = addrLen; - } - else { - if (addrLen > 0) - memcpy(addr, ifr.ifr_hwaddr.sa_data, addrLen); - /* zero out remaining bytes for broken implementations */ - memset(addr + addrLen, 0, *len - addrLen); - *len = addrLen; - ret = NO_ERROR; - } - } - close(fd); - } - else - ret = ERROR_NO_MORE_FILES; - return ret; -} -#elif defined (SIOCGARP) -static DWORD getInterfacePhysicalByName(const char *name, PDWORD len, PBYTE addr, - PDWORD type) -{ - DWORD ret; - int fd; - - if (!name || !len || !addr || !type) - return ERROR_INVALID_PARAMETER; - - fd = socket(PF_INET, SOCK_DGRAM, 0); - if (fd != -1) { - if (isLoopbackInterface(fd, name)) { - *type = MIB_IF_TYPE_LOOPBACK; - memset(addr, 0, *len); - *len = 0; - ret=NOERROR; - } - else { - struct arpreq arp; - struct sockaddr_in *saddr; - struct ifreq ifr; - - /* get IP addr */ - lstrcpynA(ifr.ifr_name, name, IFNAMSIZ); - ioctl(fd, SIOCGIFADDR, &ifr); - memset(&arp, 0, sizeof(struct arpreq)); - arp.arp_pa.sa_family = AF_INET; - saddr = (struct sockaddr_in *)&arp; /* proto addr is first member */ - saddr->sin_family = AF_INET; - memcpy(&saddr->sin_addr.s_addr, ifr.ifr_addr.sa_data + 2, sizeof(DWORD)); - if ((ioctl(fd, SIOCGARP, &arp))) - ret = ERROR_INVALID_DATA; - else { - /* FIXME: heh: who said it was ethernet? */ - int addrLen = ETH_ALEN; - - if (addrLen > *len) { - ret = ERROR_INSUFFICIENT_BUFFER; - *len = addrLen; - } - else { - if (addrLen > 0) - memcpy(addr, &arp.arp_ha.sa_data[0], addrLen); - /* zero out remaining bytes for broken implementations */ - memset(addr + addrLen, 0, *len - addrLen); - *len = addrLen; - *type = MIB_IF_TYPE_ETHERNET; - ret = NO_ERROR; - } - } - } - close(fd); - } - else - ret = ERROR_NO_MORE_FILES; - - return ret; -} -#elif defined (HAVE_SYS_SYSCTL_H) && defined (HAVE_NET_IF_DL_H) -static DWORD getInterfacePhysicalByName(const char *name, PDWORD len, PBYTE addr, - PDWORD type) -{ - DWORD ret; - struct if_msghdr *ifm; - struct sockaddr_dl *sdl; - u_char *p, *buf; - size_t mibLen; - int mib[] = { CTL_NET, AF_ROUTE, 0, AF_LINK, NET_RT_IFLIST, 0 }; - unsigned addrLen; - BOOL found = FALSE; - - if (!name || !len || !addr || !type) - return ERROR_INVALID_PARAMETER; - - if (sysctl(mib, 6, NULL, &mibLen, NULL, 0) < 0) - return ERROR_NO_MORE_FILES; - - buf = HeapAlloc(GetProcessHeap(), 0, mibLen); - if (!buf) - return ERROR_NOT_ENOUGH_MEMORY; - - if (sysctl(mib, 6, buf, &mibLen, NULL, 0) < 0) { - HeapFree(GetProcessHeap(), 0, buf); - return ERROR_NO_MORE_FILES; - } - - ret = ERROR_INVALID_DATA; - for (p = buf; !found && p < buf + mibLen; p += ifm->ifm_msglen) { - ifm = (struct if_msghdr *)p; - sdl = (struct sockaddr_dl *)(ifm + 1); - - if (ifm->ifm_type != RTM_IFINFO || (ifm->ifm_addrs & RTA_IFP) == 0) - continue; - - if (sdl->sdl_family != AF_LINK || sdl->sdl_nlen == 0 || - memcmp(sdl->sdl_data, name, max(sdl->sdl_nlen, strlen(name))) != 0) - continue; - - found = TRUE; - addrLen = min(MAX_INTERFACE_PHYSADDR, sdl->sdl_alen); - if (addrLen > *len) { - ret = ERROR_INSUFFICIENT_BUFFER; - *len = addrLen; - } - else { - if (addrLen > 0) - memcpy(addr, LLADDR(sdl), addrLen); - /* zero out remaining bytes for broken implementations */ - memset(addr + addrLen, 0, *len - addrLen); - *len = addrLen; -#if defined(HAVE_NET_IF_TYPES_H) - switch (sdl->sdl_type) - { - case IFT_ETHER: - *type = MIB_IF_TYPE_ETHERNET; - break; - case IFT_FDDI: - *type = MIB_IF_TYPE_FDDI; - break; - case IFT_ISO88024: /* Token Bus */ - *type = MIB_IF_TYPE_TOKENRING; - break; - case IFT_ISO88025: /* Token Ring */ - *type = MIB_IF_TYPE_TOKENRING; - break; - case IFT_PPP: - *type = MIB_IF_TYPE_PPP; - break; - case IFT_SLIP: - *type = MIB_IF_TYPE_SLIP; - break; - case IFT_LOOP: - *type = MIB_IF_TYPE_LOOPBACK; - break; - default: - *type = MIB_IF_TYPE_OTHER; - } -#else - /* default if we don't know */ - *type = MIB_IF_TYPE_ETHERNET; -#endif - ret = NO_ERROR; - } - } - HeapFree(GetProcessHeap(), 0, buf); - return ret; -} -#endif - -DWORD getInterfacePhysicalByIndex(IF_INDEX index, PDWORD len, PBYTE addr, - PDWORD type) -{ - char nameBuf[IF_NAMESIZE]; - char *name = getInterfaceNameByIndex(index, nameBuf); - - if (name) - return getInterfacePhysicalByName(name, len, addr, type); - else - return ERROR_INVALID_DATA; -} - -DWORD getInterfaceMtuByName(const char *name, PDWORD mtu) -{ - DWORD ret; - int fd; - - if (!name) - return ERROR_INVALID_PARAMETER; - if (!mtu) - return ERROR_INVALID_PARAMETER; - - fd = socket(PF_INET, SOCK_DGRAM, 0); - if (fd != -1) { - struct ifreq ifr; - - lstrcpynA(ifr.ifr_name, name, IFNAMSIZ); - if ((ioctl(fd, SIOCGIFMTU, &ifr))) - ret = ERROR_INVALID_DATA; - else { -#ifndef __sun - *mtu = ifr.ifr_mtu; -#else - *mtu = ifr.ifr_metric; -#endif - ret = NO_ERROR; - } - close(fd); - } - else - ret = ERROR_NO_MORE_FILES; - return ret; -} - -DWORD getInterfaceStatusByName(const char *name, INTERNAL_IF_OPER_STATUS *status) -{ - DWORD ret; - int fd; - - if (!name) - return ERROR_INVALID_PARAMETER; - if (!status) - return ERROR_INVALID_PARAMETER; - - fd = socket(PF_INET, SOCK_DGRAM, 0); - if (fd != -1) { - struct ifreq ifr; - - lstrcpynA(ifr.ifr_name, name, IFNAMSIZ); - if ((ioctl(fd, SIOCGIFFLAGS, &ifr))) - ret = ERROR_INVALID_DATA; - else { - if (ifr.ifr_flags & IFF_UP) - *status = MIB_IF_OPER_STATUS_OPERATIONAL; - else - *status = MIB_IF_OPER_STATUS_NON_OPERATIONAL; - ret = NO_ERROR; - } - close(fd); - } - else - ret = ERROR_NO_MORE_FILES; - return ret; -} - -static DWORD getIPAddrRowByName(PMIB_IPADDRROW ipAddrRow, const char *ifName, - const struct sockaddr *sa) -{ - DWORD ret, bcast; - - ret = getInterfaceIndexByName(ifName, &ipAddrRow->dwIndex); - memcpy(&ipAddrRow->dwAddr, sa->sa_data + 2, sizeof(DWORD)); - ipAddrRow->dwMask = getInterfaceMaskByName(ifName); - /* the dwBCastAddr member isn't the broadcast address, it indicates whether - * the interface uses the 1's broadcast address (1) or the 0's broadcast - * address (0). - */ - bcast = getInterfaceBCastAddrByName(ifName); - ipAddrRow->dwBCastAddr = (bcast & ipAddrRow->dwMask) ? 1 : 0; - /* FIXME: hardcoded reasm size, not sure where to get it */ - ipAddrRow->dwReasmSize = 65535; - ipAddrRow->unused1 = 0; - /* wType is a bit field composed of MIB_IPADDR_* flags. Windows <= XP seems - * to like returning undocumented values 0x20 + 0x02 but for our current - * needs returning MIB_IPADDR_PRIMARY is enough. - */ - ipAddrRow->wType = MIB_IPADDR_PRIMARY; - return ret; -} - -#if defined(HAVE_IFADDRS_H) && defined(HAVE_GETIFADDRS) - -/* Counts the IPv4 addresses in the system using the return value from - * getifaddrs, returning the count. - */ -static DWORD countIPv4Addresses(struct ifaddrs *ifa) -{ - DWORD numAddresses = 0; - - for (; ifa; ifa = ifa->ifa_next) - if (ifa->ifa_addr && ifa->ifa_addr->sa_family == AF_INET) - numAddresses++; - return numAddresses; -} - -DWORD getNumIPAddresses(void) -{ - DWORD numAddresses = 0; - struct ifaddrs *ifa; - - if (!getifaddrs(&ifa)) - { - numAddresses = countIPv4Addresses(ifa); - freeifaddrs(ifa); - } - return numAddresses; -} - -DWORD getIPAddrTable(PMIB_IPADDRTABLE *ppIpAddrTable, HANDLE heap, DWORD flags) -{ - DWORD ret; - - if (!ppIpAddrTable) - ret = ERROR_INVALID_PARAMETER; - else - { - struct ifaddrs *ifa; - - if (!getifaddrs(&ifa)) - { - DWORD size = sizeof(MIB_IPADDRTABLE); - DWORD numAddresses = countIPv4Addresses(ifa); - - if (numAddresses > 1) - size += (numAddresses - 1) * sizeof(MIB_IPADDRROW); - *ppIpAddrTable = HeapAlloc(heap, flags, size); - if (*ppIpAddrTable) - { - DWORD i = 0; - struct ifaddrs *ifp; - - ret = NO_ERROR; - (*ppIpAddrTable)->dwNumEntries = numAddresses; - for (ifp = ifa; !ret && ifp; ifp = ifp->ifa_next) - { - if (!ifp->ifa_addr || ifp->ifa_addr->sa_family != AF_INET) - continue; - - ret = getIPAddrRowByName(&(*ppIpAddrTable)->table[i], ifp->ifa_name, - ifp->ifa_addr); - i++; - } - if (ret) - HeapFree(GetProcessHeap(), 0, *ppIpAddrTable); - } - else - ret = ERROR_OUTOFMEMORY; - freeifaddrs(ifa); - } - else - ret = ERROR_INVALID_PARAMETER; - } - return ret; -} - -ULONG v6addressesFromIndex(IF_INDEX index, SOCKET_ADDRESS **addrs, ULONG *num_addrs, SOCKET_ADDRESS **masks) -{ - struct ifaddrs *ifa; - ULONG ret; - - if (!getifaddrs(&ifa)) - { - struct ifaddrs *p; - ULONG n; - char name[IFNAMSIZ]; - - getInterfaceNameByIndex(index, name); - for (p = ifa, n = 0; p; p = p->ifa_next) - if (p->ifa_addr && p->ifa_addr->sa_family == AF_INET6 && - !strcmp(name, p->ifa_name)) - n++; - if (n) - { - *addrs = HeapAlloc(GetProcessHeap(), 0, n * (sizeof(SOCKET_ADDRESS) + - sizeof(struct WS_sockaddr_in6))); - *masks = HeapAlloc(GetProcessHeap(), 0, n * (sizeof(SOCKET_ADDRESS) + - sizeof(struct WS_sockaddr_in6))); - if (*addrs && *masks) - { - struct WS_sockaddr_in6 *next_addr = (struct WS_sockaddr_in6 *)( - (BYTE *)*addrs + n * sizeof(SOCKET_ADDRESS)); - struct WS_sockaddr_in6 *mask_addr = (struct WS_sockaddr_in6 *)( - (BYTE *)*masks + n * sizeof(SOCKET_ADDRESS)); - - for (p = ifa, n = 0; p; p = p->ifa_next) - { - if (p->ifa_addr && p->ifa_addr->sa_family == AF_INET6 && - !strcmp(name, p->ifa_name)) - { - struct sockaddr_in6 *addr = (struct sockaddr_in6 *)p->ifa_addr; - struct sockaddr_in6 *mask = (struct sockaddr_in6 *)p->ifa_netmask; - - next_addr->sin6_family = WS_AF_INET6; - next_addr->sin6_port = addr->sin6_port; - next_addr->sin6_flowinfo = addr->sin6_flowinfo; - memcpy(&next_addr->sin6_addr, &addr->sin6_addr, - sizeof(next_addr->sin6_addr)); - next_addr->sin6_scope_id = addr->sin6_scope_id; - (*addrs)[n].lpSockaddr = (LPSOCKADDR)next_addr; - (*addrs)[n].iSockaddrLength = sizeof(struct WS_sockaddr_in6); - next_addr++; - - mask_addr->sin6_family = WS_AF_INET6; - mask_addr->sin6_port = mask->sin6_port; - mask_addr->sin6_flowinfo = mask->sin6_flowinfo; - memcpy(&mask_addr->sin6_addr, &mask->sin6_addr, - sizeof(mask_addr->sin6_addr)); - mask_addr->sin6_scope_id = mask->sin6_scope_id; - (*masks)[n].lpSockaddr = (LPSOCKADDR)mask_addr; - (*masks)[n].iSockaddrLength = sizeof(struct WS_sockaddr_in6); - mask_addr++; - n++; - } - } - *num_addrs = n; - ret = ERROR_SUCCESS; - } - else - { - HeapFree(GetProcessHeap(), 0, *addrs); - HeapFree(GetProcessHeap(), 0, *masks); - ret = ERROR_OUTOFMEMORY; - } - } - else - { - *addrs = NULL; - *num_addrs = 0; - *masks = NULL; - ret = ERROR_SUCCESS; - } - freeifaddrs(ifa); - } - else - ret = ERROR_NO_DATA; - return ret; -} - -#else - -/* Enumerates the IP addresses in the system using SIOCGIFCONF, returning - * the count to you in *pcAddresses. It also returns to you the struct ifconf - * used by the call to ioctl, so that you may process the addresses further. - * Free ifc->ifc_buf using HeapFree. - * Returns NO_ERROR on success, something else on failure. - */ -static DWORD enumIPAddresses(PDWORD pcAddresses, struct ifconf *ifc) -{ - DWORD ret; - int fd; - - fd = socket(PF_INET, SOCK_DGRAM, 0); - if (fd != -1) { - int ioctlRet = 0; - DWORD guessedNumAddresses = 0, numAddresses = 0; - caddr_t ifPtr; - int lastlen; - - ret = NO_ERROR; - ifc->ifc_len = 0; - ifc->ifc_buf = NULL; - /* there is no way to know the interface count beforehand, - so we need to loop again and again upping our max each time - until returned is constant across 2 calls */ - do { - lastlen = ifc->ifc_len; - HeapFree(GetProcessHeap(), 0, ifc->ifc_buf); - if (guessedNumAddresses == 0) - guessedNumAddresses = INITIAL_INTERFACES_ASSUMED; - else - guessedNumAddresses *= 2; - ifc->ifc_len = sizeof(struct ifreq) * guessedNumAddresses; - ifc->ifc_buf = HeapAlloc(GetProcessHeap(), 0, ifc->ifc_len); - ioctlRet = ioctl(fd, SIOCGIFCONF, ifc); - } while ((ioctlRet == 0) && (ifc->ifc_len != lastlen)); - - if (ioctlRet == 0) { - ifPtr = ifc->ifc_buf; - while (ifPtr && (char *)ifPtr < ifc->ifc_buf + ifc->ifc_len) { - struct ifreq *ifr = (struct ifreq *)ifPtr; - - if (ifr->ifr_addr.sa_family == AF_INET) - numAddresses++; - - ifPtr = (char *)ifPtr + ifreq_len((struct ifreq *)ifPtr); - } - } - else - ret = ERROR_INVALID_PARAMETER; /* FIXME: map from errno to Win32 */ - if (!ret) - *pcAddresses = numAddresses; - else - { - HeapFree(GetProcessHeap(), 0, ifc->ifc_buf); - ifc->ifc_buf = NULL; - } - close(fd); - } - else - ret = ERROR_NO_SYSTEM_RESOURCES; - return ret; -} - -DWORD getNumIPAddresses(void) -{ - DWORD numAddresses = 0; - struct ifconf ifc; - - if (!enumIPAddresses(&numAddresses, &ifc)) - HeapFree(GetProcessHeap(), 0, ifc.ifc_buf); - return numAddresses; -} - -DWORD getIPAddrTable(PMIB_IPADDRTABLE *ppIpAddrTable, HANDLE heap, DWORD flags) -{ - DWORD ret; - - if (!ppIpAddrTable) - ret = ERROR_INVALID_PARAMETER; - else - { - DWORD numAddresses = 0; - struct ifconf ifc; - - ret = enumIPAddresses(&numAddresses, &ifc); - if (!ret) - { - DWORD size = sizeof(MIB_IPADDRTABLE); - - if (numAddresses > 1) - size += (numAddresses - 1) * sizeof(MIB_IPADDRROW); - *ppIpAddrTable = HeapAlloc(heap, flags, size); - if (*ppIpAddrTable) { - DWORD i = 0; - caddr_t ifPtr; - - ret = NO_ERROR; - (*ppIpAddrTable)->dwNumEntries = numAddresses; - ifPtr = ifc.ifc_buf; - while (!ret && ifPtr && (char *)ifPtr < ifc.ifc_buf + ifc.ifc_len) { - struct ifreq *ifr = (struct ifreq *)ifPtr; - - ifPtr = (char *)ifPtr + ifreq_len(ifr); - - if (ifr->ifr_addr.sa_family != AF_INET) - continue; - - ret = getIPAddrRowByName(&(*ppIpAddrTable)->table[i], ifr->ifr_name, - &ifr->ifr_addr); - i++; - } - if (ret) - HeapFree(GetProcessHeap(), 0, *ppIpAddrTable); - } - else - ret = ERROR_OUTOFMEMORY; - HeapFree(GetProcessHeap(), 0, ifc.ifc_buf); - } - } - return ret; -} - -ULONG v6addressesFromIndex(IF_INDEX index, SOCKET_ADDRESS **addrs, ULONG *num_addrs, SOCKET_ADDRESS **masks) -{ - *addrs = NULL; - *num_addrs = 0; - *masks = NULL; - return ERROR_SUCCESS; -} - -#endif diff --git a/dlls/iphlpapi/ifenum.h b/dlls/iphlpapi/ifenum.h index d0143eaaf69..710b493ad36 100644 --- a/dlls/iphlpapi/ifenum.h +++ b/dlls/iphlpapi/ifenum.h @@ -44,8 +44,6 @@ #define MAX_INTERFACE_PHYSADDR 8 #define MAX_INTERFACE_DESCRIPTION 256 -BOOL isIfIndexLoopback(ULONG idx) DECLSPEC_HIDDEN; - /* A table of interface indexes, see get_interface_indices(). */ typedef struct _InterfaceIndexTable { DWORD numIndexes; @@ -59,50 +57,10 @@ DWORD get_interface_indices( BOOL skip_loopback, InterfaceIndexTable **table ) D /* ByName/ByIndex versions of various getter functions. */ -/* can be used as quick check to see if you've got a valid index, returns NULL - * if not. Overwrites your buffer, which should be at least of size - * MAX_ADAPTER_NAME. - */ -char *getInterfaceNameByIndex(IF_INDEX index, char *name) DECLSPEC_HIDDEN; - /* Fills index with the index of name, if found. Returns * ERROR_INVALID_PARAMETER if name or index is NULL, ERROR_INVALID_DATA if name * is not found, and NO_ERROR on success. */ DWORD getInterfaceIndexByName(const char *name, IF_INDEX *index) DECLSPEC_HIDDEN; -/* Gets a few physical characteristics of a device: MAC addr len, MAC addr, - * and type as one of the MIB_IF_TYPEs. - * len's in-out: on in, needs to say how many bytes are available in addr, - * which to be safe should be MAX_INTERFACE_PHYSADDR. On out, it's how many - * bytes were set, or how many were required if addr isn't big enough. - * Returns ERROR_INVALID_PARAMETER if name, len, addr, or type is NULL. - * Returns ERROR_INVALID_DATA if name/index isn't valid. - * Returns ERROR_INSUFFICIENT_BUFFER if addr isn't large enough for the - * physical address; *len will contain the required size. - * May return other errors, e.g. ERROR_OUTOFMEMORY or ERROR_NO_MORE_FILES, - * if internal errors occur. - * Returns NO_ERROR on success. - */ -DWORD getInterfacePhysicalByIndex(IF_INDEX index, PDWORD len, PBYTE addr, - PDWORD type) DECLSPEC_HIDDEN; - -DWORD getNumIPAddresses(void) DECLSPEC_HIDDEN; - -/* Gets the configured IP addresses for the system, and sets *ppIpAddrTable to - * a table of them allocated from heap, or NULL if out of memory. Returns - * NO_ERROR on success, something else on failure. Note there may be more than - * one IP address may exist per interface. - */ -DWORD getIPAddrTable(PMIB_IPADDRTABLE *ppIpAddrTable, HANDLE heap, DWORD flags) DECLSPEC_HIDDEN; - -/* Returns the IPv6 addresses for a particular interface index. - * Returns NO_ERROR on success, something else on failure. - */ -ULONG v6addressesFromIndex(IF_INDEX index, SOCKET_ADDRESS **addrs, ULONG *num_addrs, - SOCKET_ADDRESS **masks) DECLSPEC_HIDDEN; - -DWORD getInterfaceMtuByName(const char *name, PDWORD mtu) DECLSPEC_HIDDEN; -DWORD getInterfaceStatusByName(const char *name, INTERNAL_IF_OPER_STATUS *status) DECLSPEC_HIDDEN; - #endif /* ndef WINE_IFENUM_H_ */ diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 22e17e06757..2700ecd3172 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -109,6 +109,15 @@ DWORD WINAPI ConvertStringToGuidW( const WCHAR *str, GUID *guid ) return RtlNtStatusToDosError( RtlGUIDFromString( &ustr, guid ) ); } +static void if_counted_string_copy( WCHAR *dst, unsigned int len, IF_COUNTED_STRING *src ) +{ + unsigned int copy = src->Length; + + if (copy >= len * sizeof(WCHAR)) copy = 0; + memcpy( dst, src->String, copy ); + memset( (char *)dst + copy, 0, len * sizeof(WCHAR) - copy ); +} + /****************************************************************** * AddIPAddress (IPHLPAPI.@) * @@ -913,129 +922,6 @@ void adapters_addresses_copy( IP_ADAPTER_ADDRESSES *dst, IP_ADAPTER_ADDRESSES *s } } -static DWORD typeFromMibType(DWORD mib_type) -{ - switch (mib_type) - { - case MIB_IF_TYPE_ETHERNET: return IF_TYPE_ETHERNET_CSMACD; - case MIB_IF_TYPE_TOKENRING: return IF_TYPE_ISO88025_TOKENRING; - case MIB_IF_TYPE_PPP: return IF_TYPE_PPP; - case MIB_IF_TYPE_LOOPBACK: return IF_TYPE_SOFTWARE_LOOPBACK; - default: return IF_TYPE_OTHER; - } -} - -static NET_IF_CONNECTION_TYPE connectionTypeFromMibType(DWORD mib_type) -{ - switch (mib_type) - { - case MIB_IF_TYPE_PPP: return NET_IF_CONNECTION_DEMAND; - case MIB_IF_TYPE_SLIP: return NET_IF_CONNECTION_DEMAND; - default: return NET_IF_CONNECTION_DEDICATED; - } -} - -static ULONG v4addressesFromIndex(IF_INDEX index, DWORD **addrs, ULONG *num_addrs, DWORD **masks) -{ - ULONG ret, i, j; - MIB_IPADDRTABLE *at; - - *num_addrs = 0; - if ((ret = getIPAddrTable(&at, GetProcessHeap(), 0))) return ret; - for (i = 0; i < at->dwNumEntries; i++) - { - if (at->table[i].dwIndex == index) (*num_addrs)++; - } - if (!(*addrs = HeapAlloc(GetProcessHeap(), 0, *num_addrs * sizeof(DWORD)))) - { - HeapFree(GetProcessHeap(), 0, at); - return ERROR_OUTOFMEMORY; - } - if (!(*masks = HeapAlloc(GetProcessHeap(), 0, *num_addrs * sizeof(DWORD)))) - { - HeapFree(GetProcessHeap(), 0, *addrs); - HeapFree(GetProcessHeap(), 0, at); - return ERROR_OUTOFMEMORY; - } - for (i = 0, j = 0; i < at->dwNumEntries; i++) - { - if (at->table[i].dwIndex == index) - { - (*addrs)[j] = at->table[i].dwAddr; - (*masks)[j] = at->table[i].dwMask; - j++; - } - } - HeapFree(GetProcessHeap(), 0, at); - return ERROR_SUCCESS; -} - -static char *debugstr_ipv4(const in_addr_t *in_addr, char *buf) -{ - const BYTE *addrp; - char *p = buf; - - for (addrp = (const BYTE *)in_addr; - addrp - (const BYTE *)in_addr < sizeof(*in_addr); - addrp++) - { - if (addrp == (const BYTE *)in_addr + sizeof(*in_addr) - 1) - sprintf(p, "%d", *addrp); - else - p += sprintf(p, "%d.", *addrp); - } - return buf; -} - -static ULONG count_v4_gateways(DWORD index, PMIB_IPFORWARDTABLE routeTable) -{ - DWORD i, num_gateways = 0; - - for (i = 0; i < routeTable->dwNumEntries; i++) - { - if (routeTable->table[i].dwForwardIfIndex == index && - routeTable->table[i].u1.ForwardType == MIB_IPROUTE_TYPE_INDIRECT) - num_gateways++; - } - return num_gateways; -} - -static DWORD mask_v4_to_prefix(DWORD m) -{ -#ifdef HAVE___BUILTIN_POPCOUNT - return __builtin_popcount(m); -#else - m -= m >> 1 & 0x55555555; - m = (m & 0x33333333) + (m >> 2 & 0x33333333); - return ((m + (m >> 4)) & 0x0f0f0f0f) * 0x01010101 >> 24; -#endif -} - -static DWORD mask_v6_to_prefix(SOCKET_ADDRESS *m) -{ - const IN6_ADDR *mask = &((struct WS_sockaddr_in6 *)m->lpSockaddr)->sin6_addr; - DWORD ret = 0, i; - - for (i = 0; i < 8; i++) - ret += mask_v4_to_prefix(mask->u.Word[i]); - return ret; -} - -static PMIB_IPFORWARDROW findIPv4Gateway(DWORD index, - PMIB_IPFORWARDTABLE routeTable) -{ - DWORD i; - PMIB_IPFORWARDROW row = NULL; - - for (i = 0; !row && i < routeTable->dwNumEntries; i++) - { - if (routeTable->table[i].dwForwardIfIndex == index && - routeTable->table[i].u1.ForwardType == MIB_IPROUTE_TYPE_INDIRECT) - row = &routeTable->table[i]; - } - return row; -} - static BOOL sockaddr_is_loopback( SOCKADDR *sock ) { if (sock->sa_family == WS_AF_INET) @@ -1067,308 +953,211 @@ static BOOL unicast_is_dns_eligible( IP_ADAPTER_UNICAST_ADDRESS *uni ) !sockaddr_is_linklocal( uni->Address.lpSockaddr ); } -static void fill_unicast_addr_data(IP_ADAPTER_ADDRESSES *aa, IP_ADAPTER_UNICAST_ADDRESS *ua) +static DWORD unicast_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG family, ULONG flags ) { - /* Actually this information should be read somewhere from the system - * but it doesn't matter much for the bugs found so far. - * This information is required for DirectPlay8 games. */ - if (aa->IfType != IF_TYPE_SOFTWARE_LOOPBACK) - { - ua->PrefixOrigin = IpPrefixOriginDhcp; - ua->SuffixOrigin = IpSuffixOriginDhcp; - } - else - { - ua->PrefixOrigin = IpPrefixOriginManual; - ua->SuffixOrigin = IpSuffixOriginManual; - } - - /* The address is not duplicated in the network */ - ua->DadState = IpDadStatePreferred; - - /* Some address life time values, required even for non-dhcp addresses */ - ua->ValidLifetime = 60000; - ua->PreferredLifetime = 60000; - ua->LeaseLifetime = 60000; - - if (unicast_is_dns_eligible( ua )) ua->u.s.Flags |= IP_ADAPTER_ADDRESS_DNS_ELIGIBLE; -} - -static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index, - IP_ADAPTER_ADDRESSES *aa, char **ptr) -{ - ULONG ret = ERROR_SUCCESS, i, j, num_v4addrs = 0, num_v4_gateways = 0, num_v6addrs = 0; - DWORD *v4addrs = NULL, *v4masks = NULL; - SOCKET_ADDRESS *v6addrs = NULL, *v6masks = NULL; - PMIB_IPFORWARDTABLE routeTable = NULL; - BOOL output_gateways; - char name[IF_NAMESIZE], *src; - WCHAR *dst; - DWORD buflen, type; - INTERNAL_IF_OPER_STATUS status; - NET_LUID luid; - GUID guid; + struct nsi_ipv4_unicast_key *key4; + struct nsi_ipv6_unicast_key *key6; + struct nsi_ip_unicast_rw *rw; + struct nsi_ip_unicast_dynamic *dyn; + struct nsi_ip_unicast_static *stat; + IP_ADAPTER_UNICAST_ADDRESS *addr, **next; + DWORD err, count, i, key_size = (family == WS_AF_INET) ? sizeof(*key4) : sizeof(*key6); + DWORD sockaddr_size = (family == WS_AF_INET) ? sizeof(SOCKADDR_IN) : sizeof(SOCKADDR_IN6); + NET_LUID *luid; + void *key; - if ((flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) || !(flags & GAA_FLAG_SKIP_UNICAST)) - { - ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, GetProcessHeap(), 0); - if (ret) return ret; - num_v4_gateways = count_v4_gateways(index, routeTable); - } - output_gateways = (flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) && (family == WS_AF_INET || family == WS_AF_UNSPEC); + err = NsiAllocateAndGetTable( 1, ip_module_id( family ), NSI_IP_UNICAST_TABLE, &key, key_size, + (void **)&rw, sizeof(*rw), (void **)&dyn, sizeof(*dyn), + (void **)&stat, sizeof(*stat), &count, 0 ); + if (err) return err; - if (family == WS_AF_INET) - { - ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs, &v4masks); - } - else if (family == WS_AF_INET6) - { - ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs, &v6masks); - } - else if (family == WS_AF_UNSPEC) - { - ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs, &v4masks); - if (!ret) ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs, &v6masks); - } - else - { - FIXME("address family %u unsupported\n", family); - ret = ERROR_NO_DATA; - } - if (ret) - { - HeapFree(GetProcessHeap(), 0, v4addrs); - HeapFree(GetProcessHeap(), 0, v4masks); - HeapFree(GetProcessHeap(), 0, v6addrs); - HeapFree(GetProcessHeap(), 0, v6masks); - HeapFree(GetProcessHeap(), 0, routeTable); - return ret; - } - if (1) + while (aa) { - memset(aa, 0, sizeof(IP_ADAPTER_ADDRESSES)); - aa->u.s.Length = sizeof(IP_ADAPTER_ADDRESSES); - aa->u.s.IfIndex = index; - - ConvertInterfaceIndexToLuid(index, &luid); - ConvertInterfaceLuidToGuid(&luid, &guid); - ConvertGuidToStringA( &guid, *ptr, CHARS_IN_GUID ); - aa->AdapterName = *ptr; - *ptr += (CHARS_IN_GUID + 1) & ~1; + for (next = &aa->FirstUnicastAddress; *next; next = &(*next)->Next) + ; - getInterfaceNameByIndex(index, name); - if (!(flags & GAA_FLAG_SKIP_FRIENDLY_NAME)) - { - aa->FriendlyName = (WCHAR *)*ptr; - for (src = name, dst = (WCHAR *)*ptr; *src; src++, dst++) - *dst = *src; - *dst++ = 0; - *ptr = (char *)dst; - } - aa->Description = (WCHAR *)ptr; - for (src = name, dst = (WCHAR *)*ptr; *src; src++, dst++) - *dst = *src; - *dst++ = 0; - *ptr = (char *)dst; - - TRACE("%s: %d IPv4 addresses, %d IPv6 addresses:\n", name, num_v4addrs, - num_v6addrs); - - buflen = MAX_INTERFACE_PHYSADDR; - getInterfacePhysicalByIndex(index, &buflen, aa->PhysicalAddress, &type); - aa->PhysicalAddressLength = buflen; - aa->IfType = typeFromMibType(type); - aa->ConnectionType = connectionTypeFromMibType(type); - ConvertInterfaceIndexToLuid( index, &aa->Luid ); - - if (output_gateways && num_v4_gateways) - { - PMIB_IPFORWARDROW adapterRow; - - if ((adapterRow = findIPv4Gateway(index, routeTable))) - { - PIP_ADAPTER_GATEWAY_ADDRESS gw; - PSOCKADDR_IN sin; - - gw = heap_alloc( sizeof(IP_ADAPTER_GATEWAY_ADDRESS) + sizeof(SOCKADDR_IN) ); - aa->FirstGatewayAddress = gw; - - gw->u.s.Length = sizeof(IP_ADAPTER_GATEWAY_ADDRESS); - sin = (PSOCKADDR_IN)(gw + 1); - sin->sin_family = WS_AF_INET; - sin->sin_port = 0; - memcpy(&sin->sin_addr, &adapterRow->dwForwardNextHop, - sizeof(DWORD)); - gw->Address.lpSockaddr = (LPSOCKADDR)sin; - gw->Address.iSockaddrLength = sizeof(SOCKADDR_IN); - gw->Next = NULL; - } - } - if (num_v4addrs && !(flags & GAA_FLAG_SKIP_UNICAST)) + for (i = 0; i < count; i++) { - IP_ADAPTER_UNICAST_ADDRESS *ua; - struct WS_sockaddr_in *sa; - aa->u1.s1.Ipv4Enabled = TRUE; - ua = aa->FirstUnicastAddress = heap_alloc_zero( sizeof(IP_ADAPTER_UNICAST_ADDRESS) + sizeof(SOCKADDR_IN) ); - for (i = 0; i < num_v4addrs; i++) + key4 = (struct nsi_ipv4_unicast_key *)key + i; + key6 = (struct nsi_ipv6_unicast_key *)key + i; + luid = (family == WS_AF_INET) ? &key4->luid : &key6->luid; + if (luid->Value != aa->Luid.Value) continue; + addr = heap_alloc_zero( sizeof(*addr) + sockaddr_size ); + if (!addr) { - char addr_buf[16]; - - memset(ua, 0, sizeof(IP_ADAPTER_UNICAST_ADDRESS)); - ua->u.s.Length = sizeof(IP_ADAPTER_UNICAST_ADDRESS); - ua->Address.iSockaddrLength = sizeof(struct sockaddr_in); - ua->Address.lpSockaddr = (SOCKADDR *)(ua + 1); - - sa = (struct WS_sockaddr_in *)ua->Address.lpSockaddr; - sa->sin_family = WS_AF_INET; - sa->sin_addr.S_un.S_addr = v4addrs[i]; - sa->sin_port = 0; - TRACE("IPv4 %d/%d: %s\n", i + 1, num_v4addrs, - debugstr_ipv4(&sa->sin_addr.S_un.S_addr, addr_buf)); - fill_unicast_addr_data(aa, ua); - - ua->OnLinkPrefixLength = mask_v4_to_prefix(v4masks[i]); - - if (i < num_v4addrs - 1) - { - ua->Next = heap_alloc_zero( sizeof(IP_ADAPTER_UNICAST_ADDRESS) + sizeof(SOCKADDR_IN) ); - ua = ua->Next; - } + err = ERROR_NOT_ENOUGH_MEMORY; + goto err; } - } - if (num_v6addrs && !(flags & GAA_FLAG_SKIP_UNICAST)) - { - IP_ADAPTER_UNICAST_ADDRESS *ua; - struct WS_sockaddr_in6 *sa; - - aa->u1.s1.Ipv6Enabled = TRUE; - if (aa->FirstUnicastAddress) + addr->u.s.Length = sizeof(*addr); + addr->Address.lpSockaddr = (SOCKADDR *)(addr + 1); + addr->Address.iSockaddrLength = sockaddr_size; + addr->Address.lpSockaddr->sa_family = family; + if (family == WS_AF_INET) { - for (ua = aa->FirstUnicastAddress; ua->Next; ua = ua->Next) - ; - ua->Next = heap_alloc_zero( sizeof(IP_ADAPTER_UNICAST_ADDRESS) + sizeof(SOCKADDR_IN6) ); - ua = ua->Next; + SOCKADDR_IN *in = (SOCKADDR_IN *)addr->Address.lpSockaddr; + in->sin_addr = key4->addr; } else - ua = aa->FirstUnicastAddress = heap_alloc_zero( sizeof(IP_ADAPTER_UNICAST_ADDRESS) + sizeof(SOCKADDR_IN6) ); - for (i = 0; i < num_v6addrs; i++) { - char addr_buf[46]; - - memset(ua, 0, sizeof(IP_ADAPTER_UNICAST_ADDRESS)); - ua->u.s.Length = sizeof(IP_ADAPTER_UNICAST_ADDRESS); - ua->Address.iSockaddrLength = v6addrs[i].iSockaddrLength; - ua->Address.lpSockaddr = (SOCKADDR *)(ua + 1); - - sa = (struct WS_sockaddr_in6 *)ua->Address.lpSockaddr; - memcpy(sa, v6addrs[i].lpSockaddr, sizeof(*sa)); - TRACE("IPv6 %d/%d: %s\n", i + 1, num_v6addrs, - debugstr_ipv6(sa, addr_buf)); - fill_unicast_addr_data(aa, ua); - - ua->OnLinkPrefixLength = mask_v6_to_prefix(&v6masks[i]); - - if (i < num_v6addrs - 1) - { - ua->Next = heap_alloc_zero( sizeof(IP_ADAPTER_UNICAST_ADDRESS) + sizeof(SOCKADDR_IN6) ); - ua = ua->Next; - } + SOCKADDR_IN6 *in6 = (SOCKADDR_IN6 *)addr->Address.lpSockaddr; + in6->sin6_addr = key6->addr; + in6->sin6_scope_id = dyn[i].scope_id; } + addr->PrefixOrigin = rw[i].prefix_origin; + addr->SuffixOrigin = rw[i].suffix_origin; + addr->DadState = dyn[i].dad_state; + addr->ValidLifetime = rw[i].valid_lifetime; + addr->PreferredLifetime = rw[i].preferred_lifetime; + addr->LeaseLifetime = rw[i].valid_lifetime; /* FIXME */ + addr->OnLinkPrefixLength = rw[i].on_link_prefix; + if (unicast_is_dns_eligible( addr )) addr->u.s.Flags |= IP_ADAPTER_ADDRESS_DNS_ELIGIBLE; + + *next = addr; + next = &addr->Next; } - if (num_v4addrs && (flags & GAA_FLAG_INCLUDE_PREFIX)) - { - IP_ADAPTER_PREFIX *prefix; + aa = aa->Next; + } - prefix = aa->FirstPrefix = heap_alloc_zero( sizeof(*prefix) + sizeof(SOCKADDR_IN) ); - for (i = 0; i < num_v4addrs; i++) - { - char addr_buf[16]; - struct WS_sockaddr_in *sa; +err: + NsiFreeTable( key, rw, dyn, stat ); + return err; +} - prefix->u.s.Length = sizeof(*prefix); - prefix->u.s.Flags = 0; - prefix->Next = NULL; - prefix->Address.iSockaddrLength = sizeof(struct sockaddr_in); - prefix->Address.lpSockaddr = (SOCKADDR *)(prefix + 1); +static DWORD gateway_and_prefix_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG family, ULONG flags ) +{ + struct nsi_ipv4_forward_key *key4; + struct nsi_ipv6_forward_key *key6; + IP_ADAPTER_GATEWAY_ADDRESS *gw, **gw_next; + IP_ADAPTER_PREFIX *prefix, **prefix_next; + DWORD err, count, i, prefix_len, key_size = (family == WS_AF_INET) ? sizeof(*key4) : sizeof(*key6); + DWORD sockaddr_size = (family == WS_AF_INET) ? sizeof(SOCKADDR_IN) : sizeof(SOCKADDR_IN6); + SOCKADDR_INET sockaddr; + NET_LUID *luid; + void *key; - sa = (struct WS_sockaddr_in *)prefix->Address.lpSockaddr; - sa->sin_family = WS_AF_INET; - sa->sin_addr.S_un.S_addr = v4addrs[i] & v4masks[i]; - sa->sin_port = 0; + err = NsiAllocateAndGetTable( 1, ip_module_id( family ), NSI_IP_FORWARD_TABLE, &key, key_size, + NULL, 0, NULL, 0, NULL, 0, &count, 0 ); + if (err) return err; - prefix->PrefixLength = mask_v4_to_prefix(v4masks[i]); + while (aa) + { + for (gw_next = &aa->FirstGatewayAddress; *gw_next; gw_next = &(*gw_next)->Next) + ; + for (prefix_next = &aa->FirstPrefix; *prefix_next; prefix_next = &(*prefix_next)->Next) + ; - TRACE("IPv4 network: %s/%u\n", - debugstr_ipv4((const in_addr_t *)&sa->sin_addr.S_un.S_addr, addr_buf), - prefix->PrefixLength); + for (i = 0; i < count; i++) + { + key4 = (struct nsi_ipv4_forward_key *)key + i; + key6 = (struct nsi_ipv6_forward_key *)key + i; + luid = (family == WS_AF_INET) ? &key4->luid : &key6->luid; + if (luid->Value != aa->Luid.Value) continue; - if (i < num_v4addrs - 1) + if (flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) + { + memset( &sockaddr, 0, sizeof(sockaddr) ); + if (family == WS_AF_INET) { - prefix->Next = heap_alloc_zero( sizeof(*prefix) + sizeof(SOCKADDR_IN) ); - prefix = prefix->Next; + if (key4->next_hop.WS_s_addr != 0) + { + sockaddr.si_family = family; + sockaddr.Ipv4.sin_addr = key4->next_hop; + } + } + else + { + static const IN6_ADDR zero; + if (memcmp( &key6->next_hop, &zero, sizeof(zero) )) + { + sockaddr.si_family = family; + sockaddr.Ipv6.sin6_addr = key6->next_hop; + } } - } - } - if (num_v6addrs && (flags & GAA_FLAG_INCLUDE_PREFIX)) - { - IP_ADAPTER_PREFIX *prefix; - if (aa->FirstPrefix) - { - for (prefix = aa->FirstPrefix; prefix->Next; prefix = prefix->Next) - ; - prefix->Next = heap_alloc_zero( sizeof(*prefix) + sizeof(SOCKADDR_IN6) ); - prefix = prefix->Next; + if (sockaddr.si_family) + { + gw = heap_alloc_zero( sizeof(*gw) + sockaddr_size ); + if (!gw) + { + err = ERROR_NOT_ENOUGH_MEMORY; + goto err; + } + gw->u.s.Length = sizeof(*gw); + gw->Address.lpSockaddr = (SOCKADDR *)(gw + 1); + gw->Address.iSockaddrLength = sockaddr_size; + memcpy( gw->Address.lpSockaddr, &sockaddr, sockaddr_size ); + *gw_next = gw; + gw_next = &gw->Next; + } } - else - prefix = aa->FirstPrefix = heap_alloc_zero( sizeof(*prefix) + sizeof(SOCKADDR_IN6) ); - for (i = 0; i < num_v6addrs; i++) + + if (flags & GAA_FLAG_INCLUDE_PREFIX) { - char addr_buf[46]; - struct WS_sockaddr_in6 *sa; - const IN6_ADDR *addr, *mask; - - prefix->u.s.Length = sizeof(*prefix); - prefix->u.s.Flags = 0; - prefix->Next = NULL; - prefix->Address.iSockaddrLength = sizeof(struct sockaddr_in6); - prefix->Address.lpSockaddr = (SOCKADDR *)(prefix + 1); - - sa = (struct WS_sockaddr_in6 *)prefix->Address.lpSockaddr; - sa->sin6_family = WS_AF_INET6; - sa->sin6_port = 0; - sa->sin6_flowinfo = 0; - addr = &((struct WS_sockaddr_in6 *)v6addrs[i].lpSockaddr)->sin6_addr; - mask = &((struct WS_sockaddr_in6 *)v6masks[i].lpSockaddr)->sin6_addr; - for (j = 0; j < 8; j++) sa->sin6_addr.u.Word[j] = addr->u.Word[j] & mask->u.Word[j]; - sa->sin6_scope_id = 0; - - prefix->PrefixLength = mask_v6_to_prefix(&v6masks[i]); - - TRACE("IPv6 network: %s/%u\n", debugstr_ipv6(sa, addr_buf), prefix->PrefixLength); - - if (i < num_v6addrs - 1) + memset( &sockaddr, 0, sizeof(sockaddr) ); + if (family == WS_AF_INET) + { + if (!key4->next_hop.WS_s_addr) + { + sockaddr.si_family = family; + sockaddr.Ipv4.sin_addr = key4->prefix; + prefix_len = key4->prefix_len; + } + } + else { - prefix->Next = heap_alloc_zero( sizeof(*prefix) + sizeof(SOCKADDR_IN6) ); - prefix = prefix->Next; + static const IN6_ADDR zero; + if (!memcmp( &key6->next_hop, &zero, sizeof(zero) )) + { + sockaddr.si_family = family; + sockaddr.Ipv6.sin6_addr = key6->prefix; + prefix_len = key6->prefix_len; + } + } + + if (sockaddr.si_family) + { + prefix = heap_alloc_zero( sizeof(*prefix) + sockaddr_size ); + if (!prefix) + { + err = ERROR_NOT_ENOUGH_MEMORY; + goto err; + } + prefix->u.s.Length = sizeof(*prefix); + prefix->Address.lpSockaddr = (SOCKADDR *)(prefix + 1); + prefix->Address.iSockaddrLength = sockaddr_size; + memcpy( prefix->Address.lpSockaddr, &sockaddr, sockaddr_size ); + prefix->PrefixLength = prefix_len; + *prefix_next = prefix; + prefix_next = &prefix->Next; } } } + aa = aa->Next; + } - getInterfaceMtuByName(name, &aa->Mtu); +err: + NsiFreeTable( key, NULL, NULL, NULL ); + return err; +} - getInterfaceStatusByName(name, &status); - if (status == MIB_IF_OPER_STATUS_OPERATIONAL) aa->OperStatus = IfOperStatusUp; - else if (status == MIB_IF_OPER_STATUS_NON_OPERATIONAL) aa->OperStatus = IfOperStatusDown; - else aa->OperStatus = IfOperStatusUnknown; +static DWORD call_families( DWORD (*fn)( IP_ADAPTER_ADDRESSES *aa, ULONG family, ULONG flags ), + IP_ADAPTER_ADDRESSES *aa, ULONG family, ULONG flags ) +{ + DWORD err; + + if (family != WS_AF_INET) + { + err = fn( aa, WS_AF_INET6, flags ); + if (err) return err; } - HeapFree(GetProcessHeap(), 0, routeTable); - HeapFree(GetProcessHeap(), 0, v6addrs); - HeapFree(GetProcessHeap(), 0, v6masks); - HeapFree(GetProcessHeap(), 0, v4addrs); - HeapFree(GetProcessHeap(), 0, v4masks); - return ERROR_SUCCESS; + + if (family != WS_AF_INET6) + { + err = fn( aa, WS_AF_INET, flags ); + if (err) return err; + } + return err; } static DWORD dns_servers_query_code( ULONG family ) @@ -1461,20 +1250,21 @@ err: static DWORD adapters_addresses_alloc( ULONG family, ULONG flags, IP_ADAPTER_ADDRESSES **info ) { IP_ADAPTER_ADDRESSES *aa; + NET_LUID *luids; + struct nsi_ndis_ifinfo_rw *rw; + struct nsi_ndis_ifinfo_dynamic *dyn; + struct nsi_ndis_ifinfo_static *stat; DWORD err, i, count, needed; + GUID guid; char *str_ptr; - InterfaceIndexTable *table; - get_interface_indices( FALSE, &table ); - if (!table || !table->numIndexes) - { - HeapFree(GetProcessHeap(), 0, table); - return ERROR_NO_DATA; - } - count = table->numIndexes; + err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, (void **)&luids, sizeof(*luids), + (void **)&rw, sizeof(*rw), (void **)&dyn, sizeof(*dyn), + (void **)&stat, sizeof(*stat), &count, 0 ); + if (err) return err; - needed = count * (sizeof(*aa) + ((CHARS_IN_GUID + 1) & ~1) + sizeof(IF_COUNTED_STRING)); - if (!(flags & GAA_FLAG_SKIP_FRIENDLY_NAME)) needed += count * sizeof(IF_COUNTED_STRING); + needed = count * (sizeof(*aa) + ((CHARS_IN_GUID + 1) & ~1) + sizeof(stat->descr.String)); + if (!(flags & GAA_FLAG_SKIP_FRIENDLY_NAME)) needed += count * sizeof(rw->alias.String); aa = heap_alloc_zero( needed ); if (!aa) @@ -1486,18 +1276,52 @@ static DWORD adapters_addresses_alloc( ULONG family, ULONG flags, IP_ADAPTER_ADD str_ptr = (char *)(aa + count); for (i = 0; i < count; i++) { - if ((err = adapterAddressesFromIndex(family, flags, table->indexes[i], aa + i, &str_ptr))) + aa[i].u.s.Length = sizeof(*aa); + aa[i].u.s.IfIndex = stat[i].if_index; + if (i < count - 1) aa[i].Next = aa + i + 1; + ConvertInterfaceLuidToGuid( luids + i, &guid ); + ConvertGuidToStringA( &guid, str_ptr, CHARS_IN_GUID ); + aa[i].AdapterName = str_ptr; + str_ptr += (CHARS_IN_GUID + 1) & ~1; + if_counted_string_copy( (WCHAR *)str_ptr, ARRAY_SIZE(stat[i].descr.String), &stat[i].descr ); + aa[i].Description = (WCHAR *)str_ptr; + str_ptr += sizeof(stat[i].descr.String); + if (!(flags & GAA_FLAG_SKIP_FRIENDLY_NAME)) { - HeapFree(GetProcessHeap(), 0, table); - return err; + if_counted_string_copy( (WCHAR *)str_ptr, ARRAY_SIZE(rw[i].alias.String), &rw[i].alias ); + aa[i].FriendlyName = (WCHAR *)str_ptr; + str_ptr += sizeof(rw[i].alias.String); } - if (i < count - 1) aa[i].Next = aa + i + 1; + aa[i].PhysicalAddressLength = rw->phys_addr.Length; + if (aa[i].PhysicalAddressLength > sizeof(aa[i].PhysicalAddress)) aa[i].PhysicalAddressLength = 0; + memcpy( aa[i].PhysicalAddress, rw->phys_addr.Address, aa[i].PhysicalAddressLength ); + aa[i].Mtu = dyn[i].mtu; + aa[i].IfType = stat[i].type; + aa[i].OperStatus = dyn[i].oper_status; + aa[i].TransmitLinkSpeed = dyn[i].xmit_speed; + aa[i].ReceiveLinkSpeed = dyn[i].rcv_speed; + aa[i].Luid = luids[i]; + aa[i].NetworkGuid = rw[i].network_guid; + aa[i].ConnectionType = stat[i].conn_type; + } + + if (!(flags & GAA_FLAG_SKIP_UNICAST)) + { + err = call_families( unicast_addresses_alloc, aa, family, flags ); + if (err) goto err; + } + + if (flags & (GAA_FLAG_INCLUDE_ALL_GATEWAYS | GAA_FLAG_INCLUDE_PREFIX)) + { + err = call_families( gateway_and_prefix_addresses_alloc, aa, family, flags ); + if (err) goto err; } err = dns_info_alloc( aa, family, flags ); + if (err) goto err; err: - HeapFree(GetProcessHeap(), 0, table); + NsiFreeTable( luids, rw, dyn, stat ); if (!err) *info = aa; else adapters_addresses_free( aa ); return err; @@ -1861,15 +1685,6 @@ err: return err; } -static void if_counted_string_copy( WCHAR *dst, unsigned int len, IF_COUNTED_STRING *src ) -{ - unsigned int copy = src->Length; - - if (copy >= len * sizeof(WCHAR)) copy = 0; - memcpy( dst, src->String, copy ); - memset( (char *)dst + copy, 0, len * sizeof(WCHAR) - copy ); -} - static void if_row2_fill( MIB_IF_ROW2 *row, struct nsi_ndis_ifinfo_rw *rw, struct nsi_ndis_ifinfo_dynamic *dyn, struct nsi_ndis_ifinfo_static *stat ) { -- 2.23.0

1 0

[PATCH 3/4] iphlpapi: Mark non-loopback, non-linklocal addresses as dns eligible.
by Huw Davies 09 Aug '21

09 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index dbe4a12afe8..22e17e06757 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1036,6 +1036,37 @@ static PMIB_IPFORWARDROW findIPv4Gateway(DWORD index, return row; } +static BOOL sockaddr_is_loopback( SOCKADDR *sock ) +{ + if (sock->sa_family == WS_AF_INET) + { + SOCKADDR_IN *sin = (SOCKADDR_IN *)sock; + return (sin->sin_addr.WS_s_addr & 0xff) == 127; + } + else if (sock->sa_family == WS_AF_INET6) + { + SOCKADDR_IN6 *sin6 = (SOCKADDR_IN6 *)sock; + return WS_IN6_IS_ADDR_LOOPBACK( &sin6->sin6_addr ); + } + return FALSE; +} + +static BOOL sockaddr_is_linklocal( SOCKADDR *sock ) +{ + if (sock->sa_family == WS_AF_INET6) + { + SOCKADDR_IN6 *sin6 = (SOCKADDR_IN6 *)sock; + return WS_IN6_IS_ADDR_LINKLOCAL( &sin6->sin6_addr ); + } + return FALSE; +} + +static BOOL unicast_is_dns_eligible( IP_ADAPTER_UNICAST_ADDRESS *uni ) +{ + return !sockaddr_is_loopback( uni->Address.lpSockaddr ) && + !sockaddr_is_linklocal( uni->Address.lpSockaddr ); +} + static void fill_unicast_addr_data(IP_ADAPTER_ADDRESSES *aa, IP_ADAPTER_UNICAST_ADDRESS *ua) { /* Actually this information should be read somewhere from the system @@ -1059,6 +1090,8 @@ static void fill_unicast_addr_data(IP_ADAPTER_ADDRESSES *aa, IP_ADAPTER_UNICAST_ ua->ValidLifetime = 60000; ua->PreferredLifetime = 60000; ua->LeaseLifetime = 60000; + + if (unicast_is_dns_eligible( ua )) ua->u.s.Flags |= IP_ADAPTER_ADDRESS_DNS_ELIGIBLE; } static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index, @@ -1186,8 +1219,6 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index ua->u.s.Length = sizeof(IP_ADAPTER_UNICAST_ADDRESS); ua->Address.iSockaddrLength = sizeof(struct sockaddr_in); ua->Address.lpSockaddr = (SOCKADDR *)(ua + 1); - if (num_v4_gateways) - ua->u.s.Flags |= IP_ADAPTER_ADDRESS_DNS_ELIGIBLE; sa = (struct WS_sockaddr_in *)ua->Address.lpSockaddr; sa->sin_family = WS_AF_INET; -- 2.23.0

1 0

[PATCH 2/4] iphlpapi: Rewrite GetAdaptersAddresses() to first alloc and then copy the info.
by Huw Davies 09 Aug '21

09 Aug '21

This refractoring is necessary to simplify implementing it on top of nsi. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 502 ++++++++++++++++++++-------------- 1 file changed, 300 insertions(+), 202 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 6a934f926d1..dbe4a12afe8 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -760,6 +760,159 @@ err: return err; } +static void address_entry_free( void *ptr, ULONG offset, void *ctxt ) +{ + heap_free( ptr ); +} + +static void address_entry_size( void *ptr, ULONG offset, void *ctxt ) +{ + IP_ADAPTER_DNS_SERVER_ADDRESS *src_addr = ptr; /* all list types are super-sets of this type */ + ULONG *total = (ULONG *)ctxt, align = sizeof(ULONGLONG) - 1; + + *total = (*total + src_addr->u.s.Length + src_addr->Address.iSockaddrLength + align) & ~align; +} + +struct address_entry_copy_params +{ + IP_ADAPTER_ADDRESSES *src, *dst; + char *ptr; + void *next; + ULONG cur_offset; +}; + +static void address_entry_copy( void *ptr, ULONG offset, void *ctxt ) +{ + struct address_entry_copy_params *params = ctxt; + IP_ADAPTER_DNS_SERVER_ADDRESS *src_addr = ptr; /* all list types are super-sets of this type */ + IP_ADAPTER_DNS_SERVER_ADDRESS *dst_addr = (IP_ADAPTER_DNS_SERVER_ADDRESS *)params->ptr; + ULONG align = sizeof(ULONGLONG) - 1; + + memcpy( dst_addr, src_addr, src_addr->u.s.Length ); + params->ptr += src_addr->u.s.Length; + dst_addr->Address.lpSockaddr = (SOCKADDR *)params->ptr; + memcpy( dst_addr->Address.lpSockaddr, src_addr->Address.lpSockaddr, src_addr->Address.iSockaddrLength ); + params->ptr += (src_addr->Address.iSockaddrLength + align) & ~align; + + if (params->cur_offset != offset) /* new list */ + { + params->next = (BYTE *)params->dst + offset; + params->cur_offset = offset; + } + *(IP_ADAPTER_DNS_SERVER_ADDRESS **)params->next = dst_addr; + params->next = &dst_addr->Next; +} + +static void address_lists_iterate( IP_ADAPTER_ADDRESSES *aa, void (*fn)(void *entry, ULONG offset, void *ctxt), void *ctxt ) +{ + IP_ADAPTER_UNICAST_ADDRESS *uni; + IP_ADAPTER_DNS_SERVER_ADDRESS *dns; + IP_ADAPTER_GATEWAY_ADDRESS *gw; + IP_ADAPTER_PREFIX *prefix; + void *next; + + for (uni = aa->FirstUnicastAddress; uni; uni = next) + { + next = uni->Next; + fn( uni, FIELD_OFFSET( IP_ADAPTER_ADDRESSES, FirstUnicastAddress ), ctxt ); + } + + for (dns = aa->FirstDnsServerAddress; dns; dns = next) + { + next = dns->Next; + fn( dns, FIELD_OFFSET( IP_ADAPTER_ADDRESSES, FirstDnsServerAddress ), ctxt ); + } + + for (gw = aa->FirstGatewayAddress; gw; gw = next) + { + next = gw->Next; + fn( gw, FIELD_OFFSET( IP_ADAPTER_ADDRESSES, FirstGatewayAddress ), ctxt ); + } + + for (prefix = aa->FirstPrefix; prefix; prefix = next) + { + next = prefix->Next; + fn( prefix, FIELD_OFFSET( IP_ADAPTER_ADDRESSES, FirstPrefix ), ctxt ); + } +} + +void adapters_addresses_free( IP_ADAPTER_ADDRESSES *info ) +{ + IP_ADAPTER_ADDRESSES *aa; + + for (aa = info; aa; aa = aa->Next) + { + address_lists_iterate( aa, address_entry_free, NULL ); + + heap_free( aa->DnsSuffix ); + } + heap_free( info ); +} + +ULONG adapters_addresses_size( IP_ADAPTER_ADDRESSES *info ) +{ + IP_ADAPTER_ADDRESSES *aa; + ULONG size = 0, align = sizeof(ULONGLONG) - 1; + + for (aa = info; aa; aa = aa->Next) + { + size += sizeof(*aa) + ((strlen( aa->AdapterName ) + 1 + 1) & ~1); + size += (strlenW( aa->Description ) + 1 + strlenW( aa->DnsSuffix ) + 1) * sizeof(WCHAR); + if (aa->FriendlyName) size += (strlenW(aa->FriendlyName) + 1) * sizeof(WCHAR); + size = (size + align) & ~align; + address_lists_iterate( aa, address_entry_size, &size ); + } + return size; +} + +void adapters_addresses_copy( IP_ADAPTER_ADDRESSES *dst, IP_ADAPTER_ADDRESSES *src ) +{ + char *ptr; + DWORD len, align = sizeof(ULONGLONG) - 1; + struct address_entry_copy_params params; + + while (src) + { + ptr = (char *)(dst + 1); + *dst = *src; + dst->AdapterName = ptr; + len = strlen( src->AdapterName ) + 1; + memcpy( dst->AdapterName, src->AdapterName, len ); + ptr += (len + 1) & ~1; + dst->Description = (WCHAR *)ptr; + len = (strlenW( src->Description ) + 1) * sizeof(WCHAR); + memcpy( dst->Description, src->Description, len ); + ptr += len; + dst->DnsSuffix = (WCHAR *)ptr; + len = (strlenW( src->DnsSuffix ) + 1) * sizeof(WCHAR); + memcpy( dst->DnsSuffix, src->DnsSuffix, len ); + ptr += len; + if (src->FriendlyName) + { + dst->FriendlyName = (WCHAR *)ptr; + len = (strlenW( src->FriendlyName ) + 1) * sizeof(WCHAR); + memcpy( dst->FriendlyName, src->FriendlyName, len ); + ptr += len; + } + ptr = (char *)(((UINT_PTR)ptr + align) & ~align); + + params.src = src; + params.dst = dst; + params.ptr = ptr; + params.next = NULL; + params.cur_offset = ~0u; + address_lists_iterate( src, address_entry_copy, &params ); + ptr = params.ptr; + + if (src->Next) + { + dst->Next = (IP_ADAPTER_ADDRESSES *)ptr; + dst = dst->Next; + } + src = src->Next; + } +} + static DWORD typeFromMibType(DWORD mib_type) { switch (mib_type) @@ -909,13 +1062,19 @@ static void fill_unicast_addr_data(IP_ADAPTER_ADDRESSES *aa, IP_ADAPTER_UNICAST_ } static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index, - IP_ADAPTER_ADDRESSES *aa, ULONG *size) + IP_ADAPTER_ADDRESSES *aa, char **ptr) { - ULONG ret = ERROR_SUCCESS, i, j, num_v4addrs = 0, num_v4_gateways = 0, num_v6addrs = 0, total_size; + ULONG ret = ERROR_SUCCESS, i, j, num_v4addrs = 0, num_v4_gateways = 0, num_v6addrs = 0; DWORD *v4addrs = NULL, *v4masks = NULL; SOCKET_ADDRESS *v6addrs = NULL, *v6masks = NULL; PMIB_IPFORWARDTABLE routeTable = NULL; BOOL output_gateways; + char name[IF_NAMESIZE], *src; + WCHAR *dst; + DWORD buflen, type; + INTERNAL_IF_OPER_STATUS status; + NET_LUID luid; + GUID guid; if ((flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) || !(flags & GAA_FLAG_SKIP_UNICAST)) { @@ -953,61 +1112,32 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index return ret; } - total_size = sizeof(IP_ADAPTER_ADDRESSES); - total_size += CHARS_IN_GUID; - total_size += IF_NAMESIZE * sizeof(WCHAR); - if (!(flags & GAA_FLAG_SKIP_FRIENDLY_NAME)) - total_size += IF_NAMESIZE * sizeof(WCHAR); - if (flags & GAA_FLAG_INCLUDE_PREFIX) - { - total_size += sizeof(IP_ADAPTER_PREFIX) * num_v4addrs; - total_size += sizeof(IP_ADAPTER_PREFIX) * num_v6addrs; - total_size += sizeof(struct sockaddr_in) * num_v4addrs; - for (i = 0; i < num_v6addrs; i++) - total_size += v6masks[i].iSockaddrLength; - } - total_size += sizeof(IP_ADAPTER_UNICAST_ADDRESS) * num_v4addrs; - total_size += sizeof(struct sockaddr_in) * num_v4addrs; - if (output_gateways) - total_size += (sizeof(IP_ADAPTER_GATEWAY_ADDRESS) + sizeof(SOCKADDR_IN)) * num_v4_gateways; - total_size += sizeof(IP_ADAPTER_UNICAST_ADDRESS) * num_v6addrs; - total_size += sizeof(SOCKET_ADDRESS) * num_v6addrs; - for (i = 0; i < num_v6addrs; i++) - total_size += v6addrs[i].iSockaddrLength; - - if (aa && *size >= total_size) - { - char name[IF_NAMESIZE], *ptr = (char *)aa + sizeof(IP_ADAPTER_ADDRESSES), *src; - WCHAR *dst; - DWORD buflen, type; - INTERNAL_IF_OPER_STATUS status; - NET_LUID luid; - GUID guid; - + if (1) + { memset(aa, 0, sizeof(IP_ADAPTER_ADDRESSES)); aa->u.s.Length = sizeof(IP_ADAPTER_ADDRESSES); aa->u.s.IfIndex = index; ConvertInterfaceIndexToLuid(index, &luid); ConvertInterfaceLuidToGuid(&luid, &guid); - ConvertGuidToStringA( &guid, ptr, CHARS_IN_GUID ); - aa->AdapterName = ptr; - ptr += CHARS_IN_GUID; + ConvertGuidToStringA( &guid, *ptr, CHARS_IN_GUID ); + aa->AdapterName = *ptr; + *ptr += (CHARS_IN_GUID + 1) & ~1; getInterfaceNameByIndex(index, name); if (!(flags & GAA_FLAG_SKIP_FRIENDLY_NAME)) { - aa->FriendlyName = (WCHAR *)ptr; - for (src = name, dst = (WCHAR *)ptr; *src; src++, dst++) + aa->FriendlyName = (WCHAR *)*ptr; + for (src = name, dst = (WCHAR *)*ptr; *src; src++, dst++) *dst = *src; *dst++ = 0; - ptr = (char *)dst; + *ptr = (char *)dst; } aa->Description = (WCHAR *)ptr; - for (src = name, dst = (WCHAR *)ptr; *src; src++, dst++) + for (src = name, dst = (WCHAR *)*ptr; *src; src++, dst++) *dst = *src; *dst++ = 0; - ptr = (char *)dst; + *ptr = (char *)dst; TRACE("%s: %d IPv4 addresses, %d IPv6 addresses:\n", name, num_v4addrs, num_v6addrs); @@ -1028,12 +1158,11 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index PIP_ADAPTER_GATEWAY_ADDRESS gw; PSOCKADDR_IN sin; - gw = (PIP_ADAPTER_GATEWAY_ADDRESS)ptr; + gw = heap_alloc( sizeof(IP_ADAPTER_GATEWAY_ADDRESS) + sizeof(SOCKADDR_IN) ); aa->FirstGatewayAddress = gw; gw->u.s.Length = sizeof(IP_ADAPTER_GATEWAY_ADDRESS); - ptr += sizeof(IP_ADAPTER_GATEWAY_ADDRESS); - sin = (PSOCKADDR_IN)ptr; + sin = (PSOCKADDR_IN)(gw + 1); sin->sin_family = WS_AF_INET; sin->sin_port = 0; memcpy(&sin->sin_addr, &adapterRow->dwForwardNextHop, @@ -1041,7 +1170,6 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index gw->Address.lpSockaddr = (LPSOCKADDR)sin; gw->Address.iSockaddrLength = sizeof(SOCKADDR_IN); gw->Next = NULL; - ptr += sizeof(SOCKADDR_IN); } } if (num_v4addrs && !(flags & GAA_FLAG_SKIP_UNICAST)) @@ -1049,7 +1177,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index IP_ADAPTER_UNICAST_ADDRESS *ua; struct WS_sockaddr_in *sa; aa->u1.s1.Ipv4Enabled = TRUE; - ua = aa->FirstUnicastAddress = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; + ua = aa->FirstUnicastAddress = heap_alloc_zero( sizeof(IP_ADAPTER_UNICAST_ADDRESS) + sizeof(SOCKADDR_IN) ); for (i = 0; i < num_v4addrs; i++) { char addr_buf[16]; @@ -1057,7 +1185,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index memset(ua, 0, sizeof(IP_ADAPTER_UNICAST_ADDRESS)); ua->u.s.Length = sizeof(IP_ADAPTER_UNICAST_ADDRESS); ua->Address.iSockaddrLength = sizeof(struct sockaddr_in); - ua->Address.lpSockaddr = (SOCKADDR *)((char *)ua + ua->u.s.Length); + ua->Address.lpSockaddr = (SOCKADDR *)(ua + 1); if (num_v4_gateways) ua->u.s.Flags |= IP_ADAPTER_ADDRESS_DNS_ELIGIBLE; @@ -1071,10 +1199,9 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index ua->OnLinkPrefixLength = mask_v4_to_prefix(v4masks[i]); - ptr += ua->u.s.Length + ua->Address.iSockaddrLength; if (i < num_v4addrs - 1) { - ua->Next = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; + ua->Next = heap_alloc_zero( sizeof(IP_ADAPTER_UNICAST_ADDRESS) + sizeof(SOCKADDR_IN) ); ua = ua->Next; } } @@ -1089,11 +1216,11 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index { for (ua = aa->FirstUnicastAddress; ua->Next; ua = ua->Next) ; - ua->Next = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; - ua = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; + ua->Next = heap_alloc_zero( sizeof(IP_ADAPTER_UNICAST_ADDRESS) + sizeof(SOCKADDR_IN6) ); + ua = ua->Next; } else - ua = aa->FirstUnicastAddress = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; + ua = aa->FirstUnicastAddress = heap_alloc_zero( sizeof(IP_ADAPTER_UNICAST_ADDRESS) + sizeof(SOCKADDR_IN6) ); for (i = 0; i < num_v6addrs; i++) { char addr_buf[46]; @@ -1101,7 +1228,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index memset(ua, 0, sizeof(IP_ADAPTER_UNICAST_ADDRESS)); ua->u.s.Length = sizeof(IP_ADAPTER_UNICAST_ADDRESS); ua->Address.iSockaddrLength = v6addrs[i].iSockaddrLength; - ua->Address.lpSockaddr = (SOCKADDR *)((char *)ua + ua->u.s.Length); + ua->Address.lpSockaddr = (SOCKADDR *)(ua + 1); sa = (struct WS_sockaddr_in6 *)ua->Address.lpSockaddr; memcpy(sa, v6addrs[i].lpSockaddr, sizeof(*sa)); @@ -1111,10 +1238,9 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index ua->OnLinkPrefixLength = mask_v6_to_prefix(&v6masks[i]); - ptr += ua->u.s.Length + ua->Address.iSockaddrLength; if (i < num_v6addrs - 1) { - ua->Next = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; + ua->Next = heap_alloc_zero( sizeof(IP_ADAPTER_UNICAST_ADDRESS) + sizeof(SOCKADDR_IN6) ); ua = ua->Next; } } @@ -1123,7 +1249,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index { IP_ADAPTER_PREFIX *prefix; - prefix = aa->FirstPrefix = (IP_ADAPTER_PREFIX *)ptr; + prefix = aa->FirstPrefix = heap_alloc_zero( sizeof(*prefix) + sizeof(SOCKADDR_IN) ); for (i = 0; i < num_v4addrs; i++) { char addr_buf[16]; @@ -1133,7 +1259,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index prefix->u.s.Flags = 0; prefix->Next = NULL; prefix->Address.iSockaddrLength = sizeof(struct sockaddr_in); - prefix->Address.lpSockaddr = (SOCKADDR *)((char *)prefix + prefix->u.s.Length); + prefix->Address.lpSockaddr = (SOCKADDR *)(prefix + 1); sa = (struct WS_sockaddr_in *)prefix->Address.lpSockaddr; sa->sin_family = WS_AF_INET; @@ -1146,10 +1272,9 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index debugstr_ipv4((const in_addr_t *)&sa->sin_addr.S_un.S_addr, addr_buf), prefix->PrefixLength); - ptr += prefix->u.s.Length + prefix->Address.iSockaddrLength; if (i < num_v4addrs - 1) { - prefix->Next = (IP_ADAPTER_PREFIX *)ptr; + prefix->Next = heap_alloc_zero( sizeof(*prefix) + sizeof(SOCKADDR_IN) ); prefix = prefix->Next; } } @@ -1162,11 +1287,11 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index { for (prefix = aa->FirstPrefix; prefix->Next; prefix = prefix->Next) ; - prefix->Next = (IP_ADAPTER_PREFIX *)ptr; - prefix = (IP_ADAPTER_PREFIX *)ptr; + prefix->Next = heap_alloc_zero( sizeof(*prefix) + sizeof(SOCKADDR_IN6) ); + prefix = prefix->Next; } else - prefix = aa->FirstPrefix = (IP_ADAPTER_PREFIX *)ptr; + prefix = aa->FirstPrefix = heap_alloc_zero( sizeof(*prefix) + sizeof(SOCKADDR_IN6) ); for (i = 0; i < num_v6addrs; i++) { char addr_buf[46]; @@ -1177,7 +1302,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index prefix->u.s.Flags = 0; prefix->Next = NULL; prefix->Address.iSockaddrLength = sizeof(struct sockaddr_in6); - prefix->Address.lpSockaddr = (SOCKADDR *)((char *)prefix + prefix->u.s.Length); + prefix->Address.lpSockaddr = (SOCKADDR *)(prefix + 1); sa = (struct WS_sockaddr_in6 *)prefix->Address.lpSockaddr; sa->sin6_family = WS_AF_INET6; @@ -1192,10 +1317,9 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index TRACE("IPv6 network: %s/%u\n", debugstr_ipv6(sa, addr_buf), prefix->PrefixLength); - ptr += prefix->u.s.Length + prefix->Address.iSockaddrLength; if (i < num_v6addrs - 1) { - prefix->Next = (IP_ADAPTER_PREFIX *)ptr; + prefix->Next = heap_alloc_zero( sizeof(*prefix) + sizeof(SOCKADDR_IN6) ); prefix = prefix->Next; } } @@ -1208,7 +1332,6 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index else if (status == MIB_IF_OPER_STATUS_NON_OPERATIONAL) aa->OperStatus = IfOperStatusDown; else aa->OperStatus = IfOperStatusUnknown; } - *size = total_size; HeapFree(GetProcessHeap(), 0, routeTable); HeapFree(GetProcessHeap(), 0, v6addrs); HeapFree(GetProcessHeap(), 0, v6masks); @@ -1224,97 +1347,92 @@ static DWORD dns_servers_query_code( ULONG family ) return DnsConfigDnsServersUnspec; } -static ULONG get_dns_server_addresses( ULONG family, IP_ADAPTER_DNS_SERVER_ADDRESS *address, ULONG *len ) +static DWORD dns_info_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG family, ULONG flags ) { char buf[FIELD_OFFSET(DNS_ADDR_ARRAY, AddrArray[3])]; - DNS_ADDR_ARRAY *servers = (DNS_ADDR_ARRAY *)buf; - DWORD err, num, i, needed, array_len = sizeof(buf); + IP_ADAPTER_DNS_SERVER_ADDRESS *dns, **next; DWORD query = dns_servers_query_code( family ); - SOCKADDR_INET *out_addrs; + DWORD err, i, size, attempt, sockaddr_len; + WCHAR name[MAX_ADAPTER_NAME_LENGTH + 1]; + DNS_ADDR_ARRAY *servers; + DNS_TXT_DATAW *search; - for (;;) + while (aa) { - err = DnsQueryConfig( query, 0, NULL, NULL, servers, &array_len ); - if (err != ERROR_SUCCESS && err != ERROR_MORE_DATA) goto err; - num = (array_len - FIELD_OFFSET(DNS_ADDR_ARRAY, AddrArray[0])) / sizeof(DNS_ADDR); - needed = num * (sizeof(IP_ADAPTER_DNS_SERVER_ADDRESS) + sizeof(*out_addrs)); - if (!address || *len < needed) + MultiByteToWideChar( CP_ACP, 0, aa->AdapterName, -1, name, ARRAY_SIZE(name) ); + if (!(flags & GAA_FLAG_SKIP_DNS_SERVER)) { - *len = needed; - err = ERROR_BUFFER_OVERFLOW; - goto err; + servers = (DNS_ADDR_ARRAY *)buf; + for (attempt = 0; attempt < 5; attempt++) + { + err = DnsQueryConfig( query, 0, name, NULL, servers, &size ); + if (err != ERROR_MORE_DATA) break; + if (servers != (DNS_ADDR_ARRAY *)buf) heap_free( servers ); + servers = heap_alloc( size ); + if (!servers) + { + err = ERROR_NOT_ENOUGH_MEMORY; + break; + } + } + if (!err) + { + next = &aa->FirstDnsServerAddress; + for (i = 0; i < servers->AddrCount; i++) + { + sockaddr_len = servers->AddrArray[i].Data.DnsAddrUserDword[0]; + if (sockaddr_len > sizeof(servers->AddrArray[i].MaxSa)) + sockaddr_len = sizeof(servers->AddrArray[i].MaxSa); + dns = heap_alloc_zero( sizeof(*dns) + sockaddr_len ); + if (!dns) + { + err = ERROR_NOT_ENOUGH_MEMORY; + break; + } + dns->u.s.Length = sizeof(*dns); + dns->Address.lpSockaddr = (SOCKADDR *)(dns + 1); + dns->Address.iSockaddrLength = sockaddr_len; + memcpy( dns->Address.lpSockaddr, servers->AddrArray[i].MaxSa, sockaddr_len ); + *next = dns; + next = &dns->Next; + } + } + if (servers != (DNS_ADDR_ARRAY *)buf) heap_free( servers ); + if (err) goto err; } - if (!err) break; - if ((char *)servers != buf) heap_free( servers ); - servers = heap_alloc( array_len ); - if (!servers) + aa->DnsSuffix = heap_alloc( MAX_DNS_SUFFIX_STRING_LENGTH * sizeof(WCHAR) ); + if (!aa->DnsSuffix) { err = ERROR_NOT_ENOUGH_MEMORY; goto err; } - } - - *len = needed; - out_addrs = (SOCKADDR_INET *)(address + num); - for (i = 0; i < num; i++) - { - address[i].u.s.Length = sizeof(*address); - address[i].u.s.Reserved = 0; - address[i].Next = NULL; - address[i].Address.iSockaddrLength = servers->AddrArray[i].Data.DnsAddrUserDword[0]; - if (address[i].Address.iSockaddrLength > sizeof(*out_addrs)) - address[i].Address.iSockaddrLength = 0; - address[i].Address.lpSockaddr = (SOCKADDR *)(out_addrs + i); - memcpy( out_addrs + i, servers->AddrArray[i].MaxSa, address[i].Address.iSockaddrLength ); - memset( (BYTE *)(out_addrs + i) + address[i].Address.iSockaddrLength, 0, - sizeof(*out_addrs) - address[i].Address.iSockaddrLength ); - if (i) address[i - 1].Next = address + i; - } - err = ERROR_SUCCESS; - -err: - if ((char *)servers != buf) heap_free( servers ); - return err; -} - -static ULONG get_dns_suffix(WCHAR *suffix, ULONG *len) -{ - DWORD err, list_len = 0, needed = 1; - DNS_TXT_DATAW *search = NULL; + aa->DnsSuffix[0] = '\0'; - if (suffix && *len > 0) *suffix = '\0'; - - err = DnsQueryConfig( DnsConfigSearchList, 0, NULL, NULL, NULL, &list_len ); - if (err) goto err; - - search = heap_alloc( list_len ); - err = DnsQueryConfig( DnsConfigSearchList, 0, NULL, NULL, search, &list_len ); - if (err || !search->dwStringCount) goto err; + if (!DnsQueryConfig( DnsConfigSearchList, 0, name, NULL, NULL, &size ) && + (search = heap_alloc( size ))) + { + if (!DnsQueryConfig( DnsConfigSearchList, 0, name, NULL, search, &size ) && + search->dwStringCount && strlenW( search->pStringArray[0] ) < MAX_DNS_SUFFIX_STRING_LENGTH) + { + strcpyW( aa->DnsSuffix, search->pStringArray[0] ); + } + heap_free( search ); + } - needed = (strlenW( search->pStringArray[0] ) + 1) * sizeof(WCHAR); - if (!suffix || *len < needed) - { - err = ERROR_INSUFFICIENT_BUFFER; - goto err; + aa = aa->Next; } - memcpy( suffix, search->pStringArray[0], needed ); err: - *len = needed; - heap_free( search ); return err; } -ULONG WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, - PIP_ADAPTER_ADDRESSES aa, PULONG buflen) +static DWORD adapters_addresses_alloc( ULONG family, ULONG flags, IP_ADAPTER_ADDRESSES **info ) { + IP_ADAPTER_ADDRESSES *aa; + DWORD err, i, count, needed; + char *str_ptr; InterfaceIndexTable *table; - ULONG i, size, dns_server_size = 0, dns_suffix_size, total_size, ret = ERROR_NO_DATA; - - TRACE("(%d, %08x, %p, %p, %p)\n", family, flags, reserved, aa, buflen); - - if (!buflen) return ERROR_INVALID_PARAMETER; get_interface_indices( FALSE, &table ); if (!table || !table->numIndexes) @@ -1322,82 +1440,62 @@ ULONG WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses(ULONG family, ULONG flags, P HeapFree(GetProcessHeap(), 0, table); return ERROR_NO_DATA; } - total_size = 0; - for (i = 0; i < table->numIndexes; i++) - { - size = 0; - if ((ret = adapterAddressesFromIndex(family, flags, table->indexes[i], NULL, &size))) - { - HeapFree(GetProcessHeap(), 0, table); - return ret; - } - total_size += size; - } - if (!(flags & GAA_FLAG_SKIP_DNS_SERVER)) + count = table->numIndexes; + + needed = count * (sizeof(*aa) + ((CHARS_IN_GUID + 1) & ~1) + sizeof(IF_COUNTED_STRING)); + if (!(flags & GAA_FLAG_SKIP_FRIENDLY_NAME)) needed += count * sizeof(IF_COUNTED_STRING); + + aa = heap_alloc_zero( needed ); + if (!aa) { - /* Since DNS servers aren't really per adapter, get enough space for a - * single copy of them. - */ - get_dns_server_addresses( family, NULL, &dns_server_size ); - total_size += dns_server_size; + err = ERROR_NOT_ENOUGH_MEMORY; + goto err; } - /* Since DNS suffix also isn't really per adapter, get enough space for a - * single copy of it. - */ - get_dns_suffix(NULL, &dns_suffix_size); - total_size += dns_suffix_size; - if (aa && *buflen >= total_size) - { - ULONG bytes_left = size = total_size; - PIP_ADAPTER_ADDRESSES first_aa = aa; - PIP_ADAPTER_DNS_SERVER_ADDRESS firstDns; - WCHAR *dnsSuffix; - for (i = 0; i < table->numIndexes; i++) - { - if ((ret = adapterAddressesFromIndex(family, flags, table->indexes[i], aa, &size))) - { - HeapFree(GetProcessHeap(), 0, table); - return ret; - } - if (i < table->numIndexes - 1) - { - aa->Next = (IP_ADAPTER_ADDRESSES *)((char *)aa + size); - aa = aa->Next; - size = bytes_left -= size; - } - } - if (dns_server_size) - { - firstDns = (PIP_ADAPTER_DNS_SERVER_ADDRESS)((BYTE *)first_aa + total_size - dns_server_size - dns_suffix_size); - get_dns_server_addresses( family, firstDns, &dns_server_size ); - for (aa = first_aa; aa; aa = aa->Next) - { - if (aa->IfType != IF_TYPE_SOFTWARE_LOOPBACK && aa->OperStatus == IfOperStatusUp) - aa->FirstDnsServerAddress = firstDns; - } - } - aa = first_aa; - dnsSuffix = (WCHAR *)((BYTE *)aa + total_size - dns_suffix_size); - get_dns_suffix(dnsSuffix, &dns_suffix_size); - for (; aa; aa = aa->Next) + str_ptr = (char *)(aa + count); + for (i = 0; i < count; i++) + { + if ((err = adapterAddressesFromIndex(family, flags, table->indexes[i], aa + i, &str_ptr))) { - if (aa->IfType != IF_TYPE_SOFTWARE_LOOPBACK && aa->OperStatus == IfOperStatusUp) - aa->DnsSuffix = dnsSuffix; - else - aa->DnsSuffix = dnsSuffix + dns_suffix_size / sizeof(WCHAR) - 1; + HeapFree(GetProcessHeap(), 0, table); + return err; } - ret = ERROR_SUCCESS; + if (i < count - 1) aa[i].Next = aa + i + 1; } - else + + err = dns_info_alloc( aa, family, flags ); + +err: + HeapFree(GetProcessHeap(), 0, table); + if (!err) *info = aa; + else adapters_addresses_free( aa ); + return err; +} + +ULONG WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses( ULONG family, ULONG flags, void *reserved, + IP_ADAPTER_ADDRESSES *aa, ULONG *size ) +{ + IP_ADAPTER_ADDRESSES *info; + DWORD err, needed; + + TRACE( "(%d, %08x, %p, %p, %p)\n", family, flags, reserved, aa, size ); + + if (!size) return ERROR_INVALID_PARAMETER; + + err = adapters_addresses_alloc( family, flags, &info ); + if (err) return err; + + needed = adapters_addresses_size( info ); + if (!aa || *size < needed) { - ret = ERROR_BUFFER_OVERFLOW; - *buflen = total_size; + *size = needed; + err = ERROR_BUFFER_OVERFLOW; } + else + adapters_addresses_copy( aa, info ); - TRACE("num adapters %u\n", table->numIndexes); - HeapFree(GetProcessHeap(), 0, table); - return ret; + adapters_addresses_free( info ); + return err; } /****************************************************************** -- 2.23.0

1 0

[PATCH 1/4] dnsapi: Return ERROR_MORE_DATA on insufficient buffer.
by Huw Davies 09 Aug '21

09 Aug '21

This was already done correctly in the res_getservers() case. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/dnsapi/libresolv.c | 2 +- dlls/dnsapi/tests/query.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c index 7e545cf36fb..864c517333d 100644 --- a/dlls/dnsapi/libresolv.c +++ b/dlls/dnsapi/libresolv.c @@ -414,7 +414,7 @@ DNS_STATUS CDECL resolv_get_serverlist( USHORT family, DNS_ADDR_ARRAY *addrs, DW if (!addrs || *len < needed) { *len = needed; - return !addrs ? ERROR_SUCCESS : ERROR_INSUFFICIENT_BUFFER; + return !addrs ? ERROR_SUCCESS : ERROR_MORE_DATA; } *len = needed; memset( addrs, 0, needed ); diff --git a/dlls/dnsapi/tests/query.c b/dlls/dnsapi/tests/query.c index 5fb47d89782..e691822a46a 100644 --- a/dlls/dnsapi/tests/query.c +++ b/dlls/dnsapi/tests/query.c @@ -155,6 +155,10 @@ static void test_DnsQueryConfig( void ) err = DnsQueryConfig( DnsConfigDnsServersIpv4, 0, name, NULL, NULL, &size ); if (err) continue; ipv4 = malloc( size ); + size--; + err = DnsQueryConfig( DnsConfigDnsServersIpv4, 0, name, NULL, ipv4, &size ); + ok( err == ERROR_MORE_DATA, "got %d\n", err ); + size++; err = DnsQueryConfig( DnsConfigDnsServersIpv4, 0, name, NULL, ipv4, &size ); ok( !err, "got %d\n", err ); -- 2.23.0

1 0

[PATCH 1/5] hidclass.sys: Validate report IDs in hid_device_xfer_report.
by Rémi Bernon 09 Aug '21

09 Aug '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hidclass.sys/device.c | 17 +++++++++++++++-- dlls/ntoskrnl.exe/tests/driver_hid.c | 4 ---- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 8 -------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 83c0c1159ff..44965e118a2 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -303,7 +303,7 @@ static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP { const WINE_HIDP_PREPARSED_DATA *preparsed = ext->u.pdo.preparsed_data; IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); - BYTE report_id = HID_INPUT_VALUE_CAPS( preparsed )->report_id; + struct hid_value_caps *caps = NULL, *caps_end = NULL; ULONG report_len = 0, buffer_len = 0; HID_XFER_PACKET packet; BYTE *buffer = NULL; @@ -326,13 +326,19 @@ static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP { case IOCTL_HID_GET_INPUT_REPORT: report_len = preparsed->caps.InputReportByteLength; + caps = HID_INPUT_VALUE_CAPS( preparsed ); + caps_end = caps + preparsed->value_caps_count[HidP_Input]; break; case IOCTL_HID_SET_OUTPUT_REPORT: report_len = preparsed->caps.OutputReportByteLength; + caps = HID_OUTPUT_VALUE_CAPS( preparsed ); + caps_end = caps + preparsed->value_caps_count[HidP_Output]; break; case IOCTL_HID_GET_FEATURE: case IOCTL_HID_SET_FEATURE: report_len = preparsed->caps.FeatureReportByteLength; + caps = HID_FEATURE_VALUE_CAPS( preparsed ); + caps_end = caps + preparsed->value_caps_count[HidP_Feature]; break; } @@ -347,11 +353,18 @@ static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP return; } + for (; caps != caps_end; ++caps) if (!caps->report_id || caps->report_id == buffer[0]) break; + if (caps == caps_end) + { + irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + return; + } + packet.reportId = buffer[0]; packet.reportBuffer = buffer; packet.reportBufferLen = buffer_len; - if (!report_id) + if (!caps->report_id) { packet.reportId = 0; packet.reportBuffer++; diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index 4f0a8591299..83f546aa972 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -532,7 +532,6 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) ok(!in_size, "got input size %u\n", in_size); ok(out_size == sizeof(*packet), "got output size %u\n", out_size); - todo_wine_if(packet->reportId == 0x5a) ok(packet->reportId == report_id, "got id %u\n", packet->reportId); ok(packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen); ok(!!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer); @@ -552,7 +551,6 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) ok(in_size == sizeof(*packet), "got input size %u\n", in_size); ok(!out_size, "got output size %u\n", out_size); - todo_wine_if(packet->reportId == 0x5a) ok(packet->reportId == report_id, "got id %u\n", packet->reportId); ok(packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen); ok(!!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer); @@ -569,7 +567,6 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) ok(!in_size, "got input size %u\n", in_size); ok(out_size == sizeof(*packet), "got output size %u\n", out_size); - todo_wine_if(packet->reportId == 0x5a) ok(packet->reportId == report_id, "got id %u\n", packet->reportId); ok(packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen); ok(!!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer); @@ -588,7 +585,6 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) ok(in_size == sizeof(*packet), "got input size %u\n", in_size); ok(!out_size, "got output size %u\n", out_size); - todo_wine_if(packet->reportId == 0x5a) ok(packet->reportId == report_id, "got id %u\n", packet->reportId); ok(packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen); ok(!!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 128a81a5f83..4909ab202a6 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2454,9 +2454,7 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled ret = HidD_GetInputReport(file, buffer, caps.InputReportByteLength); if (report_id || broken(!ret) /* w7u */) { - todo_wine ok(!ret, "HidD_GetInputReport succeeded, last error %u\n", GetLastError()); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == ERROR_CRC), "HidD_GetInputReport returned error %u\n", GetLastError()); } @@ -2499,9 +2497,7 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled ret = HidD_GetFeature(file, buffer, caps.FeatureReportByteLength); if (report_id || broken(!ret)) { - todo_wine ok(!ret, "HidD_GetFeature succeeded, last error %u\n", GetLastError()); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == ERROR_CRC), "HidD_GetFeature returned error %u\n", GetLastError()); } @@ -2544,9 +2540,7 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled ret = HidD_SetFeature(file, buffer, caps.FeatureReportByteLength); if (report_id || broken(!ret)) { - todo_wine ok(!ret, "HidD_SetFeature succeeded, last error %u\n", GetLastError()); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == ERROR_CRC), "HidD_SetFeature returned error %u\n", GetLastError()); } @@ -2593,9 +2587,7 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled ret = HidD_SetOutputReport(file, buffer, caps.OutputReportByteLength); if (report_id || broken(!ret)) { - todo_wine ok(!ret, "HidD_SetOutputReport succeeded, last error %u\n", GetLastError()); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == ERROR_CRC), "HidD_SetOutputReport returned error %u\n", GetLastError()); } -- 2.32.0

2 6

[PATCH] msxml3: use XSD regex quantifier format S{0, m} instead of S{, m}
by Damjan Jovanovic 09 Aug '21

09 Aug '21

S{,m} is invalid in libxml2 2.9.11 and later, and was never valid in the XSD specification or any XML implementation tested. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51358 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/msxml3/datatypes.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

2 2

[PATCH] uxtheme: Fix a typo in comment.
by Zhiyi Zhang 09 Aug '21

09 Aug '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/draw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 8c3c4ae2218..b8196b09966 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -523,7 +523,7 @@ static HRESULT UXTHEME_DrawImageGlyph(HTHEME hTheme, HDC hdc, int iPartId, } /*********************************************************************** - * UXTHEME_DrawImageGlyph + * UXTHEME_DrawGlyph * * Draw glyph on top of background, if appropriate */ -- 2.30.2

1 0

[PATCH 2/2] user32: Load uxtheme when theming is active.
by Zhiyi Zhang 09 Aug '21

09 Aug '21

In comctl32 DllMain(), IsThemeActive() is a delay-loaded function and shouldn't be called in DllMain(). Instead, tests showed that uxtheme should be loaded by user32. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51540 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Further tests not included in this patch series show that uxtheme gets unloaded when theming is turned off and gets loaded when theming is turned on even after application startup. This dynamic loading/unloading behavior requires at least a window and a message loop (merely calling GetMessage() is enough), which suggests a WH_GETMESSAGE hook is installed and listens for WM_THEMECHANGED. The WM_THEMECHANGED lparam is a reserved parameter that is TRUE then theming is active and FALSE otherwise. Due to the WH_GETMESSAGE hook involved, I decided not to implement the dynamic loading and unloading of uxtheme for user32 to avoid filtering every messages. Also a test application that doesn't link to comctl32 and doesn't have a comctl32 v6 manifest still has its standard scrollbars and dialogs themed when theming is active. dlls/comctl32/commctrl.c | 3 --- dlls/user32/class.c | 16 ++++++++++++++++ dlls/user32/tests/class.c | 2 +- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 1c7718e2400..b457bdcb8be 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -208,9 +208,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) TRACKBAR_Register (); TREEVIEW_Register (); UPDOWN_Register (); - - /* Call IsThemeActive() so that delay-loaded uxtheme.dll is loaded for hooking user32 */ - IsThemeActive(); break; case DLL_PROCESS_DETACH: diff --git a/dlls/user32/class.c b/dlls/user32/class.c index c17a612c5b9..cef52883988 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -539,6 +539,19 @@ static void register_builtin( const struct builtin_class_descr *descr ) release_class_ptr( classPtr ); } +static void load_uxtheme(void) +{ + BOOL (WINAPI * pIsThemeActive)(void); + HMODULE uxtheme; + + uxtheme = LoadLibraryA("uxtheme.dll"); + if (uxtheme) + { + pIsThemeActive = (void *)GetProcAddress(uxtheme, "IsThemeActive"); + if (!pIsThemeActive || !pIsThemeActive()) + FreeLibrary(uxtheme); + } +} /*********************************************************************** * register_builtins @@ -557,6 +570,9 @@ static BOOL WINAPI register_builtins( INIT_ONCE *once, void *param, void **conte register_builtin( &SCROLL_builtin_class ); register_builtin( &STATIC_builtin_class ); register_builtin( &IME_builtin_class ); + + /* Load uxtheme.dll so that standard scrollbars and dialogs are hooked for theming support */ + load_uxtheme(); return TRUE; } diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 0f4fd1cf90e..e6762032107 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1511,6 +1511,7 @@ static void test_uxtheme(void) dll_loaded = !!GetModuleHandleA("comctl32.dll"); ok(!dll_loaded, "Expected comctl32.dll not loaded.\n"); dll_loaded = !!GetModuleHandleA("uxtheme.dll"); + todo_wine_if(dll_loaded) ok(!dll_loaded, "Expected uxtheme.dll not loaded.\n"); /* Creating a window triggers uxtheme load when theming is active */ @@ -1531,7 +1532,6 @@ static void test_uxtheme(void) is_theme_active = pIsThemeActive(); FreeLibrary(uxtheme); - todo_wine_if(is_theme_active) ok(dll_loaded == is_theme_active, "Expected uxtheme %s when theming is %s.\n", is_theme_active ? "loaded" : "not loaded", is_theme_active ? "active" : "inactive"); -- 2.30.2

1 0

[PATCH 1/2] user32/tests: Test that user32 loads uxtheme.
by Zhiyi Zhang 09 Aug '21

09 Aug '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/class.c | 50 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 94dd8105a50..0f4fd1cf90e 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1490,6 +1490,55 @@ static void test_actctx_classes(void) ReleaseActCtx(context); } +static void test_uxtheme(void) +{ + static const CHAR *class_name = "test_uxtheme_class"; + BOOL (WINAPI * pIsThemeActive)(void); + BOOL dll_loaded, is_theme_active; + WNDCLASSEXA class; + HMODULE uxtheme; + ATOM atom; + HWND hwnd; + + memset(&class, 0, sizeof(class)); + class.cbSize = sizeof(class); + class.lpfnWndProc = DefWindowProcA; + class.hInstance = GetModuleHandleA(NULL); + class.lpszClassName = class_name; + atom = RegisterClassExA(&class); + ok(atom, "RegisterClassExA failed, error %u.\n", GetLastError()); + + dll_loaded = !!GetModuleHandleA("comctl32.dll"); + ok(!dll_loaded, "Expected comctl32.dll not loaded.\n"); + dll_loaded = !!GetModuleHandleA("uxtheme.dll"); + ok(!dll_loaded, "Expected uxtheme.dll not loaded.\n"); + + /* Creating a window triggers uxtheme load when theming is active */ + hwnd = CreateWindowA(class_name, "Test", WS_POPUP, 0, 0, 1, 1, NULL, NULL, + GetModuleHandleA(NULL), NULL); + ok(!!hwnd, "Failed to create a test window, error %u.\n", GetLastError()); + + dll_loaded = !!GetModuleHandleA("comctl32.dll"); + ok(!dll_loaded, "Expected comctl32.dll not loaded.\n"); + + /* Uxtheme is loaded when theming is active */ + dll_loaded = !!GetModuleHandleA("uxtheme.dll"); + + uxtheme = LoadLibraryA("uxtheme.dll"); + ok(!!uxtheme, "Failed to load uxtheme.dll, error %u.\n", GetLastError()); + pIsThemeActive = (void *)GetProcAddress(uxtheme, "IsThemeActive"); + ok(!!pIsThemeActive, "Failed to load IsThemeActive, error %u.\n", GetLastError()); + is_theme_active = pIsThemeActive(); + FreeLibrary(uxtheme); + + todo_wine_if(is_theme_active) + ok(dll_loaded == is_theme_active, "Expected uxtheme %s when theming is %s.\n", + is_theme_active ? "loaded" : "not loaded", is_theme_active ? "active" : "inactive"); + + DestroyWindow(hwnd); + UnregisterClassA(class_name, GetModuleHandleA(NULL)); +} + START_TEST(class) { char **argv; @@ -1502,6 +1551,7 @@ START_TEST(class) return; } + test_uxtheme(); test_IME(); test_GetClassInfo(); test_extra_values(); -- 2.30.2

1 0

[PATCH] tapi32: Add lineGetTranslateCapsW stub
by Alex Henrie 09 Aug '21

09 Aug '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38585 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- A stub is enough to avoid the error. --- dlls/tapi32/line.c | 9 +++++++++ dlls/tapi32/tapi32.spec | 1 + 2 files changed, 10 insertions(+) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index a44ac1a1a72..0df9746084b 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -751,6 +751,15 @@ DWORD WINAPI lineGetStatusMessages(HLINE hLine, LPDWORD lpdwLineStatus, LPDWORD return 0; } +/*********************************************************************** + * lineGetTranslateCapsW (TAPI32.@) + */ +DWORD WINAPI lineGetTranslateCapsW(HLINEAPP line_app, DWORD api_version, LINETRANSLATECAPS *caps) +{ + FIXME("(%p, %08x, %p): stub.\n", line_app, api_version, caps); + return LINEERR_OPERATIONFAILED; +} + /*********************************************************************** * lineGetTranslateCaps (TAPI32.@) * diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec index 62631efe236..6c01a870479 100644 --- a/dlls/tapi32/tapi32.spec +++ b/dlls/tapi32/tapi32.spec @@ -67,6 +67,7 @@ @ stdcall lineGetStatusMessages(long ptr ptr) @ stdcall lineGetTranslateCaps(long long ptr) lineGetTranslateCapsA @ stdcall lineGetTranslateCapsA(long long ptr) +@ stdcall lineGetTranslateCapsW(ptr long ptr) @ stdcall lineHandoff(long str long) lineHandoffA @ stdcall lineHandoffA(long str long) @ stdcall lineHold(long) -- 2.32.0

1 0

[v2 PATCH 1/2] d3dx10: Partially implement D3DX10CreateEffectFromMemory().
by Nikolay Sivov 09 Aug '21

09 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: use default include handler dlls/d3dx10_43/d3dx10_43_main.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 06b00cb0393..da9e105efba 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -32,6 +32,7 @@ #include "d3d10_1.h" #include "d3dx10.h" +#include "d3dcompiler.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); @@ -79,12 +80,32 @@ HRESULT WINAPI D3DX10CreateEffectFromMemory(const void *data, SIZE_T datasize, c 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, " + ID3D10Blob *code; + HRESULT hr; + + TRACE("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; + 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, NULL, profile, + hlslflags, fxflags, &code, errors))) + { + WARN("Effect compilation failed, hr %#x.\n", hr); + return hr; + } + + hr = D3D10CreateEffectFromMemory(ID3D10Blob_GetBufferPointer(code), ID3D10Blob_GetBufferSize(code), + fxflags, device, effectpool, effect); + ID3D10Blob_Release(code); + + return hr; } HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(const void *data, SIZE_T datasize, const char *filename, -- 2.30.2

1 1

[tools] winetest/build-patterns: Use JavaScript to hide the WineTest reruns.
by Francois Gouget 09 Aug '21

09 Aug '21

They are now included on all pages since they will not mess up the patterns. Also reruns are now right next to the first run which makes it easier to compare them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/build-patterns | 16 +++++--------- winetest/patterns.js | 49 ++++++++++++++++++++++++++++++++++++++--- winetest/report.css | 3 +++ 3 files changed, 54 insertions(+), 14 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index a1691db3d..474fa1ffc 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -436,8 +436,7 @@ sub cmpreports { my $ra = $reports{$a}; my $rb = $reports{$b}; - return $ra->{is_rerun} <=> $rb->{is_rerun} || - ($platform_order{$ra->{platform}} || 0) <=> ($platform_order{$rb->{platform}} || 0) || + return ($platform_order{$ra->{platform}} || 0) <=> ($platform_order{$rb->{platform}} || 0) || $ra->{tag} cmp $rb->{tag} || ($ra->{num} || 0) <=> ($rb->{num} || 0); } @@ -1465,7 +1464,8 @@ EOF if (!$nolist) { my @table = ("<details><summary>Page cutomization</summary> -<div class='detailsbox'><p>This section lets you select the reports to show on this page.</p><p>"); +<div class='detailsbox'><p>This section lets you select the reports to show on this page.</p><p> +<label><input id='reruns' type='checkbox' checked> Hide WineTest reruns</label><br>"); if (!$subpage or $subpage eq "-tb-win") { push @table, "<label><input id='tbwin' class='groupcb' type='checkbox' checked> Show the TestBot Windows reports</label><br>"; @@ -1498,7 +1498,8 @@ EOF my $reportdir = $sortedreports[$reportindex] || ""; my $report = $reports{$reportdir}; my $group = " data-group='". ($report->{tag} =~ /^newtb-/ ? "tb" : "") . ($report->{is_wine} ? "wine" : "win") ."'"; - push @table, "<td><label><input class='reportcb'$group type='checkbox' id='$reportdir' checked> $reportdir</label></td>"; + my $rerun = $report->{is_rerun} ? " data-rerun='1'" : ""; + push @table, "<td><label><input class='reportcb'$group$rerun type='checkbox' id='$reportdir' checked> $reportdir</label></td>"; } push @table, "</tr>"; } @@ -1546,13 +1547,6 @@ my %tbreports; foreach my $report (values %reports) { next if ($report->{tag} !~ /^newtb-/); # ignore non-TestBot reports - if ($report->{is_rerun}) - { - # Skip reruns because they are infrequent and thus usually do not - # meaningfully contribute to the patterns. - # They can still be checked on the 'all reports' page. - next; - } # Windows and Wine have different failure modes so put them on separate # pages. my $page = $report->{is_wine} ? "wine" : "win"; diff --git a/winetest/patterns.js b/winetest/patterns.js index 80ac4b868..4876113fa 100644 --- a/winetest/patterns.js +++ b/winetest/patterns.js @@ -18,14 +18,42 @@ */ "use strict"; +var hide_reruns; +var groups; var cbs; -function refreshPage(changes) +function refreshPage(changes, rerun_checked) { + if (rerun_checked != undefined && rerun_checked != hide_reruns) + { + for (let key in cbs) + { + const cb = cbs[key]; + if (!cb.rerun) continue; + + cb.dom.disabled = rerun_checked; + if (rerun_checked) + { + cb.dom.parentNode.classList.add("disabled"); + cb.dom.parentNode.title = "Reruns are hidden"; + changes[key] = false; + } + else + { + cb.dom.parentNode.classList.remove("disabled"); + cb.dom.parentNode.title = undefined; + changes[key] = groups[cb.group].checked; + } + cb.dom.checked = changes[key]; + } + hide_reruns = rerun_checked; + } + for (let key in changes) { const cb = cbs[key]; if (cb.checked == changes[key]) continue; + if (cb.dom.parentNode.disabled) continue; if (changes[key]) { @@ -50,16 +78,22 @@ function refreshPage(changes) } } +function toggledRerunCB(e) +{ + refreshPage({}, e.target.checked); +} + function toggledGroupCB(e) { const group = e.target.id; const checked = e.target.checked; + groups[group].checked = checked; const changes = {}; for (let key in cbs) { const cb = cbs[key]; - if (cb.group == group) + if (cb.group == group && !cb.dom.disabled) { cb.dom.checked = checked; changes[key] = checked; @@ -78,7 +112,15 @@ function toggledReportCB(e) function init() { + hide_reruns = false; /* reruns are shown by default */ + const domreruns = document.getElementById("reruns"); + domreruns.addEventListener('click', toggledRerunCB); + + groups = {}; document.querySelectorAll("input.groupcb").forEach(domcb => { + groups[domcb.id] = { dom: domcb, + checked: domcb.checked + }; domcb.addEventListener('click', toggledGroupCB); }); @@ -89,6 +131,7 @@ function init() checked: true, /* all reports are shown by default */ display: domcb.style.display, group: domcb.getAttribute("data-group"), + rerun: domcb.getAttribute("data-rerun"), patlines: [] }; changes[domcb.id] = domcb.checked; @@ -118,7 +161,7 @@ function init() /* When reloading a page the browser may preserve the checkbox state * so reapply them to the rest of the page. */ - refreshPage(changes); + refreshPage(changes, domreruns.checked); } window.addEventListener('load', init); diff --git a/winetest/report.css b/winetest/report.css index f193bc3be..d42e05d8d 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -75,6 +75,9 @@ table.output td { padding: 0 5px 5px; border: 1px solid #601919; } +.disabled { + color: grey; +} .pattern { display: inline-block; -- 2.20.1

1 0

[PATCH] msvcrt: Fix x87 FPU status register assignment detection.
by Piotr Caban 08 Aug '21

08 Aug '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51568 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51579 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[PATCH] mscoree: Only override Microsoft.Xna.Framework version 4.
by Esme Povirk 08 Aug '21

08 Aug '21

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- At some point when I wasn't paying attention, Wine Mono's C++/CLI support got good enough to run the original XNA redists. We only have a replacement for XNA version 4. This relaxes the default so that XNA 3.x can still load and work. In theory, we could get rid of this default entirely, but XNA has been known to be picky about graphics drivers, and at the moment FNA has more testing in this environment, so I still feel FNA is the better choice when possible. Also ideally we would add general version filtering capabilities to the override settings, so the new default could be expressed in that syntax, but I don't see an immediate need for it. dlls/mscoree/metahost.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index acefb2887ca..b3816600214 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -89,6 +89,7 @@ MonoImage* (CDECL *mono_assembly_get_image)(MonoAssembly *assembly); MonoAssembly* (CDECL *mono_assembly_load_from)(MonoImage *image, const char *fname, MonoImageOpenStatus *status); const char* (CDECL *mono_assembly_name_get_name)(MonoAssemblyName *aname); const char* (CDECL *mono_assembly_name_get_culture)(MonoAssemblyName *aname); +WORD (CDECL *mono_assembly_name_get_version)(MonoAssemblyName *aname, WORD *minor, WORD *build, WORD *revision); MonoAssembly* (CDECL *mono_assembly_open)(const char *filename, MonoImageOpenStatus *status); void (CDECL *mono_callspec_set_assembly)(MonoAssembly *assembly); MonoClass* (CDECL *mono_class_from_mono_type)(MonoType *type); @@ -199,6 +200,7 @@ static HRESULT load_mono(LPCWSTR mono_path) LOAD_MONO_FUNCTION(mono_assembly_load_from); LOAD_MONO_FUNCTION(mono_assembly_name_get_name); LOAD_MONO_FUNCTION(mono_assembly_name_get_culture); + LOAD_MONO_FUNCTION(mono_assembly_name_get_version); LOAD_MONO_FUNCTION(mono_assembly_open); LOAD_MONO_FUNCTION(mono_config_parse); LOAD_MONO_FUNCTION(mono_class_from_mono_type); @@ -1553,8 +1555,9 @@ static DWORD get_basename_search_flags(const char *basename, MonoAssemblyName *a return reg_entry.flags; } - if (strcmp(basename, "Microsoft.Xna.Framework.*") == 0) - /* XNA redist is broken in Wine Mono, use FNA instead. */ + if (strcmp(basename, "Microsoft.Xna.Framework.*") == 0 && + mono_assembly_name_get_version(aname, NULL, NULL, NULL) == 4) + /* Use FNA as a replacement for XNA4. */ return 0; return ASSEMBLY_SEARCH_UNDEFINED; -- 2.30.2

1 0

[tools 1/2] winetest/build-patterns: Allow hiding some reports on the patterns page.
by Francois Gouget 08 Aug '21

08 Aug '21

This allows zooming on the results of a specific machine or test configuration. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/build-patterns | 31 ++++++++++++- winetest/patterns.js | 100 ++++++++++++++++++++++++++++++++++++++++ winetest/report.css | 6 +++ 3 files changed, 135 insertions(+), 2 deletions(-) create mode 100644 winetest/patterns.js diff --git a/winetest/build-patterns b/winetest/build-patterns index d530ad2f8..fc6f7edbe 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -20,6 +20,7 @@ use strict; use warnings; use open ':utf8'; use CGI qw(:standard); +use POSIX; # ceil() use Text::CSV::Encoded; use Time::Piece; @@ -980,7 +981,7 @@ sub write_pattern_line($$$) my ($html, $test, $reportdir) = @_; my $testreport = $test->{testreports}->{$reportdir}; - print $html "<div class='pattern'>"; + print $html "<div class='patline' data-id='$reportdir'><div class='pattern'>"; my $has_newmode; my ($range_symbol, $range_count) = ("", 0); @@ -1086,7 +1087,7 @@ sub write_pattern_line($$$) } my $label = $reportdir; $label = "<b>$label</b>" if ($has_newmode); - print $html "</div> $label\n"; + print $html "</div> $label\n</div>"; } sub index2symbol($) @@ -1288,6 +1289,7 @@ sub write_patterns_page($$$) <head> <title>$title</title> <link rel="stylesheet" href="/report.css" type="text/css"> + <script type="text/javascript" defer="true" src="/patterns.js"></script> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> </head> <body> @@ -1462,6 +1464,31 @@ EOF $tests{0}->{desc} .= "</ul>"; if (!$nolist) { + my @table = ("<details><summary>Page cutomization</summary> +<div class='detailsbox'><p>Uncheck the reports you do not want to see on this page.</p> +<table width='100%'>"); + my @reportmap; + for (my $i = 0; $i < @sortedreports; $i++) + { + my $reportdir = $sortedreports[$i]; + push @reportmap, $i if ($pagereports->{$reportdir}); + } + my $count = @reportmap; + for (my $i = 0; $i < ceil($count/4); $i++) + { + push @table, "<tr>"; + for (my $c = 0; $c < $count; $c += ceil($count/4)) + { + my $reportindex = $reportmap[$i + $c]; + last if (!defined $reportindex); + my $reportdir = $sortedreports[$reportindex] || ""; + push @table, "<td><label><input class='reportcb' type='checkbox' id='$reportdir' checked> $reportdir</label></td>"; + } + push @table, "</tr>"; + } + push @table, "</div></table></details>"; + $tests{0}->{desc} .= join("", @table); + $tests{0}->{desc} .= "<p>Unlike the other patterns on this page, the one below shows the number of failed test units for each configuration.</p>"; } diff --git a/winetest/patterns.js b/winetest/patterns.js new file mode 100644 index 000000000..a70df079e --- /dev/null +++ b/winetest/patterns.js @@ -0,0 +1,100 @@ +/* Hide / show reports on the patterns page + * + * Copyright 2021 Francois Gouget + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +"use strict"; + +var cbs; + +function refreshPage(changes) +{ + for (let key in changes) + { + const cb = cbs[key]; + if (cb.checked == changes[key]) continue; + + if (changes[key]) + { + cb.patlines.forEach(patline => { + patline.dom.style.display = patline.display; + const test = patline.test; + if (++test.linecount == 1 && test.id != "summary") + test.dom.style.display = test.display; + }); + } + else + { + cb.patlines.forEach(patline => { + patline.dom.style.display = "none"; + const test = patline.test; + if (--test.linecount == 0 && test.id != "summary") + test.dom.style.display = "none"; + }); + } + + cb.checked = changes[key]; + } +} + +function toggledReportCB(e) +{ + const cb = e.target; + const changes = {}; + changes[cb.id] = cb.checked; + refreshPage(changes); +} + +function init() +{ + const changes = {}; + cbs = {}; + document.querySelectorAll("input.reportcb").forEach(domcb => { + cbs[domcb.id] = { checked: true, /* all reports are shown by default */ + display: domcb.style.display, + patlines: [] + }; + changes[domcb.id] = domcb.checked; + domcb.addEventListener('click', toggledReportCB); + }); + + document.querySelectorAll("div.testfile").forEach(domtest => { + const test = { id: domtest.id, + dom: domtest, + display: domtest.style.display, + linecount: 0 + }; + + 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 + }); + if (cb.checked) test.linecount++; + } + }); + }); + + /* When reloading a page the browser may preserve the checkbox state + * so reapply them to the rest of the page. + */ + refreshPage(changes); +} + +window.addEventListener('load', init); diff --git a/winetest/report.css b/winetest/report.css index 4594c5d49..f193bc3be 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -70,6 +70,12 @@ table.output td { float: right; } +.detailsbox { + margin: 5px 1em 0 1em; + padding: 0 5px 5px; + border: 1px solid #601919; +} + .pattern { display: inline-block; font-family: monospace; -- 2.20.1

2 3

[PATCH v5 resend 1/3] advapi32/tests: Add some test for perflib keys.
by Zebediah Figura 07 Aug '21

07 Aug '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/advapi32/tests/registry.c | 139 +++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 72423eae94c..cdf9b18f5d1 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -99,6 +99,11 @@ static void InitFunctionPtrs(void) pNtUnloadKey = (void *)GetProcAddress( hntdll, "NtUnloadKey" ); } +static BOOL is_special_key(HKEY key) +{ + return !!((ULONG_PTR)key & 0x80000000); +} + /* delete key and all its subkeys */ static DWORD delete_key( HKEY hkey ) { @@ -3809,6 +3814,139 @@ todo_wine ok(dwret == ERROR_SUCCESS, "got %u\n", dwret); } +static void test_perflib_key(void) +{ + unsigned int primary_lang = PRIMARYLANGID(GetUserDefaultLangID()); + unsigned int buffer_size = 1024 * 1024; + OBJECT_NAME_INFORMATION *name_info; + HKEY perflib_key, key, key2; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING string; + char lang_name[4]; + char *buffer; + DWORD size; + LONG ret; + + ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, + "Software\\Microsoft\\Windows NT\\CurrentVersion\\Perflib", 0, KEY_READ, &perflib_key); + ok(!ret, "got %u\n", ret); + + ret = RegOpenKeyExA(perflib_key, "009", 0, KEY_READ, &key); + todo_wine ok(!ret, "got %u\n", ret); + /* English always returns TEXT; most other languages return NLSTEXT, but + * some (e.g. Hindi) return TEXT */ + todo_wine ok(key == HKEY_PERFORMANCE_TEXT || key == HKEY_PERFORMANCE_NLSTEXT, "got key %p\n", key); + + ret = RegCloseKey(key); + todo_wine ok(!ret, "got %u\n", ret); + + RtlInitUnicodeString(&string, L"009"); + InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE, perflib_key, NULL); + ret = NtOpenKey((HANDLE *)&key, KEY_ALL_ACCESS, &attr); + todo_wine ok(ret == STATUS_PREDEFINED_HANDLE || ret == STATUS_ACCESS_DENIED + || ret == STATUS_SUCCESS /* Win < 7 */, "got %#x\n", ret); + if (ret == STATUS_PREDEFINED_HANDLE) + ok(!is_special_key(key), "expected a normal handle, got %p\n", key); + else if (ret == STATUS_SUCCESS) + ok(key == HKEY_PERFORMANCE_TEXT, "got key %p\n", key); + else + { + skip("Not enough permissions to test the perflib key.\n"); + RegCloseKey(perflib_key); + return; + } + + buffer = malloc(buffer_size); + + ret = NtQueryKey(key, KeyFullInformation, buffer, buffer_size, &size); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + ret = NtEnumerateKey(key, 0, KeyFullInformation, buffer, buffer_size, &size); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + RtlInitUnicodeString(&string, L"counter"); + ret = NtQueryValueKey(key, &string, KeyValuePartialInformation, buffer, buffer_size, &size); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + ret = NtEnumerateValueKey(key, 0, KeyValuePartialInformation, buffer, buffer_size, &size); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + ret = NtSetValueKey(key, &string, 0, REG_SZ, "test", 5); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + ret = NtDeleteValueKey(key, &string); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + ret = NtDeleteKey(key); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + RtlInitUnicodeString(&string, L"subkey"); + InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE, key, NULL); + ret = NtOpenKey((HANDLE *)&key2, KEY_READ, &attr); + if (is_special_key(key)) + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + else + ok(ret == STATUS_OBJECT_NAME_NOT_FOUND + || broken(ret == STATUS_INVALID_HANDLE) /* WoW64 */, "got %#x\n", ret); + + ret = NtCreateKey((HANDLE *)&key2, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL); + if (is_special_key(key)) + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + else + ok(!ret || broken(ret == STATUS_ACCESS_DENIED) /* w8adm */ + || broken(ret == STATUS_INVALID_HANDLE) /* WoW64 */, "got %#x\n", ret); + if (!ret) + { + NtDeleteKey(key2); + NtClose(key2); + } + + /* it's a real handle, though */ + ret = NtQueryObject(key, ObjectNameInformation, buffer, buffer_size, &size); + if (is_special_key(key)) + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + else + ok(!ret, "got %#x\n", ret); + if (!ret) + { + name_info = (OBJECT_NAME_INFORMATION *)buffer; + ok(!wcsicmp(name_info->Name.Buffer, L"\\REGISTRY\\MACHINE\\SOFTWARE\\Microsoft\\Windows NT" + "\\CurrentVersion\\Perflib\\009"), "got name %s\n", debugstr_w(name_info->Name.Buffer)); + } + + ret = NtClose(key); + if (is_special_key(key)) + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + else + ok(!ret, "got %#x\n", ret); + + /* multilingual support was not really completely thought through */ + + sprintf(lang_name, "%03x", primary_lang); + if (primary_lang != LANG_ENGLISH) + { + ret = RegOpenKeyExA(perflib_key, lang_name, 0, KEY_READ, &key); + todo_wine ok(!ret, "got %u\n", ret); + ok(!is_special_key(key), "expected a normal handle, got %p\n", key); + + ret = RegQueryValueExA(key, "counter", NULL, NULL, (BYTE *)buffer, &size); + todo_wine ok(ret == ERROR_FILE_NOT_FOUND, "got %u\n", ret); + + ret = RegCloseKey(key); + todo_wine ok(!ret, "got %u\n", ret); + } + + ret = RegCloseKey(perflib_key); + ok(!ret, "got %u\n", ret); + + RtlInitUnicodeString(&string, L"\\Registry\\PerfData"); + InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE, NULL, NULL); + ret = NtOpenKey((HANDLE *)&key, KEY_READ, &attr); + todo_wine ok(ret == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", ret); + + free(buffer); +} + static void test_RegLoadMUIString(void) { HMODULE hUser32, hResDll, hFile; @@ -4213,6 +4351,7 @@ START_TEST(registry) test_RegQueryValueExPerformanceData(); test_RegLoadMUIString(); test_EnumDynamicTimeZoneInformation(); + test_perflib_key(); /* cleanup */ delete_key( hkey_main ); -- 2.30.2

2 3

[PATCH] user32/tests: GetClipboardData() returns no error for missing formats.
by Francois Gouget 07 Aug '21

07 Aug '21

Despite the documentation that says if GetClipboardData() returns NULL one can check GetLastError() to know why! Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/user32/clipboard.c | 1 + dlls/user32/tests/clipboard.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index e8de7d9bdf6..a13085719a9 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -1070,6 +1070,7 @@ HANDLE WINAPI GetClipboardData( UINT format ) GlobalFree( data ); if (status == STATUS_BUFFER_OVERFLOW) continue; /* retry with the new size */ + if (status == STATUS_OBJECT_NAME_NOT_FOUND) return 0; /* no such format */ if (status) { SetLastError( RtlNtStatusToDosError( status )); diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index c8de860f8cc..4103baeef9b 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -1543,6 +1543,11 @@ static void test_handles( HWND hwnd ) data = GetClipboardData( 0xdeadfade ); ok( data == ptr, "wrong data %p\n", data ); + SetLastError( 0xdeadbeef ); + data = GetClipboardData( CF_RIFF ); + ok( GetLastError() == 0xdeadbeef, "unexpected last error %d\n", GetLastError() ); + ok( !data, "wrong data %p\n", data ); + h = SetClipboardData( CF_PRIVATEFIRST + 7, htext4 ); ok( h == htext4, "got %p\n", h ); ok( is_moveable( h ), "expected moveable mem %p\n", h ); -- 2.20.1

2 1

[PATCH 1/4] ntdll: Add missing break to case IPV6_PKTINFO
by Alex Henrie 07 Aug '21

07 Aug '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- It looks like I lost the break statement in rebasing, sorry. --- dlls/ntdll/unix/socket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 4f1b9a468eb..35c846eb7ae 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -458,6 +458,7 @@ static int convert_control_headers(struct msghdr *hdr, WSABUF *control) ptr = fill_control_message( WS_IPPROTO_IPV6, WS_IPV6_PKTINFO, ptr, &ctlsize, (void *)&data_win, sizeof(data_win) ); if (!ptr) goto error; + break; } #endif /* IPV6_PKTINFO */ -- 2.32.0

3 5

[PATCH 1/2] oleaut32: Add support for longer currency symbols.
by Francois Gouget 07 Aug '21

07 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Note that the test for Swiss francs still fails because Wine uses "SFr." as the currency symbol instead of "CHF". The "SFr." symbol is obsolete and this is the subject of bug 51460. https://bugs.winehq.org/show_bug.cgi?id=51460 --- dlls/oleaut32/tests/vartest.c | 4 +-- dlls/oleaut32/variant.c | 46 +++++++++++++++++++++-------------- dlls/oleaut32/variant.h | 13 ---------- 3 files changed, 30 insertions(+), 33 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index fbcfba32c80..6dddc79e829 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2439,10 +2439,10 @@ static void test_VarParseNumFromStrMisc(void) /* Windows 8.1 incorrectly doubles the right-to-left mark: * "\x62f.\x645.\x200f\x200f 5" */ - todo_wine ok(hres == S_OK || broken(hres == DISP_E_TYPEMISMATCH), "returned %08x\n", hres); + ok(hres == S_OK || broken(hres == DISP_E_TYPEMISMATCH), "returned %08x\n", hres); if (hres == S_OK) { - todo_wine EXPECT(1,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,6,0,0); + EXPECT(1,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,6,0,0); EXPECT2(5,FAILDIG); } diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 2ec07817460..fe4bdb41ed2 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1499,6 +1499,19 @@ HRESULT WINAPI VarUdateFromDate(DATE dateIn, ULONG dwFlags, UDATE *lpUdate) return S_OK; } +/* The localised characters that make up a valid number */ +typedef struct tagVARIANT_NUMBER_CHARS +{ + WCHAR cNegativeSymbol; + WCHAR cPositiveSymbol; + WCHAR cDecimalPoint; + WCHAR cDigitSeparator; + DWORD sCurrencyLen; + WCHAR sCurrency[8]; + WCHAR cCurrencyDecimalPoint; + WCHAR cCurrencyDigitSeparator; +} VARIANT_NUMBER_CHARS; + #define GET_NUMBER_TEXT(fld,name) \ buff[0] = 0; \ if (!GetLocaleInfoW(lcid, lctype|fld, buff, 2)) \ @@ -1510,7 +1523,7 @@ HRESULT WINAPI VarUdateFromDate(DATE dateIn, ULONG dwFlags, UDATE *lpUdate) /* Get the valid number characters for an lcid */ static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID lcid, DWORD dwFlags) { - static const VARIANT_NUMBER_CHARS defaultChars = { '-','+','.',0,'$',0,'.',',' }; + static const VARIANT_NUMBER_CHARS defaultChars = { '-','+','.',0,1,{'$',0},'.',',' }; LCTYPE lctype = dwFlags & LOCALE_NOUSEROVERRIDE; WCHAR buff[4]; @@ -1522,17 +1535,16 @@ static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID GET_NUMBER_TEXT(LOCALE_SMONDECIMALSEP, cCurrencyDecimalPoint); GET_NUMBER_TEXT(LOCALE_SMONTHOUSANDSEP, cCurrencyDigitSeparator); - /* Local currency symbols are often 2 characters */ - lpChars->cCurrencyLocal2 = '\0'; - switch(GetLocaleInfoW(lcid, lctype|LOCALE_SCURRENCY, buff, ARRAY_SIZE(buff))) + if (!GetLocaleInfoW(lcid, lctype|LOCALE_SCURRENCY, lpChars->sCurrency, ARRAY_SIZE(lpChars->sCurrency))) { - case 3: lpChars->cCurrencyLocal2 = buff[1]; /* Fall through */ - case 2: lpChars->cCurrencyLocal = buff[0]; - break; - default: WARN("buffer too small for LOCALE_SCURRENCY\n"); + if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) + WARN("buffer too small for LOCALE_SCURRENCY\n"); + *lpChars->sCurrency = 0; } - TRACE("lcid 0x%x, cCurrencyLocal=%d,%d %s\n", lcid, lpChars->cCurrencyLocal, - lpChars->cCurrencyLocal2, wine_dbgstr_w(buff)); + if (!*lpChars->sCurrency) + wcscpy(lpChars->sCurrency, L"$"); + lpChars->sCurrencyLen = wcslen(lpChars->sCurrency); + TRACE("lcid 0x%x, sCurrency=%u %s\n", lcid, lpChars->sCurrencyLen, wine_dbgstr_w(lpChars->sCurrency)); } /* Number Parsing States */ @@ -1656,12 +1668,11 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla } else if (pNumprs->dwInFlags & NUMPRS_CURRENCY && !(pNumprs->dwOutFlags & NUMPRS_CURRENCY) && - *lpszStr == chars.cCurrencyLocal && - (!chars.cCurrencyLocal2 || lpszStr[1] == chars.cCurrencyLocal2)) + wcsncmp(lpszStr, chars.sCurrency, chars.sCurrencyLen) == 0) { pNumprs->dwOutFlags |= NUMPRS_CURRENCY; - cchUsed += chars.cCurrencyLocal2 ? 2 : 1; - lpszStr += chars.cCurrencyLocal2 ? 2 : 1; + cchUsed += chars.sCurrencyLen; + lpszStr += chars.sCurrencyLen; /* Only accept currency characters */ chars.cDecimalPoint = chars.cCurrencyDecimalPoint; } @@ -1972,12 +1983,11 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla pNumprs->dwOutFlags |= NUMPRS_NEG; } else if (pNumprs->dwInFlags & NUMPRS_CURRENCY && - *lpszStr == chars.cCurrencyLocal && - (!chars.cCurrencyLocal2 || lpszStr[1] == chars.cCurrencyLocal2)) + wcsncmp(lpszStr, chars.sCurrency, chars.sCurrencyLen) == 0) { pNumprs->dwOutFlags |= NUMPRS_CURRENCY; - cchUsed += chars.cCurrencyLocal2 ? 2 : 1; - lpszStr += chars.cCurrencyLocal2 ? 2 : 1; + cchUsed += chars.sCurrencyLen; + lpszStr += chars.sCurrencyLen; } else break; diff --git a/dlls/oleaut32/variant.h b/dlls/oleaut32/variant.h index 76444cf0514..1be8f8cdc79 100644 --- a/dlls/oleaut32/variant.h +++ b/dlls/oleaut32/variant.h @@ -101,19 +101,6 @@ #define VAR_BOOLYESNO 0x0800 /* Convert bool to "Yes"/"No" */ #define VAR_NEGATIVE 0x1000 /* Number is negative */ -/* The localised characters that make up a valid number */ -typedef struct tagVARIANT_NUMBER_CHARS -{ - WCHAR cNegativeSymbol; - WCHAR cPositiveSymbol; - WCHAR cDecimalPoint; - WCHAR cDigitSeparator; - WCHAR cCurrencyLocal; - WCHAR cCurrencyLocal2; - WCHAR cCurrencyDecimalPoint; - WCHAR cCurrencyDigitSeparator; -} VARIANT_NUMBER_CHARS; - unsigned int get_type_size(ULONG*, VARTYPE) DECLSPEC_HIDDEN; HRESULT VARIANT_ClearInd(VARIANTARG *) DECLSPEC_HIDDEN; BOOL get_date_format(LCID, DWORD, const SYSTEMTIME *, -- 2.20.1

1 1

[PATCH] user32/tests: Use wine_dbgstr_a() instead of %.8s.
by Francois Gouget 07 Aug '21

07 Aug '21

This should better handle NULL pointers and bad strings. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Maybe wine_dbgstr_an(,7) would be even better. Not very important either way. --- dlls/user32/tests/clipboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 3e89e679927..bf35a224940 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -1973,7 +1973,7 @@ static void test_data_handles(void) ok( is_fixed( h ), "expected fixed mem %p\n", h ); ok( is_moveable( text ), "expected moveable mem %p\n", text ); ptr = GlobalLock( h ); - ok( !strcmp( ptr, "foobar" ), "wrong data '%.8s'\n", ptr ); + ok( ptr && !strcmp( ptr, "foobar" ), "wrong data %s\n", wine_dbgstr_a(ptr) ); GlobalUnlock( h ); r = EmptyClipboard(); -- 2.20.1

1 0

[PATCH 1/6] ws2_32: Move gethostname() to the Unix library.
by Zebediah Figura 07 Aug '21

07 Aug '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ws2_32/protocol.c | 16 +++++++++------- dlls/ws2_32/unixlib.c | 10 ++++++++++ dlls/ws2_32/ws2_32_private.h | 1 + 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index c65e6b9674e..48e7e062d7f 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -913,6 +913,7 @@ struct WS_hostent * WINAPI WS_gethostbyname( const char *name ) { struct WS_hostent *host = NULL; char hostname[100]; + int ret; TRACE( "%s\n", debugstr_a(name) ); @@ -922,9 +923,9 @@ struct WS_hostent * WINAPI WS_gethostbyname( const char *name ) return NULL; } - if (gethostname( hostname, 100 ) == -1) + if ((ret = unix_funcs->gethostname( hostname, 100 ))) { - SetLastError( WSAENOBUFS ); + SetLastError( ret ); return NULL; } @@ -973,7 +974,7 @@ struct WS_hostent * WINAPI WS_gethostbyname( const char *name ) int WINAPI WS_gethostname( char *name, int namelen ) { char buf[256]; - int len; + int len, ret; TRACE( "name %p, len %d\n", name, namelen ); @@ -983,9 +984,9 @@ int WINAPI WS_gethostname( char *name, int namelen ) return -1; } - if (gethostname( buf, sizeof(buf) ) != 0) + if ((ret = unix_funcs->gethostname( buf, sizeof(buf) ))) { - SetLastError( sock_get_error( errno ) ); + SetLastError( ret ); return -1; } @@ -1009,6 +1010,7 @@ int WINAPI WS_gethostname( char *name, int namelen ) int WINAPI GetHostNameW( WCHAR *name, int namelen ) { char buf[256]; + int ret; TRACE( "name %p, len %d\n", name, namelen ); @@ -1018,9 +1020,9 @@ int WINAPI GetHostNameW( WCHAR *name, int namelen ) return -1; } - if (gethostname( buf, sizeof(buf) )) + if ((ret = unix_funcs->gethostname( buf, sizeof(buf) ))) { - SetLastError( sock_get_error( errno ) ); + SetLastError( ret ); return -1; } diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index 2a5fcd1b60d..cde73198c16 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -30,6 +30,7 @@ #include <errno.h> #include <pthread.h> #include <stdarg.h> +#include <unistd.h> #include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> @@ -789,11 +790,20 @@ static int CDECL unix_gethostbyname( const char *name, struct WS_hostent *const #endif +static int CDECL unix_gethostname( char *name, int len ) +{ + if (!gethostname( name, len )) + return 0; + return errno_from_unix( errno ); +} + + static const struct unix_funcs funcs = { unix_getaddrinfo, unix_gethostbyaddr, unix_gethostbyname, + unix_gethostname, }; NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) diff --git a/dlls/ws2_32/ws2_32_private.h b/dlls/ws2_32/ws2_32_private.h index 38454e1a9ba..973f24a10a9 100644 --- a/dlls/ws2_32/ws2_32_private.h +++ b/dlls/ws2_32/ws2_32_private.h @@ -203,6 +203,7 @@ struct unix_funcs int (CDECL *gethostbyaddr)( const void *addr, int len, int family, struct WS(hostent) *host, unsigned int *size ); int (CDECL *gethostbyname)( const char *name, struct WS(hostent) *host, unsigned int *size ); + int (CDECL *gethostname)( char *name, int len ); }; extern const struct unix_funcs *unix_funcs; -- 2.32.0

4 8

[PATCH] ntoskrnl: Add MmGetPhysicalAddress semi-stub
by Alex Henrie 07 Aug '21

07 Aug '21

Wine doesn't have access to the physical address space, but it works to pretend that it's the same as the virtual address space. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47047 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 +++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 0580231d8e3..7f5ca846db2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2723,6 +2723,17 @@ BOOLEAN WINAPI MmIsAddressValid(PVOID VirtualAddress) return !IsBadReadPtr(VirtualAddress, 1); } +/*********************************************************************** + * MmGetPhysicalAddress (NTOSKRNL.EXE.@) + */ +PHYSICAL_ADDRESS WINAPI MmGetPhysicalAddress(void *virtual_address) +{ + PHYSICAL_ADDRESS ret; + FIXME("(%p): semi-stub\n", virtual_address); + ret.QuadPart = (ULONG_PTR)virtual_address; + return ret; +} + /*********************************************************************** * MmMapIoSpace (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index ea6d9e9fc95..f51833b91a0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -702,7 +702,7 @@ @ stub MmFreeMappingAddress @ stdcall MmFreeNonCachedMemory(ptr long) @ stub MmFreePagesFromMdl -@ stub MmGetPhysicalAddress +@ stdcall MmGetPhysicalAddress(ptr) @ stub MmGetPhysicalMemoryRanges @ stdcall MmGetSystemRoutineAddress(ptr) @ stub MmGetVirtualForPhysical -- 2.32.0

1 0

[PATCH] ntoskrnl: Implement MmGetPhysicalAddress
by Alex Henrie 07 Aug '21

07 Aug '21

Wine doesn't have access to the physical address space, but it works to pretend that it's the same as the virtual address space. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47047 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 +++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 0580231d8e3..76bf339e9bb 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2723,6 +2723,17 @@ BOOLEAN WINAPI MmIsAddressValid(PVOID VirtualAddress) return !IsBadReadPtr(VirtualAddress, 1); } +/*********************************************************************** + * MmGetPhysicalAddress (NTOSKRNL.EXE.@) + */ +PHYSICAL_ADDRESS MmGetPhysicalAddress(void *virtual_address) +{ + PHYSICAL_ADDRESS ret; + TRACE("(%p)\n", virtual_address); + ret.QuadPart = (ULONG_PTR)virtual_address; + return ret; +} + /*********************************************************************** * MmMapIoSpace (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index ea6d9e9fc95..f51833b91a0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -702,7 +702,7 @@ @ stub MmFreeMappingAddress @ stdcall MmFreeNonCachedMemory(ptr long) @ stub MmFreePagesFromMdl -@ stub MmGetPhysicalAddress +@ stdcall MmGetPhysicalAddress(ptr) @ stub MmGetPhysicalMemoryRanges @ stdcall MmGetSystemRoutineAddress(ptr) @ stub MmGetVirtualForPhysical -- 2.32.0

4 4

[PATCH] tbs: Add Tbsi_GetDeviceInfo stub.
by Gijs Vermeulen 06 Aug '21

06 Aug '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51560 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/tbs/tbs.c | 6 ++++++ dlls/tbs/tbs.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/tbs/tbs.c b/dlls/tbs/tbs.c index 452a3890e68..cb18d01fa2c 100644 --- a/dlls/tbs/tbs.c +++ b/dlls/tbs/tbs.c @@ -29,3 +29,9 @@ TBS_RESULT WINAPI Tbsi_Context_Create(const TBS_CONTEXT_PARAMS *params, TBS_HCON FIXME("(%p, %p) stub\n", params, out); return TBS_E_TPM_NOT_FOUND; } + +TBS_RESULT WINAPI Tbsi_GetDeviceInfo(UINT32 size, void *info) +{ + FIXME("(%u, %p) stub\n", size, info); + return TBS_E_TPM_NOT_FOUND; +} diff --git a/dlls/tbs/tbs.spec b/dlls/tbs/tbs.spec index 151ea1c6478..5fa68007254 100644 --- a/dlls/tbs/tbs.spec +++ b/dlls/tbs/tbs.spec @@ -6,7 +6,7 @@ @ stdcall Tbsi_Context_Create(ptr ptr) @ stub Tbsi_Create_Windows_Key @ stub Tbsi_FilterLog -@ stub Tbsi_GetDeviceInfo +@ stdcall Tbsi_GetDeviceInfo(long ptr) @ stub Tbsi_Get_OwnerAuth @ stub Tbsi_Get_TCG_Log @ stub Tbsi_Get_TCG_Log_Ex -- 2.32.0

1 0

[PATCH 1/5] xinput1_3: Merge hid.c and xinput_main.c into main.c.
by Rémi Bernon 06 Aug '21

06 Aug '21

It doesn't seem very useful to keep things separate, the files are pretty much dependent from each other anyway and it's only 1k LoC. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I'm going for more refactoring instead, I understand the intent with the hid separation but I don't think it's doing anything useful currently. I doubt we'll ever need something else than an HID backend for this, but even if we do, it's most likely going to be device based too, and the only difference will be how we'll read the state from the device file, which is overall not going to be very different from HID. dlls/xinput1_1/Makefile.in | 3 +- dlls/xinput1_2/Makefile.in | 3 +- dlls/xinput1_3/Makefile.in | 3 +- dlls/xinput1_3/hid.c | 510 ----------------- dlls/xinput1_3/main.c | 935 ++++++++++++++++++++++++++++++++ dlls/xinput1_3/xinput_main.c | 470 ---------------- dlls/xinput1_3/xinput_private.h | 37 -- dlls/xinput1_4/Makefile.in | 3 +- dlls/xinput9_1_0/Makefile.in | 3 +- 9 files changed, 940 insertions(+), 1027 deletions(-) delete mode 100644 dlls/xinput1_3/hid.c create mode 100644 dlls/xinput1_3/main.c delete mode 100644 dlls/xinput1_3/xinput_main.c delete mode 100644 dlls/xinput1_3/xinput_private.h diff --git a/dlls/xinput1_1/Makefile.in b/dlls/xinput1_1/Makefile.in index a2b17a248cd..25572e18b21 100644 --- a/dlls/xinput1_1/Makefile.in +++ b/dlls/xinput1_1/Makefile.in @@ -5,7 +5,6 @@ DELAYIMPORTS = hid setupapi EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ - hid.c \ - xinput_main.c + main.c RC_SRCS = version.rc diff --git a/dlls/xinput1_2/Makefile.in b/dlls/xinput1_2/Makefile.in index fd38c6f6cc5..3358c2cd3c8 100644 --- a/dlls/xinput1_2/Makefile.in +++ b/dlls/xinput1_2/Makefile.in @@ -5,7 +5,6 @@ DELAYIMPORTS = hid setupapi EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ - hid.c \ - xinput_main.c + main.c RC_SRCS = version.rc diff --git a/dlls/xinput1_3/Makefile.in b/dlls/xinput1_3/Makefile.in index 3b4968fb6d8..93281d4e853 100644 --- a/dlls/xinput1_3/Makefile.in +++ b/dlls/xinput1_3/Makefile.in @@ -5,7 +5,6 @@ DELAYIMPORTS = hid setupapi EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ - hid.c \ - xinput_main.c + main.c RC_SRCS = version.rc diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c deleted file mode 100644 index 00907b54bed..00000000000 --- a/dlls/xinput1_3/hid.c +++ /dev/null @@ -1,510 +0,0 @@ -/* - * The Wine project - Xinput Joystick HID interface - * Copyright 2018 Aric Stewart - * - * 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 <assert.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#include "wine/debug.h" -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winerror.h" -#include "winreg.h" -#include "wingdi.h" -#include "winnls.h" -#include "winternl.h" - -#include "setupapi.h" -#include "devpkey.h" -#include "hidusage.h" -#include "ddk/hidsdi.h" -#include "initguid.h" -#include "devguid.h" - -#include "xinput.h" -#include "xinput_private.h" - - -WINE_DEFAULT_DEBUG_CHANNEL(xinput); - -#define XINPUT_GAMEPAD_GUIDE 0x0400 - -struct axis_info -{ - LONG min; - LONG range; - USHORT bits; -}; - -struct hid_platform_private { - PHIDP_PREPARSED_DATA ppd; - HIDP_CAPS caps; - - HANDLE device; - WCHAR *device_path; - BOOL enabled; - - char *input_report_buf[2]; - char *output_report_buf; - - struct axis_info lx, ly, ltrigger, rx, ry, rtrigger; -}; - -static DWORD last_check = 0; - -static BOOL find_opened_device(SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail, int *free_slot) -{ - struct hid_platform_private *private; - int i; - - *free_slot = XUSER_MAX_COUNT; - for (i = XUSER_MAX_COUNT; i > 0; i--) - { - if (!(private = controllers[i - 1].platform_private)) *free_slot = i - 1; - else if (!wcscmp(detail->DevicePath, private->device_path)) return TRUE; - } - return FALSE; -} - -static void MarkUsage(struct hid_platform_private *private, WORD usage, LONG min, LONG max, USHORT bits) -{ - struct axis_info info = {min, max-min, bits}; - - switch (usage) - { - case HID_USAGE_GENERIC_X: private->lx = info; break; - case HID_USAGE_GENERIC_Y: private->ly = info; break; - case HID_USAGE_GENERIC_Z: private->ltrigger = info; break; - case HID_USAGE_GENERIC_RX: private->rx = info; break; - case HID_USAGE_GENERIC_RY: private->ry = info; break; - case HID_USAGE_GENERIC_RZ: private->rtrigger = info; break; - } -} - -static BOOL VerifyGamepad(PHIDP_PREPARSED_DATA ppd, XINPUT_CAPABILITIES *xinput_caps, struct hid_platform_private *private) -{ - HIDP_BUTTON_CAPS *button_caps; - HIDP_VALUE_CAPS *value_caps; - NTSTATUS status; - - int i; - int button_count = 0; - - /* Count buttons */ - memset(xinput_caps, 0, sizeof(XINPUT_CAPABILITIES)); - - if (!(button_caps = malloc(sizeof(*button_caps) * private->caps.NumberInputButtonCaps))) return FALSE; - status = HidP_GetButtonCaps(HidP_Input, button_caps, &private->caps.NumberInputButtonCaps, ppd); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetButtonCaps returned %#x\n", status); - else for (i = 0; i < private->caps.NumberInputButtonCaps; i++) - { - if (button_caps[i].UsagePage != HID_USAGE_PAGE_BUTTON) - continue; - if (button_caps[i].IsRange) - button_count = max(button_count, button_caps[i].Range.UsageMax); - else - button_count = max(button_count, button_caps[i].NotRange.Usage); - } - free(button_caps); - if (button_count < 11) - WARN("Too few buttons, continuing anyway\n"); - xinput_caps->Gamepad.wButtons = 0xffff; - - if (!(value_caps = malloc(sizeof(*value_caps) * private->caps.NumberInputValueCaps))) return FALSE; - status = HidP_GetValueCaps(HidP_Input, value_caps, &private->caps.NumberInputValueCaps, ppd); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetValueCaps returned %#x\n", status); - else for (i = 0; i < private->caps.NumberInputValueCaps; i++) - { - if (value_caps[i].UsagePage != HID_USAGE_PAGE_GENERIC) - continue; - if (value_caps[i].IsRange) - { - int u; - for (u = value_caps[i].Range.UsageMin; u <=value_caps[i].Range.UsageMax; u++) - MarkUsage(private, u, value_caps[i].LogicalMin, value_caps[i].LogicalMax, value_caps[i].BitSize); - } - else - MarkUsage(private, value_caps[i].NotRange.Usage, value_caps[i].LogicalMin, value_caps[i].LogicalMax, value_caps[i].BitSize); - } - free(value_caps); - - if (private->ltrigger.bits) - xinput_caps->Gamepad.bLeftTrigger = (1u << (sizeof(xinput_caps->Gamepad.bLeftTrigger) + 1)) - 1; - else - WARN("Missing axis LeftTrigger\n"); - if (private->rtrigger.bits) - xinput_caps->Gamepad.bRightTrigger = (1u << (sizeof(xinput_caps->Gamepad.bRightTrigger) + 1)) - 1; - else - WARN("Missing axis RightTrigger\n"); - if (private->lx.bits) - xinput_caps->Gamepad.sThumbLX = (1u << (sizeof(xinput_caps->Gamepad.sThumbLX) + 1)) - 1; - else - WARN("Missing axis ThumbLX\n"); - if (private->ly.bits) - xinput_caps->Gamepad.sThumbLY = (1u << (sizeof(xinput_caps->Gamepad.sThumbLY) + 1)) - 1; - else - WARN("Missing axis ThumbLY\n"); - if (private->rx.bits) - xinput_caps->Gamepad.sThumbRX = (1u << (sizeof(xinput_caps->Gamepad.sThumbRX) + 1)) - 1; - else - WARN("Missing axis ThumbRX\n"); - if (private->ry.bits) - xinput_caps->Gamepad.sThumbRY = (1u << (sizeof(xinput_caps->Gamepad.sThumbRY) + 1)) - 1; - else - WARN("Missing axis ThumbRY\n"); - - xinput_caps->Type = XINPUT_DEVTYPE_GAMEPAD; - xinput_caps->SubType = XINPUT_DEVSUBTYPE_GAMEPAD; - - if (private->caps.NumberOutputValueCaps > 0) - { - xinput_caps->Flags |= XINPUT_CAPS_FFB_SUPPORTED; - xinput_caps->Vibration.wLeftMotorSpeed = 255; - xinput_caps->Vibration.wRightMotorSpeed = 255; - } - - return TRUE; -} - -static BOOL init_controller(xinput_controller *controller, PHIDP_PREPARSED_DATA ppd, HIDP_CAPS *caps, HANDLE device, WCHAR *device_path) -{ - size_t size; - struct hid_platform_private *private; - - if (!(private = calloc(1, sizeof(struct hid_platform_private)))) return FALSE; - private->caps = *caps; - if (!VerifyGamepad(ppd, &controller->caps, private)) goto failed; - - TRACE("Found gamepad %s\n", debugstr_w(device_path)); - - private->ppd = ppd; - private->device = device; - if (!(private->input_report_buf[0] = calloc(1, private->caps.InputReportByteLength))) goto failed; - if (!(private->input_report_buf[1] = calloc(1, private->caps.InputReportByteLength))) goto failed; - if (!(private->output_report_buf = calloc(1, private->caps.OutputReportByteLength))) goto failed; - size = (lstrlenW(device_path) + 1) * sizeof(WCHAR); - if (!(private->device_path = malloc(size))) goto failed; - memcpy(private->device_path, device_path, size); - private->enabled = TRUE; - - memset(&controller->state, 0, sizeof(controller->state)); - memset(&controller->vibration, 0, sizeof(controller->vibration)); - - controller->platform_private = private; - return TRUE; - -failed: - free(private->device_path); - free(private->input_report_buf[0]); - free(private->input_report_buf[1]); - free(private->output_report_buf); - free(private); - return FALSE; -} - -void HID_find_gamepads(void) -{ - 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; - HDEVINFO device_info_set; - GUID hid_guid; - SP_DEVICE_INTERFACE_DATA interface_data; - PHIDP_PREPARSED_DATA ppd; - HANDLE device; - HIDP_CAPS caps; - NTSTATUS status; - DWORD idx; - int i; - - idx = GetTickCount(); - if ((idx - last_check) < 2000) - return; - - EnterCriticalSection(&xinput_crit); - - if ((idx - last_check) < 2000) - { - LeaveCriticalSection(&xinput_crit); - return; - } - last_check = idx; - - HidD_GetHidGuid(&hid_guid); - - device_info_set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); - detail->cbSize = sizeof(*detail); - - ZeroMemory(&interface_data, sizeof(interface_data)); - interface_data.cbSize = sizeof(interface_data); - - idx = 0; - while (SetupDiEnumDeviceInterfaces(device_info_set, NULL, &hid_guid, idx++, - &interface_data)) - { - if (!SetupDiGetDeviceInterfaceDetailW(device_info_set, &interface_data, detail, sizeof(buffer), NULL, NULL)) - continue; - - if (!wcsstr(detail->DevicePath, L"IG_")) - continue; - - if (find_opened_device(detail, &i)) continue; /* already opened */ - if (i == XUSER_MAX_COUNT) break; /* no more slots */ - - device = CreateFileW(detail->DevicePath, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); - if (device == INVALID_HANDLE_VALUE) - continue; - - ppd = NULL; - if (!HidD_GetPreparsedData(device, &ppd)) - WARN("ignoring HID device, HidD_GetPreparsedData failed with error %u\n", GetLastError()); - else if ((status = HidP_GetCaps(ppd, &caps)) != HIDP_STATUS_SUCCESS) - WARN("ignoring HID device, HidP_GetCaps returned %#x\n", status); - else if (caps.UsagePage != HID_USAGE_PAGE_GENERIC) - WARN("ignoring HID device, unsupported usage page %04x\n", caps.UsagePage); - else if (caps.Usage != HID_USAGE_GENERIC_GAMEPAD && caps.Usage != HID_USAGE_GENERIC_JOYSTICK && caps.Usage != HID_USAGE_GENERIC_MULTI_AXIS_CONTROLLER) - WARN("ignoring HID device, unsupported usage %04x:%04x\n", caps.UsagePage, caps.Usage); - else if (!init_controller(&controllers[i], ppd, &caps, device, detail->DevicePath)) - WARN("ignoring HID device, failed to initialize\n"); - else - continue; - - CloseHandle(device); - HidD_FreePreparsedData(ppd); - } - - SetupDiDestroyDeviceInfoList(device_info_set); - LeaveCriticalSection(&xinput_crit); -} - -static void remove_gamepad(xinput_controller *device) -{ - EnterCriticalSection(&device->crit); - - if (device->platform_private) - { - struct hid_platform_private *private = device->platform_private; - - device->platform_private = NULL; - - CloseHandle(private->device); - free(private->input_report_buf[0]); - free(private->input_report_buf[1]); - free(private->output_report_buf); - free(private->device_path); - HidD_FreePreparsedData(private->ppd); - free(private); - } - - LeaveCriticalSection(&device->crit); -} - -void HID_destroy_gamepads(void) -{ - int i; - for (i = 0; i < XUSER_MAX_COUNT; i++) - remove_gamepad(&controllers[i]); -} - -static SHORT scale_short(LONG value, const struct axis_info *axis) -{ - return ((((ULONGLONG)(value - axis->min)) * 0xffff) / axis->range) - 32768; -} - -static BYTE scale_byte(LONG value, const struct axis_info *axis) -{ - return (((ULONGLONG)(value - axis->min)) * 0xff) / axis->range; -} - -void HID_update_state(xinput_controller *device, XINPUT_STATE *state) -{ - struct hid_platform_private *private = device->platform_private; - int i; - char **report_buf = private->input_report_buf, *tmp; - ULONG report_len = private->caps.InputReportByteLength; - NTSTATUS status; - - USAGE buttons[11]; - ULONG button_length, hat_value; - LONG value; - - if (!private->enabled) - return; - - if (!HidD_GetInputReport(private->device, report_buf[0], report_len)) - { - if (GetLastError() == ERROR_ACCESS_DENIED || GetLastError() == ERROR_INVALID_HANDLE) - { - EnterCriticalSection(&xinput_crit); - remove_gamepad(device); - LeaveCriticalSection(&xinput_crit); - } - else ERR("Failed to get input report, HidD_GetInputReport failed with error %u\n", GetLastError()); - return; - } - - if (memcmp(report_buf[0], report_buf[1], report_len) != 0) - { - device->state.dwPacketNumber++; - button_length = ARRAY_SIZE(buttons); - status = HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_BUTTON, 0, buttons, &button_length, private->ppd, report_buf[0], report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetUsages HID_USAGE_PAGE_BUTTON returned %#x\n", status); - - device->state.Gamepad.wButtons = 0; - for (i = 0; i < button_length; i++) - { - switch (buttons[i]) - { - case 1: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_A; break; - case 2: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_B; break; - case 3: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_X; break; - case 4: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_Y; break; - case 5: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_LEFT_SHOULDER; break; - case 6: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_RIGHT_SHOULDER; break; - case 7: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_BACK; break; - case 8: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_START; break; - case 9: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_LEFT_THUMB; break; - case 10: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_RIGHT_THUMB; break; - case 11: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_GUIDE; break; - } - } - - status = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_HATSWITCH, &hat_value, private->ppd, report_buf[0], report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetUsageValue HID_USAGE_PAGE_GENERIC / HID_USAGE_GENERIC_HATSWITCH returned %#x\n", status); - else - { - switch(hat_value){ - /* 8 1 2 - * 7 0 3 - * 6 5 4 */ - case 0: - break; - case 1: - device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_UP; - break; - case 2: - device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_UP | XINPUT_GAMEPAD_DPAD_RIGHT; - break; - case 3: - device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_RIGHT; - break; - case 4: - device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_RIGHT | XINPUT_GAMEPAD_DPAD_DOWN; - break; - case 5: - device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_DOWN; - break; - case 6: - device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_DOWN | XINPUT_GAMEPAD_DPAD_LEFT; - break; - case 7: - device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_LEFT; - break; - case 8: - device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_LEFT | XINPUT_GAMEPAD_DPAD_UP; - break; - } - } - - status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, &value, private->ppd, report_buf[0], report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetScaledUsageValue HID_USAGE_PAGE_GENERIC / HID_USAGE_GENERIC_X returned %#x\n", status); - else device->state.Gamepad.sThumbLX = scale_short(value, &private->lx); - - status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Y, &value, private->ppd, report_buf[0], report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetScaledUsageValue HID_USAGE_PAGE_GENERIC / HID_USAGE_GENERIC_Y returned %#x\n", status); - else device->state.Gamepad.sThumbLY = -scale_short(value, &private->ly) - 1; - - status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RX, &value, private->ppd, report_buf[0], report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetScaledUsageValue HID_USAGE_PAGE_GENERIC / HID_USAGE_GENERIC_RX returned %#x\n", status); - else device->state.Gamepad.sThumbRX = scale_short(value, &private->rx); - - status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, &value, private->ppd, report_buf[0], report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetScaledUsageValue HID_USAGE_PAGE_GENERIC / HID_USAGE_GENERIC_RY returned %#x\n", status); - else device->state.Gamepad.sThumbRY = -scale_short(value, &private->ry) - 1; - - status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RZ, &value, private->ppd, report_buf[0], report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetScaledUsageValue HID_USAGE_PAGE_GENERIC / HID_USAGE_GENERIC_RZ returned %#x\n", status); - else device->state.Gamepad.bRightTrigger = scale_byte(value, &private->rtrigger); - - status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, &value, private->ppd, report_buf[0], report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetScaledUsageValue HID_USAGE_PAGE_GENERIC / HID_USAGE_GENERIC_Z returned %#x\n", status); - else device->state.Gamepad.bLeftTrigger = scale_byte(value, &private->ltrigger); - } - - tmp = report_buf[0]; - report_buf[0] = report_buf[1]; - report_buf[1] = tmp; - memcpy(state, &device->state, sizeof(*state)); -} - -DWORD HID_set_state(xinput_controller* device, XINPUT_VIBRATION* state) -{ - struct hid_platform_private *private = device->platform_private; - char *output_report_buf = private->output_report_buf; - ULONG output_report_len = private->caps.OutputReportByteLength; - - if (device->caps.Flags & XINPUT_CAPS_FFB_SUPPORTED) - { - device->vibration.wLeftMotorSpeed = state->wLeftMotorSpeed; - device->vibration.wRightMotorSpeed = state->wRightMotorSpeed; - - if (private->enabled) - { - memset(output_report_buf, 0, output_report_len); - output_report_buf[0] = /* report id */ 0; - output_report_buf[1] = 0x8; - output_report_buf[3] = (BYTE)(state->wLeftMotorSpeed / 256); - output_report_buf[4] = (BYTE)(state->wRightMotorSpeed / 256); - - if (!HidD_SetOutputReport(private->device, output_report_buf, output_report_len)) - { - WARN("unable to set output report, HidD_SetOutputReport failed with error %u\n", GetLastError()); - return GetLastError(); - } - - return ERROR_SUCCESS; - } - } - - return ERROR_SUCCESS; -} - -void HID_enable(xinput_controller* device, BOOL enable) -{ - struct hid_platform_private *private = device->platform_private; - - if (device->caps.Flags & XINPUT_CAPS_FFB_SUPPORTED) - { - if (private->enabled && !enable) - { - XINPUT_VIBRATION state; - state.wLeftMotorSpeed = 0; - state.wRightMotorSpeed = 0; - HID_set_state(device, &state); - } - else if (!private->enabled && enable) - { - HID_set_state(device, &device->vibration); - } - } - - private->enabled = enable; -} diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c new file mode 100644 index 00000000000..6badd74851c --- /dev/null +++ b/dlls/xinput1_3/main.c @@ -0,0 +1,935 @@ +/* + * The Wine project - Xinput Joystick Library + * Copyright 2008 Andrew Fenn + * Copyright 2018 Aric Stewart + * Copyright 2021 Rémi Bernon 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 <assert.h> +#include <stdarg.h> +#include <string.h> +#include <stdlib.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winuser.h" +#include "winreg.h" +#include "wingdi.h" +#include "winnls.h" +#include "winternl.h" + +#include "setupapi.h" +#include "devpkey.h" +#include "hidusage.h" +#include "ddk/hidsdi.h" +#include "initguid.h" +#include "devguid.h" +#include "xinput.h" + +#include "wine/debug.h" + +/* Not defined in the headers, used only by XInputGetStateEx */ +#define XINPUT_GAMEPAD_GUIDE 0x0400 + +WINE_DEFAULT_DEBUG_CHANNEL(xinput); + +typedef struct _xinput_controller +{ + CRITICAL_SECTION crit; + XINPUT_CAPABILITIES caps; + void *platform_private; /* non-NULL when device is valid; validity may be read without holding crit */ + XINPUT_STATE state; + XINPUT_GAMEPAD last_keystroke; + XINPUT_VIBRATION vibration; +} xinput_controller; + +/* xinput_crit guards controllers array */ +static CRITICAL_SECTION xinput_crit; +static CRITICAL_SECTION_DEBUG xinput_critsect_debug = +{ + 0, 0, &xinput_crit, + { &xinput_critsect_debug.ProcessLocksList, &xinput_critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": xinput_crit") } +}; +static CRITICAL_SECTION xinput_crit = { &xinput_critsect_debug, -1, 0, 0, 0, 0 }; + +static xinput_controller controllers[XUSER_MAX_COUNT]; +static CRITICAL_SECTION_DEBUG controller_critsect_debug[XUSER_MAX_COUNT] = +{ + { + 0, 0, &controllers[0].crit, + { &controller_critsect_debug[0].ProcessLocksList, &controller_critsect_debug[0].ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": controllers[0].crit") } + }, + { + 0, 0, &controllers[1].crit, + { &controller_critsect_debug[1].ProcessLocksList, &controller_critsect_debug[1].ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": controllers[1].crit") } + }, + { + 0, 0, &controllers[2].crit, + { &controller_critsect_debug[2].ProcessLocksList, &controller_critsect_debug[2].ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": controllers[2].crit") } + }, + { + 0, 0, &controllers[3].crit, + { &controller_critsect_debug[3].ProcessLocksList, &controller_critsect_debug[3].ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": controllers[3].crit") } + }, +}; + +static xinput_controller controllers[XUSER_MAX_COUNT] = +{ + {{ &controller_critsect_debug[0], -1, 0, 0, 0, 0 }}, + {{ &controller_critsect_debug[1], -1, 0, 0, 0, 0 }}, + {{ &controller_critsect_debug[2], -1, 0, 0, 0, 0 }}, + {{ &controller_critsect_debug[3], -1, 0, 0, 0, 0 }}, +}; + +struct axis_info +{ + LONG min; + LONG range; + USHORT bits; +}; + +struct hid_platform_private +{ + PHIDP_PREPARSED_DATA preparsed; + HIDP_CAPS caps; + + HANDLE device; + WCHAR *device_path; + BOOL enabled; + + char *input_report_buf[2]; + char *output_report_buf; + + struct axis_info lx, ly, ltrigger, rx, ry, rtrigger; +}; + +static DWORD last_check = 0; + +static BOOL find_opened_device(SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail, int *free_slot) +{ + struct hid_platform_private *private; + int i; + + *free_slot = XUSER_MAX_COUNT; + for (i = XUSER_MAX_COUNT; i > 0; i--) + { + if (!(private = controllers[i - 1].platform_private)) *free_slot = i - 1; + else if (!wcscmp(detail->DevicePath, private->device_path)) return TRUE; + } + return FALSE; +} + +static void MarkUsage(struct hid_platform_private *private, WORD usage, LONG min, LONG max, USHORT bits) +{ + struct axis_info info = {min, max - min, bits}; + + switch (usage) + { + case HID_USAGE_GENERIC_X: private->lx = info; break; + case HID_USAGE_GENERIC_Y: private->ly = info; break; + case HID_USAGE_GENERIC_Z: private->ltrigger = info; break; + case HID_USAGE_GENERIC_RX: private->rx = info; break; + case HID_USAGE_GENERIC_RY: private->ry = info; break; + case HID_USAGE_GENERIC_RZ: private->rtrigger = info; break; + } +} + +static BOOL VerifyGamepad(PHIDP_PREPARSED_DATA preparsed, XINPUT_CAPABILITIES *xinput_caps, + struct hid_platform_private *private) +{ + HIDP_BUTTON_CAPS *button_caps; + HIDP_VALUE_CAPS *value_caps; + NTSTATUS status; + + int i; + int button_count = 0; + + /* Count buttons */ + memset(xinput_caps, 0, sizeof(XINPUT_CAPABILITIES)); + + if (!(button_caps = malloc(sizeof(*button_caps) * private->caps.NumberInputButtonCaps))) return FALSE; + status = HidP_GetButtonCaps(HidP_Input, button_caps, &private->caps.NumberInputButtonCaps, preparsed); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetButtonCaps returned %#x\n", status); + else for (i = 0; i < private->caps.NumberInputButtonCaps; i++) + { + if (button_caps[i].UsagePage != HID_USAGE_PAGE_BUTTON) + continue; + if (button_caps[i].IsRange) + button_count = max(button_count, button_caps[i].Range.UsageMax); + else + button_count = max(button_count, button_caps[i].NotRange.Usage); + } + free(button_caps); + if (button_count < 11) + WARN("Too few buttons, continuing anyway\n"); + xinput_caps->Gamepad.wButtons = 0xffff; + + if (!(value_caps = malloc(sizeof(*value_caps) * private->caps.NumberInputValueCaps))) return FALSE; + status = HidP_GetValueCaps(HidP_Input, value_caps, &private->caps.NumberInputValueCaps, preparsed); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetValueCaps returned %#x\n", status); + else for (i = 0; i < private->caps.NumberInputValueCaps; i++) + { + if (value_caps[i].UsagePage != HID_USAGE_PAGE_GENERIC) + continue; + if (value_caps[i].IsRange) + { + int u; + for (u = value_caps[i].Range.UsageMin; u <=value_caps[i].Range.UsageMax; u++) + MarkUsage(private, u, value_caps[i].LogicalMin, value_caps[i].LogicalMax, value_caps[i].BitSize); + } + else + MarkUsage(private, value_caps[i].NotRange.Usage, value_caps[i].LogicalMin, value_caps[i].LogicalMax, value_caps[i].BitSize); + } + free(value_caps); + + if (private->ltrigger.bits) + xinput_caps->Gamepad.bLeftTrigger = (1u << (sizeof(xinput_caps->Gamepad.bLeftTrigger) + 1)) - 1; + else + WARN("Missing axis LeftTrigger\n"); + if (private->rtrigger.bits) + xinput_caps->Gamepad.bRightTrigger = (1u << (sizeof(xinput_caps->Gamepad.bRightTrigger) + 1)) - 1; + else + WARN("Missing axis RightTrigger\n"); + if (private->lx.bits) + xinput_caps->Gamepad.sThumbLX = (1u << (sizeof(xinput_caps->Gamepad.sThumbLX) + 1)) - 1; + else + WARN("Missing axis ThumbLX\n"); + if (private->ly.bits) + xinput_caps->Gamepad.sThumbLY = (1u << (sizeof(xinput_caps->Gamepad.sThumbLY) + 1)) - 1; + else + WARN("Missing axis ThumbLY\n"); + if (private->rx.bits) + xinput_caps->Gamepad.sThumbRX = (1u << (sizeof(xinput_caps->Gamepad.sThumbRX) + 1)) - 1; + else + WARN("Missing axis ThumbRX\n"); + if (private->ry.bits) + xinput_caps->Gamepad.sThumbRY = (1u << (sizeof(xinput_caps->Gamepad.sThumbRY) + 1)) - 1; + else + WARN("Missing axis ThumbRY\n"); + + xinput_caps->Type = XINPUT_DEVTYPE_GAMEPAD; + xinput_caps->SubType = XINPUT_DEVSUBTYPE_GAMEPAD; + + if (private->caps.NumberOutputValueCaps > 0) + { + xinput_caps->Flags |= XINPUT_CAPS_FFB_SUPPORTED; + xinput_caps->Vibration.wLeftMotorSpeed = 255; + xinput_caps->Vibration.wRightMotorSpeed = 255; + } + + return TRUE; +} + +static BOOL init_controller(xinput_controller *controller, PHIDP_PREPARSED_DATA preparsed, + HIDP_CAPS *caps, HANDLE device, WCHAR *device_path) +{ + size_t size; + struct hid_platform_private *private; + + if (!(private = calloc(1, sizeof(struct hid_platform_private)))) return FALSE; + private->caps = *caps; + if (!VerifyGamepad(preparsed, &controller->caps, private)) goto failed; + + TRACE("Found gamepad %s\n", debugstr_w(device_path)); + + private->preparsed = preparsed; + private->device = device; + if (!(private->input_report_buf[0] = calloc(1, private->caps.InputReportByteLength))) goto failed; + if (!(private->input_report_buf[1] = calloc(1, private->caps.InputReportByteLength))) goto failed; + if (!(private->output_report_buf = calloc(1, private->caps.OutputReportByteLength))) goto failed; + size = (lstrlenW(device_path) + 1) * sizeof(WCHAR); + if (!(private->device_path = malloc(size))) goto failed; + memcpy(private->device_path, device_path, size); + private->enabled = TRUE; + + memset(&controller->state, 0, sizeof(controller->state)); + memset(&controller->vibration, 0, sizeof(controller->vibration)); + + controller->platform_private = private; + return TRUE; + +failed: + free(private->device_path); + free(private->input_report_buf[0]); + free(private->input_report_buf[1]); + free(private->output_report_buf); + free(private); + return FALSE; +} + +static void HID_find_gamepads(void) +{ + 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)}; + PHIDP_PREPARSED_DATA preparsed; + HIDP_CAPS caps; + NTSTATUS status; + HDEVINFO set; + HANDLE device; + DWORD idx; + GUID guid; + int i; + + idx = GetTickCount(); + if ((idx - last_check) < 2000) return; + + EnterCriticalSection(&xinput_crit); + + if ((idx - last_check) < 2000) + { + LeaveCriticalSection(&xinput_crit); + return; + } + last_check = idx; + + HidD_GetHidGuid(&guid); + + set = SetupDiGetClassDevsW(&guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); + detail->cbSize = sizeof(*detail); + + idx = 0; + while (SetupDiEnumDeviceInterfaces(set, NULL, &guid, idx++, &iface)) + { + if (!SetupDiGetDeviceInterfaceDetailW(set, &iface, detail, sizeof(buffer), NULL, NULL)) + continue; + + if (!wcsstr(detail->DevicePath, L"IG_")) continue; + + if (find_opened_device(detail, &i)) continue; /* already opened */ + if (i == XUSER_MAX_COUNT) break; /* no more slots */ + + device = CreateFileW(detail->DevicePath, GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); + if (device == INVALID_HANDLE_VALUE) continue; + + preparsed = NULL; + if (!HidD_GetPreparsedData(device, &preparsed)) + WARN("ignoring HID device, HidD_GetPreparsedData failed with error %u\n", GetLastError()); + else if ((status = HidP_GetCaps(preparsed, &caps)) != HIDP_STATUS_SUCCESS) + WARN("ignoring HID device, HidP_GetCaps returned %#x\n", status); + else if (caps.UsagePage != HID_USAGE_PAGE_GENERIC) + WARN("ignoring HID device, unsupported usage page %04x\n", caps.UsagePage); + else if (caps.Usage != HID_USAGE_GENERIC_GAMEPAD && caps.Usage != HID_USAGE_GENERIC_JOYSTICK && + caps.Usage != HID_USAGE_GENERIC_MULTI_AXIS_CONTROLLER) + WARN("ignoring HID device, unsupported usage %04x:%04x\n", caps.UsagePage, caps.Usage); + else if (!init_controller(&controllers[i], preparsed, &caps, device, detail->DevicePath)) + WARN("ignoring HID device, failed to initialize\n"); + else + continue; + + CloseHandle(device); + HidD_FreePreparsedData(preparsed); + } + + SetupDiDestroyDeviceInfoList(set); + LeaveCriticalSection(&xinput_crit); +} + +static void remove_gamepad(xinput_controller *device) +{ + EnterCriticalSection(&device->crit); + + if (device->platform_private) + { + struct hid_platform_private *private = device->platform_private; + + device->platform_private = NULL; + + CloseHandle(private->device); + free(private->input_report_buf[0]); + free(private->input_report_buf[1]); + free(private->output_report_buf); + free(private->device_path); + HidD_FreePreparsedData(private->preparsed); + free(private); + } + + LeaveCriticalSection(&device->crit); +} + +static void HID_destroy_gamepads(void) +{ + int i; + for (i = 0; i < XUSER_MAX_COUNT; i++) remove_gamepad(&controllers[i]); +} + +static SHORT scale_short(LONG value, const struct axis_info *axis) +{ + return ((((ULONGLONG)(value - axis->min)) * 0xffff) / axis->range) - 32768; +} + +static BYTE scale_byte(LONG value, const struct axis_info *axis) +{ + return (((ULONGLONG)(value - axis->min)) * 0xff) / axis->range; +} + +static void HID_update_state(xinput_controller *device, XINPUT_STATE *state) +{ + struct hid_platform_private *private = device->platform_private; + int i; + char **report_buf = private->input_report_buf, *tmp; + ULONG report_len = private->caps.InputReportByteLength; + NTSTATUS status; + + USAGE buttons[11]; + ULONG button_length, hat_value; + LONG value; + + if (!private->enabled) return; + + if (!HidD_GetInputReport(private->device, report_buf[0], report_len)) + { + if (GetLastError() == ERROR_ACCESS_DENIED || GetLastError() == ERROR_INVALID_HANDLE) + { + EnterCriticalSection(&xinput_crit); + remove_gamepad(device); + LeaveCriticalSection(&xinput_crit); + } + else ERR("Failed to get input report, HidD_GetInputReport failed with error %u\n", GetLastError()); + return; + } + + if (memcmp(report_buf[0], report_buf[1], report_len) != 0) + { + device->state.dwPacketNumber++; + button_length = ARRAY_SIZE(buttons); + status = HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_BUTTON, 0, buttons, &button_length, private->preparsed, report_buf[0], report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetUsages HID_USAGE_PAGE_BUTTON returned %#x\n", status); + + device->state.Gamepad.wButtons = 0; + for (i = 0; i < button_length; i++) + { + switch (buttons[i]) + { + case 1: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_A; break; + case 2: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_B; break; + case 3: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_X; break; + case 4: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_Y; break; + case 5: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_LEFT_SHOULDER; break; + case 6: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_RIGHT_SHOULDER; break; + case 7: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_BACK; break; + case 8: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_START; break; + case 9: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_LEFT_THUMB; break; + case 10: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_RIGHT_THUMB; break; + case 11: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_GUIDE; break; + } + } + + status = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_HATSWITCH, &hat_value, private->preparsed, report_buf[0], report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetUsageValue HID_USAGE_PAGE_GENERIC / HID_USAGE_GENERIC_HATSWITCH returned %#x\n", status); + else + { + switch(hat_value){ + /* 8 1 2 + * 7 0 3 + * 6 5 4 */ + case 0: + break; + case 1: + device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_UP; + break; + case 2: + device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_UP | XINPUT_GAMEPAD_DPAD_RIGHT; + break; + case 3: + device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_RIGHT; + break; + case 4: + device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_RIGHT | XINPUT_GAMEPAD_DPAD_DOWN; + break; + case 5: + device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_DOWN; + break; + case 6: + device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_DOWN | XINPUT_GAMEPAD_DPAD_LEFT; + break; + case 7: + device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_LEFT; + break; + case 8: + device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_LEFT | XINPUT_GAMEPAD_DPAD_UP; + break; + } + } + + status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, &value, private->preparsed, report_buf[0], report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetScaledUsageValue HID_USAGE_PAGE_GENERIC / HID_USAGE_GENERIC_X returned %#x\n", status); + else device->state.Gamepad.sThumbLX = scale_short(value, &private->lx); + + status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Y, &value, private->preparsed, report_buf[0], report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetScaledUsageValue HID_USAGE_PAGE_GENERIC / HID_USAGE_GENERIC_Y returned %#x\n", status); + else device->state.Gamepad.sThumbLY = -scale_short(value, &private->ly) - 1; + + status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RX, &value, private->preparsed, report_buf[0], report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetScaledUsageValue HID_USAGE_PAGE_GENERIC / HID_USAGE_GENERIC_RX returned %#x\n", status); + else device->state.Gamepad.sThumbRX = scale_short(value, &private->rx); + + status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, &value, private->preparsed, report_buf[0], report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetScaledUsageValue HID_USAGE_PAGE_GENERIC / HID_USAGE_GENERIC_RY returned %#x\n", status); + else device->state.Gamepad.sThumbRY = -scale_short(value, &private->ry) - 1; + + status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RZ, &value, private->preparsed, report_buf[0], report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetScaledUsageValue HID_USAGE_PAGE_GENERIC / HID_USAGE_GENERIC_RZ returned %#x\n", status); + else device->state.Gamepad.bRightTrigger = scale_byte(value, &private->rtrigger); + + status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, &value, private->preparsed, report_buf[0], report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetScaledUsageValue HID_USAGE_PAGE_GENERIC / HID_USAGE_GENERIC_Z returned %#x\n", status); + else device->state.Gamepad.bLeftTrigger = scale_byte(value, &private->ltrigger); + } + + tmp = report_buf[0]; + report_buf[0] = report_buf[1]; + report_buf[1] = tmp; + memcpy(state, &device->state, sizeof(*state)); +} + +static DWORD HID_set_state(xinput_controller *device, XINPUT_VIBRATION *state) +{ + struct hid_platform_private *private = device->platform_private; + char *output_report_buf = private->output_report_buf; + ULONG output_report_len = private->caps.OutputReportByteLength; + + if (device->caps.Flags & XINPUT_CAPS_FFB_SUPPORTED) + { + device->vibration.wLeftMotorSpeed = state->wLeftMotorSpeed; + device->vibration.wRightMotorSpeed = state->wRightMotorSpeed; + + if (private->enabled) + { + memset(output_report_buf, 0, output_report_len); + output_report_buf[0] = /* report id */ 0; + output_report_buf[1] = 0x8; + output_report_buf[3] = (BYTE)(state->wLeftMotorSpeed / 256); + output_report_buf[4] = (BYTE)(state->wRightMotorSpeed / 256); + + if (!HidD_SetOutputReport(private->device, output_report_buf, output_report_len)) + { + WARN("unable to set output report, HidD_SetOutputReport failed with error %u\n", GetLastError()); + return GetLastError(); + } + + return ERROR_SUCCESS; + } + } + + return ERROR_SUCCESS; +} + +static void HID_enable(xinput_controller *device, BOOL enable) +{ + struct hid_platform_private *private = device->platform_private; + + if (device->caps.Flags & XINPUT_CAPS_FFB_SUPPORTED) + { + if (private->enabled && !enable) + { + XINPUT_VIBRATION state; + state.wLeftMotorSpeed = 0; + state.wRightMotorSpeed = 0; + HID_set_state(device, &state); + } + else if (!private->enabled && enable) + { + HID_set_state(device, &device->vibration); + } + } + + private->enabled = enable; +} + +static BOOL verify_and_lock_device(xinput_controller *device) +{ + if (!device->platform_private) return FALSE; + + EnterCriticalSection(&device->crit); + + if (!device->platform_private) + { + LeaveCriticalSection(&device->crit); + return FALSE; + } + + return TRUE; +} + +static void unlock_device(xinput_controller *device) +{ + LeaveCriticalSection(&device->crit); +} + +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(inst); + break; + case DLL_PROCESS_DETACH: + if (reserved) break; + HID_destroy_gamepads(); + break; + } + return TRUE; +} + +void WINAPI DECLSPEC_HOTPATCH XInputEnable(BOOL enable) +{ + int index; + + TRACE("(enable %d)\n", enable); + + /* Setting to false will stop messages from XInputSetState being sent + to the controllers. Setting to true will send the last vibration + value (sent to XInputSetState) to the controller and allow messages to + be sent */ + HID_find_gamepads(); + + for (index = 0; index < XUSER_MAX_COUNT; index++) + { + if (!verify_and_lock_device(&controllers[index])) continue; + HID_enable(&controllers[index], enable); + unlock_device(&controllers[index]); + } +} + +DWORD WINAPI DECLSPEC_HOTPATCH XInputSetState(DWORD index, XINPUT_VIBRATION *vibration) +{ + DWORD ret; + + TRACE("(index %u, vibration %p)\n", index, vibration); + + HID_find_gamepads(); + + if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; + if (!verify_and_lock_device(&controllers[index])) return ERROR_DEVICE_NOT_CONNECTED; + + ret = HID_set_state(&controllers[index], vibration); + + unlock_device(&controllers[index]); + + return ret; +} + +/* Some versions of SteamOverlayRenderer hot-patch XInputGetStateEx() and call + * XInputGetState() in the hook, so we need a wrapper. */ +static DWORD xinput_get_state(DWORD index, XINPUT_STATE *state) +{ + if (!state) return ERROR_BAD_ARGUMENTS; + + HID_find_gamepads(); + + if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; + if (!verify_and_lock_device(&controllers[index])) return ERROR_DEVICE_NOT_CONNECTED; + + HID_update_state(&controllers[index], state); + + if (!controllers[index].platform_private) + { + /* update_state may have disconnected the controller */ + unlock_device(&controllers[index]); + return ERROR_DEVICE_NOT_CONNECTED; + } + + unlock_device(&controllers[index]); + + return ERROR_SUCCESS; +} + +DWORD WINAPI DECLSPEC_HOTPATCH XInputGetState(DWORD index, XINPUT_STATE *state) +{ + DWORD ret; + + TRACE("(index %u, state %p)!\n", index, state); + + ret = xinput_get_state(index, state); + if (ret != ERROR_SUCCESS) return ret; + + /* The main difference between this and the Ex version is the media guide button */ + state->Gamepad.wButtons &= ~XINPUT_GAMEPAD_GUIDE; + + return ERROR_SUCCESS; +} + +DWORD WINAPI DECLSPEC_HOTPATCH XInputGetStateEx(DWORD index, XINPUT_STATE *state) +{ + TRACE("(index %u, state %p)!\n", index, state); + + return xinput_get_state(index, state); +} + +static const int JS_STATE_OFF = 0; +static const int JS_STATE_LOW = 1; +static const int JS_STATE_HIGH = 2; + +static int joystick_state(const SHORT value) +{ + if (value > 20000) return JS_STATE_HIGH; + if (value < -20000) return JS_STATE_LOW; + return JS_STATE_OFF; +} + +static WORD js_vk_offs(const int x, const int y) +{ + if (y == JS_STATE_OFF) + { + /*if (x == JS_STATE_OFF) shouldn't get here */ + if (x == JS_STATE_LOW) return 3; /* LEFT */ + /*if (x == JS_STATE_HIGH)*/ return 2; /* RIGHT */ + } + if (y == JS_STATE_HIGH) + { + if (x == JS_STATE_OFF) return 0; /* UP */ + if (x == JS_STATE_LOW) return 4; /* UPLEFT */ + /*if (x == JS_STATE_HIGH)*/ return 5; /* UPRIGHT */ + } + /*if (y == JS_STATE_LOW)*/ + { + if (x == JS_STATE_OFF) return 1; /* DOWN */ + if (x == JS_STATE_LOW) return 7; /* DOWNLEFT */ + /*if (x == JS_STATE_HIGH)*/ return 6; /* DOWNRIGHT */ + } +} + +static DWORD check_joystick_keystroke(const DWORD index, XINPUT_KEYSTROKE *keystroke, const SHORT *cur_x, + const SHORT *cur_y, SHORT *last_x, SHORT *last_y, const WORD base_vk) +{ + int cur_vk = 0, cur_x_st, cur_y_st; + int last_vk = 0, last_x_st, last_y_st; + + cur_x_st = joystick_state(*cur_x); + cur_y_st = joystick_state(*cur_y); + if (cur_x_st || cur_y_st) + cur_vk = base_vk + js_vk_offs(cur_x_st, cur_y_st); + + last_x_st = joystick_state(*last_x); + last_y_st = joystick_state(*last_y); + if (last_x_st || last_y_st) + last_vk = base_vk + js_vk_offs(last_x_st, last_y_st); + + if (cur_vk != last_vk) + { + if (last_vk) + { + /* joystick was set, and now different. send a KEYUP event, and set + * last pos to centered, so the appropriate KEYDOWN event will be + * sent on the next call. */ + keystroke->VirtualKey = last_vk; + keystroke->Unicode = 0; /* unused */ + keystroke->Flags = XINPUT_KEYSTROKE_KEYUP; + keystroke->UserIndex = index; + keystroke->HidCode = 0; + + *last_x = 0; + *last_y = 0; + + return ERROR_SUCCESS; + } + + /* joystick was unset, send KEYDOWN. */ + keystroke->VirtualKey = cur_vk; + keystroke->Unicode = 0; /* unused */ + keystroke->Flags = XINPUT_KEYSTROKE_KEYDOWN; + keystroke->UserIndex = index; + keystroke->HidCode = 0; + + *last_x = *cur_x; + *last_y = *cur_y; + + return ERROR_SUCCESS; + } + + *last_x = *cur_x; + *last_y = *cur_y; + + return ERROR_EMPTY; +} + +static BOOL trigger_is_on(const BYTE value) +{ + return value > 30; +} + +static DWORD check_for_keystroke(const DWORD index, XINPUT_KEYSTROKE *keystroke) +{ + xinput_controller *device = &controllers[index]; + const XINPUT_GAMEPAD *cur; + DWORD ret = ERROR_EMPTY; + int i; + + static const struct + { + int mask; + WORD vk; + } buttons[] = { + { XINPUT_GAMEPAD_DPAD_UP, VK_PAD_DPAD_UP }, + { XINPUT_GAMEPAD_DPAD_DOWN, VK_PAD_DPAD_DOWN }, + { XINPUT_GAMEPAD_DPAD_LEFT, VK_PAD_DPAD_LEFT }, + { XINPUT_GAMEPAD_DPAD_RIGHT, VK_PAD_DPAD_RIGHT }, + { XINPUT_GAMEPAD_START, VK_PAD_START }, + { XINPUT_GAMEPAD_BACK, VK_PAD_BACK }, + { XINPUT_GAMEPAD_LEFT_THUMB, VK_PAD_LTHUMB_PRESS }, + { XINPUT_GAMEPAD_RIGHT_THUMB, VK_PAD_RTHUMB_PRESS }, + { XINPUT_GAMEPAD_LEFT_SHOULDER, VK_PAD_LSHOULDER }, + { XINPUT_GAMEPAD_RIGHT_SHOULDER, VK_PAD_RSHOULDER }, + { XINPUT_GAMEPAD_A, VK_PAD_A }, + { XINPUT_GAMEPAD_B, VK_PAD_B }, + { XINPUT_GAMEPAD_X, VK_PAD_X }, + { XINPUT_GAMEPAD_Y, VK_PAD_Y }, + /* note: guide button does not send an event */ + }; + + if (!verify_and_lock_device(device)) return ERROR_DEVICE_NOT_CONNECTED; + + cur = &device->state.Gamepad; + + /*** buttons ***/ + for (i = 0; i < ARRAY_SIZE(buttons); ++i) + { + if ((cur->wButtons & buttons[i].mask) ^ (device->last_keystroke.wButtons & buttons[i].mask)) + { + keystroke->VirtualKey = buttons[i].vk; + keystroke->Unicode = 0; /* unused */ + if (cur->wButtons & buttons[i].mask) + { + keystroke->Flags = XINPUT_KEYSTROKE_KEYDOWN; + device->last_keystroke.wButtons |= buttons[i].mask; + } + else + { + keystroke->Flags = XINPUT_KEYSTROKE_KEYUP; + device->last_keystroke.wButtons &= ~buttons[i].mask; + } + keystroke->UserIndex = index; + keystroke->HidCode = 0; + ret = ERROR_SUCCESS; + goto done; + } + } + + /*** triggers ***/ + if (trigger_is_on(cur->bLeftTrigger) ^ trigger_is_on(device->last_keystroke.bLeftTrigger)) + { + keystroke->VirtualKey = VK_PAD_LTRIGGER; + keystroke->Unicode = 0; /* unused */ + keystroke->Flags = trigger_is_on(cur->bLeftTrigger) ? XINPUT_KEYSTROKE_KEYDOWN : XINPUT_KEYSTROKE_KEYUP; + keystroke->UserIndex = index; + keystroke->HidCode = 0; + device->last_keystroke.bLeftTrigger = cur->bLeftTrigger; + ret = ERROR_SUCCESS; + goto done; + } + + if (trigger_is_on(cur->bRightTrigger) ^ trigger_is_on(device->last_keystroke.bRightTrigger)) + { + keystroke->VirtualKey = VK_PAD_RTRIGGER; + keystroke->Unicode = 0; /* unused */ + keystroke->Flags = trigger_is_on(cur->bRightTrigger) ? XINPUT_KEYSTROKE_KEYDOWN : XINPUT_KEYSTROKE_KEYUP; + keystroke->UserIndex = index; + keystroke->HidCode = 0; + device->last_keystroke.bRightTrigger = cur->bRightTrigger; + ret = ERROR_SUCCESS; + goto done; + } + + /*** joysticks ***/ + ret = check_joystick_keystroke(index, keystroke, &cur->sThumbLX, &cur->sThumbLY, + &device->last_keystroke.sThumbLX, + &device->last_keystroke.sThumbLY, VK_PAD_LTHUMB_UP); + if (ret == ERROR_SUCCESS) + goto done; + + ret = check_joystick_keystroke(index, keystroke, &cur->sThumbRX, &cur->sThumbRY, + &device->last_keystroke.sThumbRX, + &device->last_keystroke.sThumbRY, VK_PAD_RTHUMB_UP); + if (ret == ERROR_SUCCESS) + goto done; + +done: + unlock_device(device); + + return ret; +} + +DWORD WINAPI DECLSPEC_HOTPATCH XInputGetKeystroke(DWORD index, DWORD reserved, PXINPUT_KEYSTROKE keystroke) +{ + TRACE("(index %u, reserved %u, keystroke %p)\n", index, reserved, keystroke); + + if (index >= XUSER_MAX_COUNT && index != XUSER_INDEX_ANY) return ERROR_BAD_ARGUMENTS; + + if (index == XUSER_INDEX_ANY) + { + int i; + for (i = 0; i < XUSER_MAX_COUNT; ++i) + if (check_for_keystroke(i, keystroke) == ERROR_SUCCESS) + return ERROR_SUCCESS; + return ERROR_EMPTY; + } + + return check_for_keystroke(index, keystroke); +} + +DWORD WINAPI DECLSPEC_HOTPATCH XInputGetCapabilities(DWORD index, DWORD flags, XINPUT_CAPABILITIES *capabilities) +{ + TRACE("(index %u, flags 0x%x, capabilities %p)\n", index, flags, capabilities); + + HID_find_gamepads(); + + if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; + + if (!verify_and_lock_device(&controllers[index])) return ERROR_DEVICE_NOT_CONNECTED; + + if (flags & XINPUT_FLAG_GAMEPAD && controllers[index].caps.SubType != XINPUT_DEVSUBTYPE_GAMEPAD) + { + unlock_device(&controllers[index]); + return ERROR_DEVICE_NOT_CONNECTED; + } + + memcpy(capabilities, &controllers[index].caps, sizeof(*capabilities)); + + unlock_device(&controllers[index]); + + return ERROR_SUCCESS; +} + +DWORD WINAPI DECLSPEC_HOTPATCH XInputGetDSoundAudioDeviceGuids(DWORD index, GUID *render_guid, GUID *capture_guid) +{ + FIXME("(index %u, render guid %p, capture guid %p) Stub!\n", index, render_guid, capture_guid); + + if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; + if (!controllers[index].platform_private) return ERROR_DEVICE_NOT_CONNECTED; + + return ERROR_NOT_SUPPORTED; +} + +DWORD WINAPI DECLSPEC_HOTPATCH XInputGetBatteryInformation(DWORD index, BYTE type, XINPUT_BATTERY_INFORMATION* battery) +{ + static int once; + + if (!once++) FIXME("(index %u, type %u, battery %p) Stub!\n", index, type, battery); + + if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; + if (!controllers[index].platform_private) return ERROR_DEVICE_NOT_CONNECTED; + + return ERROR_NOT_SUPPORTED; +} diff --git a/dlls/xinput1_3/xinput_main.c b/dlls/xinput1_3/xinput_main.c deleted file mode 100644 index 2d9f54c83f2..00000000000 --- a/dlls/xinput1_3/xinput_main.c +++ /dev/null @@ -1,470 +0,0 @@ -/* - * The Wine project - Xinput Joystick Library - * Copyright 2008 Andrew Fenn - * - * 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 <assert.h> -#include <stdarg.h> -#include <string.h> - -#include "wine/debug.h" -#include "windef.h" -#include "winbase.h" -#include "winerror.h" - -#include "xinput.h" -#include "xinput_private.h" - -/* Not defined in the headers, used only by XInputGetStateEx */ -#define XINPUT_GAMEPAD_GUIDE 0x0400 - -WINE_DEFAULT_DEBUG_CHANNEL(xinput); - -/* xinput_crit guards controllers array */ -static CRITICAL_SECTION_DEBUG xinput_critsect_debug = -{ - 0, 0, &xinput_crit, - { &xinput_critsect_debug.ProcessLocksList, &xinput_critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": xinput_crit") } -}; -CRITICAL_SECTION xinput_crit = { &xinput_critsect_debug, -1, 0, 0, 0, 0 }; - -static CRITICAL_SECTION_DEBUG controller_critsect_debug[XUSER_MAX_COUNT] = -{ - { - 0, 0, &controllers[0].crit, - { &controller_critsect_debug[0].ProcessLocksList, &controller_critsect_debug[0].ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": controllers[0].crit") } - }, - { - 0, 0, &controllers[1].crit, - { &controller_critsect_debug[1].ProcessLocksList, &controller_critsect_debug[1].ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": controllers[1].crit") } - }, - { - 0, 0, &controllers[2].crit, - { &controller_critsect_debug[2].ProcessLocksList, &controller_critsect_debug[2].ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": controllers[2].crit") } - }, - { - 0, 0, &controllers[3].crit, - { &controller_critsect_debug[3].ProcessLocksList, &controller_critsect_debug[3].ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": controllers[3].crit") } - }, -}; - -xinput_controller controllers[XUSER_MAX_COUNT] = { - {{ &controller_critsect_debug[0], -1, 0, 0, 0, 0 }}, - {{ &controller_critsect_debug[1], -1, 0, 0, 0, 0 }}, - {{ &controller_critsect_debug[2], -1, 0, 0, 0, 0 }}, - {{ &controller_critsect_debug[3], -1, 0, 0, 0, 0 }}, -}; - -static BOOL verify_and_lock_device(xinput_controller *device) -{ - if (!device->platform_private) - return FALSE; - - EnterCriticalSection(&device->crit); - - if (!device->platform_private) - { - LeaveCriticalSection(&device->crit); - return FALSE; - } - - return TRUE; -} - -static void unlock_device(xinput_controller *device) -{ - LeaveCriticalSection(&device->crit); -} - -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) -{ - switch(reason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - case DLL_PROCESS_DETACH: - if (reserved) break; - HID_destroy_gamepads(); - break; - } - return TRUE; -} - -void WINAPI DECLSPEC_HOTPATCH XInputEnable(BOOL enable) -{ - int index; - - TRACE("(enable %d)\n", enable); - - /* Setting to false will stop messages from XInputSetState being sent - to the controllers. Setting to true will send the last vibration - value (sent to XInputSetState) to the controller and allow messages to - be sent */ - HID_find_gamepads(); - - for (index = 0; index < XUSER_MAX_COUNT; index ++) - { - if (!verify_and_lock_device(&controllers[index])) continue; - HID_enable(&controllers[index], enable); - unlock_device(&controllers[index]); - } -} - -DWORD WINAPI DECLSPEC_HOTPATCH XInputSetState(DWORD index, XINPUT_VIBRATION* vibration) -{ - DWORD ret; - - TRACE("(index %u, vibration %p)\n", index, vibration); - - HID_find_gamepads(); - - if (index >= XUSER_MAX_COUNT) - return ERROR_BAD_ARGUMENTS; - if (!verify_and_lock_device(&controllers[index])) - return ERROR_DEVICE_NOT_CONNECTED; - - ret = HID_set_state(&controllers[index], vibration); - - unlock_device(&controllers[index]); - - return ret; -} - -/* Some versions of SteamOverlayRenderer hot-patch XInputGetStateEx() and call - * XInputGetState() in the hook, so we need a wrapper. */ -static DWORD xinput_get_state(DWORD index, XINPUT_STATE *state) -{ - if (!state) - return ERROR_BAD_ARGUMENTS; - - HID_find_gamepads(); - - if (index >= XUSER_MAX_COUNT) - return ERROR_BAD_ARGUMENTS; - if (!verify_and_lock_device(&controllers[index])) - return ERROR_DEVICE_NOT_CONNECTED; - - HID_update_state(&controllers[index], state); - - if (!controllers[index].platform_private) - { - /* update_state may have disconnected the controller */ - unlock_device(&controllers[index]); - return ERROR_DEVICE_NOT_CONNECTED; - } - - unlock_device(&controllers[index]); - - return ERROR_SUCCESS; -} - - -DWORD WINAPI DECLSPEC_HOTPATCH XInputGetState(DWORD index, XINPUT_STATE* state) -{ - DWORD ret; - - TRACE("(index %u, state %p)!\n", index, state); - - ret = xinput_get_state(index, state); - if (ret != ERROR_SUCCESS) - return ret; - - /* The main difference between this and the Ex version is the media guide button */ - state->Gamepad.wButtons &= ~XINPUT_GAMEPAD_GUIDE; - - return ERROR_SUCCESS; -} - -DWORD WINAPI DECLSPEC_HOTPATCH XInputGetStateEx(DWORD index, XINPUT_STATE* state) -{ - TRACE("(index %u, state %p)!\n", index, state); - - return xinput_get_state(index, state); -} - -static const int JS_STATE_OFF = 0; -static const int JS_STATE_LOW = 1; -static const int JS_STATE_HIGH = 2; - -static int joystick_state(const SHORT value) -{ - if (value > 20000) - return JS_STATE_HIGH; - if (value < -20000) - return JS_STATE_LOW; - return JS_STATE_OFF; -} - -static WORD js_vk_offs(const int x, const int y) -{ - if (y == JS_STATE_OFF) - { - /*if (x == JS_STATE_OFF) shouldn't get here */ - if (x == JS_STATE_LOW) return 3; /* LEFT */ - /*if (x == JS_STATE_HIGH)*/ return 2; /* RIGHT */ - } - if (y == JS_STATE_HIGH) - { - if (x == JS_STATE_OFF) return 0; /* UP */ - if (x == JS_STATE_LOW) return 4; /* UPLEFT */ - /*if (x == JS_STATE_HIGH)*/ return 5; /* UPRIGHT */ - } - /*if (y == JS_STATE_LOW)*/ - { - if (x == JS_STATE_OFF) return 1; /* DOWN */ - if (x == JS_STATE_LOW) return 7; /* DOWNLEFT */ - /*if (x == JS_STATE_HIGH)*/ return 6; /* DOWNRIGHT */ - } -} - -static DWORD check_joystick_keystroke(const DWORD index, XINPUT_KEYSTROKE *keystroke, - const SHORT *cur_x, const SHORT *cur_y, SHORT *last_x, SHORT *last_y, - const WORD base_vk) -{ - int cur_vk = 0, cur_x_st, cur_y_st; - int last_vk = 0, last_x_st, last_y_st; - - cur_x_st = joystick_state(*cur_x); - cur_y_st = joystick_state(*cur_y); - if (cur_x_st || cur_y_st) - cur_vk = base_vk + js_vk_offs(cur_x_st, cur_y_st); - - last_x_st = joystick_state(*last_x); - last_y_st = joystick_state(*last_y); - if (last_x_st || last_y_st) - last_vk = base_vk + js_vk_offs(last_x_st, last_y_st); - - if (cur_vk != last_vk) - { - if (last_vk) - { - /* joystick was set, and now different. send a KEYUP event, and set - * last pos to centered, so the appropriate KEYDOWN event will be - * sent on the next call. */ - keystroke->VirtualKey = last_vk; - keystroke->Unicode = 0; /* unused */ - keystroke->Flags = XINPUT_KEYSTROKE_KEYUP; - keystroke->UserIndex = index; - keystroke->HidCode = 0; - - *last_x = 0; - *last_y = 0; - - return ERROR_SUCCESS; - } - - /* joystick was unset, send KEYDOWN. */ - keystroke->VirtualKey = cur_vk; - keystroke->Unicode = 0; /* unused */ - keystroke->Flags = XINPUT_KEYSTROKE_KEYDOWN; - keystroke->UserIndex = index; - keystroke->HidCode = 0; - - *last_x = *cur_x; - *last_y = *cur_y; - - return ERROR_SUCCESS; - } - - *last_x = *cur_x; - *last_y = *cur_y; - - return ERROR_EMPTY; -} - -static BOOL trigger_is_on(const BYTE value) -{ - return value > 30; -} - -static DWORD check_for_keystroke(const DWORD index, XINPUT_KEYSTROKE *keystroke) -{ - xinput_controller *device = &controllers[index]; - const XINPUT_GAMEPAD *cur; - DWORD ret = ERROR_EMPTY; - int i; - - static const struct { - int mask; - WORD vk; - } buttons[] = { - { XINPUT_GAMEPAD_DPAD_UP, VK_PAD_DPAD_UP }, - { XINPUT_GAMEPAD_DPAD_DOWN, VK_PAD_DPAD_DOWN }, - { XINPUT_GAMEPAD_DPAD_LEFT, VK_PAD_DPAD_LEFT }, - { XINPUT_GAMEPAD_DPAD_RIGHT, VK_PAD_DPAD_RIGHT }, - { XINPUT_GAMEPAD_START, VK_PAD_START }, - { XINPUT_GAMEPAD_BACK, VK_PAD_BACK }, - { XINPUT_GAMEPAD_LEFT_THUMB, VK_PAD_LTHUMB_PRESS }, - { XINPUT_GAMEPAD_RIGHT_THUMB, VK_PAD_RTHUMB_PRESS }, - { XINPUT_GAMEPAD_LEFT_SHOULDER, VK_PAD_LSHOULDER }, - { XINPUT_GAMEPAD_RIGHT_SHOULDER, VK_PAD_RSHOULDER }, - { XINPUT_GAMEPAD_A, VK_PAD_A }, - { XINPUT_GAMEPAD_B, VK_PAD_B }, - { XINPUT_GAMEPAD_X, VK_PAD_X }, - { XINPUT_GAMEPAD_Y, VK_PAD_Y }, - /* note: guide button does not send an event */ - }; - - if (!verify_and_lock_device(device)) - return ERROR_DEVICE_NOT_CONNECTED; - - cur = &device->state.Gamepad; - - /*** buttons ***/ - for (i = 0; i < ARRAY_SIZE(buttons); ++i) - { - if ((cur->wButtons & buttons[i].mask) ^ (device->last_keystroke.wButtons & buttons[i].mask)) - { - keystroke->VirtualKey = buttons[i].vk; - keystroke->Unicode = 0; /* unused */ - if (cur->wButtons & buttons[i].mask) - { - keystroke->Flags = XINPUT_KEYSTROKE_KEYDOWN; - device->last_keystroke.wButtons |= buttons[i].mask; - } - else - { - keystroke->Flags = XINPUT_KEYSTROKE_KEYUP; - device->last_keystroke.wButtons &= ~buttons[i].mask; - } - keystroke->UserIndex = index; - keystroke->HidCode = 0; - ret = ERROR_SUCCESS; - goto done; - } - } - - /*** triggers ***/ - if (trigger_is_on(cur->bLeftTrigger) ^ trigger_is_on(device->last_keystroke.bLeftTrigger)) - { - keystroke->VirtualKey = VK_PAD_LTRIGGER; - keystroke->Unicode = 0; /* unused */ - keystroke->Flags = trigger_is_on(cur->bLeftTrigger) ? XINPUT_KEYSTROKE_KEYDOWN : XINPUT_KEYSTROKE_KEYUP; - keystroke->UserIndex = index; - keystroke->HidCode = 0; - device->last_keystroke.bLeftTrigger = cur->bLeftTrigger; - ret = ERROR_SUCCESS; - goto done; - } - - if (trigger_is_on(cur->bRightTrigger) ^ trigger_is_on(device->last_keystroke.bRightTrigger)) - { - keystroke->VirtualKey = VK_PAD_RTRIGGER; - keystroke->Unicode = 0; /* unused */ - keystroke->Flags = trigger_is_on(cur->bRightTrigger) ? XINPUT_KEYSTROKE_KEYDOWN : XINPUT_KEYSTROKE_KEYUP; - keystroke->UserIndex = index; - keystroke->HidCode = 0; - device->last_keystroke.bRightTrigger = cur->bRightTrigger; - ret = ERROR_SUCCESS; - goto done; - } - - /*** joysticks ***/ - ret = check_joystick_keystroke(index, keystroke, &cur->sThumbLX, &cur->sThumbLY, - &device->last_keystroke.sThumbLX, - &device->last_keystroke.sThumbLY, VK_PAD_LTHUMB_UP); - if (ret == ERROR_SUCCESS) - goto done; - - ret = check_joystick_keystroke(index, keystroke, &cur->sThumbRX, &cur->sThumbRY, - &device->last_keystroke.sThumbRX, - &device->last_keystroke.sThumbRY, VK_PAD_RTHUMB_UP); - if (ret == ERROR_SUCCESS) - goto done; - -done: - unlock_device(device); - - return ret; -} - -DWORD WINAPI DECLSPEC_HOTPATCH XInputGetKeystroke(DWORD index, DWORD reserved, PXINPUT_KEYSTROKE keystroke) -{ - TRACE("(index %u, reserved %u, keystroke %p)\n", index, reserved, keystroke); - - if (index >= XUSER_MAX_COUNT && index != XUSER_INDEX_ANY) - return ERROR_BAD_ARGUMENTS; - - if (index == XUSER_INDEX_ANY) - { - int i; - for (i = 0; i < XUSER_MAX_COUNT; ++i) - if (check_for_keystroke(i, keystroke) == ERROR_SUCCESS) - return ERROR_SUCCESS; - return ERROR_EMPTY; - } - - return check_for_keystroke(index, keystroke); -} - -DWORD WINAPI DECLSPEC_HOTPATCH XInputGetCapabilities(DWORD index, DWORD flags, XINPUT_CAPABILITIES* capabilities) -{ - TRACE("(index %u, flags 0x%x, capabilities %p)\n", index, flags, capabilities); - - HID_find_gamepads(); - - if (index >= XUSER_MAX_COUNT) - return ERROR_BAD_ARGUMENTS; - - if (!verify_and_lock_device(&controllers[index])) - return ERROR_DEVICE_NOT_CONNECTED; - - if (flags & XINPUT_FLAG_GAMEPAD && controllers[index].caps.SubType != XINPUT_DEVSUBTYPE_GAMEPAD) - { - unlock_device(&controllers[index]); - return ERROR_DEVICE_NOT_CONNECTED; - } - - memcpy(capabilities, &controllers[index].caps, sizeof(*capabilities)); - - unlock_device(&controllers[index]); - - return ERROR_SUCCESS; -} - -DWORD WINAPI DECLSPEC_HOTPATCH XInputGetDSoundAudioDeviceGuids(DWORD index, GUID* render_guid, GUID* capture_guid) -{ - FIXME("(index %u, render guid %p, capture guid %p) Stub!\n", index, render_guid, capture_guid); - - if (index >= XUSER_MAX_COUNT) - return ERROR_BAD_ARGUMENTS; - if (!controllers[index].platform_private) - return ERROR_DEVICE_NOT_CONNECTED; - - return ERROR_NOT_SUPPORTED; -} - -DWORD WINAPI DECLSPEC_HOTPATCH XInputGetBatteryInformation(DWORD index, BYTE type, XINPUT_BATTERY_INFORMATION* battery) -{ - static int once; - - if (!once++) - FIXME("(index %u, type %u, battery %p) Stub!\n", index, type, battery); - - if (index >= XUSER_MAX_COUNT) - return ERROR_BAD_ARGUMENTS; - if (!controllers[index].platform_private) - return ERROR_DEVICE_NOT_CONNECTED; - - return ERROR_NOT_SUPPORTED; -} diff --git a/dlls/xinput1_3/xinput_private.h b/dlls/xinput1_3/xinput_private.h deleted file mode 100644 index 2bf16c0ffce..00000000000 --- a/dlls/xinput1_3/xinput_private.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * The Wine project - Xinput Joystick Library - * Copyright 2018 Aric Stewart - * - * 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 - */ - -typedef struct _xinput_controller -{ - CRITICAL_SECTION crit; - XINPUT_CAPABILITIES caps; - void *platform_private; /* non-NULL when device is valid; validity may be read without holding crit */ - XINPUT_STATE state; - XINPUT_GAMEPAD last_keystroke; - XINPUT_VIBRATION vibration; -} xinput_controller; - -extern CRITICAL_SECTION xinput_crit; -extern xinput_controller controllers[XUSER_MAX_COUNT]; - -void HID_find_gamepads(void) DECLSPEC_HIDDEN; -void HID_destroy_gamepads(void) DECLSPEC_HIDDEN; -void HID_update_state(xinput_controller* device, XINPUT_STATE *state) DECLSPEC_HIDDEN; -DWORD HID_set_state(xinput_controller* device, XINPUT_VIBRATION* state) DECLSPEC_HIDDEN; -void HID_enable(xinput_controller* device, BOOL enable) DECLSPEC_HIDDEN; diff --git a/dlls/xinput1_4/Makefile.in b/dlls/xinput1_4/Makefile.in index cdf4b4fed05..24b10b1e848 100644 --- a/dlls/xinput1_4/Makefile.in +++ b/dlls/xinput1_4/Makefile.in @@ -5,7 +5,6 @@ DELAYIMPORTS = hid setupapi EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ - hid.c \ - xinput_main.c + main.c RC_SRCS = version.rc diff --git a/dlls/xinput9_1_0/Makefile.in b/dlls/xinput9_1_0/Makefile.in index dc8739c4640..0142c95c44f 100644 --- a/dlls/xinput9_1_0/Makefile.in +++ b/dlls/xinput9_1_0/Makefile.in @@ -5,7 +5,6 @@ DELAYIMPORTS = hid setupapi EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ - hid.c \ - xinput_main.c + main.c RC_SRCS = version.rc -- 2.32.0

1 4

[PATCH 2/4] gdi32: Use NtGdiScaleViewportExtEx for ScaleViewportExtEx implementation.
by Jacek Caban 06 Aug '21

06 Aug '21

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

2 1

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

06 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 | 4 ---- dlls/gdi32/driver.c | 2 -- dlls/gdi32/enhmfdrv/init.c | 2 -- dlls/gdi32/font.c | 2 -- dlls/gdi32/mapping.c | 10 ---------- dlls/gdi32/mfdrv/init.c | 2 -- dlls/gdi32/ntgdi_private.h | 2 -- dlls/gdi32/path.c | 2 -- dlls/wineandroid.drv/init.c | 2 -- dlls/winemac.drv/gdi.c | 2 -- dlls/wineps.drv/init.c | 2 -- dlls/winex11.drv/init.c | 2 -- dlls/winex11.drv/xrender.c | 2 -- include/wine/gdi_driver.h | 4 +--- 14 files changed, 1 insertion(+), 39 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 7a9296d58c0..467cdb144e6 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -700,8 +700,6 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pResetDC */ NULL, /* pRestoreDC */ dibdrv_RoundRect, /* pRoundRect */ - NULL, /* pScaleViewportExt */ - NULL, /* pScaleWindowExt */ dibdrv_SelectBitmap, /* pSelectBitmap */ dibdrv_SelectBrush, /* pSelectBrush */ NULL, /* pSelectClipPath */ @@ -1282,8 +1280,6 @@ static const struct gdi_dc_funcs window_driver = NULL, /* pResetDC */ NULL, /* pRestoreDC */ windrv_RoundRect, /* pRoundRect */ - NULL, /* pScaleViewportExt */ - NULL, /* pScaleWindowExt */ NULL, /* pSelectBitmap */ NULL, /* pSelectBrush */ NULL, /* pSelectClipPath */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 1cefbfc3a44..21e066630fc 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -916,8 +916,6 @@ const struct gdi_dc_funcs null_driver = nulldrv_ResetDC, /* pResetDC */ nulldrv_RestoreDC, /* pRestoreDC */ nulldrv_RoundRect, /* pRoundRect */ - nulldrv_ScaleViewportExtEx, /* pScaleViewportExt */ - nulldrv_ScaleWindowExtEx, /* pScaleWindowExt */ nulldrv_SelectBitmap, /* pSelectBitmap */ nulldrv_SelectBrush, /* pSelectBrush */ nulldrv_SelectClipPath, /* pSelectClipPath */ diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index b104d58b6be..433c0be6c0c 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -114,8 +114,6 @@ static const struct gdi_dc_funcs emfdrv_driver = NULL, /* pResetDC */ EMFDRV_RestoreDC, /* pRestoreDC */ EMFDRV_RoundRect, /* pRoundRect */ - NULL, /* pScaleViewportExtEx */ - NULL, /* pScaleWindowExtEx */ EMFDRV_SelectBitmap, /* pSelectBitmap */ EMFDRV_SelectBrush, /* pSelectBrush */ EMFDRV_SelectClipPath, /* pSelectClipPath */ diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index ea49815b579..b8dc2cc4b1f 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3891,8 +3891,6 @@ const struct gdi_dc_funcs font_driver = NULL, /* pResetDC */ NULL, /* pRestoreDC */ NULL, /* pRoundRect */ - NULL, /* pScaleViewportExt */ - NULL, /* pScaleWindowExt */ NULL, /* pSelectBitmap */ NULL, /* pSelectBrush */ NULL, /* pSelectClipPath */ diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index 189481c2e3e..0c440908beb 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -111,16 +111,6 @@ BOOL CDECL nulldrv_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) return TRUE; } -BOOL CDECL nulldrv_ScaleViewportExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, SIZE *size ) -{ - return TRUE; -} - -BOOL CDECL nulldrv_ScaleWindowExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, SIZE *size ) -{ - return TRUE; -} - BOOL set_map_mode( DC *dc, int mode ) { SIZE virtual_size, virtual_res; diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index a860932d012..d606fccc84e 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -179,8 +179,6 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pResetDC */ MFDRV_RestoreDC, /* pRestoreDC */ NULL, /* pRoundRect */ - NULL, /* pScaleViewportExtEx */ - NULL, /* pScaleWindowExtEx */ MFDRV_SelectBitmap, /* pSelectBitmap */ MFDRV_SelectBrush, /* pSelectBrush */ MFDRV_SelectClipPath, /* pSelectClipPath */ diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 07b761f272f..9af4aa3d61f 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -588,8 +588,6 @@ extern BOOL CDECL nulldrv_PolyBezierTo( PHYSDEV dev, const POINT *points, DWORD extern BOOL CDECL nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types, DWORD count ) DECLSPEC_HIDDEN; extern BOOL CDECL nulldrv_PolylineTo( PHYSDEV dev, const POINT *points, INT count ) DECLSPEC_HIDDEN; extern BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_ScaleViewportExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, SIZE *size ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_ScaleWindowExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL CDECL nulldrv_SelectClipPath( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; 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, diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 51ab7a3dab9..57a93658abd 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -2152,8 +2152,6 @@ const struct gdi_dc_funcs path_driver = NULL, /* pResetDC */ NULL, /* pRestoreDC */ pathdrv_RoundRect, /* pRoundRect */ - NULL, /* pScaleViewportExt */ - NULL, /* pScaleWindowExt */ NULL, /* pSelectBitmap */ NULL, /* pSelectBrush */ NULL, /* pSelectClipPath */ diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index e055828af1c..b3d4f945993 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -361,8 +361,6 @@ static const struct gdi_dc_funcs android_drv_funcs = NULL, /* pResetDC */ NULL, /* pRestoreDC */ NULL, /* pRoundRect */ - NULL, /* pScaleViewportExt */ - NULL, /* pScaleWindowExt */ NULL, /* pSelectBitmap */ NULL, /* pSelectBrush */ NULL, /* pSelectClipPath */ diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 4259ecc8b0b..b657afd5943 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -341,8 +341,6 @@ static const struct gdi_dc_funcs macdrv_funcs = NULL, /* pResetDC */ NULL, /* pRestoreDC */ NULL, /* pRoundRect */ - NULL, /* pScaleViewportExt */ - NULL, /* pScaleWindowExt */ NULL, /* pSelectBitmap */ NULL, /* pSelectBrush */ NULL, /* pSelectClipPath */ diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 4d6e70a126f..e71e82e092f 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -855,8 +855,6 @@ static const struct gdi_dc_funcs psdrv_funcs = PSDRV_ResetDC, /* pResetDC */ NULL, /* pRestoreDC */ PSDRV_RoundRect, /* pRoundRect */ - NULL, /* pScaleViewportExt */ - NULL, /* pScaleWindowExt */ NULL, /* pSelectBitmap */ PSDRV_SelectBrush, /* pSelectBrush */ NULL, /* pSelectClipPath */ diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 1b51da43423..937286b8601 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -420,8 +420,6 @@ static const struct gdi_dc_funcs x11drv_funcs = NULL, /* pResetDC */ NULL, /* pRestoreDC */ X11DRV_RoundRect, /* pRoundRect */ - NULL, /* pScaleViewportExt */ - NULL, /* pScaleWindowExt */ NULL, /* pSelectBitmap */ X11DRV_SelectBrush, /* pSelectBrush */ NULL, /* pSelectClipPath */ diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 045f0c5f64b..3ab576ea8d5 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2232,8 +2232,6 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pResetDC */ NULL, /* pRestoreDC */ NULL, /* pRoundRect */ - NULL, /* pScaleViewportExt */ - NULL, /* pScaleWindowExt */ NULL, /* pSelectBitmap */ xrenderdrv_SelectBrush, /* pSelectBrush */ NULL, /* pSelectClipPath */ diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 2f6fd4ff734..ffa730f9105 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -145,8 +145,6 @@ struct gdi_dc_funcs HDC (CDECL *pResetDC)(PHYSDEV,const DEVMODEW*); BOOL (CDECL *pRestoreDC)(PHYSDEV,INT); BOOL (CDECL *pRoundRect)(PHYSDEV,INT,INT,INT,INT,INT,INT); - BOOL (CDECL *pScaleViewportExtEx)(PHYSDEV,INT,INT,INT,INT,SIZE*); - BOOL (CDECL *pScaleWindowExtEx)(PHYSDEV,INT,INT,INT,INT,SIZE*); HBITMAP (CDECL *pSelectBitmap)(PHYSDEV,HBITMAP); HBRUSH (CDECL *pSelectBrush)(PHYSDEV,HBRUSH,const struct brush_pattern*); BOOL (CDECL *pSelectClipPath)(PHYSDEV,INT); @@ -185,7 +183,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 57 +#define WINE_GDI_DRIVER_VERSION 58 #define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */ -- 2.23.0

1 0

[PATCH v2 3/4] gdi32: Use NtGdiScaleWindowExtEx for ScaleWindowExtEx implementation.
by Huw Davies 06 Aug '21

06 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 | 15 +++++------- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 4 ++++ dlls/gdi32/gdidc.c | 15 ++++++++++++ dlls/gdi32/mapping.c | 48 +++++++++++++++++++------------------- dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- 7 files changed, 53 insertions(+), 37 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index f544a5ab998..6b843b5a641 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -309,20 +309,17 @@ BOOL EMFDC_ScaleViewportExtEx( DC_ATTR *dc_attr, INT x_num, INT x_denom, INT y_n return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } -BOOL CDECL EMFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) +BOOL EMFDC_ScaleWindowExtEx( DC_ATTR *dc_attr, INT x_num, INT x_denom, INT y_num, INT y_denom ) { - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pScaleWindowExtEx ); EMRSCALEWINDOWEXTEX emr; emr.emr.iType = EMR_SCALEWINDOWEXTEX; emr.emr.nSize = sizeof(emr); - emr.xNum = xNum; - emr.xDenom = xDenom; - emr.yNum = yNum; - emr.yDenom = yDenom; - - if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; - return next->funcs->pScaleWindowExtEx( next, xNum, xDenom, yNum, yDenom, size ); + emr.xNum = x_num; + emr.xDenom = x_denom; + emr.yNum = y_num; + emr.yDenom = y_denom; + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } BOOL EMFDC_SetLayout( DC_ATTR *dc_attr, DWORD layout ) diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 5b7c27f5fe1..b104d58b6be 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -115,7 +115,7 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_RestoreDC, /* pRestoreDC */ EMFDRV_RoundRect, /* pRoundRect */ NULL, /* pScaleViewportExtEx */ - EMFDRV_ScaleWindowExtEx, /* pScaleWindowExtEx */ + NULL, /* pScaleWindowExtEx */ EMFDRV_SelectBitmap, /* pSelectBitmap */ EMFDRV_SelectBrush, /* pSelectBrush */ EMFDRV_SelectClipPath, /* pSelectClipPath */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 895525317cc..ebea5565725 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -77,6 +77,8 @@ extern BOOL METADC_RoundRect( HDC hdc, INT left, INT top, INT right, INT bottom, extern BOOL METADC_SaveDC( HDC hdc ) DECLSPEC_HIDDEN; extern BOOL METADC_ScaleViewportExtEx( HDC hdc, INT x_num, INT x_denom, INT y_num, INT y_denom ) DECLSPEC_HIDDEN; +extern BOOL METADC_ScaleWindowExtEx( HDC hdc, INT x_num, INT x_denom, INT y_num, + INT y_denom ) DECLSPEC_HIDDEN; extern BOOL METADC_SetBkMode( HDC hdc, INT mode ) DECLSPEC_HIDDEN; extern BOOL METADC_SetLayout( HDC hdc, DWORD layout ) DECLSPEC_HIDDEN; extern BOOL METADC_SetTextCharacterExtra( HDC hdc, INT extra ) DECLSPEC_HIDDEN; @@ -140,6 +142,8 @@ extern BOOL EMFDC_RoundRect( DC_ATTR *dc_attr, INT left, INT top, INT right, INT extern BOOL EMFDC_SaveDC( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; extern BOOL EMFDC_ScaleViewportExtEx( DC_ATTR *dc_attr, INT x_num, INT x_denom, INT y_num, INT y_denom ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_ScaleWindowExtEx( DC_ATTR *dc_attr, INT x_num, INT x_denom, INT y_num, + INT y_denom ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetArcDirection( DC_ATTR *dc_attr, INT dir ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetBkMode( DC_ATTR *dc_attr, INT mode ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetLayout( DC_ATTR *dc_attr, DWORD layout ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 341944c70da..f3afb75a67e 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1247,6 +1247,21 @@ BOOL WINAPI ScaleViewportExtEx( HDC hdc, INT x_num, INT x_denom, return NtGdiScaleViewportExtEx( hdc, x_num, x_denom, y_num, y_denom, size ); } +/*********************************************************************** + * ScaleWindowExtEx (GDI32.@) + */ +BOOL WINAPI ScaleWindowExtEx( HDC hdc, INT x_num, INT x_denom, + INT y_num, INT y_denom, SIZE *size ) +{ + DC_ATTR *dc_attr; + + if (is_meta_dc( hdc )) return METADC_ScaleWindowExtEx( hdc, x_num, x_denom, y_num, y_denom ); + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_ScaleWindowExtEx( dc_attr, x_num, x_denom, y_num, y_denom )) + return FALSE; + return NtGdiScaleWindowExtEx( hdc, x_num, x_denom, y_num, y_denom, size ); +} + /*********************************************************************** * GdiSetPixelFormat (GDI32.@) */ diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index 09ecec4f717..189481c2e3e 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -118,20 +118,6 @@ BOOL CDECL nulldrv_ScaleViewportExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT BOOL CDECL nulldrv_ScaleWindowExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, 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 (!x_num || !x_denom || !y_num || !y_denom) return FALSE; - - dc->attr->wnd_ext.cx = (dc->attr->wnd_ext.cx * x_num) / x_denom; - dc->attr->wnd_ext.cy = (dc->attr->wnd_ext.cy * y_num) / y_denom; - if (dc->attr->wnd_ext.cx == 0) dc->attr->wnd_ext.cx = 1; - if (dc->attr->wnd_ext.cy == 0) dc->attr->wnd_ext.cy = 1; - if (dc->attr->map_mode == MM_ISOTROPIC) MAPPING_FixIsotropic( dc ); - DC_UpdateXforms( dc ); return TRUE; } @@ -535,21 +521,35 @@ BOOL WINAPI NtGdiScaleViewportExtEx( HDC hdc, INT x_num, INT x_denom, /*********************************************************************** - * ScaleWindowExtEx (GDI32.@) + * NtGdiScaleWindowExtEx (win32u.@) */ -BOOL WINAPI ScaleWindowExtEx( HDC hdc, INT xNum, INT xDenom, - INT yNum, INT yDenom, LPSIZE size ) +BOOL WINAPI NtGdiScaleWindowExtEx( HDC hdc, INT x_num, INT x_denom, + INT y_num, INT y_denom, SIZE *size ) { - BOOL ret = FALSE; - DC * dc = get_dc_ptr( hdc ); + DC *dc; - if (dc) + if ((!(dc = get_dc_ptr( hdc )))) return FALSE; + + if (size) *size = dc->attr->wnd_ext; + + if (dc->attr->map_mode == MM_ISOTROPIC || dc->attr->map_mode == MM_ANISOTROPIC) { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pScaleWindowExtEx ); - ret = physdev->funcs->pScaleWindowExtEx( physdev, xNum, xDenom, yNum, yDenom, size ); - release_dc_ptr( dc ); + if (!x_num || !x_denom || !y_num || !y_denom) + { + release_dc_ptr( dc ); + return FALSE; + } + + dc->attr->wnd_ext.cx = (dc->attr->wnd_ext.cx * x_num) / x_denom; + dc->attr->wnd_ext.cy = (dc->attr->wnd_ext.cy * y_num) / y_denom; + if (dc->attr->wnd_ext.cx == 0) dc->attr->wnd_ext.cx = 1; + if (dc->attr->wnd_ext.cy == 0) dc->attr->wnd_ext.cy = 1; + if (dc->attr->map_mode == MM_ISOTROPIC) MAPPING_FixIsotropic( dc ); + DC_UpdateXforms( dc ); } - return ret; + + release_dc_ptr( dc ); + return TRUE; } diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index c96b1053eb5..fe89b0b6d5e 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -130,9 +130,9 @@ BOOL METADC_ScaleViewportExtEx( HDC hdc, INT x_num, INT x_denom, INT y_num, INT return metadc_param4( hdc, META_SCALEVIEWPORTEXT, x_num, x_denom, y_num, y_denom ); } -BOOL CDECL MFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) +BOOL METADC_ScaleWindowExtEx( HDC hdc, INT x_num, INT x_denom, INT y_num, INT y_denom ) { - return MFDRV_MetaParam4( dev, META_SCALEWINDOWEXT, xNum, xDenom, yNum, yDenom ); + return metadc_param4( hdc, META_SCALEWINDOWEXT, x_num, x_denom, y_num, y_denom ); } BOOL METADC_SetTextJustification( HDC hdc, INT extra, INT breaks ) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 9641887cb23..a860932d012 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -180,7 +180,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = MFDRV_RestoreDC, /* pRestoreDC */ NULL, /* pRoundRect */ NULL, /* pScaleViewportExtEx */ - MFDRV_ScaleWindowExtEx, /* pScaleWindowExtEx */ + NULL, /* pScaleWindowExtEx */ MFDRV_SelectBitmap, /* pSelectBitmap */ MFDRV_SelectBrush, /* pSelectBrush */ MFDRV_SelectClipPath, /* pSelectClipPath */ -- 2.23.0

1 0

[PATCH v2 2/4] gdi32: Use NtGdiScaleViewportExtEx for ScaleViewportExtEx implementation.
by Huw Davies 06 Aug '21

06 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 | 20 ++++-------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 2 -- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 4 +++ dlls/gdi32/gdidc.c | 14 ++++++++ dlls/gdi32/mapping.c | 48 ++++++++++++++-------------- dlls/gdi32/mfdrv/dc.c | 4 +-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 52 insertions(+), 45 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 521d529728f..f544a5ab998 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -296,25 +296,17 @@ BOOL CDECL EMFDRV_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) return ret; } -BOOL CDECL EMFDRV_ScaleViewportExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) +BOOL EMFDC_ScaleViewportExtEx( DC_ATTR *dc_attr, INT x_num, INT x_denom, INT y_num, INT y_denom ) { - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pScaleViewportExtEx ); - EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); EMRSCALEVIEWPORTEXTEX emr; - BOOL ret; emr.emr.iType = EMR_SCALEVIEWPORTEXTEX; emr.emr.nSize = sizeof(emr); - emr.xNum = xNum; - emr.xDenom = xDenom; - emr.yNum = yNum; - emr.yDenom = yDenom; - - if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; - physDev->modifying_transform++; - ret = next->funcs->pScaleViewportExtEx( next, xNum, xDenom, yNum, yDenom, size ); - physDev->modifying_transform--; - return ret; + emr.xNum = x_num; + emr.xDenom = x_denom; + emr.yNum = y_num; + emr.yDenom = y_denom; + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } BOOL CDECL EMFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index d165f153a22..1cb580dfc36 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -98,8 +98,6 @@ extern BOOL CDECL EMFDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT righ extern BOOL CDECL EMFDRV_RestoreDC( PHYSDEV dev, INT level ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_ScaleViewportExtEx( PHYSDEV dev, INT xNum, INT xDenom, - INT yNum, INT yDenom, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) DECLSPEC_HIDDEN; extern HBITMAP CDECL EMFDRV_SelectBitmap( PHYSDEV dev, HBITMAP handle ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 63784f62841..5b7c27f5fe1 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -114,7 +114,7 @@ static const struct gdi_dc_funcs emfdrv_driver = NULL, /* pResetDC */ EMFDRV_RestoreDC, /* pRestoreDC */ EMFDRV_RoundRect, /* pRoundRect */ - EMFDRV_ScaleViewportExtEx, /* pScaleViewportExtEx */ + NULL, /* pScaleViewportExtEx */ EMFDRV_ScaleWindowExtEx, /* pScaleWindowExtEx */ EMFDRV_SelectBitmap, /* pSelectBitmap */ EMFDRV_SelectBrush, /* pSelectBrush */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 53a4ba267d4..895525317cc 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -75,6 +75,8 @@ extern BOOL METADC_Rectangle( HDC hdc, INT left, INT top, INT right, INT bottom) extern BOOL METADC_RoundRect( HDC hdc, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; extern BOOL METADC_SaveDC( HDC hdc ) DECLSPEC_HIDDEN; +extern BOOL METADC_ScaleViewportExtEx( HDC hdc, INT x_num, INT x_denom, INT y_num, + INT y_denom ) DECLSPEC_HIDDEN; extern BOOL METADC_SetBkMode( HDC hdc, INT mode ) DECLSPEC_HIDDEN; extern BOOL METADC_SetLayout( HDC hdc, DWORD layout ) DECLSPEC_HIDDEN; extern BOOL METADC_SetTextCharacterExtra( HDC hdc, INT extra ) DECLSPEC_HIDDEN; @@ -136,6 +138,8 @@ extern BOOL EMFDC_Rectangle( DC_ATTR *dc_attr, INT left, INT top, INT right, extern BOOL EMFDC_RoundRect( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SaveDC( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_ScaleViewportExtEx( DC_ATTR *dc_attr, INT x_num, INT x_denom, INT y_num, + INT y_denom ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetArcDirection( DC_ATTR *dc_attr, INT dir ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetBkMode( DC_ATTR *dc_attr, INT mode ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetLayout( DC_ATTR *dc_attr, DWORD layout ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 69e59c580f0..341944c70da 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1232,6 +1232,20 @@ BOOL WINAPI LPtoDP( HDC hdc, POINT *points, INT count ) return NtGdiTransformPoints( hdc, points, points, count, NtGdiLPtoDP ); } +/*********************************************************************** + * ScaleViewportExtEx (GDI32.@) + */ +BOOL WINAPI ScaleViewportExtEx( HDC hdc, INT x_num, INT x_denom, + INT y_num, INT y_denom, SIZE *size ) +{ + DC_ATTR *dc_attr; + + if (is_meta_dc( hdc )) return METADC_ScaleViewportExtEx( hdc, x_num, x_denom, y_num, y_denom ); + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_ScaleViewportExtEx( dc_attr, x_num, x_denom, y_num, y_denom )) + return FALSE; + return NtGdiScaleViewportExtEx( hdc, x_num, x_denom, y_num, y_denom, size ); +} /*********************************************************************** * GdiSetPixelFormat (GDI32.@) diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index 7ec20957e92..09ecec4f717 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -113,20 +113,6 @@ BOOL CDECL nulldrv_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) BOOL CDECL nulldrv_ScaleViewportExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, 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 (!x_num || !x_denom || !y_num || !y_denom) return FALSE; - - dc->attr->vport_ext.cx = (dc->attr->vport_ext.cx * x_num) / x_denom; - dc->attr->vport_ext.cy = (dc->attr->vport_ext.cy * y_num) / y_denom; - if (dc->attr->vport_ext.cx == 0) dc->attr->vport_ext.cx = 1; - if (dc->attr->vport_ext.cy == 0) dc->attr->vport_ext.cy = 1; - if (dc->attr->map_mode == MM_ISOTROPIC) MAPPING_FixIsotropic( dc ); - DC_UpdateXforms( dc ); return TRUE; } @@ -516,21 +502,35 @@ BOOL WINAPI OffsetWindowOrgEx( HDC hdc, INT x, INT y, LPPOINT pt ) /*********************************************************************** - * ScaleViewportExtEx (GDI32.@) + * NtGdiScaleViewportExtEx (win32u.@) */ -BOOL WINAPI ScaleViewportExtEx( HDC hdc, INT xNum, INT xDenom, - INT yNum, INT yDenom, LPSIZE size ) +BOOL WINAPI NtGdiScaleViewportExtEx( HDC hdc, INT x_num, INT x_denom, + INT y_num, INT y_denom, SIZE *size ) { - BOOL ret = FALSE; - DC * dc = get_dc_ptr( hdc ); + DC *dc; - if (dc) + if ((!(dc = get_dc_ptr( hdc )))) return FALSE; + + if (size) *size = dc->attr->vport_ext; + + if (dc->attr->map_mode == MM_ISOTROPIC || dc->attr->map_mode == MM_ANISOTROPIC) { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pScaleViewportExtEx ); - ret = physdev->funcs->pScaleViewportExtEx( physdev, xNum, xDenom, yNum, yDenom, size ); - release_dc_ptr( dc ); + if (!x_num || !x_denom || !y_num || !y_denom) + { + release_dc_ptr( dc ); + return FALSE; + } + + dc->attr->vport_ext.cx = (dc->attr->vport_ext.cx * x_num) / x_denom; + dc->attr->vport_ext.cy = (dc->attr->vport_ext.cy * y_num) / y_denom; + if (dc->attr->vport_ext.cx == 0) dc->attr->vport_ext.cx = 1; + if (dc->attr->vport_ext.cy == 0) dc->attr->vport_ext.cy = 1; + if (dc->attr->map_mode == MM_ISOTROPIC) MAPPING_FixIsotropic( dc ); + DC_UpdateXforms( dc ); } - return ret; + + release_dc_ptr( dc ); + return TRUE; } diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index 7172d74ebb8..c96b1053eb5 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -125,9 +125,9 @@ BOOL CDECL MFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) return MFDRV_MetaParam2( dev, META_OFFSETWINDOWORG, x, y ); } -BOOL CDECL MFDRV_ScaleViewportExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) +BOOL METADC_ScaleViewportExtEx( HDC hdc, INT x_num, INT x_denom, INT y_num, INT y_denom ) { - return MFDRV_MetaParam4( dev, META_SCALEVIEWPORTEXT, xNum, xDenom, yNum, yDenom ); + return metadc_param4( hdc, META_SCALEVIEWPORTEXT, x_num, x_denom, y_num, y_denom ); } BOOL CDECL MFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 6af270c709e..9641887cb23 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -179,7 +179,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pResetDC */ MFDRV_RestoreDC, /* pRestoreDC */ NULL, /* pRoundRect */ - MFDRV_ScaleViewportExtEx, /* pScaleViewportExtEx */ + NULL, /* pScaleViewportExtEx */ MFDRV_ScaleWindowExtEx, /* pScaleWindowExtEx */ MFDRV_SelectBitmap, /* pSelectBitmap */ MFDRV_SelectBrush, /* pSelectBrush */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index fb3326af36e..9610a2fb17d 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -91,7 +91,6 @@ extern BOOL CDECL MFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt 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; -extern BOOL CDECL MFDRV_ScaleViewportExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) DECLSPEC_HIDDEN; extern HBITMAP CDECL MFDRV_SelectBitmap( PHYSDEV dev, HBITMAP handle ) DECLSPEC_HIDDEN; extern HBRUSH CDECL MFDRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; -- 2.23.0

1 0

[PATCH v2 1/4] gdi32: Support StockFlag in GDI_HANDLE_ENTRY.
by Huw Davies 06 Aug '21

06 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/gdiobj.c | 14 ++++++++++++-- dlls/gdi32/tests/gdiobj.c | 1 - include/ntgdi.h | 5 +++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 16a7b897e30..326414372e6 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -613,6 +613,16 @@ static void set_gdi_shared(void) NtCurrentTeb()->Peb->GdiSharedHandleTable = &gdi_shared; } +static HGDIOBJ make_stock_object( HGDIOBJ obj ) +{ + GDI_HANDLE_ENTRY *entry; + + if (!(entry = handle_entry( obj ))) return 0; + entry_obj( entry )->system = TRUE; + entry->StockFlag = 1; + return entry_to_handle( entry ); +} + /*********************************************************************** * DllMain * @@ -668,8 +678,8 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) /* clear the NOSYSTEM bit on all stock objects*/ for (i = 0; i < NB_STOCK_OBJECTS; i++) { - if (stock_objects[i]) __wine_make_gdi_object_system( stock_objects[i], TRUE ); - if (scaled_stock_objects[i]) __wine_make_gdi_object_system( scaled_stock_objects[i], TRUE ); + stock_objects[i] = make_stock_object( stock_objects[i] ); + scaled_stock_objects[i] = make_stock_object( scaled_stock_objects[i] ); } return TRUE; } diff --git a/dlls/gdi32/tests/gdiobj.c b/dlls/gdi32/tests/gdiobj.c index 789c9ecb0f8..64d37e39ab6 100644 --- a/dlls/gdi32/tests/gdiobj.c +++ b/dlls/gdi32/tests/gdiobj.c @@ -396,7 +396,6 @@ static void test_shared_handle_entry( HGDIOBJ obj, unsigned int type, BOOL is_st todo_wine ok(entry->ExtType == NTGDI_OBJ_DC, "ExtType = %x, expected NTGDI_OBJ_DC\n", entry->ExtType); } - todo_wine_if(is_stock) ok(entry->StockFlag == is_stock, "StockFlag = %x\n", entry->StockFlag); ok(entry->Type == (type & 0x1f), "Type = %x, expected %x\n", entry->Type, type & 0x1f); ok(entry->Object, "Object = NULL\n"); diff --git a/include/ntgdi.h b/include/ntgdi.h index d023d10bfc6..d6d7a5572d1 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -67,8 +67,9 @@ typedef struct _GDI_HANDLE_ENTRY /* Wine extension, native uses NTGDI_OBJ_DC */ #define NTGDI_OBJ_MEMDC 0x41 -#define NTGDI_HANDLE_TYPE_SHIFT 16 -#define NTGDI_HANDLE_TYPE_MASK 0x007f0000 +#define NTGDI_HANDLE_TYPE_SHIFT 16 +#define NTGDI_HANDLE_TYPE_MASK 0x007f0000 +#define NTGDI_HANDLE_STOCK_OBJECT 0x00800000 typedef struct _GDI_SHARED_MEMORY { -- 2.23.0

1 0

[PATCH] jscript: Avoid use after free in JSON_parse().
by Jacek Caban 06 Aug '21

06 Aug '21

From: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/json.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)

1 0

[PATCH v3 1/5] d2d1/tests: Add tests for effect inputs.
by Ziqing Hui 06 Aug '21

06 Aug '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v3: Add a "default_input_count" field to effect_test. Remove off_limit_tests variable. Add winetest_push_context() to loop. Split a loop into two loops. Use individual todo_wine rather than todo_wine block. dlls/d2d1/tests/d2d1.c | 82 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 78 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 629bbd65523..146952d7418 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9680,13 +9680,16 @@ static void test_mt_factory(BOOL d3d11) static void test_effect(BOOL d3d11) { - unsigned int i, min_inputs, max_inputs, str_size; + unsigned int i, j, min_inputs, max_inputs, str_size, input_count; + D2D1_BITMAP_PROPERTIES bitmap_desc; D2D1_BUFFER_PRECISION precision; ID2D1Image *image_a, *image_b; struct d2d1_test_context ctx; ID2D1DeviceContext *context; ID2D1Factory1 *factory; + ID2D1Bitmap *bitmap; ID2D1Effect *effect; + D2D1_SIZE_U size; BYTE buffer[64]; BOOL cached; CLSID clsid; @@ -9695,14 +9698,15 @@ static void test_effect(BOOL d3d11) const struct effect_test { const CLSID *clsid; + UINT32 default_input_count; UINT32 min_inputs; UINT32 max_inputs; } effect_tests[] = { - {&CLSID_D2D12DAffineTransform, 1, 1}, - {&CLSID_D2D13DPerspectiveTransform, 1, 1}, - {&CLSID_D2D1Composite, 1, 0xffffffff}, + {&CLSID_D2D12DAffineTransform, 1, 1, 1}, + {&CLSID_D2D13DPerspectiveTransform, 1, 1, 1}, + {&CLSID_D2D1Composite, 2, 1, 0xffffffff}, }; if (!init_test_context(&ctx, d3d11)) @@ -9797,6 +9801,76 @@ static void test_effect(BOOL d3d11) max_inputs, test->max_inputs); } + input_count = ID2D1Effect_GetInputCount(effect); + todo_wine + ok (input_count == test->default_input_count, "Got unexpected input count %u, expected %u.\n", + input_count, test->default_input_count); + + input_count = (test->max_inputs < 16 ? test->max_inputs : 16); + for (j = 0; j < input_count + 4; ++j) + { + 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(); + } + + input_count = ID2D1Effect_GetInputCount(effect); + for (j = 0; j < input_count + 4; ++j) + { + winetest_push_context("Input %u", j); + ID2D1Effect_GetInput(effect, j, &image_a); + todo_wine + ok(image_a == NULL, "Got unexpected image_a %p.\n", image_a); + winetest_pop_context(); + } + + set_size_u(&size, 1, 1); + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + hr = ID2D1RenderTarget_CreateBitmap(ctx.rt, size, NULL, 4, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ID2D1Effect_SetInput(effect, 0, (ID2D1Image *)bitmap, FALSE); + for (j = 0; j < input_count + 4; ++j) + { + winetest_push_context("Input %u", j); + image_a = (ID2D1Image *)0xdeadbeef; + ID2D1Effect_GetInput(effect, j, &image_a); + if (j == 0) + { + todo_wine + ok(image_a == (ID2D1Image *)bitmap, "Got unexpected image_a %p.\n", image_a); + if (image_a == (ID2D1Image *)bitmap) + ID2D1Image_Release(image_a); + } + else + { + todo_wine + ok(image_a == NULL, "Got unexpected image_a %p.\n", image_a); + } + winetest_pop_context(); + } + + for (j = input_count; j < input_count + 4; ++j) + { + winetest_push_context("Input %u", j); + image_a = (ID2D1Image *)0xdeadbeef; + ID2D1Effect_SetInput(effect, j, (ID2D1Image *)bitmap, FALSE); + ID2D1Effect_GetInput(effect, j, &image_a); + todo_wine + ok(image_a == NULL, "Got unexpected image_a %p.\n", image_a); + winetest_pop_context(); + } + ID2D1Bitmap_Release(bitmap); + ID2D1Effect_Release(effect); winetest_pop_context(); } -- 2.25.1

3 8

[PATCH] wined3d: Don't try to reset query pools if we don't have a command buffer.
by Jan Sikorski 06 Aug '21

06 Aug '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51419 Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index eac4eacff5a..8df416851f2 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1314,12 +1314,15 @@ void wined3d_context_vk_end_current_render_pass(struct wined3d_context_vk *conte context_vk->vk_framebuffer = VK_NULL_HANDLE; } - LIST_FOR_EACH_ENTRY_SAFE(pool_vk, pool_vk_next, &context_vk->completed_query_pools, - struct wined3d_query_pool_vk, completed_entry) + if (vk_command_buffer) { - list_remove(&pool_vk->completed_entry); - list_init(&pool_vk->completed_entry); - wined3d_query_pool_vk_reset(pool_vk, context_vk, vk_command_buffer); + LIST_FOR_EACH_ENTRY_SAFE(pool_vk, pool_vk_next, &context_vk->completed_query_pools, + struct wined3d_query_pool_vk, completed_entry) + { + list_remove(&pool_vk->completed_entry); + list_init(&pool_vk->completed_entry); + wined3d_query_pool_vk_reset(pool_vk, context_vk, vk_command_buffer); + } } } -- 2.30.2

2 3

[PATCH] jscript: Avoid use after free in JSON_parse().
by Paul Gofman 06 Aug '21

06 Aug '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/jscript/json.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c index a8014f95b4f..20234807727 100644 --- a/dlls/jscript/json.c +++ b/dlls/jscript/json.c @@ -291,16 +291,21 @@ static HRESULT JSON_parse(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsign parse_ctx.end = buf + jsstr_length(str); parse_ctx.ctx = ctx; hres = parse_json_value(&parse_ctx, &ret); - jsstr_release(str); if(FAILED(hres)) + { + jsstr_release(str); return hres; + } if(skip_spaces(&parse_ctx)) { FIXME("syntax error\n"); + jsstr_release(str); jsval_release(ret); return E_FAIL; } + jsstr_release(str); + if(r) *r = ret; else -- 2.31.1

1 0

[PATCH 4/4] wininet: InternetErrorDlg(FLAGS_ERROR_UI_FILTER_FOR_ERRORS) should return ERROR_SUCCESS instead of ERROR_NOT_SUPPORTED.
by Dmitry Timoshkov 06 Aug '21

06 Aug '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wininet/dialogs.c | 3 ++- dlls/wininet/tests/internet.c | 12 ++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 6f15c4f04a8..f9e0f2d8822 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -536,7 +536,8 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, res = ERROR_SUCCESS; break; default: - res = ERROR_NOT_SUPPORTED; + res = (dwFlags & FLAGS_ERROR_UI_FILTER_FOR_ERRORS) ? ERROR_SUCCESS : ERROR_NOT_SUPPORTED; + break; } if(req) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index f59fbc4dd4d..c32bf87cbf6 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1594,10 +1594,7 @@ static void test_InternetErrorDlg(void) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); res = InternetErrorDlg(NULL, req, i, FLAGS_ERROR_UI_FILTER_FOR_ERRORS | FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); - todo_wine_if(i != ERROR_INTERNET_INCORRECT_PASSWORD && i != ERROR_INTERNET_SEC_CERT_DATE_INVALID && - i != ERROR_INTERNET_SEC_CERT_CN_INVALID && i != ERROR_INTERNET_INVALID_CA && - i != ERROR_INTERNET_SEC_CERT_ERRORS && i != ERROR_INTERNET_SEC_CERT_REV_FAILED && - i != ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR && i != ERROR_INTERNET_POST_IS_NON_SECURE) + todo_wine_if(i == ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION) ok(res == expected2, "Got %d, expected %d (%d)\n", res, expected2, i); /* With a null req */ @@ -1612,19 +1609,14 @@ static void test_InternetErrorDlg(void) expected2 = ERROR_INVALID_PARAMETER; res = InternetErrorDlg(NULL, NULL, i, FLAGS_ERROR_UI_FILTER_FOR_ERRORS | FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); - todo_wine_if(i != ERROR_INTERNET_SEC_CERT_DATE_INVALID && i != ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR && - i != ERROR_INTERNET_SEC_CERT_CN_INVALID && i != ERROR_INTERNET_INVALID_CA && - i != ERROR_INTERNET_SEC_CERT_ERRORS && i != ERROR_INTERNET_SEC_CERT_REV_FAILED && - i != ERROR_INTERNET_POST_IS_NON_SECURE && i != ERROR_INTERNET_INCORRECT_PASSWORD) + todo_wine_if(i == ERROR_INTERNET_INSERT_CDROM || i == ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED || i == ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION) ok(res == expected2, "Got %d, expected %d (%d)\n", res, expected2, i); } res = InternetErrorDlg(NULL, req, 0xdeadbeef, FLAGS_ERROR_UI_FILTER_FOR_ERRORS | FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); -todo_wine ok(res == ERROR_SUCCESS, "Got %d, expected ERROR_SUCCESS\n", res); res = InternetErrorDlg(NULL, NULL, 0xdeadbeef, FLAGS_ERROR_UI_FILTER_FOR_ERRORS | FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); -todo_wine ok(res == ERROR_SUCCESS, "Got %d, expected ERROR_SUCCESS\n", res); res = InternetCloseHandle(req); -- 2.31.1

1 0

[PATCH 3/4] wininet: Fix some InternetErrorDlg() conditions returning ERROR_INVALID_PARAMETER.
by Dmitry Timoshkov 06 Aug '21

06 Aug '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wininet/dialogs.c | 5 +---- dlls/wininet/tests/internet.c | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index a425534fa87..6f15c4f04a8 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -498,7 +498,7 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, if( !dwError && !(dwFlags & FLAGS_ERROR_UI_FILTER_FOR_ERRORS ) ) break; if(!req) - return ERROR_INVALID_HANDLE; + return ERROR_INVALID_PARAMETER; switch(req->status_code) { case HTTP_STATUS_PROXY_AUTH_REQ: @@ -523,9 +523,6 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, res = ERROR_CANCELLED; break; } - if(!req) - return ERROR_INVALID_HANDLE; - if( dwFlags & ~FLAGS_ERROR_UI_FLAGS_CHANGE_OPTIONS ) FIXME("%08x contains unsupported flags.\n", dwFlags); diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index e137f7bd725..f59fbc4dd4d 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1605,7 +1605,7 @@ static void test_InternetErrorDlg(void) expected = ERROR_INVALID_PARAMETER; res = InternetErrorDlg(hwnd, NULL, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); - todo_wine_if((test_flags & FLAG_TODO) || i == ERROR_INTERNET_INCORRECT_PASSWORD || i == ERROR_INTERNET_INSERT_CDROM || i == ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED) + todo_wine_if((test_flags & FLAG_TODO) || i == ERROR_INTERNET_INSERT_CDROM || i == ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); if(test_flags & FLAG_NEEDREQ) @@ -1615,7 +1615,7 @@ static void test_InternetErrorDlg(void) todo_wine_if(i != ERROR_INTERNET_SEC_CERT_DATE_INVALID && i != ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR && i != ERROR_INTERNET_SEC_CERT_CN_INVALID && i != ERROR_INTERNET_INVALID_CA && i != ERROR_INTERNET_SEC_CERT_ERRORS && i != ERROR_INTERNET_SEC_CERT_REV_FAILED && - i != ERROR_INTERNET_POST_IS_NON_SECURE) + i != ERROR_INTERNET_POST_IS_NON_SECURE && i != ERROR_INTERNET_INCORRECT_PASSWORD) ok(res == expected2, "Got %d, expected %d (%d)\n", res, expected2, i); } -- 2.31.1

1 0

[PATCH 2/4] wininet/tests: Add some tests for InternetErrorDlg(FLAGS_ERROR_UI_FILTER_FOR_ERRORS).
by Dmitry Timoshkov 06 Aug '21

06 Aug '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wininet/tests/internet.c | 41 +++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index c61a9793a95..e137f7bd725 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1515,7 +1515,7 @@ static void test_InternetErrorDlg(void) for(i = INTERNET_ERROR_BASE; i < INTERNET_ERROR_LAST; i++) { - DWORD expected = ERROR_NOT_SUPPORTED, test_flags = 0, j; + DWORD expected = ERROR_NOT_SUPPORTED, expected2 = ERROR_SUCCESS, test_flags = 0, j; for (j = 0; j < ARRAY_SIZE(no_ui_res); ++j) { @@ -1523,6 +1523,7 @@ static void test_InternetErrorDlg(void) { test_flags = no_ui_res[j].test_flags; expected = no_ui_res[j].res; + expected2 = no_ui_res[j].res; } } @@ -1554,7 +1555,10 @@ static void test_InternetErrorDlg(void) case ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR: /* later 9.x versions */ case ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE: /* later 11.x versions */ if(res == ERROR_CANCELLED) + { expected = ERROR_CANCELLED; + expected2 = ERROR_CANCELLED; + } break; case ERROR_INTERNET_FORTEZZA_LOGIN_NEEDED: if (res == NTE_PROV_TYPE_NOT_DEF) /* XP, 2003 */ @@ -1562,15 +1566,24 @@ static void test_InternetErrorDlg(void) break; case ERROR_INTERNET_CHG_POST_IS_NON_SECURE: if(res == ERROR_CANCELLED) /* before win10 returns ERROR_CANCELLED */ + { expected = ERROR_CANCELLED; + expected2 = ERROR_CANCELLED; + } break; default: break; } if(expected == ERROR_NOT_SUPPORTED && res == ERROR_CANCELLED) /* Win10 1607+ */ + { expected = ERROR_CANCELLED; + expected2 = ERROR_SUCCESS; + } else if(expected == ERROR_CANCELLED && res == ERROR_NOT_SUPPORTED) /* XP, Win7, Win8 */ + { expected = ERROR_NOT_SUPPORTED; + expected2 = ERROR_SUCCESS; + } todo_wine_if(test_flags & FLAG_TODO) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); @@ -1580,16 +1593,40 @@ static void test_InternetErrorDlg(void) todo_wine_if(test_flags & FLAG_TODO) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); + res = InternetErrorDlg(NULL, req, i, FLAGS_ERROR_UI_FILTER_FOR_ERRORS | FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); + todo_wine_if(i != ERROR_INTERNET_INCORRECT_PASSWORD && i != ERROR_INTERNET_SEC_CERT_DATE_INVALID && + i != ERROR_INTERNET_SEC_CERT_CN_INVALID && i != ERROR_INTERNET_INVALID_CA && + i != ERROR_INTERNET_SEC_CERT_ERRORS && i != ERROR_INTERNET_SEC_CERT_REV_FAILED && + i != ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR && i != ERROR_INTERNET_POST_IS_NON_SECURE) + ok(res == expected2, "Got %d, expected %d (%d)\n", res, expected2, i); /* With a null req */ if(test_flags & FLAG_NEEDREQ) expected = ERROR_INVALID_PARAMETER; res = InternetErrorDlg(hwnd, NULL, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); - todo_wine_if ((test_flags & FLAG_TODO) || i == ERROR_INTERNET_INCORRECT_PASSWORD || i == ERROR_INTERNET_INSERT_CDROM || i == ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED) + todo_wine_if((test_flags & FLAG_TODO) || i == ERROR_INTERNET_INCORRECT_PASSWORD || i == ERROR_INTERNET_INSERT_CDROM || i == ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); + + if(test_flags & FLAG_NEEDREQ) + expected2 = ERROR_INVALID_PARAMETER; + + res = InternetErrorDlg(NULL, NULL, i, FLAGS_ERROR_UI_FILTER_FOR_ERRORS | FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); + todo_wine_if(i != ERROR_INTERNET_SEC_CERT_DATE_INVALID && i != ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR && + i != ERROR_INTERNET_SEC_CERT_CN_INVALID && i != ERROR_INTERNET_INVALID_CA && + i != ERROR_INTERNET_SEC_CERT_ERRORS && i != ERROR_INTERNET_SEC_CERT_REV_FAILED && + i != ERROR_INTERNET_POST_IS_NON_SECURE) + ok(res == expected2, "Got %d, expected %d (%d)\n", res, expected2, i); } + res = InternetErrorDlg(NULL, req, 0xdeadbeef, FLAGS_ERROR_UI_FILTER_FOR_ERRORS | FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); +todo_wine + ok(res == ERROR_SUCCESS, "Got %d, expected ERROR_SUCCESS\n", res); + + res = InternetErrorDlg(NULL, NULL, 0xdeadbeef, FLAGS_ERROR_UI_FILTER_FOR_ERRORS | FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); +todo_wine + ok(res == ERROR_SUCCESS, "Got %d, expected ERROR_SUCCESS\n", res); + res = InternetCloseHandle(req); ok(res == TRUE, "InternetCloseHandle failed: 0x%08x\n", GetLastError()); res = InternetCloseHandle(con); -- 2.31.1

1 0

[PATCH] combase: When looking up an apartment which has a given creator thread ID use multi-threaded apartment only if the thread doesn't have an apartment-threaded one.
by Dmitry Timoshkov 06 Aug '21

06 Aug '21

CoIncrementMTAUsage() always creates the MTA if it doesn't already exist, and mta->tid may accidently match the apt->tid of the apartment-threaded apartment of the thread. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/combase/apartment.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/combase/apartment.c b/dlls/combase/apartment.c index 108d6a71c5c..690bc69db1b 100644 --- a/dlls/combase/apartment.c +++ b/dlls/combase/apartment.c @@ -663,13 +663,20 @@ struct apartment * apartment_findfromtid(DWORD tid) EnterCriticalSection(&apt_cs); LIST_FOR_EACH_ENTRY(apt, &apts, struct apartment, entry) { - if (apt->tid == tid) + if (apt != mta && apt->tid == tid) { result = apt; apartment_addref(result); break; } } + + if (!result && mta && mta->tid == tid) + { + result = mta; + apartment_addref(result); + } + LeaveCriticalSection(&apt_cs); return result; -- 2.31.1

2 1

[PATCH] ole32/tests: Add more tests for CoIncrementMTAUsage/CoDecrementMTAUsage.
by Dmitry Timoshkov 06 Aug '21

06 Aug '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ole32/tests/compobj.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index d1e947e393f..1d46a5b9c13 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -4098,6 +4098,25 @@ static void test_mta_usage(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE); + + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + test_apt_type(APTTYPE_MAINSTA, APTTYPEQUALIFIER_NONE); + + cookie = 0; + hr = pCoIncrementMTAUsage(&cookie); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(cookie != NULL, "Unexpected cookie %p.\n", cookie); + + test_apt_type(APTTYPE_MAINSTA, APTTYPEQUALIFIER_NONE); + + hr = pCoDecrementMTAUsage(cookie); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + CoUninitialize(); + + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE); } static void test_CoCreateInstanceFromApp(void) -- 2.31.1

3 3

[PATCH 4/4] gdi32: Remove no longer used driver entry points.
by Jacek Caban 06 Aug '21

06 Aug '21

1 0

[PATCH 3/4] gdi32: Use NtGdiScaleWindowExtEx for ScaleWindowExtEx implementation.
by Jacek Caban 06 Aug '21

06 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 15 +++++------- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 4 ++++ dlls/gdi32/gdidc.c | 15 ++++++++++++ dlls/gdi32/mapping.c | 48 +++++++++++++++++++------------------- dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- 7 files changed, 53 insertions(+), 37 deletions(-)

1 0

[PATCH 1/4] gdi32: Support StockFlag in GDI_HANDLE_ENTRY.
by Jacek Caban 06 Aug '21

06 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdiobj.c | 14 ++++++++++++-- dlls/gdi32/tests/gdiobj.c | 1 - include/ntgdi.h | 5 +++-- 3 files changed, 15 insertions(+), 5 deletions(-)

1 0

[PATCH 1/2] oleaut32: The decimal point takes priority over the thousands separator.
by Francois Gouget 06 Aug '21

06 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/oleaut32/tests/vartest.c | 9 +++------ dlls/oleaut32/variant.c | 3 +++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 89859988f1f..ecc8e8b0f11 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2313,17 +2313,14 @@ static void test_VarParseNumFromStrMisc(void) SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONDECIMALSEP, L"~"); hres = wconvert_str(L",1", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_DECIMAL, &np, rgb, LOCALE_USER_DEFAULT, 0); - todo_wine EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_DECIMAL,NUMPRS_DECIMAL,2,0,-1); - todo_wine EXPECTRGB(0,1); - EXPECTRGB(1,FAILDIG); + EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_DECIMAL,NUMPRS_DECIMAL,2,0,-1); + EXPECT2(1,FAILDIG); hres = wconvert_str(L"1,000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); - todo_wine EXPECTFAIL; + EXPECTFAIL; hres = wconvert_str(L"1,", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_DECIMAL|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); - if (broken(1)) /* FIXME Reenable once Wine is less broken */ EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_DECIMAL|NUMPRS_USE_ALL,NUMPRS_DECIMAL,2,0,0); - todo_wine ok(np.dwOutFlags == NUMPRS_DECIMAL, "Got dwOutFlags=%08x\n", np.dwOutFlags); EXPECT2(1,FAILDIG); /* But not for their monetary equivalents */ diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 14ba63b9b2e..264b9f6594b 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1607,6 +1607,9 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla return DISP_E_TYPEMISMATCH; VARIANT_GetLocalisedNumberChars(&chars, lcid, dwFlags); + if (chars.cDigitSeparator == chars.cDecimalPoint) + /* The decimal point completely masks the digit separator */ + chars.cDigitSeparator = 0; /* Setting the thousands separator to a non-breaking space implies regular * spaces are allowed too. But the converse is not true. */ -- 2.20.1

1 1

[PATCH] ws2_32: Add a trailing linefeed to a FIXME().
by Francois Gouget 06 Aug '21

06 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ws2_32/unixlib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index 240389aeeaa..f0480c5865b 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -348,7 +348,7 @@ static unsigned int errno_from_unix( int err ) case EREMOTE: return WSAEREMOTE; #endif default: - FIXME( "unknown error: %s", strerror( err ) ); + FIXME( "unknown error: %s\n", strerror( err ) ); return WSAEFAULT; } } -- 2.20.1

1 0

[PATCH vkd3d 1/4] build: Add hlsl.h and preproc.h to libvkd3d_shader_la_SOURCES.
by Zebediah Figura 06 Aug '21

06 Aug '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.am b/Makefile.am index 5b3c4ff0..8dd803d1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -170,7 +170,9 @@ libvkd3d_shader_la_SOURCES = \ libs/vkd3d-shader/checksum.c \ libs/vkd3d-shader/dxbc.c \ libs/vkd3d-shader/hlsl.c \ + libs/vkd3d-shader/hlsl.h \ libs/vkd3d-shader/hlsl_codegen.c \ + libs/vkd3d-shader/preproc.h \ libs/vkd3d-shader/spirv.c \ libs/vkd3d-shader/trace.c \ libs/vkd3d-shader/vkd3d_shader.map \ -- 2.32.0

5 10

[PATCH vkd3d v2] vkd3d-shader: Move SM4 byte code definitions to a separate header.
by Zebediah Figura 06 Aug '21

06 Aug '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Makefile.am | 1 + libs/vkd3d-shader/dxbc.c | 460 +-------------------- libs/vkd3d-shader/sm4.h | 488 +++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 13 - 4 files changed, 490 insertions(+), 472 deletions(-) create mode 100644 libs/vkd3d-shader/sm4.h diff --git a/Makefile.am b/Makefile.am index 8cbcd263..1946af37 100644 --- a/Makefile.am +++ b/Makefile.am @@ -173,6 +173,7 @@ libvkd3d_shader_la_SOURCES = \ libs/vkd3d-shader/hlsl.h \ libs/vkd3d-shader/hlsl_codegen.c \ libs/vkd3d-shader/preproc.h \ + libs/vkd3d-shader/sm4.h \ libs/vkd3d-shader/spirv.c \ libs/vkd3d-shader/trace.c \ libs/vkd3d-shader/vkd3d_shader.map \ diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index dd18b6f1..9da89a4a 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -18,465 +18,7 @@ */ #include "vkd3d_shader_private.h" - -#define VKD3D_SM4_INSTRUCTION_MODIFIER (0x1u << 31) - -#define VKD3D_SM4_MODIFIER_MASK 0x3fu - -#define VKD3D_SM5_MODIFIER_DATA_TYPE_SHIFT 6 -#define VKD3D_SM5_MODIFIER_DATA_TYPE_MASK (0xffffu << VKD3D_SM5_MODIFIER_DATA_TYPE_SHIFT) - -#define VKD3D_SM5_MODIFIER_RESOURCE_TYPE_SHIFT 6 -#define VKD3D_SM5_MODIFIER_RESOURCE_TYPE_MASK (0xfu << VKD3D_SM5_MODIFIER_RESOURCE_TYPE_SHIFT) - -#define VKD3D_SM5_MODIFIER_RESOURCE_STRIDE_SHIFT 11 -#define VKD3D_SM5_MODIFIER_RESOURCE_STRIDE_MASK (0xfffu << VKD3D_SM5_MODIFIER_RESOURCE_STRIDE_SHIFT) - -#define VKD3D_SM4_AOFFIMMI_U_SHIFT 9 -#define VKD3D_SM4_AOFFIMMI_U_MASK (0xfu << VKD3D_SM4_AOFFIMMI_U_SHIFT) -#define VKD3D_SM4_AOFFIMMI_V_SHIFT 13 -#define VKD3D_SM4_AOFFIMMI_V_MASK (0xfu << VKD3D_SM4_AOFFIMMI_V_SHIFT) -#define VKD3D_SM4_AOFFIMMI_W_SHIFT 17 -#define VKD3D_SM4_AOFFIMMI_W_MASK (0xfu << VKD3D_SM4_AOFFIMMI_W_SHIFT) - -#define VKD3D_SM4_INSTRUCTION_LENGTH_SHIFT 24 -#define VKD3D_SM4_INSTRUCTION_LENGTH_MASK (0x1fu << VKD3D_SM4_INSTRUCTION_LENGTH_SHIFT) - -#define VKD3D_SM4_INSTRUCTION_FLAGS_SHIFT 11 -#define VKD3D_SM4_INSTRUCTION_FLAGS_MASK (0x7u << VKD3D_SM4_INSTRUCTION_FLAGS_SHIFT) - -#define VKD3D_SM4_RESOURCE_TYPE_SHIFT 11 -#define VKD3D_SM4_RESOURCE_TYPE_MASK (0xfu << VKD3D_SM4_RESOURCE_TYPE_SHIFT) - -#define VKD3D_SM4_PRIMITIVE_TYPE_SHIFT 11 -#define VKD3D_SM4_PRIMITIVE_TYPE_MASK (0x3fu << VKD3D_SM4_PRIMITIVE_TYPE_SHIFT) - -#define VKD3D_SM4_INDEX_TYPE_SHIFT 11 -#define VKD3D_SM4_INDEX_TYPE_MASK (0x1u << VKD3D_SM4_INDEX_TYPE_SHIFT) - -#define VKD3D_SM4_SAMPLER_MODE_SHIFT 11 -#define VKD3D_SM4_SAMPLER_MODE_MASK (0xfu << VKD3D_SM4_SAMPLER_MODE_SHIFT) - -#define VKD3D_SM4_SHADER_DATA_TYPE_SHIFT 11 -#define VKD3D_SM4_SHADER_DATA_TYPE_MASK (0xfu << VKD3D_SM4_SHADER_DATA_TYPE_SHIFT) - -#define VKD3D_SM4_INTERPOLATION_MODE_SHIFT 11 -#define VKD3D_SM4_INTERPOLATION_MODE_MASK (0xfu << VKD3D_SM4_INTERPOLATION_MODE_SHIFT) - -#define VKD3D_SM4_GLOBAL_FLAGS_SHIFT 11 -#define VKD3D_SM4_GLOBAL_FLAGS_MASK (0xffu << VKD3D_SM4_GLOBAL_FLAGS_SHIFT) - -#define VKD3D_SM5_PRECISE_SHIFT 19 -#define VKD3D_SM5_PRECISE_MASK (0xfu << VKD3D_SM5_PRECISE_SHIFT) - -#define VKD3D_SM5_CONTROL_POINT_COUNT_SHIFT 11 -#define VKD3D_SM5_CONTROL_POINT_COUNT_MASK (0xffu << VKD3D_SM5_CONTROL_POINT_COUNT_SHIFT) - -#define VKD3D_SM5_FP_ARRAY_SIZE_SHIFT 16 -#define VKD3D_SM5_FP_TABLE_COUNT_MASK 0xffffu - -#define VKD3D_SM5_UAV_FLAGS_SHIFT 15 -#define VKD3D_SM5_UAV_FLAGS_MASK (0x1ffu << VKD3D_SM5_UAV_FLAGS_SHIFT) - -#define VKD3D_SM5_SYNC_FLAGS_SHIFT 11 -#define VKD3D_SM5_SYNC_FLAGS_MASK (0xffu << VKD3D_SM5_SYNC_FLAGS_SHIFT) - -#define VKD3D_SM5_TESSELLATOR_SHIFT 11 -#define VKD3D_SM5_TESSELLATOR_MASK (0xfu << VKD3D_SM5_TESSELLATOR_SHIFT) - -#define VKD3D_SM4_OPCODE_MASK 0xff - -#define VKD3D_SM4_REGISTER_MODIFIER (0x1u << 31) - -#define VKD3D_SM4_ADDRESSING_SHIFT2 28 -#define VKD3D_SM4_ADDRESSING_MASK2 (0x3u << VKD3D_SM4_ADDRESSING_SHIFT2) - -#define VKD3D_SM4_ADDRESSING_SHIFT1 25 -#define VKD3D_SM4_ADDRESSING_MASK1 (0x3u << VKD3D_SM4_ADDRESSING_SHIFT1) - -#define VKD3D_SM4_ADDRESSING_SHIFT0 22 -#define VKD3D_SM4_ADDRESSING_MASK0 (0x3u << VKD3D_SM4_ADDRESSING_SHIFT0) - -#define VKD3D_SM4_REGISTER_ORDER_SHIFT 20 -#define VKD3D_SM4_REGISTER_ORDER_MASK (0x3u << VKD3D_SM4_REGISTER_ORDER_SHIFT) - -#define VKD3D_SM4_REGISTER_TYPE_SHIFT 12 -#define VKD3D_SM4_REGISTER_TYPE_MASK (0xffu << VKD3D_SM4_REGISTER_TYPE_SHIFT) - -#define VKD3D_SM4_SWIZZLE_TYPE_SHIFT 2 -#define VKD3D_SM4_SWIZZLE_TYPE_MASK (0x3u << VKD3D_SM4_SWIZZLE_TYPE_SHIFT) - -#define VKD3D_SM4_DIMENSION_SHIFT 0 -#define VKD3D_SM4_DIMENSION_MASK (0x3u << VKD3D_SM4_DIMENSION_SHIFT) - -#define VKD3D_SM4_WRITEMASK_SHIFT 4 -#define VKD3D_SM4_WRITEMASK_MASK (0xfu << VKD3D_SM4_WRITEMASK_SHIFT) - -#define VKD3D_SM4_SWIZZLE_SHIFT 4 -#define VKD3D_SM4_SWIZZLE_MASK (0xffu << VKD3D_SM4_SWIZZLE_SHIFT) - -#define VKD3D_SM4_VERSION_MAJOR(version) (((version) >> 4) & 0xf) -#define VKD3D_SM4_VERSION_MINOR(version) (((version) >> 0) & 0xf) - -#define VKD3D_SM4_ADDRESSING_RELATIVE 0x2 -#define VKD3D_SM4_ADDRESSING_OFFSET 0x1 - -#define VKD3D_SM4_INSTRUCTION_FLAG_SATURATE 0x4 - -#define VKD3D_SM4_CONDITIONAL_NZ (0x1u << 18) - -#define VKD3D_SM4_TYPE_COMPONENT(com, i) (((com) >> (4 * (i))) & 0xfu) - -enum vkd3d_sm4_opcode -{ - VKD3D_SM4_OP_ADD = 0x00, - VKD3D_SM4_OP_AND = 0x01, - VKD3D_SM4_OP_BREAK = 0x02, - VKD3D_SM4_OP_BREAKC = 0x03, - VKD3D_SM4_OP_CASE = 0x06, - VKD3D_SM4_OP_CONTINUE = 0x07, - VKD3D_SM4_OP_CONTINUEC = 0x08, - VKD3D_SM4_OP_CUT = 0x09, - VKD3D_SM4_OP_DEFAULT = 0x0a, - VKD3D_SM4_OP_DERIV_RTX = 0x0b, - VKD3D_SM4_OP_DERIV_RTY = 0x0c, - VKD3D_SM4_OP_DISCARD = 0x0d, - VKD3D_SM4_OP_DIV = 0x0e, - VKD3D_SM4_OP_DP2 = 0x0f, - VKD3D_SM4_OP_DP3 = 0x10, - VKD3D_SM4_OP_DP4 = 0x11, - VKD3D_SM4_OP_ELSE = 0x12, - VKD3D_SM4_OP_EMIT = 0x13, - VKD3D_SM4_OP_ENDIF = 0x15, - VKD3D_SM4_OP_ENDLOOP = 0x16, - VKD3D_SM4_OP_ENDSWITCH = 0x17, - VKD3D_SM4_OP_EQ = 0x18, - VKD3D_SM4_OP_EXP = 0x19, - VKD3D_SM4_OP_FRC = 0x1a, - VKD3D_SM4_OP_FTOI = 0x1b, - VKD3D_SM4_OP_FTOU = 0x1c, - VKD3D_SM4_OP_GE = 0x1d, - VKD3D_SM4_OP_IADD = 0x1e, - VKD3D_SM4_OP_IF = 0x1f, - VKD3D_SM4_OP_IEQ = 0x20, - VKD3D_SM4_OP_IGE = 0x21, - VKD3D_SM4_OP_ILT = 0x22, - VKD3D_SM4_OP_IMAD = 0x23, - VKD3D_SM4_OP_IMAX = 0x24, - VKD3D_SM4_OP_IMIN = 0x25, - VKD3D_SM4_OP_IMUL = 0x26, - VKD3D_SM4_OP_INE = 0x27, - VKD3D_SM4_OP_INEG = 0x28, - VKD3D_SM4_OP_ISHL = 0x29, - VKD3D_SM4_OP_ISHR = 0x2a, - VKD3D_SM4_OP_ITOF = 0x2b, - VKD3D_SM4_OP_LABEL = 0x2c, - VKD3D_SM4_OP_LD = 0x2d, - VKD3D_SM4_OP_LD2DMS = 0x2e, - VKD3D_SM4_OP_LOG = 0x2f, - VKD3D_SM4_OP_LOOP = 0x30, - VKD3D_SM4_OP_LT = 0x31, - VKD3D_SM4_OP_MAD = 0x32, - VKD3D_SM4_OP_MIN = 0x33, - VKD3D_SM4_OP_MAX = 0x34, - VKD3D_SM4_OP_SHADER_DATA = 0x35, - VKD3D_SM4_OP_MOV = 0x36, - VKD3D_SM4_OP_MOVC = 0x37, - VKD3D_SM4_OP_MUL = 0x38, - VKD3D_SM4_OP_NE = 0x39, - VKD3D_SM4_OP_NOP = 0x3a, - VKD3D_SM4_OP_NOT = 0x3b, - VKD3D_SM4_OP_OR = 0x3c, - VKD3D_SM4_OP_RESINFO = 0x3d, - VKD3D_SM4_OP_RET = 0x3e, - VKD3D_SM4_OP_RETC = 0x3f, - VKD3D_SM4_OP_ROUND_NE = 0x40, - VKD3D_SM4_OP_ROUND_NI = 0x41, - VKD3D_SM4_OP_ROUND_PI = 0x42, - VKD3D_SM4_OP_ROUND_Z = 0x43, - VKD3D_SM4_OP_RSQ = 0x44, - VKD3D_SM4_OP_SAMPLE = 0x45, - VKD3D_SM4_OP_SAMPLE_C = 0x46, - VKD3D_SM4_OP_SAMPLE_C_LZ = 0x47, - VKD3D_SM4_OP_SAMPLE_LOD = 0x48, - VKD3D_SM4_OP_SAMPLE_GRAD = 0x49, - VKD3D_SM4_OP_SAMPLE_B = 0x4a, - VKD3D_SM4_OP_SQRT = 0x4b, - VKD3D_SM4_OP_SWITCH = 0x4c, - VKD3D_SM4_OP_SINCOS = 0x4d, - VKD3D_SM4_OP_UDIV = 0x4e, - VKD3D_SM4_OP_ULT = 0x4f, - VKD3D_SM4_OP_UGE = 0x50, - VKD3D_SM4_OP_UMUL = 0x51, - VKD3D_SM4_OP_UMAX = 0x53, - VKD3D_SM4_OP_UMIN = 0x54, - VKD3D_SM4_OP_USHR = 0x55, - VKD3D_SM4_OP_UTOF = 0x56, - VKD3D_SM4_OP_XOR = 0x57, - VKD3D_SM4_OP_DCL_RESOURCE = 0x58, - VKD3D_SM4_OP_DCL_CONSTANT_BUFFER = 0x59, - VKD3D_SM4_OP_DCL_SAMPLER = 0x5a, - VKD3D_SM4_OP_DCL_INDEX_RANGE = 0x5b, - VKD3D_SM4_OP_DCL_OUTPUT_TOPOLOGY = 0x5c, - VKD3D_SM4_OP_DCL_INPUT_PRIMITIVE = 0x5d, - VKD3D_SM4_OP_DCL_VERTICES_OUT = 0x5e, - VKD3D_SM4_OP_DCL_INPUT = 0x5f, - VKD3D_SM4_OP_DCL_INPUT_SGV = 0x60, - VKD3D_SM4_OP_DCL_INPUT_SIV = 0x61, - VKD3D_SM4_OP_DCL_INPUT_PS = 0x62, - VKD3D_SM4_OP_DCL_INPUT_PS_SGV = 0x63, - VKD3D_SM4_OP_DCL_INPUT_PS_SIV = 0x64, - VKD3D_SM4_OP_DCL_OUTPUT = 0x65, - VKD3D_SM4_OP_DCL_OUTPUT_SIV = 0x67, - VKD3D_SM4_OP_DCL_TEMPS = 0x68, - VKD3D_SM4_OP_DCL_INDEXABLE_TEMP = 0x69, - VKD3D_SM4_OP_DCL_GLOBAL_FLAGS = 0x6a, - VKD3D_SM4_OP_LOD = 0x6c, - VKD3D_SM4_OP_GATHER4 = 0x6d, - VKD3D_SM4_OP_SAMPLE_POS = 0x6e, - VKD3D_SM4_OP_SAMPLE_INFO = 0x6f, - VKD3D_SM5_OP_HS_DECLS = 0x71, - VKD3D_SM5_OP_HS_CONTROL_POINT_PHASE = 0x72, - VKD3D_SM5_OP_HS_FORK_PHASE = 0x73, - VKD3D_SM5_OP_HS_JOIN_PHASE = 0x74, - VKD3D_SM5_OP_EMIT_STREAM = 0x75, - VKD3D_SM5_OP_CUT_STREAM = 0x76, - VKD3D_SM5_OP_FCALL = 0x78, - VKD3D_SM5_OP_BUFINFO = 0x79, - VKD3D_SM5_OP_DERIV_RTX_COARSE = 0x7a, - VKD3D_SM5_OP_DERIV_RTX_FINE = 0x7b, - VKD3D_SM5_OP_DERIV_RTY_COARSE = 0x7c, - VKD3D_SM5_OP_DERIV_RTY_FINE = 0x7d, - VKD3D_SM5_OP_GATHER4_C = 0x7e, - VKD3D_SM5_OP_GATHER4_PO = 0x7f, - VKD3D_SM5_OP_GATHER4_PO_C = 0x80, - VKD3D_SM5_OP_RCP = 0x81, - VKD3D_SM5_OP_F32TOF16 = 0x82, - VKD3D_SM5_OP_F16TOF32 = 0x83, - VKD3D_SM5_OP_COUNTBITS = 0x86, - VKD3D_SM5_OP_FIRSTBIT_HI = 0x87, - VKD3D_SM5_OP_FIRSTBIT_LO = 0x88, - VKD3D_SM5_OP_FIRSTBIT_SHI = 0x89, - VKD3D_SM5_OP_UBFE = 0x8a, - VKD3D_SM5_OP_IBFE = 0x8b, - VKD3D_SM5_OP_BFI = 0x8c, - VKD3D_SM5_OP_BFREV = 0x8d, - VKD3D_SM5_OP_SWAPC = 0x8e, - VKD3D_SM5_OP_DCL_STREAM = 0x8f, - VKD3D_SM5_OP_DCL_FUNCTION_BODY = 0x90, - VKD3D_SM5_OP_DCL_FUNCTION_TABLE = 0x91, - VKD3D_SM5_OP_DCL_INTERFACE = 0x92, - VKD3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT = 0x93, - VKD3D_SM5_OP_DCL_OUTPUT_CONTROL_POINT_COUNT = 0x94, - VKD3D_SM5_OP_DCL_TESSELLATOR_DOMAIN = 0x95, - VKD3D_SM5_OP_DCL_TESSELLATOR_PARTITIONING = 0x96, - VKD3D_SM5_OP_DCL_TESSELLATOR_OUTPUT_PRIMITIVE = 0x97, - VKD3D_SM5_OP_DCL_HS_MAX_TESSFACTOR = 0x98, - VKD3D_SM5_OP_DCL_HS_FORK_PHASE_INSTANCE_COUNT = 0x99, - VKD3D_SM5_OP_DCL_HS_JOIN_PHASE_INSTANCE_COUNT = 0x9a, - VKD3D_SM5_OP_DCL_THREAD_GROUP = 0x9b, - VKD3D_SM5_OP_DCL_UAV_TYPED = 0x9c, - VKD3D_SM5_OP_DCL_UAV_RAW = 0x9d, - VKD3D_SM5_OP_DCL_UAV_STRUCTURED = 0x9e, - VKD3D_SM5_OP_DCL_TGSM_RAW = 0x9f, - VKD3D_SM5_OP_DCL_TGSM_STRUCTURED = 0xa0, - VKD3D_SM5_OP_DCL_RESOURCE_RAW = 0xa1, - VKD3D_SM5_OP_DCL_RESOURCE_STRUCTURED = 0xa2, - VKD3D_SM5_OP_LD_UAV_TYPED = 0xa3, - VKD3D_SM5_OP_STORE_UAV_TYPED = 0xa4, - VKD3D_SM5_OP_LD_RAW = 0xa5, - VKD3D_SM5_OP_STORE_RAW = 0xa6, - VKD3D_SM5_OP_LD_STRUCTURED = 0xa7, - VKD3D_SM5_OP_STORE_STRUCTURED = 0xa8, - VKD3D_SM5_OP_ATOMIC_AND = 0xa9, - VKD3D_SM5_OP_ATOMIC_OR = 0xaa, - VKD3D_SM5_OP_ATOMIC_XOR = 0xab, - VKD3D_SM5_OP_ATOMIC_CMP_STORE = 0xac, - VKD3D_SM5_OP_ATOMIC_IADD = 0xad, - VKD3D_SM5_OP_ATOMIC_IMAX = 0xae, - VKD3D_SM5_OP_ATOMIC_IMIN = 0xaf, - VKD3D_SM5_OP_ATOMIC_UMAX = 0xb0, - VKD3D_SM5_OP_ATOMIC_UMIN = 0xb1, - VKD3D_SM5_OP_IMM_ATOMIC_ALLOC = 0xb2, - VKD3D_SM5_OP_IMM_ATOMIC_CONSUME = 0xb3, - VKD3D_SM5_OP_IMM_ATOMIC_IADD = 0xb4, - VKD3D_SM5_OP_IMM_ATOMIC_AND = 0xb5, - VKD3D_SM5_OP_IMM_ATOMIC_OR = 0xb6, - VKD3D_SM5_OP_IMM_ATOMIC_XOR = 0xb7, - VKD3D_SM5_OP_IMM_ATOMIC_EXCH = 0xb8, - VKD3D_SM5_OP_IMM_ATOMIC_CMP_EXCH = 0xb9, - VKD3D_SM5_OP_IMM_ATOMIC_IMAX = 0xba, - VKD3D_SM5_OP_IMM_ATOMIC_IMIN = 0xbb, - VKD3D_SM5_OP_IMM_ATOMIC_UMAX = 0xbc, - VKD3D_SM5_OP_IMM_ATOMIC_UMIN = 0xbd, - VKD3D_SM5_OP_SYNC = 0xbe, - VKD3D_SM5_OP_DADD = 0xbf, - VKD3D_SM5_OP_DEQ = 0xc3, - VKD3D_SM5_OP_DGE = 0xc4, - VKD3D_SM5_OP_DLT = 0xc5, - VKD3D_SM5_OP_DNE = 0xc6, - VKD3D_SM5_OP_DMOV = 0xc7, - VKD3D_SM5_OP_EVAL_SAMPLE_INDEX = 0xcc, - VKD3D_SM5_OP_EVAL_CENTROID = 0xcd, - VKD3D_SM5_OP_DCL_GS_INSTANCES = 0xce, -}; - -enum vkd3d_sm4_instruction_modifier -{ - VKD3D_SM4_MODIFIER_AOFFIMMI = 0x1, - VKD3D_SM5_MODIFIER_RESOURCE_TYPE = 0x2, - VKD3D_SM5_MODIFIER_DATA_TYPE = 0x3, -}; - -enum vkd3d_sm4_register_type -{ - VKD3D_SM4_RT_TEMP = 0x00, - VKD3D_SM4_RT_INPUT = 0x01, - VKD3D_SM4_RT_OUTPUT = 0x02, - VKD3D_SM4_RT_INDEXABLE_TEMP = 0x03, - VKD3D_SM4_RT_IMMCONST = 0x04, - VKD3D_SM4_RT_IMMCONST64 = 0x05, - VKD3D_SM4_RT_SAMPLER = 0x06, - VKD3D_SM4_RT_RESOURCE = 0x07, - VKD3D_SM4_RT_CONSTBUFFER = 0x08, - VKD3D_SM4_RT_IMMCONSTBUFFER = 0x09, - VKD3D_SM4_RT_PRIMID = 0x0b, - VKD3D_SM4_RT_DEPTHOUT = 0x0c, - VKD3D_SM4_RT_NULL = 0x0d, - VKD3D_SM4_RT_RASTERIZER = 0x0e, - VKD3D_SM4_RT_OMASK = 0x0f, - VKD3D_SM5_RT_STREAM = 0x10, - VKD3D_SM5_RT_FUNCTION_BODY = 0x11, - VKD3D_SM5_RT_FUNCTION_POINTER = 0x13, - VKD3D_SM5_RT_OUTPUT_CONTROL_POINT_ID = 0x16, - VKD3D_SM5_RT_FORK_INSTANCE_ID = 0x17, - VKD3D_SM5_RT_JOIN_INSTANCE_ID = 0x18, - VKD3D_SM5_RT_INPUT_CONTROL_POINT = 0x19, - VKD3D_SM5_RT_OUTPUT_CONTROL_POINT = 0x1a, - VKD3D_SM5_RT_PATCH_CONSTANT_DATA = 0x1b, - VKD3D_SM5_RT_DOMAIN_LOCATION = 0x1c, - VKD3D_SM5_RT_UAV = 0x1e, - VKD3D_SM5_RT_SHARED_MEMORY = 0x1f, - VKD3D_SM5_RT_THREAD_ID = 0x20, - VKD3D_SM5_RT_THREAD_GROUP_ID = 0x21, - VKD3D_SM5_RT_LOCAL_THREAD_ID = 0x22, - VKD3D_SM5_RT_COVERAGE = 0x23, - VKD3D_SM5_RT_LOCAL_THREAD_INDEX = 0x24, - VKD3D_SM5_RT_GS_INSTANCE_ID = 0x25, - VKD3D_SM5_RT_DEPTHOUT_GREATER_EQUAL = 0x26, - VKD3D_SM5_RT_DEPTHOUT_LESS_EQUAL = 0x27, -}; - -enum vkd3d_sm4_register_modifier -{ - VKD3D_SM4_REGISTER_MODIFIER_NONE = 0x01, - VKD3D_SM4_REGISTER_MODIFIER_NEGATE = 0x41, - VKD3D_SM4_REGISTER_MODIFIER_ABS = 0x81, - VKD3D_SM4_REGISTER_MODIFIER_ABS_NEGATE = 0xc1, -}; - -enum vkd3d_sm4_output_primitive_type -{ - VKD3D_SM4_OUTPUT_PT_POINTLIST = 0x1, - VKD3D_SM4_OUTPUT_PT_LINESTRIP = 0x3, - VKD3D_SM4_OUTPUT_PT_TRIANGLESTRIP = 0x5, -}; - -enum vkd3d_sm4_input_primitive_type -{ - VKD3D_SM4_INPUT_PT_POINT = 0x01, - VKD3D_SM4_INPUT_PT_LINE = 0x02, - VKD3D_SM4_INPUT_PT_TRIANGLE = 0x03, - VKD3D_SM4_INPUT_PT_LINEADJ = 0x06, - VKD3D_SM4_INPUT_PT_TRIANGLEADJ = 0x07, - VKD3D_SM5_INPUT_PT_PATCH1 = 0x08, - VKD3D_SM5_INPUT_PT_PATCH2 = 0x09, - VKD3D_SM5_INPUT_PT_PATCH3 = 0x0a, - VKD3D_SM5_INPUT_PT_PATCH4 = 0x0b, - VKD3D_SM5_INPUT_PT_PATCH5 = 0x0c, - VKD3D_SM5_INPUT_PT_PATCH6 = 0x0d, - VKD3D_SM5_INPUT_PT_PATCH7 = 0x0e, - VKD3D_SM5_INPUT_PT_PATCH8 = 0x0f, - VKD3D_SM5_INPUT_PT_PATCH9 = 0x10, - VKD3D_SM5_INPUT_PT_PATCH10 = 0x11, - VKD3D_SM5_INPUT_PT_PATCH11 = 0x12, - VKD3D_SM5_INPUT_PT_PATCH12 = 0x13, - VKD3D_SM5_INPUT_PT_PATCH13 = 0x14, - VKD3D_SM5_INPUT_PT_PATCH14 = 0x15, - VKD3D_SM5_INPUT_PT_PATCH15 = 0x16, - VKD3D_SM5_INPUT_PT_PATCH16 = 0x17, - VKD3D_SM5_INPUT_PT_PATCH17 = 0x18, - VKD3D_SM5_INPUT_PT_PATCH18 = 0x19, - VKD3D_SM5_INPUT_PT_PATCH19 = 0x1a, - VKD3D_SM5_INPUT_PT_PATCH20 = 0x1b, - VKD3D_SM5_INPUT_PT_PATCH21 = 0x1c, - VKD3D_SM5_INPUT_PT_PATCH22 = 0x1d, - VKD3D_SM5_INPUT_PT_PATCH23 = 0x1e, - VKD3D_SM5_INPUT_PT_PATCH24 = 0x1f, - VKD3D_SM5_INPUT_PT_PATCH25 = 0x20, - VKD3D_SM5_INPUT_PT_PATCH26 = 0x21, - VKD3D_SM5_INPUT_PT_PATCH27 = 0x22, - VKD3D_SM5_INPUT_PT_PATCH28 = 0x23, - VKD3D_SM5_INPUT_PT_PATCH29 = 0x24, - VKD3D_SM5_INPUT_PT_PATCH30 = 0x25, - VKD3D_SM5_INPUT_PT_PATCH31 = 0x26, - VKD3D_SM5_INPUT_PT_PATCH32 = 0x27, -}; - -enum vkd3d_sm4_swizzle_type -{ - VKD3D_SM4_SWIZZLE_NONE = 0x0, - VKD3D_SM4_SWIZZLE_VEC4 = 0x1, - VKD3D_SM4_SWIZZLE_SCALAR = 0x2, -}; - -enum vkd3d_sm4_dimension -{ - VKD3D_SM4_DIMENSION_NONE = 0x0, - VKD3D_SM4_DIMENSION_SCALAR = 0x1, - VKD3D_SM4_DIMENSION_VEC4 = 0x2, -}; - -enum vkd3d_sm4_resource_type -{ - VKD3D_SM4_RESOURCE_BUFFER = 0x1, - VKD3D_SM4_RESOURCE_TEXTURE_1D = 0x2, - VKD3D_SM4_RESOURCE_TEXTURE_2D = 0x3, - VKD3D_SM4_RESOURCE_TEXTURE_2DMS = 0x4, - VKD3D_SM4_RESOURCE_TEXTURE_3D = 0x5, - VKD3D_SM4_RESOURCE_TEXTURE_CUBE = 0x6, - VKD3D_SM4_RESOURCE_TEXTURE_1DARRAY = 0x7, - VKD3D_SM4_RESOURCE_TEXTURE_2DARRAY = 0x8, - VKD3D_SM4_RESOURCE_TEXTURE_2DMSARRAY = 0x9, - VKD3D_SM4_RESOURCE_TEXTURE_CUBEARRAY = 0xa, - VKD3D_SM4_RESOURCE_RAW_BUFFER = 0xb, - VKD3D_SM4_RESOURCE_STRUCTURED_BUFFER = 0xc, -}; - -enum vkd3d_sm4_data_type -{ - VKD3D_SM4_DATA_UNORM = 0x1, - VKD3D_SM4_DATA_SNORM = 0x2, - VKD3D_SM4_DATA_INT = 0x3, - VKD3D_SM4_DATA_UINT = 0x4, - VKD3D_SM4_DATA_FLOAT = 0x5, - VKD3D_SM4_DATA_MIXED = 0x6, - VKD3D_SM4_DATA_DOUBLE = 0x7, - VKD3D_SM4_DATA_CONTINUED = 0x8, - VKD3D_SM4_DATA_UNUSED = 0x9, -}; - -enum vkd3d_sm4_sampler_mode -{ - VKD3D_SM4_SAMPLER_DEFAULT = 0x0, - VKD3D_SM4_SAMPLER_COMPARISON = 0x1, -}; - -enum vkd3d_sm4_shader_data_type -{ - VKD3D_SM4_SHADER_DATA_IMMEDIATE_CONSTANT_BUFFER = 0x3, - VKD3D_SM4_SHADER_DATA_MESSAGE = 0x4, -}; +#include "sm4.h" struct vkd3d_shader_src_param_entry { diff --git a/libs/vkd3d-shader/sm4.h b/libs/vkd3d-shader/sm4.h new file mode 100644 index 00000000..c94a73d4 --- /dev/null +++ b/libs/vkd3d-shader/sm4.h @@ -0,0 +1,488 @@ +/* + * Copyright 2009 Henri Verbeet 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 + */ + +#ifndef __VKD3D_SM4_H +#define __VKD3D_SM4_H + +#define VKD3D_SM4_PS 0x0000u +#define VKD3D_SM4_VS 0x0001u +#define VKD3D_SM4_GS 0x0002u +#define VKD3D_SM5_HS 0x0003u +#define VKD3D_SM5_DS 0x0004u +#define VKD3D_SM5_CS 0x0005u + +#define VKD3D_SM4_INSTRUCTION_MODIFIER (0x1u << 31) + +#define VKD3D_SM4_MODIFIER_MASK 0x3fu + +#define VKD3D_SM5_MODIFIER_DATA_TYPE_SHIFT 6 +#define VKD3D_SM5_MODIFIER_DATA_TYPE_MASK (0xffffu << VKD3D_SM5_MODIFIER_DATA_TYPE_SHIFT) + +#define VKD3D_SM5_MODIFIER_RESOURCE_TYPE_SHIFT 6 +#define VKD3D_SM5_MODIFIER_RESOURCE_TYPE_MASK (0xfu << VKD3D_SM5_MODIFIER_RESOURCE_TYPE_SHIFT) + +#define VKD3D_SM5_MODIFIER_RESOURCE_STRIDE_SHIFT 11 +#define VKD3D_SM5_MODIFIER_RESOURCE_STRIDE_MASK (0xfffu << VKD3D_SM5_MODIFIER_RESOURCE_STRIDE_SHIFT) + +#define VKD3D_SM4_AOFFIMMI_U_SHIFT 9 +#define VKD3D_SM4_AOFFIMMI_U_MASK (0xfu << VKD3D_SM4_AOFFIMMI_U_SHIFT) +#define VKD3D_SM4_AOFFIMMI_V_SHIFT 13 +#define VKD3D_SM4_AOFFIMMI_V_MASK (0xfu << VKD3D_SM4_AOFFIMMI_V_SHIFT) +#define VKD3D_SM4_AOFFIMMI_W_SHIFT 17 +#define VKD3D_SM4_AOFFIMMI_W_MASK (0xfu << VKD3D_SM4_AOFFIMMI_W_SHIFT) + +#define VKD3D_SM4_INSTRUCTION_LENGTH_SHIFT 24 +#define VKD3D_SM4_INSTRUCTION_LENGTH_MASK (0x1fu << VKD3D_SM4_INSTRUCTION_LENGTH_SHIFT) + +#define VKD3D_SM4_INSTRUCTION_FLAGS_SHIFT 11 +#define VKD3D_SM4_INSTRUCTION_FLAGS_MASK (0x7u << VKD3D_SM4_INSTRUCTION_FLAGS_SHIFT) + +#define VKD3D_SM4_RESOURCE_TYPE_SHIFT 11 +#define VKD3D_SM4_RESOURCE_TYPE_MASK (0xfu << VKD3D_SM4_RESOURCE_TYPE_SHIFT) + +#define VKD3D_SM4_PRIMITIVE_TYPE_SHIFT 11 +#define VKD3D_SM4_PRIMITIVE_TYPE_MASK (0x3fu << VKD3D_SM4_PRIMITIVE_TYPE_SHIFT) + +#define VKD3D_SM4_INDEX_TYPE_SHIFT 11 +#define VKD3D_SM4_INDEX_TYPE_MASK (0x1u << VKD3D_SM4_INDEX_TYPE_SHIFT) + +#define VKD3D_SM4_SAMPLER_MODE_SHIFT 11 +#define VKD3D_SM4_SAMPLER_MODE_MASK (0xfu << VKD3D_SM4_SAMPLER_MODE_SHIFT) + +#define VKD3D_SM4_SHADER_DATA_TYPE_SHIFT 11 +#define VKD3D_SM4_SHADER_DATA_TYPE_MASK (0xfu << VKD3D_SM4_SHADER_DATA_TYPE_SHIFT) + +#define VKD3D_SM4_INTERPOLATION_MODE_SHIFT 11 +#define VKD3D_SM4_INTERPOLATION_MODE_MASK (0xfu << VKD3D_SM4_INTERPOLATION_MODE_SHIFT) + +#define VKD3D_SM4_GLOBAL_FLAGS_SHIFT 11 +#define VKD3D_SM4_GLOBAL_FLAGS_MASK (0xffu << VKD3D_SM4_GLOBAL_FLAGS_SHIFT) + +#define VKD3D_SM5_PRECISE_SHIFT 19 +#define VKD3D_SM5_PRECISE_MASK (0xfu << VKD3D_SM5_PRECISE_SHIFT) + +#define VKD3D_SM5_CONTROL_POINT_COUNT_SHIFT 11 +#define VKD3D_SM5_CONTROL_POINT_COUNT_MASK (0xffu << VKD3D_SM5_CONTROL_POINT_COUNT_SHIFT) + +#define VKD3D_SM5_FP_ARRAY_SIZE_SHIFT 16 +#define VKD3D_SM5_FP_TABLE_COUNT_MASK 0xffffu + +#define VKD3D_SM5_UAV_FLAGS_SHIFT 15 +#define VKD3D_SM5_UAV_FLAGS_MASK (0x1ffu << VKD3D_SM5_UAV_FLAGS_SHIFT) + +#define VKD3D_SM5_SYNC_FLAGS_SHIFT 11 +#define VKD3D_SM5_SYNC_FLAGS_MASK (0xffu << VKD3D_SM5_SYNC_FLAGS_SHIFT) + +#define VKD3D_SM5_TESSELLATOR_SHIFT 11 +#define VKD3D_SM5_TESSELLATOR_MASK (0xfu << VKD3D_SM5_TESSELLATOR_SHIFT) + +#define VKD3D_SM4_OPCODE_MASK 0xff + +#define VKD3D_SM4_REGISTER_MODIFIER (0x1u << 31) + +#define VKD3D_SM4_ADDRESSING_SHIFT2 28 +#define VKD3D_SM4_ADDRESSING_MASK2 (0x3u << VKD3D_SM4_ADDRESSING_SHIFT2) + +#define VKD3D_SM4_ADDRESSING_SHIFT1 25 +#define VKD3D_SM4_ADDRESSING_MASK1 (0x3u << VKD3D_SM4_ADDRESSING_SHIFT1) + +#define VKD3D_SM4_ADDRESSING_SHIFT0 22 +#define VKD3D_SM4_ADDRESSING_MASK0 (0x3u << VKD3D_SM4_ADDRESSING_SHIFT0) + +#define VKD3D_SM4_REGISTER_ORDER_SHIFT 20 +#define VKD3D_SM4_REGISTER_ORDER_MASK (0x3u << VKD3D_SM4_REGISTER_ORDER_SHIFT) + +#define VKD3D_SM4_REGISTER_TYPE_SHIFT 12 +#define VKD3D_SM4_REGISTER_TYPE_MASK (0xffu << VKD3D_SM4_REGISTER_TYPE_SHIFT) + +#define VKD3D_SM4_SWIZZLE_TYPE_SHIFT 2 +#define VKD3D_SM4_SWIZZLE_TYPE_MASK (0x3u << VKD3D_SM4_SWIZZLE_TYPE_SHIFT) + +#define VKD3D_SM4_DIMENSION_SHIFT 0 +#define VKD3D_SM4_DIMENSION_MASK (0x3u << VKD3D_SM4_DIMENSION_SHIFT) + +#define VKD3D_SM4_WRITEMASK_SHIFT 4 +#define VKD3D_SM4_WRITEMASK_MASK (0xfu << VKD3D_SM4_WRITEMASK_SHIFT) + +#define VKD3D_SM4_SWIZZLE_SHIFT 4 +#define VKD3D_SM4_SWIZZLE_MASK (0xffu << VKD3D_SM4_SWIZZLE_SHIFT) + +#define VKD3D_SM4_VERSION_MAJOR(version) (((version) >> 4) & 0xf) +#define VKD3D_SM4_VERSION_MINOR(version) (((version) >> 0) & 0xf) + +#define VKD3D_SM4_ADDRESSING_RELATIVE 0x2 +#define VKD3D_SM4_ADDRESSING_OFFSET 0x1 + +#define VKD3D_SM4_INSTRUCTION_FLAG_SATURATE 0x4 + +#define VKD3D_SM4_CONDITIONAL_NZ (0x1u << 18) + +#define VKD3D_SM4_TYPE_COMPONENT(com, i) (((com) >> (4 * (i))) & 0xfu) + +enum vkd3d_sm4_opcode +{ + VKD3D_SM4_OP_ADD = 0x00, + VKD3D_SM4_OP_AND = 0x01, + VKD3D_SM4_OP_BREAK = 0x02, + VKD3D_SM4_OP_BREAKC = 0x03, + VKD3D_SM4_OP_CASE = 0x06, + VKD3D_SM4_OP_CONTINUE = 0x07, + VKD3D_SM4_OP_CONTINUEC = 0x08, + VKD3D_SM4_OP_CUT = 0x09, + VKD3D_SM4_OP_DEFAULT = 0x0a, + VKD3D_SM4_OP_DERIV_RTX = 0x0b, + VKD3D_SM4_OP_DERIV_RTY = 0x0c, + VKD3D_SM4_OP_DISCARD = 0x0d, + VKD3D_SM4_OP_DIV = 0x0e, + VKD3D_SM4_OP_DP2 = 0x0f, + VKD3D_SM4_OP_DP3 = 0x10, + VKD3D_SM4_OP_DP4 = 0x11, + VKD3D_SM4_OP_ELSE = 0x12, + VKD3D_SM4_OP_EMIT = 0x13, + VKD3D_SM4_OP_ENDIF = 0x15, + VKD3D_SM4_OP_ENDLOOP = 0x16, + VKD3D_SM4_OP_ENDSWITCH = 0x17, + VKD3D_SM4_OP_EQ = 0x18, + VKD3D_SM4_OP_EXP = 0x19, + VKD3D_SM4_OP_FRC = 0x1a, + VKD3D_SM4_OP_FTOI = 0x1b, + VKD3D_SM4_OP_FTOU = 0x1c, + VKD3D_SM4_OP_GE = 0x1d, + VKD3D_SM4_OP_IADD = 0x1e, + VKD3D_SM4_OP_IF = 0x1f, + VKD3D_SM4_OP_IEQ = 0x20, + VKD3D_SM4_OP_IGE = 0x21, + VKD3D_SM4_OP_ILT = 0x22, + VKD3D_SM4_OP_IMAD = 0x23, + VKD3D_SM4_OP_IMAX = 0x24, + VKD3D_SM4_OP_IMIN = 0x25, + VKD3D_SM4_OP_IMUL = 0x26, + VKD3D_SM4_OP_INE = 0x27, + VKD3D_SM4_OP_INEG = 0x28, + VKD3D_SM4_OP_ISHL = 0x29, + VKD3D_SM4_OP_ISHR = 0x2a, + VKD3D_SM4_OP_ITOF = 0x2b, + VKD3D_SM4_OP_LABEL = 0x2c, + VKD3D_SM4_OP_LD = 0x2d, + VKD3D_SM4_OP_LD2DMS = 0x2e, + VKD3D_SM4_OP_LOG = 0x2f, + VKD3D_SM4_OP_LOOP = 0x30, + VKD3D_SM4_OP_LT = 0x31, + VKD3D_SM4_OP_MAD = 0x32, + VKD3D_SM4_OP_MIN = 0x33, + VKD3D_SM4_OP_MAX = 0x34, + VKD3D_SM4_OP_SHADER_DATA = 0x35, + VKD3D_SM4_OP_MOV = 0x36, + VKD3D_SM4_OP_MOVC = 0x37, + VKD3D_SM4_OP_MUL = 0x38, + VKD3D_SM4_OP_NE = 0x39, + VKD3D_SM4_OP_NOP = 0x3a, + VKD3D_SM4_OP_NOT = 0x3b, + VKD3D_SM4_OP_OR = 0x3c, + VKD3D_SM4_OP_RESINFO = 0x3d, + VKD3D_SM4_OP_RET = 0x3e, + VKD3D_SM4_OP_RETC = 0x3f, + VKD3D_SM4_OP_ROUND_NE = 0x40, + VKD3D_SM4_OP_ROUND_NI = 0x41, + VKD3D_SM4_OP_ROUND_PI = 0x42, + VKD3D_SM4_OP_ROUND_Z = 0x43, + VKD3D_SM4_OP_RSQ = 0x44, + VKD3D_SM4_OP_SAMPLE = 0x45, + VKD3D_SM4_OP_SAMPLE_C = 0x46, + VKD3D_SM4_OP_SAMPLE_C_LZ = 0x47, + VKD3D_SM4_OP_SAMPLE_LOD = 0x48, + VKD3D_SM4_OP_SAMPLE_GRAD = 0x49, + VKD3D_SM4_OP_SAMPLE_B = 0x4a, + VKD3D_SM4_OP_SQRT = 0x4b, + VKD3D_SM4_OP_SWITCH = 0x4c, + VKD3D_SM4_OP_SINCOS = 0x4d, + VKD3D_SM4_OP_UDIV = 0x4e, + VKD3D_SM4_OP_ULT = 0x4f, + VKD3D_SM4_OP_UGE = 0x50, + VKD3D_SM4_OP_UMUL = 0x51, + VKD3D_SM4_OP_UMAX = 0x53, + VKD3D_SM4_OP_UMIN = 0x54, + VKD3D_SM4_OP_USHR = 0x55, + VKD3D_SM4_OP_UTOF = 0x56, + VKD3D_SM4_OP_XOR = 0x57, + VKD3D_SM4_OP_DCL_RESOURCE = 0x58, + VKD3D_SM4_OP_DCL_CONSTANT_BUFFER = 0x59, + VKD3D_SM4_OP_DCL_SAMPLER = 0x5a, + VKD3D_SM4_OP_DCL_INDEX_RANGE = 0x5b, + VKD3D_SM4_OP_DCL_OUTPUT_TOPOLOGY = 0x5c, + VKD3D_SM4_OP_DCL_INPUT_PRIMITIVE = 0x5d, + VKD3D_SM4_OP_DCL_VERTICES_OUT = 0x5e, + VKD3D_SM4_OP_DCL_INPUT = 0x5f, + VKD3D_SM4_OP_DCL_INPUT_SGV = 0x60, + VKD3D_SM4_OP_DCL_INPUT_SIV = 0x61, + VKD3D_SM4_OP_DCL_INPUT_PS = 0x62, + VKD3D_SM4_OP_DCL_INPUT_PS_SGV = 0x63, + VKD3D_SM4_OP_DCL_INPUT_PS_SIV = 0x64, + VKD3D_SM4_OP_DCL_OUTPUT = 0x65, + VKD3D_SM4_OP_DCL_OUTPUT_SIV = 0x67, + VKD3D_SM4_OP_DCL_TEMPS = 0x68, + VKD3D_SM4_OP_DCL_INDEXABLE_TEMP = 0x69, + VKD3D_SM4_OP_DCL_GLOBAL_FLAGS = 0x6a, + VKD3D_SM4_OP_LOD = 0x6c, + VKD3D_SM4_OP_GATHER4 = 0x6d, + VKD3D_SM4_OP_SAMPLE_POS = 0x6e, + VKD3D_SM4_OP_SAMPLE_INFO = 0x6f, + VKD3D_SM5_OP_HS_DECLS = 0x71, + VKD3D_SM5_OP_HS_CONTROL_POINT_PHASE = 0x72, + VKD3D_SM5_OP_HS_FORK_PHASE = 0x73, + VKD3D_SM5_OP_HS_JOIN_PHASE = 0x74, + VKD3D_SM5_OP_EMIT_STREAM = 0x75, + VKD3D_SM5_OP_CUT_STREAM = 0x76, + VKD3D_SM5_OP_FCALL = 0x78, + VKD3D_SM5_OP_BUFINFO = 0x79, + VKD3D_SM5_OP_DERIV_RTX_COARSE = 0x7a, + VKD3D_SM5_OP_DERIV_RTX_FINE = 0x7b, + VKD3D_SM5_OP_DERIV_RTY_COARSE = 0x7c, + VKD3D_SM5_OP_DERIV_RTY_FINE = 0x7d, + VKD3D_SM5_OP_GATHER4_C = 0x7e, + VKD3D_SM5_OP_GATHER4_PO = 0x7f, + VKD3D_SM5_OP_GATHER4_PO_C = 0x80, + VKD3D_SM5_OP_RCP = 0x81, + VKD3D_SM5_OP_F32TOF16 = 0x82, + VKD3D_SM5_OP_F16TOF32 = 0x83, + VKD3D_SM5_OP_COUNTBITS = 0x86, + VKD3D_SM5_OP_FIRSTBIT_HI = 0x87, + VKD3D_SM5_OP_FIRSTBIT_LO = 0x88, + VKD3D_SM5_OP_FIRSTBIT_SHI = 0x89, + VKD3D_SM5_OP_UBFE = 0x8a, + VKD3D_SM5_OP_IBFE = 0x8b, + VKD3D_SM5_OP_BFI = 0x8c, + VKD3D_SM5_OP_BFREV = 0x8d, + VKD3D_SM5_OP_SWAPC = 0x8e, + VKD3D_SM5_OP_DCL_STREAM = 0x8f, + VKD3D_SM5_OP_DCL_FUNCTION_BODY = 0x90, + VKD3D_SM5_OP_DCL_FUNCTION_TABLE = 0x91, + VKD3D_SM5_OP_DCL_INTERFACE = 0x92, + VKD3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT = 0x93, + VKD3D_SM5_OP_DCL_OUTPUT_CONTROL_POINT_COUNT = 0x94, + VKD3D_SM5_OP_DCL_TESSELLATOR_DOMAIN = 0x95, + VKD3D_SM5_OP_DCL_TESSELLATOR_PARTITIONING = 0x96, + VKD3D_SM5_OP_DCL_TESSELLATOR_OUTPUT_PRIMITIVE = 0x97, + VKD3D_SM5_OP_DCL_HS_MAX_TESSFACTOR = 0x98, + VKD3D_SM5_OP_DCL_HS_FORK_PHASE_INSTANCE_COUNT = 0x99, + VKD3D_SM5_OP_DCL_HS_JOIN_PHASE_INSTANCE_COUNT = 0x9a, + VKD3D_SM5_OP_DCL_THREAD_GROUP = 0x9b, + VKD3D_SM5_OP_DCL_UAV_TYPED = 0x9c, + VKD3D_SM5_OP_DCL_UAV_RAW = 0x9d, + VKD3D_SM5_OP_DCL_UAV_STRUCTURED = 0x9e, + VKD3D_SM5_OP_DCL_TGSM_RAW = 0x9f, + VKD3D_SM5_OP_DCL_TGSM_STRUCTURED = 0xa0, + VKD3D_SM5_OP_DCL_RESOURCE_RAW = 0xa1, + VKD3D_SM5_OP_DCL_RESOURCE_STRUCTURED = 0xa2, + VKD3D_SM5_OP_LD_UAV_TYPED = 0xa3, + VKD3D_SM5_OP_STORE_UAV_TYPED = 0xa4, + VKD3D_SM5_OP_LD_RAW = 0xa5, + VKD3D_SM5_OP_STORE_RAW = 0xa6, + VKD3D_SM5_OP_LD_STRUCTURED = 0xa7, + VKD3D_SM5_OP_STORE_STRUCTURED = 0xa8, + VKD3D_SM5_OP_ATOMIC_AND = 0xa9, + VKD3D_SM5_OP_ATOMIC_OR = 0xaa, + VKD3D_SM5_OP_ATOMIC_XOR = 0xab, + VKD3D_SM5_OP_ATOMIC_CMP_STORE = 0xac, + VKD3D_SM5_OP_ATOMIC_IADD = 0xad, + VKD3D_SM5_OP_ATOMIC_IMAX = 0xae, + VKD3D_SM5_OP_ATOMIC_IMIN = 0xaf, + VKD3D_SM5_OP_ATOMIC_UMAX = 0xb0, + VKD3D_SM5_OP_ATOMIC_UMIN = 0xb1, + VKD3D_SM5_OP_IMM_ATOMIC_ALLOC = 0xb2, + VKD3D_SM5_OP_IMM_ATOMIC_CONSUME = 0xb3, + VKD3D_SM5_OP_IMM_ATOMIC_IADD = 0xb4, + VKD3D_SM5_OP_IMM_ATOMIC_AND = 0xb5, + VKD3D_SM5_OP_IMM_ATOMIC_OR = 0xb6, + VKD3D_SM5_OP_IMM_ATOMIC_XOR = 0xb7, + VKD3D_SM5_OP_IMM_ATOMIC_EXCH = 0xb8, + VKD3D_SM5_OP_IMM_ATOMIC_CMP_EXCH = 0xb9, + VKD3D_SM5_OP_IMM_ATOMIC_IMAX = 0xba, + VKD3D_SM5_OP_IMM_ATOMIC_IMIN = 0xbb, + VKD3D_SM5_OP_IMM_ATOMIC_UMAX = 0xbc, + VKD3D_SM5_OP_IMM_ATOMIC_UMIN = 0xbd, + VKD3D_SM5_OP_SYNC = 0xbe, + VKD3D_SM5_OP_DADD = 0xbf, + VKD3D_SM5_OP_DEQ = 0xc3, + VKD3D_SM5_OP_DGE = 0xc4, + VKD3D_SM5_OP_DLT = 0xc5, + VKD3D_SM5_OP_DNE = 0xc6, + VKD3D_SM5_OP_DMOV = 0xc7, + VKD3D_SM5_OP_EVAL_SAMPLE_INDEX = 0xcc, + VKD3D_SM5_OP_EVAL_CENTROID = 0xcd, + VKD3D_SM5_OP_DCL_GS_INSTANCES = 0xce, +}; + +enum vkd3d_sm4_instruction_modifier +{ + VKD3D_SM4_MODIFIER_AOFFIMMI = 0x1, + VKD3D_SM5_MODIFIER_RESOURCE_TYPE = 0x2, + VKD3D_SM5_MODIFIER_DATA_TYPE = 0x3, +}; + +enum vkd3d_sm4_register_type +{ + VKD3D_SM4_RT_TEMP = 0x00, + VKD3D_SM4_RT_INPUT = 0x01, + VKD3D_SM4_RT_OUTPUT = 0x02, + VKD3D_SM4_RT_INDEXABLE_TEMP = 0x03, + VKD3D_SM4_RT_IMMCONST = 0x04, + VKD3D_SM4_RT_IMMCONST64 = 0x05, + VKD3D_SM4_RT_SAMPLER = 0x06, + VKD3D_SM4_RT_RESOURCE = 0x07, + VKD3D_SM4_RT_CONSTBUFFER = 0x08, + VKD3D_SM4_RT_IMMCONSTBUFFER = 0x09, + VKD3D_SM4_RT_PRIMID = 0x0b, + VKD3D_SM4_RT_DEPTHOUT = 0x0c, + VKD3D_SM4_RT_NULL = 0x0d, + VKD3D_SM4_RT_RASTERIZER = 0x0e, + VKD3D_SM4_RT_OMASK = 0x0f, + VKD3D_SM5_RT_STREAM = 0x10, + VKD3D_SM5_RT_FUNCTION_BODY = 0x11, + VKD3D_SM5_RT_FUNCTION_POINTER = 0x13, + VKD3D_SM5_RT_OUTPUT_CONTROL_POINT_ID = 0x16, + VKD3D_SM5_RT_FORK_INSTANCE_ID = 0x17, + VKD3D_SM5_RT_JOIN_INSTANCE_ID = 0x18, + VKD3D_SM5_RT_INPUT_CONTROL_POINT = 0x19, + VKD3D_SM5_RT_OUTPUT_CONTROL_POINT = 0x1a, + VKD3D_SM5_RT_PATCH_CONSTANT_DATA = 0x1b, + VKD3D_SM5_RT_DOMAIN_LOCATION = 0x1c, + VKD3D_SM5_RT_UAV = 0x1e, + VKD3D_SM5_RT_SHARED_MEMORY = 0x1f, + VKD3D_SM5_RT_THREAD_ID = 0x20, + VKD3D_SM5_RT_THREAD_GROUP_ID = 0x21, + VKD3D_SM5_RT_LOCAL_THREAD_ID = 0x22, + VKD3D_SM5_RT_COVERAGE = 0x23, + VKD3D_SM5_RT_LOCAL_THREAD_INDEX = 0x24, + VKD3D_SM5_RT_GS_INSTANCE_ID = 0x25, + VKD3D_SM5_RT_DEPTHOUT_GREATER_EQUAL = 0x26, + VKD3D_SM5_RT_DEPTHOUT_LESS_EQUAL = 0x27, +}; + +enum vkd3d_sm4_register_modifier +{ + VKD3D_SM4_REGISTER_MODIFIER_NONE = 0x01, + VKD3D_SM4_REGISTER_MODIFIER_NEGATE = 0x41, + VKD3D_SM4_REGISTER_MODIFIER_ABS = 0x81, + VKD3D_SM4_REGISTER_MODIFIER_ABS_NEGATE = 0xc1, +}; + +enum vkd3d_sm4_output_primitive_type +{ + VKD3D_SM4_OUTPUT_PT_POINTLIST = 0x1, + VKD3D_SM4_OUTPUT_PT_LINESTRIP = 0x3, + VKD3D_SM4_OUTPUT_PT_TRIANGLESTRIP = 0x5, +}; + +enum vkd3d_sm4_input_primitive_type +{ + VKD3D_SM4_INPUT_PT_POINT = 0x01, + VKD3D_SM4_INPUT_PT_LINE = 0x02, + VKD3D_SM4_INPUT_PT_TRIANGLE = 0x03, + VKD3D_SM4_INPUT_PT_LINEADJ = 0x06, + VKD3D_SM4_INPUT_PT_TRIANGLEADJ = 0x07, + VKD3D_SM5_INPUT_PT_PATCH1 = 0x08, + VKD3D_SM5_INPUT_PT_PATCH2 = 0x09, + VKD3D_SM5_INPUT_PT_PATCH3 = 0x0a, + VKD3D_SM5_INPUT_PT_PATCH4 = 0x0b, + VKD3D_SM5_INPUT_PT_PATCH5 = 0x0c, + VKD3D_SM5_INPUT_PT_PATCH6 = 0x0d, + VKD3D_SM5_INPUT_PT_PATCH7 = 0x0e, + VKD3D_SM5_INPUT_PT_PATCH8 = 0x0f, + VKD3D_SM5_INPUT_PT_PATCH9 = 0x10, + VKD3D_SM5_INPUT_PT_PATCH10 = 0x11, + VKD3D_SM5_INPUT_PT_PATCH11 = 0x12, + VKD3D_SM5_INPUT_PT_PATCH12 = 0x13, + VKD3D_SM5_INPUT_PT_PATCH13 = 0x14, + VKD3D_SM5_INPUT_PT_PATCH14 = 0x15, + VKD3D_SM5_INPUT_PT_PATCH15 = 0x16, + VKD3D_SM5_INPUT_PT_PATCH16 = 0x17, + VKD3D_SM5_INPUT_PT_PATCH17 = 0x18, + VKD3D_SM5_INPUT_PT_PATCH18 = 0x19, + VKD3D_SM5_INPUT_PT_PATCH19 = 0x1a, + VKD3D_SM5_INPUT_PT_PATCH20 = 0x1b, + VKD3D_SM5_INPUT_PT_PATCH21 = 0x1c, + VKD3D_SM5_INPUT_PT_PATCH22 = 0x1d, + VKD3D_SM5_INPUT_PT_PATCH23 = 0x1e, + VKD3D_SM5_INPUT_PT_PATCH24 = 0x1f, + VKD3D_SM5_INPUT_PT_PATCH25 = 0x20, + VKD3D_SM5_INPUT_PT_PATCH26 = 0x21, + VKD3D_SM5_INPUT_PT_PATCH27 = 0x22, + VKD3D_SM5_INPUT_PT_PATCH28 = 0x23, + VKD3D_SM5_INPUT_PT_PATCH29 = 0x24, + VKD3D_SM5_INPUT_PT_PATCH30 = 0x25, + VKD3D_SM5_INPUT_PT_PATCH31 = 0x26, + VKD3D_SM5_INPUT_PT_PATCH32 = 0x27, +}; + +enum vkd3d_sm4_swizzle_type +{ + VKD3D_SM4_SWIZZLE_NONE = 0x0, + VKD3D_SM4_SWIZZLE_VEC4 = 0x1, + VKD3D_SM4_SWIZZLE_SCALAR = 0x2, +}; + +enum vkd3d_sm4_dimension +{ + VKD3D_SM4_DIMENSION_NONE = 0x0, + VKD3D_SM4_DIMENSION_SCALAR = 0x1, + VKD3D_SM4_DIMENSION_VEC4 = 0x2, +}; + +enum vkd3d_sm4_resource_type +{ + VKD3D_SM4_RESOURCE_BUFFER = 0x1, + VKD3D_SM4_RESOURCE_TEXTURE_1D = 0x2, + VKD3D_SM4_RESOURCE_TEXTURE_2D = 0x3, + VKD3D_SM4_RESOURCE_TEXTURE_2DMS = 0x4, + VKD3D_SM4_RESOURCE_TEXTURE_3D = 0x5, + VKD3D_SM4_RESOURCE_TEXTURE_CUBE = 0x6, + VKD3D_SM4_RESOURCE_TEXTURE_1DARRAY = 0x7, + VKD3D_SM4_RESOURCE_TEXTURE_2DARRAY = 0x8, + VKD3D_SM4_RESOURCE_TEXTURE_2DMSARRAY = 0x9, + VKD3D_SM4_RESOURCE_TEXTURE_CUBEARRAY = 0xa, + VKD3D_SM4_RESOURCE_RAW_BUFFER = 0xb, + VKD3D_SM4_RESOURCE_STRUCTURED_BUFFER = 0xc, +}; + +enum vkd3d_sm4_data_type +{ + VKD3D_SM4_DATA_UNORM = 0x1, + VKD3D_SM4_DATA_SNORM = 0x2, + VKD3D_SM4_DATA_INT = 0x3, + VKD3D_SM4_DATA_UINT = 0x4, + VKD3D_SM4_DATA_FLOAT = 0x5, + VKD3D_SM4_DATA_MIXED = 0x6, + VKD3D_SM4_DATA_DOUBLE = 0x7, + VKD3D_SM4_DATA_CONTINUED = 0x8, + VKD3D_SM4_DATA_UNUSED = 0x9, +}; + +enum vkd3d_sm4_sampler_mode +{ + VKD3D_SM4_SAMPLER_DEFAULT = 0x0, + VKD3D_SM4_SAMPLER_COMPARISON = 0x1, +}; + +enum vkd3d_sm4_shader_data_type +{ + VKD3D_SM4_SHADER_DATA_IMMEDIATE_CONSTANT_BUFFER = 0x3, + VKD3D_SM4_SHADER_DATA_MESSAGE = 0x4, +}; + +#endif /* __VKD3D_SM4_H */ diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 76704d5a..85859e84 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -555,19 +555,6 @@ enum vkd3d_shader_conditional_op VKD3D_SHADER_CONDITIONAL_OP_Z = 1 }; -#define VKD3D_SM1_VS 0xfffeu -#define VKD3D_SM1_PS 0xffffu -#define VKD3D_SM4_PS 0x0000u -#define VKD3D_SM4_VS 0x0001u -#define VKD3D_SM4_GS 0x0002u -#define VKD3D_SM5_HS 0x0003u -#define VKD3D_SM5_DS 0x0004u -#define VKD3D_SM5_CS 0x0005u - -/* Shader version tokens, and shader end tokens */ -#define VKD3DPS_VERSION(major, minor) ((VKD3D_SM1_PS << 16) | ((major) << 8) | (minor)) -#define VKD3DVS_VERSION(major, minor) ((VKD3D_SM1_VS << 16) | ((major) << 8) | (minor)) - #define MAX_IMMEDIATE_CONSTANT_BUFFER_SIZE 4096 #define MAX_REG_OUTPUT 32 -- 2.32.0

2 1

[PATCH vkd3d] configure: Also extract the cross target from Clang compilers.
by Chip Davis 06 Aug '21

06 Aug '21

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- m4/check-mingw-prog.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/m4/check-mingw-prog.m4 b/m4/check-mingw-prog.m4 index ac3e07d..94fe795 100644 --- a/m4/check-mingw-prog.m4 +++ b/m4/check-mingw-prog.m4 @@ -15,7 +15,7 @@ AS_VAR_IF([vkd3d_cross_cc], [$3], AC_MSG_CHECKING([whether $CC works]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [AC_MSG_RESULT([yes]) - $2=`expr "$CC" : '$.*$-gcc'`], + $2=`expr "$CC" : '$.*$-gcc' \| "$CC" : '$.*$-clang'`], [AC_MSG_RESULT([no])]) CC="$vkd3d_cc_saved"]) AS_VAR_POPDEF([vkd3d_cross_cc])dnl @@ -34,7 +34,7 @@ AS_VAR_IF([vkd3d_cross_cc], [$3], AC_MSG_CHECKING([whether $CC works]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [AC_MSG_RESULT([yes]) - $2=`expr "$CC" : '$.*$-gcc'`], + $2=`expr "$CC" : '$.*$-gcc' \| "$CC" : '$.*$-clang'`], [AC_MSG_RESULT([no])]) CC="$vkd3d_cc_saved"]) AS_VAR_POPDEF([vkd3d_cross_cc])dnl -- 2.31.1

2 1

[PATCH vkd3d] tests: Include <stddef.h> from "d3d12_crosstest.h". (Clang)
by Chip Davis 06 Aug '21

06 Aug '21

Neither MinGW's nor Microsoft's <windows.h> includes <stddef.h>, either directly or indirectly. Also, unlike GCC, Clang's <inttypes.h> does not include <stddef.h>, either. "vkd3d_windows.h" does include <stddef.h>, and this is why building for the host works, even with Clang. Fixes cross compilation errors with Clang related to using offsetof(3). Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- tests/d3d12_crosstest.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 43af375..0b77bde 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -52,6 +52,7 @@ typedef int HRESULT; #include <inttypes.h> #include <limits.h> #include <math.h> +#include <stddef.h> #include <time.h> #ifdef _WIN32 -- 2.31.1

2 1

[PATCH 1/2] d3dx10: Partially implement D3DX10CreateEffectFromMemory().
by Nikolay Sivov 06 Aug '21

06 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx10_43/d3dx10_43_main.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 06b00cb0393..650645362ea 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -32,6 +32,7 @@ #include "d3d10_1.h" #include "d3dx10.h" +#include "d3dcompiler.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); @@ -79,12 +80,29 @@ HRESULT WINAPI D3DX10CreateEffectFromMemory(const void *data, SIZE_T datasize, c 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, " + ID3D10Blob *code; + HRESULT hr; + + TRACE("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; + if (pump) + FIXME("Asynchronous mode is not supported.\n"); + + if (FAILED(hr = D3DCompile(data, datasize, filename, defines, include, NULL, profile, + hlslflags, fxflags, &code, errors))) + { + WARN("Effect compilation failed, hr %#x.\n", hr); + return hr; + } + + hr = D3D10CreateEffectFromMemory(ID3D10Blob_GetBufferPointer(code), ID3D10Blob_GetBufferSize(code), + fxflags, device, effectpool, effect); + ID3D10Blob_Release(code); + + return hr; } HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(const void *data, SIZE_T datasize, const char *filename, -- 2.30.2

1 1

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

06 Aug '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/xinput1_3/hid.c | 49 ++++++++++++++++++++++++++++++++- dlls/xinput1_3/xinput_main.c | 2 +- dlls/xinput1_3/xinput_private.h | 2 +- 3 files changed, 50 insertions(+), 3 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index 00907b54bed..176e18fd95c 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -70,6 +70,8 @@ struct hid_platform_private { }; 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) { @@ -85,6 +87,40 @@ static BOOL find_opened_device(SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail, int *f return FALSE; } +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( 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 void MarkUsage(struct hid_platform_private *private, WORD usage, LONG min, LONG max, USHORT bits) { struct axis_info info = {min, max-min, bits}; @@ -223,6 +259,8 @@ failed: 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; HDEVINFO device_info_set; @@ -235,6 +273,8 @@ void HID_find_gamepads(void) DWORD idx; int i; + InitOnceExecuteOnce(&init_once, start_update_thread, NULL, NULL); + idx = GetTickCount(); if ((idx - last_check) < 2000) return; @@ -317,9 +357,16 @@ static void remove_gamepad(xinput_controller *device) LeaveCriticalSection(&device->crit); } -void HID_destroy_gamepads(void) +void HID_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++) remove_gamepad(&controllers[i]); } diff --git a/dlls/xinput1_3/xinput_main.c b/dlls/xinput1_3/xinput_main.c index 2d9f54c83f2..547247dc76e 100644 --- a/dlls/xinput1_3/xinput_main.c +++ b/dlls/xinput1_3/xinput_main.c @@ -104,7 +104,7 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) break; case DLL_PROCESS_DETACH: if (reserved) break; - HID_destroy_gamepads(); + HID_stop_update_thread(); break; } return TRUE; diff --git a/dlls/xinput1_3/xinput_private.h b/dlls/xinput1_3/xinput_private.h index 2bf16c0ffce..79c3023c543 100644 --- a/dlls/xinput1_3/xinput_private.h +++ b/dlls/xinput1_3/xinput_private.h @@ -31,7 +31,7 @@ extern CRITICAL_SECTION xinput_crit; extern xinput_controller controllers[XUSER_MAX_COUNT]; void HID_find_gamepads(void) DECLSPEC_HIDDEN; -void HID_destroy_gamepads(void) DECLSPEC_HIDDEN; +void HID_stop_update_thread(void) DECLSPEC_HIDDEN; void HID_update_state(xinput_controller* device, XINPUT_STATE *state) DECLSPEC_HIDDEN; DWORD HID_set_state(xinput_controller* device, XINPUT_VIBRATION* state) DECLSPEC_HIDDEN; void HID_enable(xinput_controller* device, BOOL enable) DECLSPEC_HIDDEN; -- 2.32.0

2 5

[PATCH v2 1/6] dnsapi: Delay import netapi32.
by Huw Davies 06 Aug '21

06 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/dnsapi/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dnsapi/Makefile.in b/dlls/dnsapi/Makefile.in index ae00cf73a9f..d8b33a0533d 100644 --- a/dlls/dnsapi/Makefile.in +++ b/dlls/dnsapi/Makefile.in @@ -1,6 +1,6 @@ MODULE = dnsapi.dll IMPORTLIB = dnsapi -IMPORTS = netapi32 +DELAYIMPORTS = netapi32 EXTRALIBS = $(RESOLV_LIBS) EXTRADLLFLAGS = -mno-cygwin -- 2.23.0

2 3

[PATCH 1/5] ntoskrnl.exe/tests: Wait for second report first.
by Rémi Bernon 06 Aug '21

06 Aug '21

And increasing the polling period, so that first queued read is unlikely to complete before we queued the second one. This was meant to test that all pending reads are satisfied at once after a poll, but it causes some spurious failures as they aren't satisfied atomically (especially on Wine). As there's an increasing seq counter in each poll it should be enough to compare the report data. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This should help with spurious failure like: https://test.winehq.org/data/3f2850aeaa159270384764843cdb1dc3cbe902c6/linux… dlls/ntoskrnl.exe/tests/ntoskrnl.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index f5ebf21b7f9..6c4dacf3a2d 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2710,12 +2710,12 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled ok(!ret, "ReadFile succeded\n"); ok(GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError()); - /* wait for first report to be ready */ - ret = GetOverlappedResult(async_file, &overlapped, &value, TRUE); + /* wait for second report to be ready */ + ret = GetOverlappedResult(async_file, &overlapped2, &value, TRUE); ok(ret, "GetOverlappedResult failed, last error %u\n", GetLastError()); ok(value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected 3\n", value); - /* second report should be ready and the same */ - ret = GetOverlappedResult(async_file, &overlapped2, &value, FALSE); + /* first report should be ready and the same */ + ret = GetOverlappedResult(async_file, &overlapped, &value, FALSE); ok(ret, "GetOverlappedResult failed, last error %u\n", GetLastError()); ok(value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected 3\n", value); ok(memcmp(report, buffer + caps.InputReportByteLength, caps.InputReportByteLength), @@ -2839,7 +2839,7 @@ static void test_hid_device(DWORD report_id, DWORD polled) todo_wine ok(poll_freq == 5, "got poll_freq %u, expected 5\n", poll_freq); out_len = 0; - poll_freq = 50; + poll_freq = 500; SetLastError(0xdeadbeef); ret = sync_ioctl(file, IOCTL_HID_SET_POLL_FREQUENCY_MSEC, &poll_freq, sizeof(ULONG), NULL, &out_len); ok(ret, "IOCTL_HID_GET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError()); @@ -2850,14 +2850,14 @@ static void test_hid_device(DWORD report_id, DWORD polled) ret = sync_ioctl(file, IOCTL_HID_GET_POLL_FREQUENCY_MSEC, NULL, 0, &poll_freq, &out_len); ok(ret, "IOCTL_HID_GET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError()); ok(out_len == sizeof(ULONG), "got out_len %u, expected sizeof(ULONG)\n", out_len); - ok(poll_freq == 50, "got poll_freq %u, expected 100\n", poll_freq); + ok(poll_freq == 500, "got poll_freq %u, expected 100\n", poll_freq); out_len = sizeof(ULONG); SetLastError(0xdeadbeef); ret = sync_ioctl(async_file, IOCTL_HID_GET_POLL_FREQUENCY_MSEC, NULL, 0, &poll_freq, &out_len); ok(ret, "IOCTL_HID_GET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError()); ok(out_len == sizeof(ULONG), "got out_len %u, expected sizeof(ULONG)\n", out_len); - ok(poll_freq == 50, "got poll_freq %u, expected 100\n", poll_freq); + ok(poll_freq == 500, "got poll_freq %u, expected 100\n", poll_freq); } test_hidp(file, async_file, report_id, polled); -- 2.32.0

2 6

[PATCH] nsiproxy: Include sys/types.h
by Gerald Pfeifer 06 Aug '21

06 Aug '21

This addresses In file included from dlls/nsiproxy.sys/ip.c:29: /usr/include/net/route.h:59:9: error: unknown type name ‘uint16_t’ and similar errors that show on FreeBSD 11 for example, Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/nsiproxy.sys/ip.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index fa88b8e0819..cb98c6a5206 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -21,6 +21,10 @@ #include "config.h" #include <stdarg.h> +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif + #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif -- 2.31.1

2 1

[PATCH] d3dx11_43: Implement D3DX11GetImageInfoFromMemory
by Alistair Leslie-Hughes 06 Aug '21

06 Aug '21

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=50210 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/d3dx11_42/Makefile.in | 1 + dlls/d3dx11_43/Makefile.in | 1 + dlls/d3dx11_43/main.c | 9 - dlls/d3dx11_43/tests/d3dx11.c | 668 ++++++++++++++++++++++++++++++++++ dlls/d3dx11_43/texture.c | 176 +++++++++ 5 files changed, 846 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx11_42/Makefile.in b/dlls/d3dx11_42/Makefile.in index dbc31e2407d..410d4555d2f 100644 --- a/dlls/d3dx11_42/Makefile.in +++ b/dlls/d3dx11_42/Makefile.in @@ -1,6 +1,7 @@ EXTRADEFS = -DD3DX11_SDK_VERSION=42 MODULE = d3dx11_42.dll IMPORTS = d3dcompiler +DELAYIMPORTS = windowscodecs PARENTSRC = ../d3dx11_43 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/d3dx11_43/Makefile.in b/dlls/d3dx11_43/Makefile.in index b69f3f1ce02..ed23958a671 100644 --- a/dlls/d3dx11_43/Makefile.in +++ b/dlls/d3dx11_43/Makefile.in @@ -2,6 +2,7 @@ EXTRADEFS = -DD3DX11_SDK_VERSION=43 MODULE = d3dx11_43.dll IMPORTLIB = d3dx11 IMPORTS = d3dcompiler +DELAYIMPORTS = windowscodecs EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/d3dx11_43/main.c b/dlls/d3dx11_43/main.c index 950f6d76f5c..00c1db35e42 100644 --- a/dlls/d3dx11_43/main.c +++ b/dlls/d3dx11_43/main.c @@ -66,12 +66,3 @@ HRESULT WINAPI D3DX11GetImageInfoFromFileW(const WCHAR *filename, ID3DX11ThreadP return E_NOTIMPL; } - -HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump, - D3DX11_IMAGE_INFO *img_info, HRESULT *hresult) -{ - FIXME("src_data %p, src_data_size %lu, pump %p, img_info %p, hresult %p stub!\n", - src_data, src_data_size, pump, img_info, hresult); - - return E_NOTIMPL; -} diff --git a/dlls/d3dx11_43/tests/d3dx11.c b/dlls/d3dx11_43/tests/d3dx11.c index 06924877da4..a53c79a25b9 100644 --- a/dlls/d3dx11_43/tests/d3dx11.c +++ b/dlls/d3dx11_43/tests/d3dx11.c @@ -25,6 +25,646 @@ static WCHAR temp_dir[MAX_PATH]; +/* 1x1 1bpp bmp image */ +static const BYTE test_bmp_1bpp[] = +{ + 0x42, 0x4d, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x28, 0x00, + 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x12, 0x0b, 0x00, 0x00, 0x12, 0x0b, 0x00, 0x00, 0x02, 0x00, + 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xf1, 0xf2, 0xf3, 0x80, 0xf4, 0xf5, 0xf6, 0x81, 0x00, 0x00, + 0x00, 0x00 +}; +static const BYTE test_bmp_1bpp_data[] = +{ + 0xf3, 0xf2, 0xf1, 0xff +}; + +/* 1x1 4bpp bmp image */ +static const BYTE test_bmp_4bpp[] = +{ + 0x42, 0x4d, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x28, 0x00, + 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x12, 0x0b, 0x00, 0x00, 0x12, 0x0b, 0x00, 0x00, 0x02, 0x00, + 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xf1, 0xf2, 0xf3, 0x80, 0xf4, 0xf5, 0xf6, 0x81, 0x00, 0x00, + 0x00, 0x00 +}; +static const BYTE test_bmp_4bpp_data[] = +{ + 0xf3, 0xf2, 0xf1, 0xff +}; + +/* 1x1 8bpp bmp image */ +static const BYTE test_bmp_8bpp[] = +{ + 0x42, 0x4d, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x28, 0x00, + 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x08, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x12, 0x0b, 0x00, 0x00, 0x12, 0x0b, 0x00, 0x00, 0x02, 0x00, + 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xf1, 0xf2, 0xf3, 0x80, 0xf4, 0xf5, 0xf6, 0x81, 0x00, 0x00, + 0x00, 0x00 +}; +static const BYTE test_bmp_8bpp_data[] = +{ + 0xf3, 0xf2, 0xf1, 0xff +}; + +/* 1x1 16bpp bmp image */ +static const BYTE test_bmp_16bpp[] = +{ + 0x42, 0x4d, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, 0x28, 0x00, + 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x12, 0x0b, 0x00, 0x00, 0x12, 0x0b, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x42, 0x00, 0x00, 0x00, 0x00 +}; +static const BYTE test_bmp_16bpp_data[] = +{ + 0x84, 0x84, 0x73, 0xff +}; + +/* 1x1 24bpp bmp image */ +static const BYTE test_bmp_24bpp[] = +{ + 0x42, 0x4d, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, 0x28, 0x00, + 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x18, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x12, 0x0b, 0x00, 0x00, 0x12, 0x0b, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x73, 0x84, 0x84, 0x00, 0x00, 0x00 +}; +static const BYTE test_bmp_24bpp_data[] = +{ + 0x84, 0x84, 0x73, 0xff +}; + +/* 2x2 32bpp XRGB bmp image */ +static const BYTE test_bmp_32bpp_xrgb[] = +{ + 0x42, 0x4d, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, 0x28, 0x00, + 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x12, 0x0b, 0x00, 0x00, 0x12, 0x0b, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0xb0, 0xc0, 0x00, 0xa1, 0xb1, 0xc1, 0x00, 0xa2, 0xb2, + 0xc2, 0x00, 0xa3, 0xb3, 0xc3, 0x00 +}; +static const BYTE test_bmp_32bpp_xrgb_data[] = +{ + 0xc2, 0xb2, 0xa2, 0xff, 0xc3, 0xb3, 0xa3, 0xff, 0xc0, 0xb0, 0xa0, 0xff, 0xc1, 0xb1, 0xa1, 0xff + +}; + +/* 2x2 32bpp ARGB bmp image */ +static const BYTE test_bmp_32bpp_argb[] = +{ + 0x42, 0x4d, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, 0x28, 0x00, + 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x12, 0x0b, 0x00, 0x00, 0x12, 0x0b, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0xb0, 0xc0, 0x00, 0xa1, 0xb1, 0xc1, 0x00, 0xa2, 0xb2, + 0xc2, 0x00, 0xa3, 0xb3, 0xc3, 0x01 +}; +static const BYTE test_bmp_32bpp_argb_data[] = +{ + 0xc2, 0xb2, 0xa2, 0xff, 0xc3, 0xb3, 0xa3, 0xff, 0xc0, 0xb0, 0xa0, 0xff, 0xc1, 0xb1, 0xa1, 0xff + +}; + +/* 1x1 8bpp gray png image */ +static const BYTE test_png_8bpp_gray[] = +{ + 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, + 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x08, 0x00, 0x00, 0x00, 0x00, 0x3a, 0x7e, 0x9b, + 0x55, 0x00, 0x00, 0x00, 0x0a, 0x49, 0x44, 0x41, 0x54, 0x08, 0xd7, 0x63, 0xf8, 0x0f, 0x00, 0x01, + 0x01, 0x01, 0x00, 0x1b, 0xb6, 0xee, 0x56, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, + 0x42, 0x60, 0x82 +}; +static const BYTE test_png_8bpp_gray_data[] = +{ + 0xff, 0xff, 0xff, 0xff +}; + +/* 1x1 jpg image */ +static const BYTE test_jpg[] = +{ + 0xff, 0xd8, 0xff, 0xe0, 0x00, 0x10, 0x4a, 0x46, 0x49, 0x46, 0x00, 0x01, 0x01, 0x01, 0x01, 0x2c, + 0x01, 0x2c, 0x00, 0x00, 0xff, 0xdb, 0x00, 0x43, 0x00, 0x05, 0x03, 0x04, 0x04, 0x04, 0x03, 0x05, + 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x06, 0x07, 0x0c, 0x08, 0x07, 0x07, 0x07, 0x07, 0x0f, 0x0b, + 0x0b, 0x09, 0x0c, 0x11, 0x0f, 0x12, 0x12, 0x11, 0x0f, 0x11, 0x11, 0x13, 0x16, 0x1c, 0x17, 0x13, + 0x14, 0x1a, 0x15, 0x11, 0x11, 0x18, 0x21, 0x18, 0x1a, 0x1d, 0x1d, 0x1f, 0x1f, 0x1f, 0x13, 0x17, + 0x22, 0x24, 0x22, 0x1e, 0x24, 0x1c, 0x1e, 0x1f, 0x1e, 0xff, 0xdb, 0x00, 0x43, 0x01, 0x05, 0x05, + 0x05, 0x07, 0x06, 0x07, 0x0e, 0x08, 0x08, 0x0e, 0x1e, 0x14, 0x11, 0x14, 0x1e, 0x1e, 0x1e, 0x1e, + 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, + 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, + 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0xff, 0xc0, + 0x00, 0x11, 0x08, 0x00, 0x01, 0x00, 0x01, 0x03, 0x01, 0x22, 0x00, 0x02, 0x11, 0x01, 0x03, 0x11, + 0x01, 0xff, 0xc4, 0x00, 0x15, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xff, 0xc4, 0x00, 0x14, 0x10, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xc4, + 0x00, 0x14, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xff, 0xc4, 0x00, 0x14, 0x11, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xda, 0x00, 0x0c, 0x03, 0x01, + 0x00, 0x02, 0x11, 0x03, 0x11, 0x00, 0x3f, 0x00, 0xb2, 0xc0, 0x07, 0xff, 0xd9 +}; +static const BYTE test_jpg_data[] = +{ + 0xff, 0xff, 0xff, 0xff +}; + +/* 1x1 gif image */ +static const BYTE test_gif[] = +{ + 0x47, 0x49, 0x46, 0x38, 0x37, 0x61, 0x01, 0x00, 0x01, 0x00, 0x80, 0x00, 0x00, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0x2c, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x02, 0x02, 0x44, + 0x01, 0x00, 0x3b +}; +static const BYTE test_gif_data[] = +{ + 0xff, 0xff, 0xff, 0xff +}; + +/* 1x1 tiff image */ +static const BYTE test_tiff[] = +{ + 0x49, 0x49, 0x2a, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0xfe, 0x00, + 0x04, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x02, 0x01, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0xd2, 0x00, 0x00, 0x00, 0x03, 0x01, + 0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x06, 0x01, 0x03, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x0d, 0x01, 0x02, 0x00, 0x1b, 0x00, 0x00, 0x00, 0xd8, 0x00, + 0x00, 0x00, 0x11, 0x01, 0x04, 0x00, 0x01, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x12, 0x01, + 0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x15, 0x01, 0x03, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x16, 0x01, 0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x40, 0x00, + 0x00, 0x00, 0x17, 0x01, 0x04, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x1a, 0x01, + 0x05, 0x00, 0x01, 0x00, 0x00, 0x00, 0xf4, 0x00, 0x00, 0x00, 0x1b, 0x01, 0x05, 0x00, 0x01, 0x00, + 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0x1c, 0x01, 0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x28, 0x01, 0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x08, 0x00, 0x08, 0x00, 0x08, 0x00, 0x2f, 0x68, 0x6f, 0x6d, 0x65, 0x2f, 0x6d, 0x65, + 0x68, 0x2f, 0x44, 0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x74, + 0x69, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x48, + 0x00, 0x00, 0x00, 0x01 +}; +static const BYTE test_tiff_data[] = +{ + 0x00, 0x00, 0x00, 0xff +}; + +/* 1x1 alpha dds image */ +static const BYTE test_dds_alpha[] = +{ + 0x44, 0x44, 0x53, 0x20, 0x7c, 0x00, 0x00, 0x00, 0x07, 0x10, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff +}; +static const BYTE test_dds_alpha_data[] = +{ + 0xff +}; + +/* 1x1 luminance dds image */ +static const BYTE test_dds_luminance[] = +{ + 0x44, 0x44, 0x53, 0x20, 0x7c, 0x00, 0x00, 0x00, 0x07, 0x10, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x82 +}; +static const BYTE test_dds_luminance_data[] = +{ + 0x82, 0x82, 0x82, 0xff +}; + +/* 1x1 16bpp dds image */ +static const BYTE test_dds_16bpp[] = +{ + 0x44, 0x44, 0x53, 0x20, 0x7c, 0x00, 0x00, 0x00, 0x07, 0x10, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, + 0xe0, 0x03, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x0e, 0x42 +}; +static const BYTE test_dds_16bpp_data[] = +{ + 0x84, 0x84, 0x73, 0xff +}; + +/* 1x1 24bpp dds image */ +static const BYTE test_dds_24bpp[] = +{ + 0x44, 0x44, 0x53, 0x20, 0x7c, 0x00, 0x00, 0x00, 0x07, 0x10, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, + 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x70, 0x81, 0x83 +}; +static const BYTE test_dds_24bpp_data[] = +{ + 0x83, 0x81, 0x70, 0xff +}; + +/* 1x1 32bpp dds image */ +static const BYTE test_dds_32bpp[] = +{ + 0x44, 0x44, 0x53, 0x20, 0x7c, 0x00, 0x00, 0x00, 0x07, 0x10, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, + 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x10, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x70, 0x81, 0x83, 0xff +}; +static const BYTE test_dds_32bpp_data[] = +{ + 0x83, 0x81, 0x70, 0xff +}; + +/* 1x1 64bpp dds image */ +static const BYTE test_dds_64bpp[] = +{ + 0x44, 0x44, 0x53, 0x20, 0x7c, 0x00, 0x00, 0x00, 0x0f, 0x10, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x83, 0x83, 0x81, 0x81, 0x70, 0x70, 0xff, 0xff +}; +static const BYTE test_dds_64bpp_data[] = +{ + 0x83, 0x83, 0x81, 0x81, 0x70, 0x70, 0xff, 0xff +}; + +/* 1x1 96bpp dds image */ +static const BYTE test_dds_96bpp[] = +{ + 0x44, 0x44, 0x53, 0x20, 0x7c, 0x00, 0x00, 0x00, 0x0f, 0x10, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x44, 0x58, 0x31, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x06, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x84, 0x83, 0x03, 0x3f, 0x82, 0x81, 0x01, 0x3f, 0xe2, 0xe0, 0xe0, 0x3e +}; +static const BYTE test_dds_96bpp_data[] = +{ + 0x84, 0x83, 0x03, 0x3f, 0x82, 0x81, 0x01, 0x3f, 0xe2, 0xe0, 0xe0, 0x3e +}; + +/* 1x1 128bpp dds image */ +static const BYTE test_dds_128bpp[] = +{ + 0x44, 0x44, 0x53, 0x20, 0x7c, 0x00, 0x00, 0x00, 0x0f, 0x10, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x84, 0x83, 0x03, 0x3f, 0x82, 0x81, 0x01, 0x3f, 0xe2, 0xe0, 0xe0, 0x3e, 0x00, 0x00, 0x80, 0x3f +}; +static const BYTE test_dds_128bpp_data[] = +{ + 0x84, 0x83, 0x03, 0x3f, 0x82, 0x81, 0x01, 0x3f, 0xe2, 0xe0, 0xe0, 0x3e, 0x00, 0x00, 0x80, 0x3f + +}; + +/* 4x4 DXT1 dds image */ +static const BYTE test_dds_dxt1[] = +{ + 0x44, 0x44, 0x53, 0x20, 0x7c, 0x00, 0x00, 0x00, 0x07, 0x10, 0x08, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x44, 0x58, 0x54, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x2a, 0x31, 0xf5, 0xbc, 0xe3, 0x6e, 0x2a, 0x3a +}; +static const BYTE test_dds_dxt1_data[] = +{ + 0x2a, 0x31, 0xf5, 0xbc, 0xe3, 0x6e, 0x2a, 0x3a +}; + +/* 4x4 DXT2 dds image */ +static const BYTE test_dds_dxt2[] = +{ + 0x44, 0x44, 0x53, 0x20, 0x7c, 0x00, 0x00, 0x00, 0x07, 0x10, 0x02, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x44, 0x58, 0x54, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x40, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xde, 0xc4, 0x10, 0x2f, 0xbf, 0xff, 0x7b, + 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x57, 0x53, 0x00, 0x00, 0x52, 0x52, 0x55, 0x55, + 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xce, 0x59, 0x00, 0x00, 0x54, 0x55, 0x55, 0x55 +}; +static const BYTE test_dds_dxt2_data[] = +{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xde, 0xc4, 0x10, 0x2f, 0xbf, 0xff, 0x7b + +}; + +/* 1x3 DXT3 dds image */ +static const BYTE test_dds_dxt3[] = +{ + 0x44, 0x44, 0x53, 0x20, 0x7c, 0x00, 0x00, 0x00, 0x07, 0x10, 0x0a, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x44, 0x58, 0x54, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x40, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0c, 0x92, 0x38, 0x84, 0x00, 0xff, 0x55, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x53, 0x8b, 0x53, 0x8b, 0x00, 0x00, 0x00, 0x00 +}; +static const BYTE test_dds_dxt3_data[] = +{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x4e, 0x92, 0xd6, 0x83, 0x00, 0xaa, 0x55, 0x55 + +}; + +/* 4x4 DXT4 dds image */ +static const BYTE test_dds_dxt4[] = +{ + 0x44, 0x44, 0x53, 0x20, 0x7c, 0x00, 0x00, 0x00, 0x07, 0x10, 0x02, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x44, 0x58, 0x54, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x40, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfd, 0xde, 0xc4, 0x10, 0x2f, 0xbf, 0xff, 0x7b, + 0xff, 0x00, 0x40, 0x02, 0x24, 0x49, 0x92, 0x24, 0x57, 0x53, 0x00, 0x00, 0x52, 0x52, 0x55, 0x55, + 0xff, 0x00, 0x48, 0x92, 0x24, 0x49, 0x92, 0x24, 0xce, 0x59, 0x00, 0x00, 0x54, 0x55, 0x55, 0x55 +}; +static const BYTE test_dds_dxt4_data[] = +{ + 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfd, 0xde, 0xc4, 0x10, 0x2f, 0xbf, 0xff, 0x7b + +}; + +/* 4x2 DXT5 dds image */ +static const BYTE test_dds_dxt5[] = +{ + 0x44, 0x44, 0x53, 0x20, 0x7c, 0x00, 0x00, 0x00, 0x07, 0x10, 0x08, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x44, 0x58, 0x54, 0x35, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xef, 0x87, 0x0f, 0x78, 0x05, 0x05, 0x50, 0x50 +}; +static const BYTE test_dds_dxt5_data[] = +{ + 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xef, 0x87, 0x0f, 0x78, 0x05, 0x05, 0x05, 0x05 + +}; + +/* 4x4 BC4 dds image */ +static const BYTE test_dds_bc4[] = +{ + 0x44, 0x44, 0x53, 0x20, 0x7c, 0x00, 0x00, 0x00, 0x07, 0x10, 0x0a, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x42, 0x43, 0x34, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x40, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xd9, 0x15, 0xbc, 0x41, 0x5b, 0xa3, 0x3d, 0x3a, 0x8f, 0x3d, 0x45, 0x81, 0x20, 0x45, 0x81, 0x20, + 0x6f, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +}; +static const BYTE test_dds_bc4_data[] = +{ + 0xd9, 0x15, 0xbc, 0x41, 0x5b, 0xa3, 0x3d, 0x3a +}; + +/* 6x3 BC5 dds image */ +static const BYTE test_dds_bc5[] = +{ + 0x44, 0x44, 0x53, 0x20, 0x7c, 0x00, 0x00, 0x00, 0x07, 0x10, 0x0a, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x06, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x42, 0x43, 0x35, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x40, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x9f, 0x28, 0x73, 0xac, 0xd5, 0x80, 0xaa, 0xd5, 0x70, 0x2c, 0x4e, 0xd6, 0x76, 0x1d, 0xd6, 0x76, + 0xd5, 0x0f, 0xc3, 0x50, 0x96, 0xcf, 0x53, 0x96, 0xdf, 0x16, 0xc3, 0x50, 0x96, 0xcf, 0x53, 0x96, + 0x83, 0x55, 0x08, 0x83, 0x30, 0x08, 0x83, 0x30, 0x79, 0x46, 0x31, 0x1c, 0xc3, 0x31, 0x1c, 0xc3, + 0x6d, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x5c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +}; +static const BYTE test_dds_bc5_data[] = +{ + 0x95, 0x35, 0xe2, 0xa3, 0xf5, 0xd2, 0x28, 0x68, 0x65, 0x32, 0x7c, 0x4e, 0xdb, 0xe4, 0x56, 0x0a, + 0xb9, 0x33, 0xaf, 0xf0, 0x52, 0xbe, 0xed, 0x27, 0xb4, 0x2e, 0xa6, 0x60, 0x4e, 0xb6, 0x5d, 0x3f + +}; + +/* 4x4 DXT1 cube map */ +static const BYTE test_dds_cube[] = +{ + 0x44, 0x44, 0x53, 0x20, 0x7c, 0x00, 0x00, 0x00, 0x07, 0x10, 0x0a, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x44, 0x58, 0x54, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x40, 0x00, + 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xf5, 0xa7, 0x08, 0x69, 0x74, 0xc0, 0xbf, 0xd7, 0x32, 0x96, 0x0b, 0x7b, 0xcc, 0x55, 0xcc, 0x55, + 0x0e, 0x84, 0x0e, 0x84, 0x00, 0x00, 0x00, 0x00, 0xf5, 0xa7, 0x08, 0x69, 0x74, 0xc0, 0xbf, 0xd7, + 0x32, 0x96, 0x0b, 0x7b, 0xcc, 0x55, 0xcc, 0x55, 0x0e, 0x84, 0x0e, 0x84, 0x00, 0x00, 0x00, 0x00, + 0xf5, 0xa7, 0x08, 0x69, 0x74, 0xc0, 0xbf, 0xd7, 0x32, 0x96, 0x0b, 0x7b, 0xcc, 0x55, 0xcc, 0x55, + 0x0e, 0x84, 0x0e, 0x84, 0x00, 0x00, 0x00, 0x00, 0xf5, 0xa7, 0x08, 0x69, 0x74, 0xc0, 0xbf, 0xd7, + 0x32, 0x96, 0x0b, 0x7b, 0xcc, 0x55, 0xcc, 0x55, 0x0e, 0x84, 0x0e, 0x84, 0x00, 0x00, 0x00, 0x00, + 0xf5, 0xa7, 0x08, 0x69, 0x74, 0xc0, 0xbf, 0xd7, 0x32, 0x96, 0x0b, 0x7b, 0xcc, 0x55, 0xcc, 0x55, + 0x0e, 0x84, 0x0e, 0x84, 0x00, 0x00, 0x00, 0x00, 0xf5, 0xa7, 0x08, 0x69, 0x74, 0xc0, 0xbf, 0xd7, + 0x32, 0x96, 0x0b, 0x7b, 0xcc, 0x55, 0xcc, 0x55, 0x0e, 0x84, 0x0e, 0x84, 0x00, 0x00, 0x00, 0x00 +}; +static const BYTE test_dds_cube_data[] = +{ + 0xf5, 0xa7, 0x08, 0x69, 0x74, 0xc0, 0xbf, 0xd7 +}; + +static const struct test_image +{ + const BYTE *data; + unsigned int size; + const BYTE *expected_data; + D3DX11_IMAGE_INFO expected_info; +} +test_image[] = +{ + { + test_bmp_1bpp, sizeof(test_bmp_1bpp), test_bmp_1bpp_data, + {1, 1, 1, 1, 1, 0, DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3DX11_IFF_BMP} + }, + { + test_bmp_4bpp, sizeof(test_bmp_4bpp), test_bmp_4bpp_data, + {1, 1, 1, 1, 1, 0, DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3DX11_IFF_BMP} + }, + { + test_bmp_8bpp, sizeof(test_bmp_8bpp), test_bmp_8bpp_data, + {1, 1, 1, 1, 1, 0, DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3DX11_IFF_BMP} + }, + { + test_bmp_16bpp, sizeof(test_bmp_16bpp), test_bmp_16bpp_data, + {1, 1, 1, 1, 1, 0, DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3DX11_IFF_BMP} + }, + { + test_bmp_24bpp, sizeof(test_bmp_24bpp), test_bmp_24bpp_data, + {1, 1, 1, 1, 1, 0, DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3DX11_IFF_BMP} + }, + { + test_bmp_32bpp_xrgb, sizeof(test_bmp_32bpp_xrgb), test_bmp_32bpp_xrgb_data, + {2, 2, 1, 1, 1, 0, DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3DX11_IFF_BMP} + }, + { + test_bmp_32bpp_argb, sizeof(test_bmp_32bpp_argb), test_bmp_32bpp_argb_data, + {2, 2, 1, 1, 1, 0, DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3DX11_IFF_BMP} + }, + { + test_png_8bpp_gray, sizeof(test_png_8bpp_gray), test_png_8bpp_gray_data, + {1, 1, 1, 1, 1, 0, DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3DX11_IFF_PNG} + }, + { + test_jpg, sizeof(test_jpg), test_jpg_data, + {1, 1, 1, 1, 1, 0, DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3DX11_IFF_JPG} + }, + { + test_gif, sizeof(test_gif), test_gif_data, + {1, 1, 1, 1, 1, 0, DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3DX11_IFF_GIF} + }, + { + test_tiff, sizeof(test_tiff), test_tiff_data, + {1, 1, 1, 1, 1, 0, DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3DX11_IFF_TIFF} + }, + { + test_dds_alpha, sizeof(test_dds_alpha), test_dds_alpha_data, + {1, 1, 1, 1, 1, 0, DXGI_FORMAT_A8_UNORM, D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3DX11_IFF_DDS} + }, + { + test_dds_luminance, sizeof(test_dds_luminance), test_dds_luminance_data, + {1, 1, 1, 1, 1, 0, DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3DX11_IFF_DDS} + }, + { + test_dds_16bpp, sizeof(test_dds_16bpp), test_dds_16bpp_data, + {1, 1, 1, 1, 1, 0, DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3DX11_IFF_DDS} + }, + { + test_dds_24bpp, sizeof(test_dds_24bpp), test_dds_24bpp_data, + {1, 1, 1, 1, 1, 0, DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3DX11_IFF_DDS} + }, + { + test_dds_32bpp, sizeof(test_dds_32bpp), test_dds_32bpp_data, + {1, 1, 1, 1, 1, 0, DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3DX11_IFF_DDS} + }, + { + test_dds_64bpp, sizeof(test_dds_64bpp), test_dds_64bpp_data, + {1, 1, 1, 1, 1, 0, DXGI_FORMAT_R16G16B16A16_UNORM, D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3DX11_IFF_DDS} + }, + { + test_dds_96bpp, sizeof(test_dds_96bpp), test_dds_96bpp_data, + {1, 1, 1, 1, 1, 0, DXGI_FORMAT_R32G32B32_FLOAT, D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3DX11_IFF_DDS} + }, + { + test_dds_128bpp, sizeof(test_dds_128bpp), test_dds_128bpp_data, + {1, 1, 1, 1, 1, 0, DXGI_FORMAT_R32G32B32A32_FLOAT, D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3DX11_IFF_DDS} + }, + { + test_dds_dxt1, sizeof(test_dds_dxt1), test_dds_dxt1_data, + {4, 4, 1, 1, 1, 0, DXGI_FORMAT_BC1_UNORM, D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3DX11_IFF_DDS} + }, + { + test_dds_dxt2, sizeof(test_dds_dxt2), test_dds_dxt2_data, + {4, 4, 1, 1, 3, 0, DXGI_FORMAT_BC2_UNORM, D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3DX11_IFF_DDS} + }, + { + test_dds_dxt3, sizeof(test_dds_dxt3), test_dds_dxt3_data, + {1, 3, 1, 1, 2, 0, DXGI_FORMAT_BC2_UNORM, D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3DX11_IFF_DDS} + }, + { + test_dds_dxt4, sizeof(test_dds_dxt4), test_dds_dxt4_data, + {4, 4, 1, 1, 3, 0, DXGI_FORMAT_BC3_UNORM, D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3DX11_IFF_DDS} + }, + { + test_dds_dxt5, sizeof(test_dds_dxt5), test_dds_dxt5_data, + {4, 2, 1, 1, 1, 0, DXGI_FORMAT_BC3_UNORM, D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3DX11_IFF_DDS} + }, + { + test_dds_bc4, sizeof(test_dds_bc4), test_dds_bc4_data, + {4, 4, 1, 1, 3, 0, DXGI_FORMAT_BC4_UNORM, D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3DX11_IFF_DDS} + }, + { + test_dds_bc5, sizeof(test_dds_bc5), test_dds_bc5_data, + {6, 3, 1, 1, 3, 0, DXGI_FORMAT_BC5_UNORM, D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3DX11_IFF_DDS} + }, + { + test_dds_cube, sizeof(test_dds_cube), test_dds_cube_data, + {4, 4, 1, 6, 3, 0x4, DXGI_FORMAT_BC1_UNORM, D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3DX11_IFF_DDS} + }, +}; + +static void check_image_info(D3DX11_IMAGE_INFO *image_info, const struct test_image *image, unsigned int line) +{ + ok_(__FILE__, line)(image_info->Width == image->expected_info.Width, + "Got unexpected Width %u, expected %u.\n", + image_info->Width, image->expected_info.Width); + ok_(__FILE__, line)(image_info->Height == image->expected_info.Height, + "Got unexpected Height %u, expected %u.\n", + image_info->Height, image->expected_info.Height); + ok_(__FILE__, line)(image_info->Depth == image->expected_info.Depth, + "Got unexpected Depth %u, expected %u.\n", + image_info->Depth, image->expected_info.Depth); + ok_(__FILE__, line)(image_info->ArraySize == image->expected_info.ArraySize, + "Got unexpected ArraySize %u, expected %u.\n", + image_info->ArraySize, image->expected_info.ArraySize); + ok_(__FILE__, line)(image_info->MipLevels == image->expected_info.MipLevels, + "Got unexpected MipLevels %u, expected %u.\n", + image_info->MipLevels, image->expected_info.MipLevels); + ok_(__FILE__, line)(image_info->MiscFlags == image->expected_info.MiscFlags, + "Got unexpected MiscFlags %#x, expected %#x.\n", + image_info->MiscFlags, image->expected_info.MiscFlags); + ok_(__FILE__, line)(image_info->Format == image->expected_info.Format, + "Got unexpected Format %#x, expected %#x.\n", + image_info->Format, image->expected_info.Format); + ok_(__FILE__, line)(image_info->ResourceDimension == image->expected_info.ResourceDimension, + "Got unexpected ResourceDimension %u, expected %u.\n", + image_info->ResourceDimension, image->expected_info.ResourceDimension); + ok_(__FILE__, line)(image_info->ImageFileFormat == image->expected_info.ImageFileFormat, + "Got unexpected ImageFileFormat %u, expected %u.\n", + image_info->ImageFileFormat, image->expected_info.ImageFileFormat); +} + static BOOL create_file(const WCHAR *filename, const char *data, unsigned int size, WCHAR *out_path) { WCHAR path[MAX_PATH]; @@ -404,10 +1044,38 @@ static void test_D3DX11CompileFromFile(void) delete_directory(L"include"); } +static void test_get_image_info(void) +{ + D3DX11_IMAGE_INFO image_info; + unsigned int i; + DWORD dword; + HRESULT hr; + + hr = D3DX11GetImageInfoFromMemory(test_image[0].data, 0, NULL, &image_info, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = D3DX11GetImageInfoFromMemory(NULL, test_image[0].size, NULL, &image_info, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = D3DX11GetImageInfoFromMemory(&dword, sizeof(dword), NULL, &image_info, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(test_image); ++i) + { + winetest_push_context("Test %u", i); + + hr = D3DX11GetImageInfoFromMemory(test_image[i].data, test_image[i].size, NULL, &image_info, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + if (hr == S_OK) + check_image_info(&image_info, test_image + i, __LINE__); + + winetest_pop_context(); + } +} + START_TEST(d3dx11) { test_D3DX11CreateAsyncMemoryLoader(); test_D3DX11CreateAsyncFileLoader(); test_D3DX11CreateAsyncResourceLoader(); test_D3DX11CompileFromFile(); + test_get_image_info(); } diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c index ee6808d76d6..8addf4f84d3 100644 --- a/dlls/d3dx11_43/texture.c +++ b/dlls/d3dx11_43/texture.c @@ -15,14 +15,190 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS #include "d3dx11.h" #include "d3dcompiler.h" +#include "wincodec.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); +HRESULT WINAPI WICCreateImagingFactory_Proxy(UINT sdk_version, IWICImagingFactory **imaging_factory); + +static const struct +{ + const GUID *wic_container_guid; + D3DX11_IMAGE_FILE_FORMAT d3dx_file_format; +} +file_formats[] = +{ + { &GUID_ContainerFormatBmp, D3DX11_IFF_BMP }, + { &GUID_ContainerFormatJpeg, D3DX11_IFF_JPG }, + { &GUID_ContainerFormatPng, D3DX11_IFF_PNG }, + { &GUID_ContainerFormatDds, D3DX11_IFF_DDS }, + { &GUID_ContainerFormatTiff, D3DX11_IFF_TIFF }, + { &GUID_ContainerFormatGif, D3DX11_IFF_GIF }, + { &GUID_ContainerFormatWmp, D3DX11_IFF_WMP }, +}; + +static D3DX11_IMAGE_FILE_FORMAT wic_container_guid_to_file_format(GUID *container_format) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(file_formats); ++i) + { + if (IsEqualGUID(file_formats[i].wic_container_guid, container_format)) + return file_formats[i].d3dx_file_format; + } + return D3DX11_IFF_FORCE_DWORD; +} + +static D3D11_RESOURCE_DIMENSION wic_dimension_to_d3dx11_dimension(WICDdsDimension wic_dimension) +{ + switch (wic_dimension) + { + case WICDdsTexture1D: + return D3D11_RESOURCE_DIMENSION_TEXTURE1D; + case WICDdsTexture2D: + case WICDdsTextureCube: + return D3D11_RESOURCE_DIMENSION_TEXTURE2D; + case WICDdsTexture3D: + return D3D11_RESOURCE_DIMENSION_TEXTURE3D; + default: + return D3D11_RESOURCE_DIMENSION_UNKNOWN; + } +} + +static const DXGI_FORMAT to_be_converted_format[] = +{ + DXGI_FORMAT_UNKNOWN, + DXGI_FORMAT_R8_UNORM, + DXGI_FORMAT_R8G8_UNORM, + DXGI_FORMAT_B5G6R5_UNORM, + DXGI_FORMAT_B4G4R4A4_UNORM, + DXGI_FORMAT_B5G5R5A1_UNORM, + DXGI_FORMAT_B8G8R8X8_UNORM, + DXGI_FORMAT_B8G8R8A8_UNORM +}; + +static DXGI_FORMAT get_d3dx11_dds_format(DXGI_FORMAT format) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(to_be_converted_format); ++i) + { + if (format == to_be_converted_format[i]) + return DXGI_FORMAT_R8G8B8A8_UNORM; + } + return format; +} + +HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump, + D3DX11_IMAGE_INFO *img_info, HRESULT *hresult) +{ + IWICBitmapFrameDecode *frame = NULL; + IWICImagingFactory *factory = NULL; + IWICDdsDecoder *dds_decoder = NULL; + IWICBitmapDecoder *decoder = NULL; + WICDdsParameters dds_params; + IWICStream *stream = NULL; + unsigned int frame_count; + GUID container_format; + HRESULT hr; + + TRACE("src_data %p, src_data_size %lu, pump %p, img_info %p, hresult %p.\n", + src_data, src_data_size, pump, img_info, hresult); + + if (!src_data || !src_data_size || !img_info) + return E_FAIL; + if (pump) + FIXME("Thread pump is not supported yet.\n"); + + WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory); + IWICImagingFactory_CreateStream(factory, &stream); + hr = IWICStream_InitializeFromMemory(stream, (BYTE *)src_data, src_data_size); + if (FAILED(hr)) + { + WARN("Failed to initialize stream.\n"); + goto end; + } + hr = IWICImagingFactory_CreateDecoderFromStream(factory, (IStream *)stream, NULL, 0, &decoder); + if (FAILED(hr)) + goto end; + + hr = IWICBitmapDecoder_GetContainerFormat(decoder, &container_format); + if (FAILED(hr)) + goto end; + img_info->ImageFileFormat = wic_container_guid_to_file_format(&container_format); + if (img_info->ImageFileFormat == D3DX11_IFF_FORCE_DWORD) + { + hr = E_FAIL; + WARN("Unsupported image file format %s.\n", debugstr_guid(&container_format)); + goto end; + } + + hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); + if (FAILED(hr) || !frame_count) + goto end; + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + if (FAILED(hr)) + goto end; + hr = IWICBitmapFrameDecode_GetSize(frame, &img_info->Width, &img_info->Height); + if (FAILED(hr)) + goto end; + + if (img_info->ImageFileFormat == D3DX11_IFF_DDS) + { + hr = IWICBitmapDecoder_QueryInterface(decoder, &IID_IWICDdsDecoder, (void **)&dds_decoder); + if (FAILED(hr)) + goto end; + hr = IWICDdsDecoder_GetParameters(dds_decoder, &dds_params); + if (FAILED(hr)) + goto end; + img_info->ArraySize = dds_params.ArraySize; + img_info->Depth = dds_params.Depth; + img_info->MipLevels = dds_params.MipLevels; + img_info->ResourceDimension = wic_dimension_to_d3dx11_dimension(dds_params.Dimension); + img_info->Format = get_d3dx11_dds_format(dds_params.DxgiFormat); + img_info->MiscFlags = 0; + if (dds_params.Dimension == WICDdsTextureCube) + { + img_info->MiscFlags = D3D11_RESOURCE_MISC_TEXTURECUBE; + img_info->ArraySize *= 6; + } + } + else + { + img_info->ArraySize = 1; + img_info->Depth = 1; + img_info->MipLevels = 1; + img_info->ResourceDimension = D3D11_RESOURCE_DIMENSION_TEXTURE2D; + img_info->Format = DXGI_FORMAT_R8G8B8A8_UNORM; + img_info->MiscFlags = 0; + } + +end: + if (dds_decoder) + IWICDdsDecoder_Release(dds_decoder); + if (frame) + IWICBitmapFrameDecode_Release(frame); + if (decoder) + IWICBitmapDecoder_Release(decoder); + if (stream) + IWICStream_Release(stream); + if (factory) + IWICImagingFactory_Release(factory); + + if (hr != S_OK) + { + WARN("Invalid or unsupported image file.\n"); + return E_FAIL; + } + return S_OK; +} + HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, const void *data, SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11ShaderResourceView **view, HRESULT *hresult) -- 2.30.2

2 2

[PATCH 1/3] include: Add d3dx10 vector and matrix types.
by Nikolay Sivov 05 Aug '21

05 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/d3dx10math.h | 165 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 165 insertions(+) diff --git a/include/d3dx10math.h b/include/d3dx10math.h index c8bcfd2ce4e..adc7adab9fd 100644 --- a/include/d3dx10math.h +++ b/include/d3dx10math.h @@ -24,6 +24,35 @@ #include <math.h> +#ifndef D3DVECTOR_DEFINED +typedef struct _D3DVECTOR +{ + float x; + float y; + float z; +} D3DVECTOR; +#define D3DVECTOR_DEFINED +#endif + +#ifndef D3DMATRIX_DEFINED +typedef struct _D3DMATRIX +{ + union + { + struct + { + float _11, _12, _13, _14; + float _21, _22, _23, _24; + float _31, _32, _33, _34; + float _41, _42, _43, _44; + + }; + float m[4][4]; + }; +} D3DMATRIX; +#define D3DMATRIX_DEFINED +#endif + typedef enum _D3DX_CPU_OPTIMIZATION { D3DX_NOT_OPTIMIZED, @@ -82,6 +111,142 @@ public: float r, g, b, a; } D3DXCOLOR, *LPD3DXCOLOR; +typedef struct D3DXVECTOR2 +{ +#ifdef __cplusplus + D3DXVECTOR2(); + D3DXVECTOR2(const FLOAT *pf); + D3DXVECTOR2(FLOAT fx, FLOAT fy); + + operator FLOAT* (); + operator const FLOAT* () const; + + D3DXVECTOR2& operator += (const D3DXVECTOR2&); + D3DXVECTOR2& operator -= (const D3DXVECTOR2&); + D3DXVECTOR2& operator *= (FLOAT); + D3DXVECTOR2& operator /= (FLOAT); + + D3DXVECTOR2 operator + () const; + D3DXVECTOR2 operator - () const; + + D3DXVECTOR2 operator + (const D3DXVECTOR2&) const; + D3DXVECTOR2 operator - (const D3DXVECTOR2&) const; + D3DXVECTOR2 operator * (FLOAT) const; + D3DXVECTOR2 operator / (FLOAT) const; + + friend D3DXVECTOR2 operator * (FLOAT, const D3DXVECTOR2&); + + BOOL operator == (const D3DXVECTOR2&) const; + BOOL operator != (const D3DXVECTOR2&) const; +#endif /* __cplusplus */ + FLOAT x, y; +} D3DXVECTOR2, *LPD3DXVECTOR2; + +#ifdef __cplusplus +typedef struct D3DXVECTOR3 : public D3DVECTOR +{ + D3DXVECTOR3(); + D3DXVECTOR3(const FLOAT *pf); + D3DXVECTOR3(const D3DVECTOR& v); + D3DXVECTOR3(FLOAT fx, FLOAT fy, FLOAT fz); + + operator FLOAT* (); + operator const FLOAT* () const; + + D3DXVECTOR3& operator += (const D3DXVECTOR3&); + D3DXVECTOR3& operator -= (const D3DXVECTOR3&); + D3DXVECTOR3& operator *= (FLOAT); + D3DXVECTOR3& operator /= (FLOAT); + + D3DXVECTOR3 operator + () const; + D3DXVECTOR3 operator - () const; + + D3DXVECTOR3 operator + (const D3DXVECTOR3&) const; + D3DXVECTOR3 operator - (const D3DXVECTOR3&) const; + D3DXVECTOR3 operator * (FLOAT) const; + D3DXVECTOR3 operator / (FLOAT) const; + + friend D3DXVECTOR3 operator * (FLOAT, const struct D3DXVECTOR3&); + + BOOL operator == (const D3DXVECTOR3&) const; + BOOL operator != (const D3DXVECTOR3&) const; +} D3DXVECTOR3, *LPD3DXVECTOR3; +#else /* !__cplusplus */ +typedef struct _D3DVECTOR D3DXVECTOR3, *LPD3DXVECTOR3; +#endif /* !__cplusplus */ + +typedef struct D3DXVECTOR4 +{ +#ifdef __cplusplus + D3DXVECTOR4(); + D3DXVECTOR4(const FLOAT *pf); + D3DXVECTOR4(FLOAT fx, FLOAT fy, FLOAT fz, FLOAT fw); + + operator FLOAT* (); + operator const FLOAT* () const; + + D3DXVECTOR4& operator += (const D3DXVECTOR4&); + D3DXVECTOR4& operator -= (const D3DXVECTOR4&); + D3DXVECTOR4& operator *= (FLOAT); + D3DXVECTOR4& operator /= (FLOAT); + + D3DXVECTOR4 operator + () const; + D3DXVECTOR4 operator - () const; + + D3DXVECTOR4 operator + (const D3DXVECTOR4&) const; + D3DXVECTOR4 operator - (const D3DXVECTOR4&) const; + D3DXVECTOR4 operator * (FLOAT) const; + D3DXVECTOR4 operator / (FLOAT) const; + + friend D3DXVECTOR4 operator * (FLOAT, const D3DXVECTOR4&); + + BOOL operator == (const D3DXVECTOR4&) const; + BOOL operator != (const D3DXVECTOR4&) const; +#endif /* __cplusplus */ + FLOAT x, y, z, w; +} D3DXVECTOR4, *LPD3DXVECTOR4; + +#ifdef __cplusplus +typedef struct D3DXMATRIX : public D3DMATRIX +{ + D3DXMATRIX(); + D3DXMATRIX(const FLOAT *pf); + D3DXMATRIX(const D3DMATRIX& mat); + D3DXMATRIX(FLOAT f11, FLOAT f12, FLOAT f13, FLOAT f14, + FLOAT f21, FLOAT f22, FLOAT f23, FLOAT f24, + FLOAT f31, FLOAT f32, FLOAT f33, FLOAT f34, + FLOAT f41, FLOAT f42, FLOAT f43, FLOAT f44); + + FLOAT& operator () (UINT row, UINT col); + FLOAT operator () (UINT row, UINT col) const; + + operator FLOAT* (); + operator const FLOAT* () const; + + D3DXMATRIX& operator *= (const D3DXMATRIX&); + D3DXMATRIX& operator += (const D3DXMATRIX&); + D3DXMATRIX& operator -= (const D3DXMATRIX&); + D3DXMATRIX& operator *= (FLOAT); + D3DXMATRIX& operator /= (FLOAT); + + D3DXMATRIX operator + () const; + D3DXMATRIX operator - () const; + + D3DXMATRIX operator * (const D3DXMATRIX&) const; + D3DXMATRIX operator + (const D3DXMATRIX&) const; + D3DXMATRIX operator - (const D3DXMATRIX&) const; + D3DXMATRIX operator * (FLOAT) const; + D3DXMATRIX operator / (FLOAT) const; + + friend D3DXMATRIX operator * (FLOAT, const D3DXMATRIX&); + + BOOL operator == (const D3DXMATRIX&) const; + BOOL operator != (const D3DXMATRIX&) const; +} D3DXMATRIX, *LPD3DXMATRIX; +#else /* !__cplusplus */ +typedef struct _D3DMATRIX D3DXMATRIX, *LPD3DXMATRIX; +#endif /* !__cplusplus */ + #ifdef __cplusplus extern "C" { #endif -- 2.30.2

3 5

[PATCH v2] include: Add d3dx10 vector and matrix types.
by Matteo Bruni 05 Aug '21

05 Aug '21

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: I did some light cleanup. I dropped your Signed-off-by to be safe, if the patch still looks okay to you, feel free to sign it off (again). include/d3dx10math.h | 164 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) diff --git a/include/d3dx10math.h b/include/d3dx10math.h index c8bcfd2ce4e..5790fbdf63b 100644 --- a/include/d3dx10math.h +++ b/include/d3dx10math.h @@ -24,6 +24,34 @@ #include <math.h> +#ifndef D3DVECTOR_DEFINED +#define D3DVECTOR_DEFINED +typedef struct _D3DVECTOR +{ + float x; + float y; + float z; +} D3DVECTOR; +#endif + +#ifndef D3DMATRIX_DEFINED +#define D3DMATRIX_DEFINED +typedef struct _D3DMATRIX +{ + union + { + struct + { + float _11, _12, _13, _14; + float _21, _22, _23, _24; + float _31, _32, _33, _34; + float _41, _42, _43, _44; + }; + float m[4][4]; + }; +} D3DMATRIX; +#endif + typedef enum _D3DX_CPU_OPTIMIZATION { D3DX_NOT_OPTIMIZED, @@ -82,6 +110,142 @@ public: float r, g, b, a; } D3DXCOLOR, *LPD3DXCOLOR; +typedef struct D3DXVECTOR2 +{ +#ifdef __cplusplus + D3DXVECTOR2() {}; + D3DXVECTOR2(const float *pf); + D3DXVECTOR2(float fx, float fy); + + operator float* (); + operator const float* () const; + + D3DXVECTOR2& operator += (const D3DXVECTOR2&); + D3DXVECTOR2& operator -= (const D3DXVECTOR2&); + D3DXVECTOR2& operator *= (float); + D3DXVECTOR2& operator /= (float); + + D3DXVECTOR2 operator + () const; + D3DXVECTOR2 operator - () const; + + D3DXVECTOR2 operator + (const D3DXVECTOR2&) const; + D3DXVECTOR2 operator - (const D3DXVECTOR2&) const; + D3DXVECTOR2 operator * (float) const; + D3DXVECTOR2 operator / (float) const; + + friend D3DXVECTOR2 operator * (float, const D3DXVECTOR2&); + + BOOL operator == (const D3DXVECTOR2&) const; + BOOL operator != (const D3DXVECTOR2&) const; +#endif /* __cplusplus */ + float x, y; +} D3DXVECTOR2, *LPD3DXVECTOR2; + +#ifdef __cplusplus +typedef struct D3DXVECTOR3 : public D3DVECTOR +{ + D3DXVECTOR3() {}; + D3DXVECTOR3(const float *pf); + D3DXVECTOR3(const D3DVECTOR& v); + D3DXVECTOR3(float fx, float fy, float fz); + + operator float* (); + operator const float* () const; + + D3DXVECTOR3& operator += (const D3DXVECTOR3&); + D3DXVECTOR3& operator -= (const D3DXVECTOR3&); + D3DXVECTOR3& operator *= (float); + D3DXVECTOR3& operator /= (float); + + D3DXVECTOR3 operator + () const; + D3DXVECTOR3 operator - () const; + + D3DXVECTOR3 operator + (const D3DXVECTOR3&) const; + D3DXVECTOR3 operator - (const D3DXVECTOR3&) const; + D3DXVECTOR3 operator * (float) const; + D3DXVECTOR3 operator / (float) const; + + friend D3DXVECTOR3 operator * (float, const struct D3DXVECTOR3&); + + BOOL operator == (const D3DXVECTOR3&) const; + BOOL operator != (const D3DXVECTOR3&) const; +} D3DXVECTOR3, *LPD3DXVECTOR3; +#else /* !__cplusplus */ +typedef struct _D3DVECTOR D3DXVECTOR3, *LPD3DXVECTOR3; +#endif /* !__cplusplus */ + +typedef struct D3DXVECTOR4 +{ +#ifdef __cplusplus + D3DXVECTOR4() {}; + D3DXVECTOR4(const float *pf); + D3DXVECTOR4(float fx, float fy, float fz, float fw); + + operator float* (); + operator const float* () const; + + D3DXVECTOR4& operator += (const D3DXVECTOR4&); + D3DXVECTOR4& operator -= (const D3DXVECTOR4&); + D3DXVECTOR4& operator *= (float); + D3DXVECTOR4& operator /= (float); + + D3DXVECTOR4 operator + () const; + D3DXVECTOR4 operator - () const; + + D3DXVECTOR4 operator + (const D3DXVECTOR4&) const; + D3DXVECTOR4 operator - (const D3DXVECTOR4&) const; + D3DXVECTOR4 operator * (float) const; + D3DXVECTOR4 operator / (float) const; + + friend D3DXVECTOR4 operator * (float, const D3DXVECTOR4&); + + BOOL operator == (const D3DXVECTOR4&) const; + BOOL operator != (const D3DXVECTOR4&) const; +#endif /* __cplusplus */ + float x, y, z, w; +} D3DXVECTOR4, *LPD3DXVECTOR4; + +#ifdef __cplusplus +typedef struct D3DXMATRIX : public D3DMATRIX +{ + D3DXMATRIX() {}; + D3DXMATRIX(const float *pf); + D3DXMATRIX(const D3DMATRIX& mat); + D3DXMATRIX(float f11, float f12, float f13, float f14, + float f21, float f22, float f23, float f24, + float f31, float f32, float f33, float f34, + float f41, float f42, float f43, float f44); + + float& operator () (UINT row, UINT col); + float operator () (UINT row, UINT col) const; + + operator float* (); + operator const float* () const; + + D3DXMATRIX& operator *= (const D3DXMATRIX&); + D3DXMATRIX& operator += (const D3DXMATRIX&); + D3DXMATRIX& operator -= (const D3DXMATRIX&); + D3DXMATRIX& operator *= (float); + D3DXMATRIX& operator /= (float); + + D3DXMATRIX operator + () const; + D3DXMATRIX operator - () const; + + D3DXMATRIX operator * (const D3DXMATRIX&) const; + D3DXMATRIX operator + (const D3DXMATRIX&) const; + D3DXMATRIX operator - (const D3DXMATRIX&) const; + D3DXMATRIX operator * (float) const; + D3DXMATRIX operator / (float) const; + + friend D3DXMATRIX operator * (float, const D3DXMATRIX&); + + BOOL operator == (const D3DXMATRIX&) const; + BOOL operator != (const D3DXMATRIX&) const; +} D3DXMATRIX, *LPD3DXMATRIX; +#else /* !__cplusplus */ +typedef struct _D3DMATRIX D3DXMATRIX, *LPD3DXMATRIX; +#endif /* !__cplusplus */ + #ifdef __cplusplus extern "C" { #endif -- 2.26.3

1 0

[PATCH 9/9] gdi32: Remove no longer used driver entry points.
by Jacek Caban 05 Aug '21

05 Aug '21

2 1

[PATCH 8/9] gdi32: Use ntgdi interface for SetLayout implementation.
by Jacek Caban 05 Aug '21

05 Aug '21

2 1

[PATCH 7/9] gdi32: Store mapper flags in DC_ATTR.
by Jacek Caban 05 Aug '21

05 Aug '21

2 1

[PATCH 6/9] gdi32: Use DC_ATTR for SetTextCharacterExtra implementation.
by Jacek Caban 05 Aug '21

05 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 23 ----------------------- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 15 +++++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 6 files changed, 19 insertions(+), 27 deletions(-)

2 1

[PATCH 5/9] gdi32: Store char_extra in DC_ATTR.
by Jacek Caban 05 Aug '21

05 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 5 ++--- dlls/gdi32/font.c | 28 ++++++++-------------------- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 5 files changed, 20 insertions(+), 24 deletions(-)

2 1

[PATCH 4/9] gdi32: Use ntgdi interface for SetMapMode implementation.
by Jacek Caban 05 Aug '21

05 Aug '21

2 1

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