- Wine-Commits - list.winehq.org

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

Rémi Bernon : maintainers: Assume maintainership of IME support.
by Alexandre Julliard March 7, 2023

March 7, 2023

Module: wine Branch: master Commit: bd7a1a4d6670a58bfcc18bb077b066b308900ac0 URL: https://gitlab.winehq.org/wine/wine/-/commit/bd7a1a4d6670a58bfcc18bb077b066… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 3 11:46:22 2023 +0100 maintainers: Assume maintainership of IME support. --- MAINTAINERS | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 2bca4a051c4..9d60385414f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -183,8 +183,12 @@ F: dlls/win32u/rawinput.c F: server/queue.c Input methods -M: Aric Stewart <aric(a)codeweavers.com> +M: Rémi Bernon <rbernon(a)codeweavers.com> +P: Aric Stewart <aric(a)codeweavers.com> F: dlls/imm32/ +F: dlls/win32u/imm.c +F: dlls/winemac.drv/ime.c +F: dlls/winex11.drv/ime.c JavaScript M: Jacek Caban <jacek(a)codeweavers.com>

1 0

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

March 7, 2023

Module: wine Branch: master Commit: b7d55543d62e48640dcfae04d575b5687403ea72 URL: https://gitlab.winehq.org/wine/wine/-/commit/b7d55543d62e48640dcfae04d575b5… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Dec 18 20:12:36 2022 -0500 windows.perception.stub: Add ISpatialSurfaceObserverStatics stub interface. --- dlls/windows.perception.stub/observer.c | 30 +++++++++++++++++++ dlls/windows.perception.stub/private.h | 38 +++++++++++++++++++++++++ dlls/windows.perception.stub/tests/perception.c | 1 + 3 files changed, 69 insertions(+) diff --git a/dlls/windows.perception.stub/observer.c b/dlls/windows.perception.stub/observer.c index f41a35beb70..e5cb0bac3ea 100644 --- a/dlls/windows.perception.stub/observer.c +++ b/dlls/windows.perception.stub/observer.c @@ -26,6 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(perception); struct observer { IActivationFactory IActivationFactory_iface; + ISpatialSurfaceObserverStatics ISpatialSurfaceObserverStatics_iface; LONG ref; }; @@ -50,6 +51,13 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID return S_OK; } + if (IsEqualGUID( iid, &IID_ISpatialSurfaceObserverStatics )) + { + *out = &impl->ISpatialSurfaceObserverStatics_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; @@ -108,9 +116,31 @@ static const struct IActivationFactoryVtbl factory_vtbl = factory_ActivateInstance, }; +DEFINE_IINSPECTABLE( observer_statics, ISpatialSurfaceObserverStatics, struct observer, IActivationFactory_iface ) + +static HRESULT WINAPI observer_statics_RequestAccessAsync( ISpatialSurfaceObserverStatics *iface, IAsyncOperation_SpatialPerceptionAccessStatus **result ) +{ + FIXME( "iface %p, result %p stub!\n", iface, result ); + return E_NOTIMPL; +} + +static const struct ISpatialSurfaceObserverStaticsVtbl observer_statics_vtbl = +{ + observer_statics_QueryInterface, + observer_statics_AddRef, + observer_statics_Release, + /* IInspectable methods */ + observer_statics_GetIids, + observer_statics_GetRuntimeClassName, + observer_statics_GetTrustLevel, + /* ISpatialSurfaceObserverStatics methods */ + observer_statics_RequestAccessAsync, +}; + static struct observer observer_statics = { {&factory_vtbl}, + {&observer_statics_vtbl}, 1, }; diff --git a/dlls/windows.perception.stub/private.h b/dlls/windows.perception.stub/private.h index 497b3998a02..a32f8221380 100644 --- a/dlls/windows.perception.stub/private.h +++ b/dlls/windows.perception.stub/private.h @@ -37,4 +37,42 @@ extern IActivationFactory *observer_factory; +#define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ + static inline impl_type *impl_from( iface_type *iface ) \ + { \ + return CONTAINING_RECORD( iface, impl_type, iface_mem ); \ + } \ + static HRESULT WINAPI pfx##_QueryInterface( iface_type *iface, REFIID iid, void **out ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_QueryInterface( (IInspectable *)(expr), iid, out ); \ + } \ + static ULONG WINAPI pfx##_AddRef( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_AddRef( (IInspectable *)(expr) ); \ + } \ + static ULONG WINAPI pfx##_Release( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_Release( (IInspectable *)(expr) ); \ + } \ + static HRESULT WINAPI pfx##_GetIids( iface_type *iface, ULONG *iid_count, IID **iids ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetIids( (IInspectable *)(expr), iid_count, iids ); \ + } \ + static HRESULT WINAPI pfx##_GetRuntimeClassName( iface_type *iface, HSTRING *class_name ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetRuntimeClassName( (IInspectable *)(expr), class_name ); \ + } \ + static HRESULT WINAPI pfx##_GetTrustLevel( iface_type *iface, TrustLevel *trust_level ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetTrustLevel( (IInspectable *)(expr), trust_level ); \ + } +#define DEFINE_IINSPECTABLE( pfx, iface_type, impl_type, base_iface ) \ + DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from_##iface_type, iface_type##_iface, &impl->base_iface ) + #endif diff --git a/dlls/windows.perception.stub/tests/perception.c b/dlls/windows.perception.stub/tests/perception.c index f26a45788a6..8b075042f72 100644 --- a/dlls/windows.perception.stub/tests/perception.c +++ b/dlls/windows.perception.stub/tests/perception.c @@ -68,6 +68,7 @@ static void test_ObserverStatics(void) check_interface( factory, &IID_IUnknown ); check_interface( factory, &IID_IInspectable ); check_interface( factory, &IID_IAgileObject ); + check_interface( factory, &IID_ISpatialSurfaceObserverStatics ); ref = IActivationFactory_Release( factory ); ok( ref == 1, "got ref %ld.\n", ref );

