February 2024 - Wine-commits

Alexandre Julliard : ntdll: Move the dynamic unwind tables to unwind.c.
by Alexandre Julliard 14 Feb '24

14 Feb '24

Module: wine Branch: master Commit: 8602a1c24e887b310339a4b75dafe2fbf810a93c URL: https://gitlab.winehq.org/wine/wine/-/commit/8602a1c24e887b310339a4b75dafe2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 14 19:03:46 2024 +0100 ntdll: Move the dynamic unwind tables to unwind.c. --- dlls/ntdll/exception.c | 204 -------------------------------------- dlls/ntdll/ntdll_misc.h | 4 - dlls/ntdll/signal_arm.c | 13 --- dlls/ntdll/signal_arm64.c | 13 --- dlls/ntdll/signal_arm64ec.c | 29 ------ dlls/ntdll/signal_x86_64.c | 13 --- dlls/ntdll/unwind.c | 234 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 234 insertions(+), 276 deletions(-)

1 0

Alexandre Julliard : ntdll: Move RtlUnwind to unwind.c.
by Alexandre Julliard 14 Feb '24

14 Feb '24

Module: wine Branch: master Commit: 3b85ab31a9179f46de12ab4cc8807eb8f701efc6 URL: https://gitlab.winehq.org/wine/wine/-/commit/3b85ab31a9179f46de12ab4cc8807e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 14 19:13:27 2024 +0100 ntdll: Move RtlUnwind to unwind.c. --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/signal_arm.c | 19 ------------------- dlls/ntdll/signal_arm64.c | 18 ------------------ dlls/ntdll/signal_arm64ec.c | 19 ------------------- dlls/ntdll/signal_x86_64.c | 19 ------------------- dlls/ntdll/unwind.c | 24 ++++++++++++++++++++++++ 6 files changed, 25 insertions(+), 76 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index ccd270fee95..66995346e57 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1513,7 +1513,7 @@ @ cdecl __isascii(long) @ cdecl __iscsym(long) @ cdecl __iscsymf(long) -@ stdcall -arch=arm __jump_unwind(ptr ptr) +@ stdcall -arch=arm __jump_unwind(ptr ptr) _local_unwind @ cdecl __toascii(long) @ cdecl -norelay -arch=i386 -ret64 _alldiv(int64 int64) @ cdecl -arch=i386 -norelay _alldvrm(int64 int64) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 12ab2860fa7..b07f91464a9 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -827,25 +827,6 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec } -/*********************************************************************** - * RtlUnwind (NTDLL.@) - */ -void WINAPI RtlUnwind( void *frame, void *target_ip, EXCEPTION_RECORD *rec, void *retval ) -{ - CONTEXT context; - RtlUnwindEx( frame, target_ip, rec, retval, &context, NULL ); -} - - -/******************************************************************* - * __jump_unwind (NTDLL.@) - */ -void WINAPI __jump_unwind( void *frame, void *target_ip ) -{ - CONTEXT context; - RtlUnwindEx( frame, target_ip, NULL, NULL, &context, NULL ); -} - extern LONG __C_ExecuteExceptionFilter(PEXCEPTION_POINTERS ptrs, PVOID frame, PEXCEPTION_FILTER filter, PUCHAR nonvolatile); diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 53d8cbfe304..0d6a88ed799 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -841,24 +841,6 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec } -/*********************************************************************** - * RtlUnwind (NTDLL.@) - */ -void WINAPI RtlUnwind( void *frame, void *target_ip, EXCEPTION_RECORD *rec, void *retval ) -{ - CONTEXT context; - RtlUnwindEx( frame, target_ip, rec, retval, &context, NULL ); -} - -/******************************************************************* - * _local_unwind (NTDLL.@) - */ -void WINAPI _local_unwind( void *frame, void *target_ip ) -{ - CONTEXT context; - RtlUnwindEx( frame, target_ip, NULL, NULL, &context, NULL ); -} - extern LONG __C_ExecuteExceptionFilter(PEXCEPTION_POINTERS ptrs, PVOID frame, PEXCEPTION_FILTER filter, PUCHAR nonvolatile); diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 8b4fd399c09..3f1869a644f 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -1792,25 +1792,6 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec } -/******************************************************************* - * RtlUnwind (NTDLL.@) - */ -void WINAPI RtlUnwind( void *frame, void *target_ip, EXCEPTION_RECORD *rec, void *retval ) -{ - FIXME( "not implemented\n" ); -} - - -/******************************************************************* - * _local_unwind (NTDLL.@) - */ -void WINAPI _local_unwind( void *frame, void *target_ip ) -{ - CONTEXT context; - RtlUnwindEx( frame, target_ip, NULL, NULL, &context, NULL ); -} - - /******************************************************************* * __C_specific_handler (NTDLL.@) */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 1dc4c9b75df..1396887bcc9 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -981,25 +981,6 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec } -/******************************************************************* - * RtlUnwind (NTDLL.@) - */ -void WINAPI RtlUnwind( void *frame, void *target_ip, EXCEPTION_RECORD *rec, void *retval ) -{ - CONTEXT context; - RtlUnwindEx( frame, target_ip, rec, retval, &context, NULL ); -} - - -/******************************************************************* - * _local_unwind (NTDLL.@) - */ -void WINAPI _local_unwind( void *frame, void *target_ip ) -{ - CONTEXT context; - RtlUnwindEx( frame, target_ip, NULL, NULL, &context, NULL ); -} - /******************************************************************* * __C_specific_handler (NTDLL.@) */ diff --git a/dlls/ntdll/unwind.c b/dlls/ntdll/unwind.c index 42b119544fa..db95f12ebb2 100644 --- a/dlls/ntdll/unwind.c +++ b/dlls/ntdll/unwind.c @@ -1916,4 +1916,28 @@ BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, ULONG_P #endif /* __x86_64__ */ + +/*********************************************************************** + * Generic unwind functions + */ + + +/*********************************************************************** + * RtlUnwind (NTDLL.@) + */ +void WINAPI RtlUnwind( void *frame, void *target_ip, EXCEPTION_RECORD *rec, void *retval ) +{ + CONTEXT context; + RtlUnwindEx( frame, target_ip, rec, retval, &context, NULL ); +} + + +/******************************************************************* + * _local_unwind (NTDLL.@) + */ +void WINAPI _local_unwind( void *frame, void *target_ip ) +{ + RtlUnwind( frame, target_ip, NULL, NULL ); +} + #endif /* !__i386__ */

