February 2024 - Wine-Commits

Rémi Bernon : mouhid.sys: Introduce a new HID pointer device driver.
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: wine Branch: master Commit: 0ed830eac58b9aa54208c66ec2bdb9540355a817 URL: https://gitlab.winehq.org/wine/wine/-/commit/0ed830eac58b9aa54208c66ec2bdb9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jan 14 15:02:37 2024 +0100 mouhid.sys: Introduce a new HID pointer device driver. This only matches with digitizer devices for now, it could later be used for HID mice but for now we use a different path for that. --- MAINTAINERS | 1 + configure | 2 + configure.ac | 1 + dlls/mouhid.sys/Makefile.in | 8 ++ dlls/mouhid.sys/main.c | 164 ++++++++++++++++++++++++++++++++++++++++ dlls/mouhid.sys/mouhid.inf | 22 ++++++ dlls/mouhid.sys/mouhid.rc | 20 +++++ dlls/mouhid.sys/mouhid.sys.spec | 1 + loader/wine.inf.in | 1 + 9 files changed, 220 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 4bab36bfdf9..2e259f12d70 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -169,6 +169,7 @@ P: Aric Stewart <aric(a)codeweavers.com> F: dlls/hid/ F: dlls/hidclass.sys/ F: dlls/hidparse.sys/ +F: dlls/mouhid.sys/ F: dlls/winehid.sys/ HTTP server diff --git a/configure b/configure index 4d82d725b12..164d58a9532 100755 --- a/configure +++ b/configure @@ -1233,6 +1233,7 @@ enable_midimap enable_mlang enable_mmcndmgr enable_mmdevapi +enable_mouhid_sys enable_mountmgr_sys enable_mp3dmod enable_mpr @@ -21976,6 +21977,7 @@ wine_fn_config_makefile dlls/mmdevapi/tests enable_tests wine_fn_config_makefile dlls/mmdevldr.vxd enable_win16 wine_fn_config_makefile dlls/mmsystem.dll16 enable_win16 wine_fn_config_makefile dlls/monodebg.vxd enable_win16 +wine_fn_config_makefile dlls/mouhid.sys enable_mouhid_sys wine_fn_config_makefile dlls/mountmgr.sys enable_mountmgr_sys wine_fn_config_makefile dlls/mouse.drv16 enable_win16 wine_fn_config_makefile dlls/mp3dmod enable_mp3dmod diff --git a/configure.ac b/configure.ac index bbbab078778..f1afb4d9db7 100644 --- a/configure.ac +++ b/configure.ac @@ -2792,6 +2792,7 @@ WINE_CONFIG_MAKEFILE(dlls/mmdevapi/tests) WINE_CONFIG_MAKEFILE(dlls/mmdevldr.vxd,enable_win16) WINE_CONFIG_MAKEFILE(dlls/mmsystem.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/monodebg.vxd,enable_win16) +WINE_CONFIG_MAKEFILE(dlls/mouhid.sys) WINE_CONFIG_MAKEFILE(dlls/mountmgr.sys) WINE_CONFIG_MAKEFILE(dlls/mouse.drv16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/mp3dmod) diff --git a/dlls/mouhid.sys/Makefile.in b/dlls/mouhid.sys/Makefile.in new file mode 100644 index 00000000000..0003f6f5494 --- /dev/null +++ b/dlls/mouhid.sys/Makefile.in @@ -0,0 +1,8 @@ +MODULE = mouhid.sys +IMPORTS = ntoskrnl +EXTRADLLFLAGS = -Wl,--subsystem,native + +SOURCES = \ + main.c \ + mouhid.rc \ + mouhid.sys.spec diff --git a/dlls/mouhid.sys/main.c b/dlls/mouhid.sys/main.c new file mode 100644 index 00000000000..af54ffbd70b --- /dev/null +++ b/dlls/mouhid.sys/main.c @@ -0,0 +1,164 @@ +/* + * Copyright 2024 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 <stdarg.h> +#include <stdlib.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winioctl.h" +#include "ntuser.h" + +#include "ddk/wdm.h" +#include "ddk/hidport.h" +#include "ddk/hidpddi.h" +#include "ddk/hidtypes.h" + +#include "wine/hid.h" +#include "wine/debug.h" +#include "wine/list.h" + +WINE_DEFAULT_DEBUG_CHANNEL(hid); + +struct device +{ + LONG removed; + DEVICE_OBJECT *bus_device; +}; + +static inline struct device *impl_from_DEVICE_OBJECT( DEVICE_OBJECT *device ) +{ + return (struct device *)device->DeviceExtension; +} + +static NTSTATUS WINAPI driver_ioctl( DEVICE_OBJECT *device, IRP *irp ) +{ + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); + ULONG code = stack->Parameters.DeviceIoControl.IoControlCode; + struct device *impl = impl_from_DEVICE_OBJECT( device ); + + if (InterlockedOr( &impl->removed, FALSE )) + { + irp->IoStatus.Status = STATUS_DELETE_PENDING; + irp->IoStatus.Information = 0; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return STATUS_DELETE_PENDING; + } + + TRACE( "device %p, irp %p, code %#lx, bus_device %p.\n", device, irp, code, impl->bus_device ); + + IoSkipCurrentIrpStackLocation( irp ); + return IoCallDriver( impl->bus_device, irp ); +} + +static NTSTATUS WINAPI set_event_completion( DEVICE_OBJECT *device, IRP *irp, void *context ) +{ + if (irp->PendingReturned) KeSetEvent( (KEVENT *)context, IO_NO_INCREMENT, FALSE ); + return STATUS_MORE_PROCESSING_REQUIRED; +} + +static NTSTATUS WINAPI driver_pnp( DEVICE_OBJECT *device, IRP *irp ) +{ + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); + struct device *impl = impl_from_DEVICE_OBJECT( device ); + UCHAR code = stack->MinorFunction; + NTSTATUS status; + KEVENT event; + + TRACE( "device %p, irp %p, code %#x, bus_device %p.\n", device, irp, code, impl->bus_device ); + + switch (stack->MinorFunction) + { + case IRP_MN_START_DEVICE: + KeInitializeEvent( &event, NotificationEvent, FALSE ); + IoCopyCurrentIrpStackLocationToNext( irp ); + IoSetCompletionRoutine( irp, set_event_completion, &event, TRUE, TRUE, TRUE ); + + status = IoCallDriver( impl->bus_device, irp ); + if (status == STATUS_PENDING) + { + KeWaitForSingleObject( &event, Executive, KernelMode, FALSE, NULL ); + status = irp->IoStatus.Status; + } + + if (status) irp->IoStatus.Status = status; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return status; + + case IRP_MN_SURPRISE_REMOVAL: + status = STATUS_SUCCESS; + break; + + case IRP_MN_REMOVE_DEVICE: + IoSkipCurrentIrpStackLocation( irp ); + status = IoCallDriver( impl->bus_device, irp ); + IoDetachDevice( impl->bus_device ); + IoDeleteDevice( device ); + return status; + + default: + IoSkipCurrentIrpStackLocation( irp ); + return IoCallDriver( impl->bus_device, irp ); + } + + return STATUS_SUCCESS; +} + +static NTSTATUS WINAPI add_device( DRIVER_OBJECT *driver, DEVICE_OBJECT *bus_device ) +{ + struct device *impl; + DEVICE_OBJECT *device; + NTSTATUS status; + + TRACE( "driver %p, bus_device %p.\n", driver, bus_device ); + + if ((status = IoCreateDevice( driver, sizeof(struct device), NULL, FILE_DEVICE_BUS_EXTENDER, + 0, FALSE, &device ))) + { + ERR( "failed to create bus FDO, status %#lx.\n", status ); + return status; + } + + impl = device->DeviceExtension; + impl->bus_device = bus_device; + + IoAttachDeviceToDeviceStack( device, bus_device ); + device->Flags &= ~DO_DEVICE_INITIALIZING; + return STATUS_SUCCESS; +} + +static void WINAPI driver_unload( DRIVER_OBJECT *driver ) +{ + TRACE( "driver %p\n", driver ); +} + +NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) +{ + TRACE( "driver %p, path %s.\n", driver, debugstr_w(path->Buffer) ); + + driver->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = driver_ioctl; + driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = driver_ioctl; + driver->MajorFunction[IRP_MJ_PNP] = driver_pnp; + driver->DriverExtension->AddDevice = add_device; + driver->DriverUnload = driver_unload; + + return STATUS_SUCCESS; +} diff --git a/dlls/mouhid.sys/mouhid.inf b/dlls/mouhid.sys/mouhid.inf new file mode 100644 index 00000000000..efc65794fdc --- /dev/null +++ b/dlls/mouhid.sys/mouhid.inf @@ -0,0 +1,22 @@ +[Version] +Signature="$CHICAGO$" +ClassGuid={4d36e97d-e325-11ce-bfc1-08002be10318} +Class=System + +[Manufacturer] +Wine=mfg_section + +[mfg_section] +HID touch screen device=device_section,HID_DEVICE_UP:000D_U:0004 + +[device_section.Services] +AddService = mouhid,0x2,svc_section + +[svc_section] +Description="Wine HID mouse device driver" +DisplayName="Wine HID mouse" +ServiceBinary="%12%\mouhid.sys" +LoadOrderGroup="WinePlugPlay" +ServiceType=1 +StartType=3 +ErrorControl=1 diff --git a/dlls/mouhid.sys/mouhid.rc b/dlls/mouhid.sys/mouhid.rc new file mode 100644 index 00000000000..e395b5f5fea --- /dev/null +++ b/dlls/mouhid.sys/mouhid.rc @@ -0,0 +1,20 @@ +/* + * Copyright 2024 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 + */ + +/* @makedep: mouhid.inf */ +1 WINE_DATA_FILE mouhid.inf diff --git a/dlls/mouhid.sys/mouhid.sys.spec b/dlls/mouhid.sys/mouhid.sys.spec new file mode 100644 index 00000000000..76421d7e35b --- /dev/null +++ b/dlls/mouhid.sys/mouhid.sys.spec @@ -0,0 +1 @@ +# nothing to export diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 06551152f3a..35644cbd285 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2608,6 +2608,7 @@ services,"@%11%\ws2_32.dll,-4" [InfFiles] input.inf,"@%12%\hidclass.sys,-1" +mouhid.inf,"@%12%\mouhid.sys,-1" winebus.inf,"@%12%\winebus.sys,-1" winehid.inf,"@%12%\winehid.sys,-1" wineusb.inf,"@%12%\wineusb.sys,-1"