1 0

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

March 7, 2023

Module: wine Branch: master Commit: ffb664f1c56a102da2058a635414ba79d0bc52fc URL: https://gitlab.winehq.org/wine/wine/-/commit/ffb664f1c56a102da2058a635414ba… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Dec 18 19:57:40 2022 -0500 windows.perception.stub: Add stub DLL. --- configure | 3 + configure.ac | 2 + dlls/windows.perception.stub/Makefile.in | 9 ++ dlls/windows.perception.stub/classes.idl | 23 ++++ dlls/windows.perception.stub/main.c | 55 ++++++++++ dlls/windows.perception.stub/observer.c | 117 +++++++++++++++++++++ dlls/windows.perception.stub/private.h | 40 +++++++ dlls/windows.perception.stub/tests/Makefile.in | 5 + dlls/windows.perception.stub/tests/perception.c | 86 +++++++++++++++ .../windows.perception.stub.spec | 5 + 10 files changed, 345 insertions(+)

1 0

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

March 7, 2023

Module: wine Branch: master Commit: 16b3b791050bb7f3ce551234226e0c52796ff325 URL: https://gitlab.winehq.org/wine/wine/-/commit/16b3b791050bb7f3ce551234226e0c… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Dec 18 19:14:15 2022 -0500 include: Add windows.graphics.directx.idl file. Needed by windows.perception.spatial.surfaces.idl. --- include/Makefile.in | 1 + include/windows.graphics.directx.idl | 167 +++++++++++++++++++++++++++++++++++ 2 files changed, 168 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 42f5aa47dcb..d4b726d4bad 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -815,6 +815,7 @@ SOURCES = \ windows.gaming.input.idl \ windows.gaming.ui.idl \ windows.globalization.idl \ + windows.graphics.directx.idl \ windows.h \ windows.media.closedcaptioning.idl \ windows.media.devices.idl \ diff --git a/include/windows.graphics.directx.idl b/include/windows.graphics.directx.idl new file mode 100644 index 00000000000..251d3d20f2a --- /dev/null +++ b/include/windows.graphics.directx.idl @@ -0,0 +1,167 @@ +/* + * 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"; + +namespace Windows.Graphics.DirectX { + typedef enum DirectXPixelFormat DirectXPixelFormat; + + declare { + interface Windows.Foundation.Collections.IIterable<Windows.Graphics.DirectX.DirectXPixelFormat>; + interface Windows.Foundation.Collections.IIterator<Windows.Graphics.DirectX.DirectXPixelFormat>; + interface Windows.Foundation.Collections.IVectorView<Windows.Graphics.DirectX.DirectXPixelFormat>; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum DirectXPixelFormat + { + Unknown = 0, + R32G32B32A32Typeless = 1, + R32G32B32A32Float = 2, + R32G32B32A32UInt = 3, + R32G32B32A32Int = 4, + R32G32B32Typeless = 5, + R32G32B32Float = 6, + R32G32B32UInt = 7, + R32G32B32Int = 8, + R16G16B16A16Typeless = 9, + R16G16B16A16Float = 10, + R16G16B16A16UIntNormalized = 11, + R16G16B16A16UInt = 12, + R16G16B16A16IntNormalized = 13, + R16G16B16A16Int = 14, + R32G32Typeless = 15, + R32G32Float = 16, + R32G32UInt = 17, + R32G32Int = 18, + R32G8X24Typeless = 19, + D32FloatS8X24UInt = 20, + R32FloatX8X24Typeless = 21, + X32TypelessG8X24UInt = 22, + R10G10B10A2Typeless = 23, + R10G10B10A2UIntNormalized = 24, + R10G10B10A2UInt = 25, + R11G11B10Float = 26, + R8G8B8A8Typeless = 27, + R8G8B8A8UIntNormalized = 28, + R8G8B8A8UIntNormalizedSrgb = 29, + R8G8B8A8UInt = 30, + R8G8B8A8IntNormalized = 31, + R8G8B8A8Int = 32, + R16G16Typeless = 33, + R16G16Float = 34, + R16G16UIntNormalized = 35, + R16G16UInt = 36, + R16G16IntNormalized = 37, + R16G16Int = 38, + R32Typeless = 39, + D32Float = 40, + R32Float = 41, + R32UInt = 42, + R32Int = 43, + R24G8Typeless = 44, + D24UIntNormalizedS8UInt = 45, + R24UIntNormalizedX8Typeless = 46, + X24TypelessG8UInt = 47, + R8G8Typeless = 48, + R8G8UIntNormalized = 49, + R8G8UInt = 50, + R8G8IntNormalized = 51, + R8G8Int = 52, + R16Typeless = 53, + R16Float = 54, + D16UIntNormalized = 55, + R16UIntNormalized = 56, + R16UInt = 57, + R16IntNormalized = 58, + R16Int = 59, + R8Typeless = 60, + R8UIntNormalized = 61, + R8UInt = 62, + R8IntNormalized = 63, + R8Int = 64, + A8UIntNormalized = 65, + R1UIntNormalized = 66, + R9G9B9E5SharedExponent = 67, + R8G8B8G8UIntNormalized = 68, + G8R8G8B8UIntNormalized = 69, + BC1Typeless = 70, + BC1UIntNormalized = 71, + BC1UIntNormalizedSrgb = 72, + BC2Typeless = 73, + BC2UIntNormalized = 74, + BC2UIntNormalizedSrgb = 75, + BC3Typeless = 76, + BC3UIntNormalized = 77, + BC3UIntNormalizedSrgb = 78, + BC4Typeless = 79, + BC4UIntNormalized = 80, + BC4IntNormalized = 81, + BC5Typeless = 82, + BC5UIntNormalized = 83, + BC5IntNormalized = 84, + B5G6R5UIntNormalized = 85, + B5G5R5A1UIntNormalized = 86, + B8G8R8A8UIntNormalized = 87, + B8G8R8X8UIntNormalized = 88, + R10G10B10XRBiasA2UIntNormalized = 89, + B8G8R8A8Typeless = 90, + B8G8R8A8UIntNormalizedSrgb = 91, + B8G8R8X8Typeless = 92, + B8G8R8X8UIntNormalizedSrgb = 93, + BC6HTypeless = 94, + BC6H16UnsignedFloat = 95, + BC6H16Float = 96, + BC7Typeless = 97, + BC7UIntNormalized = 98, + BC7UIntNormalizedSrgb = 99, + Ayuv = 100, + Y410 = 101, + Y416 = 102, + NV12 = 103, + P010 = 104, + P016 = 105, + Opaque420 = 106, + Yuy2 = 107, + Y210 = 108, + Y216 = 109, + NV11 = 110, + AI44 = 111, + IA44 = 112, + P8 = 113, + A8P8 = 114, + B4G4R4A4UIntNormalized = 115, + P208 = 130, + V208 = 131, + V408 = 132, + [contract(Windows.Foundation.UniversalApiContract, 10.0)] + SamplerFeedbackMinMipOpaque = 189, + [contract(Windows.Foundation.UniversalApiContract, 10.0)] + SamplerFeedbackMipRegionUsedOpaque = 190, + }; +}

