March 2023 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Always call Wow64PrepareForException when dispatching an exception.
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: wine Branch: master Commit: eccf92996c88adee809cea6e1416fa72e4c92ef3 URL: https://gitlab.winehq.org/wine/wine/-/commit/eccf92996c88adee809cea6e1416fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 8 11:42:58 2023 +0100 ntdll: Always call Wow64PrepareForException when dispatching an exception. --- dlls/ntdll/signal_arm64.c | 2 ++ dlls/ntdll/signal_x86_64.c | 3 ++- dlls/wow64cpu/cpu.c | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index cadf774be67..2eed51b101e 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -494,6 +494,8 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte NTSTATUS status; DWORD c; + if (pWow64PrepareForException) pWow64PrepareForException( rec, context ); + TRACE( "code=%lx flags=%lx addr=%p pc=%016I64x\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, context->Pc ); for (c = 0; c < rec->NumberParameters; c++) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 81479f1fd91..7ebd52766e6 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -508,6 +508,8 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) NTSTATUS status; DWORD c; + if (pWow64PrepareForException) pWow64PrepareForException( rec, context ); + TRACE_(seh)( "code=%lx flags=%lx addr=%p ip=%Ix\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, context->Rip ); for (c = 0; c < min( EXCEPTION_MAXIMUM_PARAMETERS, rec->NumberParameters ); c++) @@ -584,7 +586,6 @@ NTSTATUS WINAPI dispatch_wow_exception( EXCEPTION_RECORD *rec_ptr, CONTEXT *cont RtlInitializeExtendedContext( buffer, context_ptr->ContextFlags, &context_ex ); context = RtlLocateLegacyContext( context_ex, NULL ); RtlCopyContext( context, context_ptr->ContextFlags, context_ptr ); - pWow64PrepareForException( &rec, context ); return dispatch_exception( &rec, context ); } diff --git a/dlls/wow64cpu/cpu.c b/dlls/wow64cpu/cpu.c index 13c94751d19..5bcaf9d1c45 100644 --- a/dlls/wow64cpu/cpu.c +++ b/dlls/wow64cpu/cpu.c @@ -375,6 +375,8 @@ NTSTATUS WINAPI BTCpuResetToConsistentState( EXCEPTION_POINTERS *ptrs ) CONTEXT *context = ptrs->ContextRecord; I386_CONTEXT wow_context; + if (context->SegCs == cs64_sel) return STATUS_SUCCESS; /* exception in 64-bit code, nothing to do */ + copy_context_64to32( &wow_context, CONTEXT_I386_ALL, context ); wow_context.EFlags &= ~(0x100|0x40000); BTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &wow_context );

1 0