1 0

Rastislav Stanik : iphlpapi: Add stub for GetAnycastIpAddressTable().
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: wine Branch: master Commit: 1bab7ea25e2c1e7bad6940c63c83ec0c1ef5c8f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/1bab7ea25e2c1e7bad6940c63c83ec… Author: Rastislav Stanik <gitlab(a)rastos.org> Date: Thu Jan 25 21:14:20 2024 +0100 iphlpapi: Add stub for GetAnycastIpAddressTable(). This change adds an implementation of Win32 API function GetAnycastIpAddressTable() that does not return real information, it just says "no entries found". Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56065 --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 12 ++++++++++++ include/netioapi.h | 15 +++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index ef2c576947d..dcc15a2753e 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -73,7 +73,7 @@ @ stdcall GetAdaptersAddresses( long long ptr ptr ptr ) @ stdcall GetAdaptersInfo( ptr ptr ) #@ stub GetAnycastIpAddressEntry -#@ stub GetAnycastIpAddressTable +@ stdcall GetAnycastIpAddressTable( long ptr ) @ stdcall GetBestInterface( long ptr ) @ stdcall GetBestInterfaceEx( ptr ptr ) @ stub GetBestInterfaceFromStack diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 9c451500fa5..343cc2345d2 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3734,6 +3734,18 @@ err: return err; } +DWORD WINAPI GetAnycastIpAddressTable(ADDRESS_FAMILY family, MIB_ANYCASTIPADDRESS_TABLE **table) +{ + FIXME( "(%u, %p) stub\n", family, table ); + if (!table || (family != AF_INET && family != AF_INET6 && family != AF_UNSPEC)) + return ERROR_INVALID_PARAMETER; + + *table = heap_alloc_zero(sizeof(MIB_ANYCASTIPADDRESS_TABLE)); + if (!*table) return ERROR_NOT_ENOUGH_MEMORY; + (*table)->NumEntries = 0; + return NO_ERROR; +} + /****************************************************************** * GetUniDirectionalAdapterInfo (IPHLPAPI.@) * diff --git a/include/netioapi.h b/include/netioapi.h index 8c1491f9efa..f49c670dac6 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -172,6 +172,20 @@ typedef struct _MIB_UNICASTIPADDRESS_TABLE MIB_UNICASTIPADDRESS_ROW Table[1]; } MIB_UNICASTIPADDRESS_TABLE, *PMIB_UNICASTIPADDRESS_TABLE; +typedef struct _MIB_ANYCASTIPADDRESS_ROW +{ + SOCKADDR_INET Address; + NET_LUID InterfaceLuid; + NET_IFINDEX InterfaceIndex; + SCOPE_ID ScopeId; +} MIB_ANYCASTIPADDRESS_ROW, *PMIB_ANYCASTIPADDRESS_ROW; + +typedef struct _MIB_ANYCASTIPADDRESS_TABLE +{ + ULONG NumEntries; + MIB_ANYCASTIPADDRESS_ROW Table[ANY_SIZE]; +} MIB_ANYCASTIPADDRESS_TABLE, *PMIB_ANYCASTIPADDRESS_TABLE; + typedef struct _IP_ADDRESS_PREFIX { SOCKADDR_INET Prefix; @@ -254,6 +268,7 @@ IPHLPAPI_DLL_LINKAGE DWORD WINAPI ConvertInterfaceNameToLuidA(const char*,NET_LU IPHLPAPI_DLL_LINKAGE DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR*,NET_LUID*); IPHLPAPI_DLL_LINKAGE DWORD WINAPI ConvertLengthToIpv4Mask(ULONG,ULONG*); IPHLPAPI_DLL_LINKAGE void WINAPI FreeMibTable(void*); +IPHLPAPI_DLL_LINKAGE DWORD WINAPI GetAnycastIpAddressTable(ADDRESS_FAMILY,MIB_ANYCASTIPADDRESS_TABLE**); IPHLPAPI_DLL_LINKAGE NET_IF_COMPARTMENT_ID WINAPI GetCurrentThreadCompartmentId(void); IPHLPAPI_DLL_LINKAGE DWORD WINAPI GetIfEntry2(MIB_IF_ROW2*); IPHLPAPI_DLL_LINKAGE DWORD WINAPI GetIfEntry2Ex(MIB_IF_TABLE_LEVEL,MIB_IF_ROW2*);