1 0

Alexandre Julliard : ntdll: Implement RtlVirtualUnwind for ARM64EC.
by Alexandre Julliard 14 Feb '24

14 Feb '24

Module: wine Branch: master Commit: cb2013e7b40ba796a42b32d2e6a08cee4191b3ec URL: https://gitlab.winehq.org/wine/wine/-/commit/cb2013e7b40ba796a42b32d2e6a08c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 14 16:04:18 2024 +0100 ntdll: Implement RtlVirtualUnwind for ARM64EC. --- dlls/ntdll/ntdll_misc.h | 5 +++++ dlls/ntdll/signal_arm64ec.c | 17 ++--------------- dlls/ntdll/unwind.c | 14 ++++++++++++++ 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 40273d8944a..dedf0484b55 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -84,6 +84,11 @@ extern void WINAPI KiUserCallbackDispatcher(ULONG,void*,ULONG); extern void WINAPI KiUserCallbackDispatcherReturn(void); extern void (WINAPI *pWow64PrepareForException)( EXCEPTION_RECORD *rec, CONTEXT *context ); +#ifdef __arm64ec__ +extern void context_x64_to_arm( ARM64_NT_CONTEXT *arm_ctx, const CONTEXT *ctx ); +extern void context_arm_to_x64( CONTEXT *ctx, const ARM64_NT_CONTEXT *arm_ctx ); +#endif + /* debug helpers */ extern LPCSTR debugstr_us( const UNICODE_STRING *str ); extern const char *debugstr_exception_code( DWORD code ); diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 3f1869a644f..ddf37ea6545 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -130,7 +130,7 @@ static UINT fpcsr_to_mxcsr( UINT fpcr, UINT fpsr ) return ret; } -static void context_x64_to_arm( ARM64_NT_CONTEXT *arm_ctx, const CONTEXT *ctx ) +void context_x64_to_arm( ARM64_NT_CONTEXT *arm_ctx, const CONTEXT *ctx ) { ARM64EC_NT_CONTEXT *ec_ctx = (ARM64EC_NT_CONTEXT *)ctx; UINT64 fpcsr; @@ -177,7 +177,7 @@ static void context_x64_to_arm( ARM64_NT_CONTEXT *arm_ctx, const CONTEXT *ctx ) arm_ctx->Fpsr = fpcsr >> 32; } -static void context_arm_to_x64( CONTEXT *ctx, const ARM64_NT_CONTEXT *arm_ctx ) +void context_arm_to_x64( CONTEXT *ctx, const ARM64_NT_CONTEXT *arm_ctx ) { ARM64EC_NT_CONTEXT *ec_ctx = (ARM64EC_NT_CONTEXT *)ctx; @@ -1769,19 +1769,6 @@ void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) } -/********************************************************************** - * RtlVirtualUnwind (NTDLL.@) - */ -PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, - RUNTIME_FUNCTION *function, CONTEXT *context, - PVOID *data, ULONG64 *frame_ret, - KNONVOLATILE_CONTEXT_POINTERS *ctx_ptr ) -{ - FIXME( "not implemented\n" ); - return NULL; -} - - /******************************************************************* * RtlUnwindEx (NTDLL.@) */ diff --git a/dlls/ntdll/unwind.c b/dlls/ntdll/unwind.c index db95f12ebb2..be99fe67453 100644 --- a/dlls/ntdll/unwind.c +++ b/dlls/ntdll/unwind.c @@ -1751,6 +1751,20 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, unsigned int i, prolog_offset; BOOL mach_frame = FALSE; +#ifdef __arm64ec__ + if (RtlIsEcCode( (void *)pc )) + { + ARM64_NT_CONTEXT arm_context; + void *ret; + + context_x64_to_arm( &arm_context, context ); + ret = RtlVirtualUnwind_arm64( type, base, pc, (ARM64_RUNTIME_FUNCTION *)function, + &arm_context, data, frame_ret, NULL ); + context_arm_to_x64( context, &arm_context ); + return ret; + } +#endif + TRACE( "type %lx rip %I64x rsp %I64x\n", type, pc, context->Rsp ); if (TRACE_ON(unwind)) dump_unwind_info( base, function );

1 0

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

14 Feb '24

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_OPTIONS10 in CheckFeatureSupport().
by Alexandre Julliard 13 Feb '24

13 Feb '24

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

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

13 Feb '24

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_OPTIONS12 in CheckFeatureSupport().
by Alexandre Julliard 13 Feb '24

13 Feb '24

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 13 Feb '24

13 Feb '24

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 13 Feb '24

13 Feb '24

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

Zebediah Figura : kernelbase: Reimplement UrlCanonicalize().
by Alexandre Julliard 13 Feb '24

13 Feb '24

Module: wine Branch: master Commit: 37aabda67ebab9db607bd42a36809274de0fabf3 URL: https://gitlab.winehq.org/wine/wine/-/commit/37aabda67ebab9db607bd42a368092… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 23 00:01:25 2024 -0600 kernelbase: Reimplement UrlCanonicalize(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=23166 --- dlls/kernelbase/path.c | 878 +++++++++++++++++++++++++++++++++-------------- dlls/shlwapi/tests/url.c | 12 +- 2 files changed, 618 insertions(+), 272 deletions(-)

1 0