Alexandre Julliard : maintainers: Assume maintainership of ARM platforms.
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: wine Branch: master Commit: 4d217cb274847223cdaab79bbd0980dff1c09dd5 URL: https://gitlab.winehq.org/wine/wine/-/commit/4d217cb274847223cdaab79bbd0980… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 8 09:16:12 2023 +0100 maintainers: Assume maintainership of ARM platforms. --- MAINTAINERS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 9d60385414f..7e2645d8b5d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -29,7 +29,8 @@ Maintainers List ----------------------------------- ARM, ARM64 -M: André Zwing <nerv(a)dawncrow.de> +M: Alexandre Julliard <julliard(a)winehq.org> +P: André Zwing <nerv(a)dawncrow.de> F: dlls/dbghelp/cpu_arm* F: dlls/msvcrt/except_arm.c F: dlls/ntdll/signal_arm*

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Support distance() intrinsic.
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: vkd3d Branch: master Commit: a18f3d4dd5a1b8921067db4a88a587002cb1a8ff URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a18f3d4dd5a1b8921067db4a88a58… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 30 11:13:33 2023 +0300 vkd3d-shader/hlsl: Support distance() intrinsic. --- Makefile.am | 1 + libs/vkd3d-shader/hlsl.y | 24 ++++++++++++++++++++++++ tests/distance.shader_test | 23 +++++++++++++++++++++++ 3 files changed, 48 insertions(+) diff --git a/Makefile.am b/Makefile.am index 29692432..191f4eb9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -61,6 +61,7 @@ vkd3d_shader_tests = \ tests/cbuffer.shader_test \ tests/compute.shader_test \ tests/conditional.shader_test \ + tests/distance.shader_test \ tests/entry-point-semantics.shader_test \ tests/exp.shader_test \ tests/floor.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 10ac3179..e50d1862 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2533,6 +2533,29 @@ static bool intrinsic_cross(struct hlsl_ctx *ctx, return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_ADD, mul2, mul1_neg, loc); } +static bool intrinsic_distance(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg1, *arg2, *neg, *add, *dot; + + if (!(arg1 = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + if (!(arg2 = intrinsic_float_convert_arg(ctx, params, params->args[1], loc))) + return false; + + if (!(neg = add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_NEG, arg2, loc))) + return false; + + if (!(add = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_ADD, arg1, neg, loc))) + return false; + + if (!(dot = add_binary_dot_expr(ctx, params->instrs, add, add, loc))) + return false; + + return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_SQRT, dot, loc); +} + static bool intrinsic_dot(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -3203,6 +3226,7 @@ intrinsic_functions[] = {"clamp", 3, true, intrinsic_clamp}, {"cos", 1, true, intrinsic_cos}, {"cross", 2, true, intrinsic_cross}, + {"distance", 2, true, intrinsic_distance}, {"dot", 2, true, intrinsic_dot}, {"exp", 1, true, intrinsic_exp}, {"exp2", 1, true, intrinsic_exp2}, diff --git a/tests/distance.shader_test b/tests/distance.shader_test new file mode 100644 index 00000000..3f544645 --- /dev/null +++ b/tests/distance.shader_test @@ -0,0 +1,23 @@ +[pixel shader] +uniform float4 x; +uniform float4 y; + +float4 main() : sv_target +{ + return distance(x, y); +} + +[test] +uniform 0 float4 -2.0 3.0 4.0 0.1 +uniform 4 float4 2.0 -1.0 4.0 5.0 +draw quad +probe all rgba (7.483983, 7.483983, 7.483983, 7.483983) 1 + +[pixel shader] +uniform int4 x; +uniform int4 y; + +float4 main() : sv_target +{ + return distance(x, y); +}

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Support rsqrt() intrinsic.
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: vkd3d Branch: master Commit: d6b656641c107ade3e078e4dc0210f6d9713a1d1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d6b656641c107ade3e078e4dc0210… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 27 19:07:10 2023 +0300 vkd3d-shader/hlsl: Support rsqrt() intrinsic. --- libs/vkd3d-shader/hlsl.y | 12 ++++++++++++ tests/sqrt.shader_test | 13 +++++++++++++ 2 files changed, 25 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index e011ea24..10ac3179 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2941,6 +2941,17 @@ static bool intrinsic_round(struct hlsl_ctx *ctx, return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_ROUND, arg, loc); } +static bool intrinsic_rsqrt(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_RSQ, arg, loc); +} + static bool intrinsic_saturate(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -3208,6 +3219,7 @@ intrinsic_functions[] = {"pow", 2, true, intrinsic_pow}, {"reflect", 2, true, intrinsic_reflect}, {"round", 1, true, intrinsic_round}, + {"rsqrt", 1, true, intrinsic_rsqrt}, {"saturate", 1, true, intrinsic_saturate}, {"sin", 1, true, intrinsic_sin}, {"smoothstep", 3, true, intrinsic_smoothstep}, diff --git a/tests/sqrt.shader_test b/tests/sqrt.shader_test index 5d048b4f..78d89d38 100644 --- a/tests/sqrt.shader_test +++ b/tests/sqrt.shader_test @@ -10,3 +10,16 @@ float4 main() : sv_target uniform 0 float4 1.0 9.0 32.3 46.5 draw quad probe all rgba (1.0, 3.0, 5.683309, 6.819091) 1 + +[pixel shader] +uniform float4 f; + +float4 main() : sv_target +{ + return rsqrt(f); +} + +[test] +uniform 0 float4 1.0 9.0 4.0 16.0 +draw quad +probe all rgba (1.0, 0.33333333, 0.5, 0.25) 1

1 0

Mohamad Al-Jaf : windows.perception.stub: Implement ISpatialSurfaceObserverStatics2::IsSupported().
by Alexandre Julliard March 7, 2023

March 7, 2023

Module: wine Branch: master Commit: 50f5f9af1c27c4380a7489596d20d8048f003365 URL: https://gitlab.winehq.org/wine/wine/-/commit/50f5f9af1c27c4380a7489596d20d8… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Dec 18 20:29:37 2022 -0500 windows.perception.stub: Implement ISpatialSurfaceObserverStatics2::IsSupported(). Needed by the VR games Forewarned and Überlaüfer. --- dlls/windows.perception.stub/observer.c | 6 ++++-- dlls/windows.perception.stub/tests/perception.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/windows.perception.stub/observer.c b/dlls/windows.perception.stub/observer.c index 16f573e4d84..50643b77981 100644 --- a/dlls/windows.perception.stub/observer.c +++ b/dlls/windows.perception.stub/observer.c @@ -149,8 +149,10 @@ DEFINE_IINSPECTABLE( observer_statics2, ISpatialSurfaceObserverStatics2, struct static HRESULT WINAPI observer_statics2_IsSupported( ISpatialSurfaceObserverStatics2 *iface, boolean *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + TRACE( "iface %p, value %p.\n", iface, value ); + + *value = FALSE; + return S_OK; } static const struct ISpatialSurfaceObserverStatics2Vtbl observer_statics2_vtbl = diff --git a/dlls/windows.perception.stub/tests/perception.c b/dlls/windows.perception.stub/tests/perception.c index a112bf7e52a..3e11f5ea8e7 100644 --- a/dlls/windows.perception.stub/tests/perception.c +++ b/dlls/windows.perception.stub/tests/perception.c @@ -77,8 +77,8 @@ static void test_ObserverStatics(void) value = TRUE; hr = ISpatialSurfaceObserverStatics2_IsSupported( observer_statics2, &value ); - todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); - todo_wine ok( !value, "got %d.\n", value ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + ok( !value, "got %d.\n", value ); ref = ISpatialSurfaceObserverStatics2_Release( observer_statics2 ); ok( ref == 2, "got ref %ld.\n", ref );

1 0

Mohamad Al-Jaf : windows.perception.stub: Add ISpatialSurfaceObserverStatics2 stub interface.
by Alexandre Julliard March 7, 2023

March 7, 2023

Module: wine Branch: master Commit: 006bc33c57c96bd733147c4088d36bfc14da907e URL: https://gitlab.winehq.org/wine/wine/-/commit/006bc33c57c96bd733147c4088d36b… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Feb 23 03:50:15 2023 -0500 windows.perception.stub: Add ISpatialSurfaceObserverStatics2 stub interface. --- dlls/windows.perception.stub/observer.c | 30 +++++++++++++++++++++++++ dlls/windows.perception.stub/tests/perception.c | 6 +++++ 2 files changed, 36 insertions(+) diff --git a/dlls/windows.perception.stub/observer.c b/dlls/windows.perception.stub/observer.c index e5cb0bac3ea..16f573e4d84 100644 --- a/dlls/windows.perception.stub/observer.c +++ b/dlls/windows.perception.stub/observer.c @@ -27,6 +27,7 @@ struct observer { IActivationFactory IActivationFactory_iface; ISpatialSurfaceObserverStatics ISpatialSurfaceObserverStatics_iface; + ISpatialSurfaceObserverStatics2 ISpatialSurfaceObserverStatics2_iface; LONG ref; }; @@ -58,6 +59,13 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID return S_OK; } + if (IsEqualGUID( iid, &IID_ISpatialSurfaceObserverStatics2 )) + { + *out = &impl->ISpatialSurfaceObserverStatics2_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; @@ -137,10 +145,32 @@ static const struct ISpatialSurfaceObserverStaticsVtbl observer_statics_vtbl = observer_statics_RequestAccessAsync, }; +DEFINE_IINSPECTABLE( observer_statics2, ISpatialSurfaceObserverStatics2, struct observer, IActivationFactory_iface ) + +static HRESULT WINAPI observer_statics2_IsSupported( ISpatialSurfaceObserverStatics2 *iface, boolean *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static const struct ISpatialSurfaceObserverStatics2Vtbl observer_statics2_vtbl = +{ + observer_statics2_QueryInterface, + observer_statics2_AddRef, + observer_statics2_Release, + /* IInspectable methods */ + observer_statics2_GetIids, + observer_statics2_GetRuntimeClassName, + observer_statics2_GetTrustLevel, + /* ISpatialSurfaceObserverStatics2 methods */ + observer_statics2_IsSupported, +}; + static struct observer observer_statics = { {&factory_vtbl}, {&observer_statics_vtbl}, + {&observer_statics2_vtbl}, 1, }; diff --git a/dlls/windows.perception.stub/tests/perception.c b/dlls/windows.perception.stub/tests/perception.c index 8b075042f72..9b7b7a07eaf 100644 --- a/dlls/windows.perception.stub/tests/perception.c +++ b/dlls/windows.perception.stub/tests/perception.c @@ -48,6 +48,7 @@ static void check_interface_( unsigned int line, void *obj, const IID *iid ) static void test_ObserverStatics(void) { static const WCHAR *observer_statics_name = L"Windows.Perception.Spatial.Surfaces.SpatialSurfaceObserver"; + ISpatialSurfaceObserverStatics2 *observer_statics2; IActivationFactory *factory; HSTRING str; HRESULT hr; @@ -70,6 +71,11 @@ static void test_ObserverStatics(void) check_interface( factory, &IID_IAgileObject ); check_interface( factory, &IID_ISpatialSurfaceObserverStatics ); + hr = IActivationFactory_QueryInterface( factory, &IID_ISpatialSurfaceObserverStatics2, (void **)&observer_statics2 ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + ref = ISpatialSurfaceObserverStatics2_Release( observer_statics2 ); + ok( ref == 2, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory ); ok( ref == 1, "got ref %ld.\n", ref ); }

1 0

Mohamad Al-Jaf : windows.perception.stub/tests: Add ISpatialSurfaceObserverStatics2::IsSupported() tests.
by Alexandre Julliard March 7, 2023

March 7, 2023

Module: wine Branch: master Commit: 4f9a79bcea71126eae94946100f5967be4a03320 URL: https://gitlab.winehq.org/wine/wine/-/commit/4f9a79bcea71126eae94946100f596… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Dec 18 20:23:34 2022 -0500 windows.perception.stub/tests: Add ISpatialSurfaceObserverStatics2::IsSupported() tests. --- dlls/windows.perception.stub/tests/perception.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/windows.perception.stub/tests/perception.c b/dlls/windows.perception.stub/tests/perception.c index 9b7b7a07eaf..a112bf7e52a 100644 --- a/dlls/windows.perception.stub/tests/perception.c +++ b/dlls/windows.perception.stub/tests/perception.c @@ -50,6 +50,7 @@ static void test_ObserverStatics(void) static const WCHAR *observer_statics_name = L"Windows.Perception.Spatial.Surfaces.SpatialSurfaceObserver"; ISpatialSurfaceObserverStatics2 *observer_statics2; IActivationFactory *factory; + BOOLEAN value; HSTRING str; HRESULT hr; LONG ref; @@ -74,6 +75,11 @@ static void test_ObserverStatics(void) hr = IActivationFactory_QueryInterface( factory, &IID_ISpatialSurfaceObserverStatics2, (void **)&observer_statics2 ); ok( hr == S_OK, "got hr %#lx.\n", hr ); + value = TRUE; + hr = ISpatialSurfaceObserverStatics2_IsSupported( observer_statics2, &value ); + todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + todo_wine ok( !value, "got %d.\n", value ); + ref = ISpatialSurfaceObserverStatics2_Release( observer_statics2 ); ok( ref == 2, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory );

1 0

Mohamad Al-Jaf : include: Add windows.perception.spatial.idl file.
by Alexandre Julliard March 7, 2023

March 7, 2023

Module: wine Branch: master Commit: 9065c6637e7e72142cd1704fb314c0c8ba693cef URL: https://gitlab.winehq.org/wine/wine/-/commit/9065c6637e7e72142cd1704fb314c0… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Dec 18 19:20:57 2022 -0500 include: Add windows.perception.spatial.idl file. Needed by windows.perception.spatial.surfaces.idl. --- include/Makefile.in | 1 + include/windows.perception.spatial.idl | 180 +++++++++++++++++++++++++++++++++ 2 files changed, 181 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 19dacb850ed..42f5aa47dcb 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -821,6 +821,7 @@ SOURCES = \ windows.media.idl \ windows.media.speechrecognition.idl \ windows.media.speechsynthesis.idl \ + windows.perception.spatial.idl \ windows.security.credentials.idl \ windows.security.cryptography.idl \ windows.storage.streams.idl \ diff --git a/include/windows.perception.spatial.idl b/include/windows.perception.spatial.idl new file mode 100644 index 00000000000..d19330963f7 --- /dev/null +++ b/include/windows.perception.spatial.idl @@ -0,0 +1,180 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * 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 + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +import "windows.foundation.numerics.idl"; +/* import "windows.perception.idl"; */ +import "windows.storage.streams.idl"; +/* import "windows.system.remotesystems.idl"; */ + +namespace Windows.Perception.Spatial { + typedef enum SpatialPerceptionAccessStatus SpatialPerceptionAccessStatus; + typedef struct SpatialBoundingBox SpatialBoundingBox; + typedef struct SpatialBoundingFrustum SpatialBoundingFrustum; + typedef struct SpatialBoundingOrientedBox SpatialBoundingOrientedBox; + typedef struct SpatialBoundingSphere SpatialBoundingSphere; + + interface ISpatialBoundingVolume; + interface ISpatialBoundingVolumeStatics; + interface ISpatialCoordinateSystem; + + runtimeclass SpatialBoundingVolume; + runtimeclass SpatialCoordinateSystem; + + declare { + interface Windows.Foundation.Collections.IIterable<Windows.Perception.Spatial.SpatialBoundingVolume *>; + interface Windows.Foundation.Collections.IIterator<Windows.Perception.Spatial.SpatialBoundingVolume *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Perception.Spatial.SpatialPerceptionAccessStatus>; + interface Windows.Foundation.IAsyncOperation<Windows.Perception.Spatial.SpatialPerceptionAccessStatus>; + interface Windows.Foundation.IReference<Windows.Perception.Spatial.SpatialBoundingBox>; + interface Windows.Foundation.IReference<Windows.Perception.Spatial.SpatialBoundingFrustum>; + interface Windows.Foundation.IReference<Windows.Perception.Spatial.SpatialBoundingOrientedBox>; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0) + ] + enum SpatialPerceptionAccessStatus + { + Unspecified = 0, + Allowed = 1, + DeniedByUser = 2, + DeniedBySystem = 3, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0) + ] + struct SpatialBoundingBox + { + Windows.Foundation.Numerics.Vector3 Center; + Windows.Foundation.Numerics.Vector3 Extents; + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0) + ] + struct SpatialBoundingFrustum + { + Windows.Foundation.Numerics.Plane Near; + Windows.Foundation.Numerics.Plane Far; + Windows.Foundation.Numerics.Plane Right; + Windows.Foundation.Numerics.Plane Left; + Windows.Foundation.Numerics.Plane Top; + Windows.Foundation.Numerics.Plane Bottom; + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0) + ] + struct SpatialBoundingOrientedBox + { + Windows.Foundation.Numerics.Vector3 Center; + Windows.Foundation.Numerics.Vector3 Extents; + Windows.Foundation.Numerics.Quaternion Orientation; + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0) + ] + struct SpatialBoundingSphere + { + Windows.Foundation.Numerics.Vector3 Center; + FLOAT Radius; + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.Perception.Spatial.SpatialBoundingVolume), + uuid(fb2065da-68c3-33df-b7af-4c787207999c) + ] + interface ISpatialBoundingVolume : IInspectable + { + } + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.Perception.Spatial.SpatialBoundingVolume), + uuid(05889117-b3e1-36d8-b017-566181a5b196) + ] + interface ISpatialBoundingVolumeStatics : IInspectable + { + HRESULT FromBox( + [in] Windows.Perception.Spatial.SpatialCoordinateSystem *system, + [in] Windows.Perception.Spatial.SpatialBoundingBox box, + [out, retval] Windows.Perception.Spatial.SpatialBoundingVolume **value + ); + HRESULT FromOrientedBox( + [in] Windows.Perception.Spatial.SpatialCoordinateSystem *system, + [in] Windows.Perception.Spatial.SpatialBoundingOrientedBox box, + [out, retval] Windows.Perception.Spatial.SpatialBoundingVolume **value + ); + HRESULT FromSphere( + [in] Windows.Perception.Spatial.SpatialCoordinateSystem *system, + [in] Windows.Perception.Spatial.SpatialBoundingSphere sphere, + [out, retval] Windows.Perception.Spatial.SpatialBoundingVolume **value + ); + HRESULT FromFrustum( + [in] Windows.Perception.Spatial.SpatialCoordinateSystem *system, + [in] Windows.Perception.Spatial.SpatialBoundingFrustum frustum, + [out, retval] Windows.Perception.Spatial.SpatialBoundingVolume **value + ); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.Perception.Spatial.SpatialCoordinateSystem), + uuid(69ebca4b-60a3-3586-a653-59a7bd676d07) + ] + interface ISpatialCoordinateSystem : IInspectable + { + HRESULT TryGetTransformTo( + [in] Windows.Perception.Spatial.SpatialCoordinateSystem *target, + [out, retval] Windows.Foundation.IReference<Windows.Foundation.Numerics.Matrix4x4> **value + ); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + static(Windows.Perception.Spatial.ISpatialBoundingVolumeStatics, Windows.Foundation.UniversalApiContract, 2.0), + threading(both) + ] + runtimeclass SpatialBoundingVolume + { + [default] interface Windows.Perception.Spatial.ISpatialBoundingVolume; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass SpatialCoordinateSystem + { + [default] interface Windows.Perception.Spatial.ISpatialCoordinateSystem; + } +}

1 0

Mohamad Al-Jaf : include: Add windows.perception.spatial.surfaces.idl file.
by Alexandre Julliard March 7, 2023

March 7, 2023

Module: wine Branch: master Commit: 79a7c7ca40e0d439872ce0d1927ed0198417c8b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/79a7c7ca40e0d439872ce0d1927ed0… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Dec 18 19:24:02 2022 -0500 include: Add windows.perception.spatial.surfaces.idl file. --- include/Makefile.in | 1 + include/windows.perception.spatial.surfaces.idl | 232 ++++++++++++++++++++++++ 2 files changed, 233 insertions(+)

1 0

Francois Gouget : t2embed/tests: Fix the TTGetEmbeddingType() test in UTF-8 locales.
by Alexandre Julliard March 7, 2023

March 7, 2023

Module: wine Branch: master Commit: 6da1e08dba93ac1e13faae8102cd69f14d449940 URL: https://gitlab.winehq.org/wine/wine/-/commit/6da1e08dba93ac1e13faae8102cd69… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 7 13:57:59 2023 +0100 t2embed/tests: Fix the TTGetEmbeddingType() test in UTF-8 locales. A screen-compatible memory DC uses a TrueType font by default in UTF-8 locales. --- dlls/t2embed/tests/t2embed.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/t2embed/tests/t2embed.c b/dlls/t2embed/tests/t2embed.c index 004ba5492ae..aa4e1ca2cc8 100644 --- a/dlls/t2embed/tests/t2embed.c +++ b/dlls/t2embed/tests/t2embed.c @@ -20,6 +20,7 @@ #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "wingdi.h" #include "winuser.h" #include "t2embapi.h" @@ -100,12 +101,15 @@ static void test_TTGetEmbeddingType(void) hdc = CreateCompatibleDC(0); ret = TTGetEmbeddingType(hdc, NULL); - ok(ret == E_NOTATRUETYPEFONT, "Unexpected retval %#lx.\n", ret); + ok(ret == E_NOTATRUETYPEFONT || (ret == E_PERMISSIONSINVALID && GetACP() == CP_UTF8), + "Unexpected retval %#lx.\n", ret); status = 0xdeadbeef; ret = TTGetEmbeddingType(hdc, &status); - ok(ret == E_NOTATRUETYPEFONT, "Unexpected retval %#lx.\n", ret); - ok(status == 0xdeadbeef, "Unexpected status %#lx.\n", status); + ok(ret == E_NOTATRUETYPEFONT || (ret == E_NONE && GetACP() == CP_UTF8), + "Unexpected retval %#lx.\n", ret); + ok(status == 0xdeadbeef || (status == EMBED_EDITABLE && GetACP() == CP_UTF8), + "Unexpected status %#lx.\n", status); memset(&logfont, 0, sizeof(logfont)); logfont.lfHeight = 12;

1 0