1 0

Alex Henrie : ntdll: Include alloc_type argument in NtMapViewOfSection(Ex) traces.
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: wine Branch: master Commit: fb2ebbbb4024286a692dfc7c5424c8e1ee50096d URL: https://gitlab.winehq.org/wine/wine/-/commit/fb2ebbbb4024286a692dfc7c5424c8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jan 7 14:51:25 2024 -0700 ntdll: Include alloc_type argument in NtMapViewOfSection(Ex) traces. LANCommander calls NtMapViewOfSectionEx with alloc_type=MEM_REPLACE_PLACEHOLDER, but you couldn't tell from the trace. --- dlls/ntdll/unix/virtual.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 02c0bebe879..2b6ce543531 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -5444,8 +5444,8 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p offset.QuadPart = offset_ptr ? offset_ptr->QuadPart : 0; - TRACE("handle=%p process=%p addr=%p off=%s size=%lx access=%x\n", - handle, process, *addr_ptr, wine_dbgstr_longlong(offset.QuadPart), *size_ptr, (int)protect ); + TRACE("handle=%p process=%p addr=%p off=%s size=0x%lx alloc_type=0x%x access=0x%x\n", + handle, process, *addr_ptr, wine_dbgstr_longlong(offset.QuadPart), *size_ptr, (int)alloc_type, (int)protect ); /* Check parameters */ if (zero_bits > 21 && zero_bits < 32) @@ -5525,8 +5525,8 @@ NTSTATUS WINAPI NtMapViewOfSectionEx( HANDLE handle, HANDLE process, PVOID *addr offset.QuadPart = offset_ptr ? offset_ptr->QuadPart : 0; - TRACE( "handle=%p process=%p addr=%p off=%s size=%lx access=%x\n", - handle, process, *addr_ptr, wine_dbgstr_longlong(offset.QuadPart), *size_ptr, (int)protect ); + TRACE( "handle=%p process=%p addr=%p off=%s size=0x%lx alloc_type=0x%x access=0x%x\n", + handle, process, *addr_ptr, wine_dbgstr_longlong(offset.QuadPart), *size_ptr, (int)alloc_type, (int)protect ); status = get_extended_params( parameters, count, &limit_low, &limit_high, &align, &attributes, &machine );