1 0

Francois Gouget : dbghelp/tests: Let the tests run on Windows 7, 8 and 10 <= 1607.
by Alexandre Julliard March 7, 2023

March 7, 2023

Module: wine Branch: master Commit: ed6ab3222ede03fa090ac17e1abd868f7e99f87f URL: https://gitlab.winehq.org/wine/wine/-/commit/ed6ab3222ede03fa090ac17e1abd86… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 7 15:40:26 2023 +0100 dbghelp/tests: Let the tests run on Windows 7, 8 and 10 <= 1607. Provide a fallback if IsWow64Process2() is not available. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=54605 --- dlls/dbghelp/tests/dbghelp.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 3a0ad20dadd..f68ca8281de 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -564,10 +564,21 @@ enum process_kind static enum process_kind get_process_kind(HANDLE process) { - const BOOL is_win64 = sizeof(void*) == 8; + HMODULE mod; USHORT m1, m2; + BOOL (WINAPI *pIsWow64Process2)(HANDLE,USHORT*,USHORT*); + const BOOL is_win64 = sizeof(void*) == 8; - if (!IsWow64Process2(process, &m1, &m2)) return PCSKIND_ERROR; + mod = GetModuleHandleA("kernel32"); + pIsWow64Process2 = (void*)GetProcAddress(mod, "IsWow64Process2"); + if (!pIsWow64Process2) + { + BOOL is_wow64; + return is_win64 ? PCSKIND_64BIT : + IsWow64Process(process, &is_wow64) && is_wow64 ? PCSKIND_WOW64 : + PCSKIND_32BIT; + } + if (!pIsWow64Process2(process, &m1, &m2)) return PCSKIND_ERROR; if (m1 == IMAGE_FILE_MACHINE_UNKNOWN && get_machine_bitness(m2) == 32) return PCSKIND_32BIT; if (m1 == IMAGE_FILE_MACHINE_UNKNOWN && get_machine_bitness(m2) == 64) return PCSKIND_64BIT; if (get_machine_bitness(m1) == 32 && get_machine_bitness(m2) == 64)

1 0

Rémi Bernon : winex11: Initialize IO_STATUS_BLOCK in X11DRV_GetICMProfile.
by Alexandre Julliard March 7, 2023

March 7, 2023

Module: wine Branch: master Commit: eca1e4ea3666d0f9290f3bc2fc75f3e44e42656c URL: https://gitlab.winehq.org/wine/wine/-/commit/eca1e4ea3666d0f9290f3bc2fc75f3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 6 13:12:19 2023 +0100 winex11: Initialize IO_STATUS_BLOCK in X11DRV_GetICMProfile. To avoid invalid writes on WOW64 Nt calls. --- dlls/winex11.drv/graphics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 54e6b9b2084..e3b0445379a 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1689,7 +1689,7 @@ BOOL CDECL X11DRV_GetICMProfile( PHYSDEV dev, BOOL allow_default, LPDWORD size, else if ((buffer = get_icm_profile( &buflen ))) { static const WCHAR icm[] = {'.','i','c','m',0}; - IO_STATUS_BLOCK io; + IO_STATUS_BLOCK io = {{0}}; UINT64 hash = 0; HANDLE file; int status;

1 0