1 0

Marc-Aurel Zent : iphlpapi: Implement GetRTTAndHopCount().
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: wine Branch: master Commit: cd2570c28d0f3351795d3b926a068e6b2585fb71 URL: https://gitlab.winehq.org/wine/wine/-/commit/cd2570c28d0f3351795d3b926a068e… Author: Marc-Aurel Zent <mzent(a)codeweavers.com> Date: Thu Jan 11 23:54:49 2024 +0100 iphlpapi: Implement GetRTTAndHopCount(). --- dlls/iphlpapi/iphlpapi_main.c | 50 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 43 insertions(+), 7 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 9c7582b71fb..9c451500fa5 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2781,15 +2781,51 @@ DWORD WINAPI GetPerAdapterInfo( ULONG index, IP_PER_ADAPTER_INFO *info, ULONG *s * RETURNS * Success: TRUE * Failure: FALSE - * - * FIXME - * Stub, returns FALSE. */ -BOOL WINAPI GetRTTAndHopCount(IPAddr DestIpAddress, PULONG HopCount, ULONG MaxHops, PULONG RTT) +BOOL WINAPI GetRTTAndHopCount( IPAddr dest_ip_address, ULONG *hop_count, ULONG max_hops, ULONG *rtt ) { - FIXME("(DestIpAddress 0x%08lx, HopCount %p, MaxHops %ld, RTT %p): stub\n", - DestIpAddress, HopCount, MaxHops, RTT); - return FALSE; + char send_buffer[0x20] = { 0xDE, 0xAD, 0xBE, 0xEF }; + char receive_buffer[sizeof(ICMP_ECHO_REPLY) + sizeof(send_buffer)]; + const DWORD timeout = 5000; + DWORD replies; + IP_OPTION_INFORMATION send_options = { 0 }; + ICMP_ECHO_REPLY *reply; + HANDLE icmp_handle; + + TRACE( "(dest_ip_address 0x%08lx, hop_count %p, max_hops %ld, rtt %p)\n", + dest_ip_address, hop_count, max_hops, rtt ); + + if (!hop_count || !rtt || dest_ip_address == INADDR_NONE) + return FALSE; + + if ((icmp_handle = IcmpCreateFile()) == INVALID_HANDLE_VALUE) + return FALSE; + + for (send_options.Ttl = 1; send_options.Ttl <= max_hops; send_options.Ttl++) + { + replies = IcmpSendEcho( icmp_handle, dest_ip_address, send_buffer, sizeof(send_buffer), + &send_options, receive_buffer, sizeof(receive_buffer), timeout ); + + if (!replies) + { + if (GetLastError() == IP_TTL_EXPIRED_TRANSIT) continue; + if (GetLastError() == IP_REQ_TIMED_OUT) continue; + break; + } + + reply = (PICMP_ECHO_REPLY)receive_buffer; + + if (reply->Status == IP_SUCCESS) + { + *hop_count = send_options.Ttl; + *rtt = reply->RoundTripTime; + IcmpCloseHandle( icmp_handle ); + return TRUE; + } + } + + IcmpCloseHandle( icmp_handle ); + return FALSE; } /******************************************************************

1 0

Conor McCarthy : vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS12 in CheckFeatureSupport().
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

Module: vkd3d Branch: master Commit: 7b4e731aa53f6e9ec0d40afab74ff207374fbb5e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7b4e731aa53f6e9ec0d40afab74ff… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Feb 9 23:34:11 2024 +1000 vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS12 in CheckFeatureSupport(). --- libs/vkd3d/device.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 40e42913..414714d4 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3467,6 +3467,27 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device7 return S_OK; } + case D3D12_FEATURE_D3D12_OPTIONS12: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS12 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + data->MSPrimitivesPipelineStatisticIncludesCulledPrimitives = D3D12_TRI_STATE_UNKNOWN; + data->EnhancedBarriersSupported = FALSE; + data->RelaxedFormatCastingSupported = FALSE; + + TRACE("Mesh shader primitives pipeline stats include cull primitives %#x.\n", + data->MSPrimitivesPipelineStatisticIncludesCulledPrimitives); + TRACE("Enhanced barriers %#x.\n", data->EnhancedBarriersSupported); + TRACE("Relaxed format casting %#x.\n", data->RelaxedFormatCastingSupported); + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL;

1 0

Conor McCarthy : vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS13 in CheckFeatureSupport().
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

Module: vkd3d Branch: master Commit: aac3916fcfa7169898557dfa6c3658d7239cccc7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/aac3916fcfa7169898557dfa6c365… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Feb 9 23:39:20 2024 +1000 vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS13 in CheckFeatureSupport(). --- libs/vkd3d/device.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 414714d4..f5a57ad3 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3488,6 +3488,32 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device7 return S_OK; } + case D3D12_FEATURE_D3D12_OPTIONS13: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS13 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + data->UnrestrictedBufferTextureCopyPitchSupported = FALSE; + data->UnrestrictedVertexElementAlignmentSupported = FALSE; + data->InvertedViewportHeightFlipsYSupported = FALSE; + data->InvertedViewportDepthFlipsZSupported = FALSE; + data->TextureCopyBetweenDimensionsSupported = FALSE; + data->AlphaBlendFactorSupported = FALSE; + + TRACE("Unrestricted buffer-texture copy pitch %#x.\n", data->UnrestrictedBufferTextureCopyPitchSupported); + TRACE("Unrestricted vertex element alignment %#x.\n", data->UnrestrictedVertexElementAlignmentSupported); + TRACE("Inverted viewport height flips Y %#x.\n", data->InvertedViewportHeightFlipsYSupported); + TRACE("Inverted viewport depth flips Z %#x.\n", data->InvertedViewportDepthFlipsZSupported); + TRACE("Texture copy between dimensions %#x.\n", data->TextureCopyBetweenDimensionsSupported); + TRACE("Alpha blend factor support %#x.\n", data->AlphaBlendFactorSupported); + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL;

1 0

Henri Verbeet : tests: Implement check_requirements() for the OpenGL shader runner.
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

Module: vkd3d Branch: master Commit: 0f3a42c34b3d8d8b38564f79029e9ac8758d22dc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0f3a42c34b3d8d8b38564f79029e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 12 19:57:42 2024 +0100 tests: Implement check_requirements() for the OpenGL shader runner. --- tests/shader_runner.c | 4 +--- tests/shader_runner_gl.c | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index a683866c..c645e6c0 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -1350,10 +1350,8 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_o case STATE_REQUIRE: if (runner->maximum_shader_model < runner->minimum_shader_model - || (runner->ops->check_requirements && !runner->ops->check_requirements(runner))) - { + || !runner->ops->check_requirements(runner)) skip_tests = true; - } break; case STATE_RESOURCE: diff --git a/tests/shader_runner_gl.c b/tests/shader_runner_gl.c index a898d021..881ca77a 100644 --- a/tests/shader_runner_gl.c +++ b/tests/shader_runner_gl.c @@ -59,6 +59,12 @@ struct gl_runner { struct shader_runner r; + struct + { + bool float64; + bool int64; + } caps; + EGLDisplay display; EGLContext context; @@ -93,7 +99,7 @@ static bool check_gl_extension(const char *extension, GLint extension_count) return false; } -static bool check_gl_extensions(void) +static bool check_gl_extensions(struct gl_runner *runner) { GLint count; @@ -114,6 +120,11 @@ static bool check_gl_extensions(void) return false; } + if (check_gl_extension("GL_ARB_gpu_shader_fp64", count)) + runner->caps.float64 = true; + if (check_gl_extension("GL_ARB_gpu_shader_int64", count)) + runner->caps.int64 = true; + return true; } @@ -210,7 +221,8 @@ static bool gl_runner_init(struct gl_runner *runner) continue; } - if (!check_gl_extensions()) + memset(&runner->caps, 0, sizeof(runner->caps)); + if (!check_gl_extensions(runner)) { trace("Device %u lacks required extensions.\n", i); eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); @@ -237,6 +249,9 @@ static bool gl_runner_init(struct gl_runner *runner) trace("GL_RENDERER: %s\n", glGetString(GL_RENDERER)); trace(" GL_VERSION: %s\n", glGetString(GL_VERSION)); + trace(" float64: %u.\n", runner->caps.float64); + trace(" int64: %u.\n", runner->caps.int64); + p_glSpecializeShader = (void *)eglGetProcAddress("glSpecializeShader"); glDebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DEBUG_SEVERITY_NOTIFICATION, 0, NULL, GL_FALSE); @@ -274,6 +289,18 @@ static void gl_runner_cleanup(struct gl_runner *runner) ok(ret, "Failed to terminate EGL display connection.\n"); } +static bool gl_runner_check_requirements(struct shader_runner *r) +{ + struct gl_runner *runner = gl_runner(r); + + if (r->require_float64 && !runner->caps.float64) + return false; + if (r->require_int64 && !runner->caps.int64) + return false; + + return true; +} + static const struct format_info *get_format_info(enum DXGI_FORMAT format) { size_t i; @@ -979,6 +1006,7 @@ static void gl_runner_release_readback(struct shader_runner *runner, struct reso static const struct shader_runner_ops gl_runner_ops = { + .check_requirements = gl_runner_check_requirements, .create_resource = gl_runner_create_resource, .destroy_resource = gl_runner_destroy_resource, .dispatch = gl_runner_dispatch,

1 0

Conor McCarthy : vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS11 in CheckFeatureSupport().
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

Module: vkd3d Branch: master Commit: 68663b4fefef422ea6a37c4d55eda7a567e67bb6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/68663b4fefef422ea6a37c4d55eda… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Feb 9 23:29:59 2024 +1000 vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS11 in CheckFeatureSupport(). --- libs/vkd3d/device.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 98e21ed3..40e42913 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3451,6 +3451,22 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device7 return S_OK; } + case D3D12_FEATURE_D3D12_OPTIONS11: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS11 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + data->AtomicInt64OnDescriptorHeapResourceSupported = FALSE; + + TRACE("Atomic int64 on descriptor heap resource %#x.\n", data->AtomicInt64OnDescriptorHeapResourceSupported); + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL;

1 0

Conor McCarthy : vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS10 in CheckFeatureSupport().
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

Module: vkd3d Branch: master Commit: a0bb055ad25a4a4d4a8badf9e79fb27c1965b847 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a0bb055ad25a4a4d4a8badf9e79fb… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Feb 9 23:27:24 2024 +1000 vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS10 in CheckFeatureSupport(). --- libs/vkd3d/device.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 1e094690..98e21ed3 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3433,6 +3433,24 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device7 return S_OK; } + case D3D12_FEATURE_D3D12_OPTIONS10: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS10 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + data->VariableRateShadingSumCombinerSupported = FALSE; + data->MeshShaderPerPrimitiveShadingRateSupported = FALSE; + + TRACE("Variable rate shading sum combiner %#x.\n", data->VariableRateShadingSumCombinerSupported); + TRACE("Mesh shader per primitive shading rate %#x.\n", data->MeshShaderPerPrimitiveShadingRateSupported); + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL;

1 0

Zhiyi Zhang : include: Rename DF_WINE_CREATE_DESKTOP to DF_WINE_VIRTUAL_DESKTOP.
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

Module: wine Branch: master Commit: 2990a4f8c35498a48ce9c2cfd0a8cf5651af7070 URL: https://gitlab.winehq.org/wine/wine/-/commit/2990a4f8c35498a48ce9c2cfd0a8cf… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jan 10 17:22:50 2024 +0800 include: Rename DF_WINE_CREATE_DESKTOP to DF_WINE_VIRTUAL_DESKTOP. --- dlls/user32/winstation.c | 2 +- dlls/win32u/winstation.c | 6 +++--- include/ntuser.h | 2 +- programs/explorer/desktop.c | 2 +- server/winstation.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index 62593ca046f..c433ea6ec88 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -256,7 +256,7 @@ HDESK WINAPI CreateDesktopW( LPCWSTR name, LPCWSTR device, LPDEVMODEW devmode, OBJECT_ATTRIBUTES attr; UNICODE_STRING str; - if (device || (devmode && !(flags & DF_WINE_CREATE_DESKTOP))) + if (device || (devmode && !(flags & DF_WINE_VIRTUAL_DESKTOP))) { SetLastError( ERROR_INVALID_PARAMETER ); return 0; diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c index b187b246941..9df27517a43 100644 --- a/dlls/win32u/winstation.c +++ b/dlls/win32u/winstation.c @@ -47,7 +47,7 @@ BOOL is_virtual_desktop(void) DWORD len; if (!NtUserGetObjectInformation( desktop, UOI_FLAGS, &flags, sizeof(flags), &len )) return FALSE; - return !!(flags.dwFlags & DF_WINE_CREATE_DESKTOP); + return !!(flags.dwFlags & DF_WINE_VIRTUAL_DESKTOP); } /*********************************************************************** @@ -154,7 +154,7 @@ HDESK WINAPI NtUserCreateDesktopEx( OBJECT_ATTRIBUTES *attr, UNICODE_STRING *dev WCHAR buffer[MAX_PATH]; HANDLE ret; - if ((device && device->Length) || (devmode && !(flags & DF_WINE_CREATE_DESKTOP))) + if ((device && device->Length) || (devmode && !(flags & DF_WINE_VIRTUAL_DESKTOP))) { RtlSetLastWin32Error( ERROR_INVALID_PARAMETER ); return 0; @@ -184,7 +184,7 @@ HDESK WINAPI NtUserCreateDesktopEx( OBJECT_ATTRIBUTES *attr, UNICODE_STRING *dev } /* force update display cache to use virtual desktop display settings */ - if (flags & DF_WINE_CREATE_DESKTOP) update_display_cache( TRUE ); + if (flags & DF_WINE_VIRTUAL_DESKTOP) update_display_cache( TRUE ); return ret; } diff --git a/include/ntuser.h b/include/ntuser.h index 31b93ef36e9..e60efc11b6f 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -297,7 +297,7 @@ struct unpack_dde_message_result #define SPY_RESULT_DEFWND 0x0002 /* CreateDesktop wine specific flag */ -#define DF_WINE_CREATE_DESKTOP 0x80000000 +#define DF_WINE_VIRTUAL_DESKTOP 0x80000000 /* NtUserMessageCall codes */ enum diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 65a89862190..aa80e353143 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -1095,7 +1095,7 @@ void manage_desktop( WCHAR *arg ) DEVMODEW devmode = {.dmPelsWidth = width, .dmPelsHeight = height}; /* magic: desktop "root" means use the root window */ if ((using_root = !wcsicmp( name, L"root" ))) desktop = CreateDesktopW( name, NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); - else desktop = CreateDesktopW( name, NULL, &devmode, DF_WINE_CREATE_DESKTOP, DESKTOP_ALL_ACCESS, NULL ); + else desktop = CreateDesktopW( name, NULL, &devmode, DF_WINE_VIRTUAL_DESKTOP, DESKTOP_ALL_ACCESS, NULL ); if (!desktop) { ERR( "failed to create desktop %s error %ld\n", debugstr_w(name), GetLastError() ); diff --git a/server/winstation.c b/server/winstation.c index 5903497d61e..5c59fbffae1 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -243,7 +243,7 @@ static struct desktop *create_desktop( const struct unicode_str *name, unsigned } else { - desktop->flags |= (flags & DF_WINE_CREATE_DESKTOP); + desktop->flags |= (flags & DF_WINE_VIRTUAL_DESKTOP); clear_error(); } }

1 0