- Wine-Commits - list.winehq.org

Mohamad Al-Jaf : include: Add Windows.UI.Composition.CompositionObject definition.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: 0d4b02a15f273183f068193888aed7374d939646 URL: https://gitlab.winehq.org/wine/wine/-/commit/0d4b02a15f273183f068193888aed7… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Apr 5 20:49:08 2023 -0400 include: Add Windows.UI.Composition.CompositionObject definition. Needed for mingw Firefox build. --- include/windows.ui.composition.idl | 107 +++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl index 927a793d223..cfe665501f7 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -44,7 +44,14 @@ namespace Windows.UI.Composition { typedef enum CompositionGetValueStatus CompositionGetValueStatus; typedef enum CompositionStretch CompositionStretch; + interface IAnimationObject; interface IColorKeyFrameAnimation; + interface ICompositionAnimation; + interface ICompositionAnimation2; + interface ICompositionAnimation3; + interface ICompositionAnimation4; + interface ICompositionAnimationBase; + interface ICompositionAnimationFactory; interface ICompositionBatchCompletedEventArgs; interface ICompositionBrush; interface ICompositionBrushFactory; @@ -58,6 +65,12 @@ namespace Windows.UI.Composition { interface ICompositionEasingFunctionStatics; interface ICompositionEffectBrush; interface ICompositionEffectFactory; + interface ICompositionObject; + interface ICompositionObject2; + interface ICompositionObject3; + interface ICompositionObject4; + interface ICompositionObjectFactory; + interface ICompositionObjectStatics; interface ICompositionPropertySet; interface ICompositionPropertySet2; interface ICompositionScopedBatch; @@ -133,7 +146,9 @@ namespace Windows.UI.Composition { declare { interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.UI.Composition.ICompositionSurface *>; interface Windows.Foundation.IAsyncOperation<Windows.UI.Composition.ICompositionSurface *>; + interface Windows.Foundation.Collections.IIterable<Windows.UI.Composition.CompositionAnimation *>; interface Windows.Foundation.Collections.IIterable<Windows.UI.Composition.Visual *>; + interface Windows.Foundation.Collections.IIterator<Windows.UI.Composition.CompositionAnimation *>; interface Windows.Foundation.Collections.IIterator<Windows.UI.Composition.Visual *>; interface Windows.Foundation.TypedEventHandler<IInspectable *, Windows.UI.Composition.CompositionBatchCompletedEventArgs *>; } @@ -272,6 +287,66 @@ namespace Windows.UI.Composition { ); } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.CompositionAnimation), + uuid(464c4c2c-1caa-4061-9b40-e13fde1503ca) + ] + interface ICompositionAnimation : IInspectable + { + HRESULT ClearAllParameters(); + HRESULT ClearParameter([in] HSTRING key); + HRESULT SetColorParameter([in] HSTRING key, [in] Windows.UI.Color value); + HRESULT SetMatrix3x2Parameter([in] HSTRING key, [in] Windows.Foundation.Numerics.Matrix3x2 value); + HRESULT SetMatrix4x4Parameter([in] HSTRING key, [in] Windows.Foundation.Numerics.Matrix4x4 value); + HRESULT SetQuaternionParameter([in] HSTRING key, [in] Windows.Foundation.Numerics.Quaternion value); + HRESULT SetReferenceParameter([in] HSTRING key, [in] Windows.UI.Composition.CompositionObject *object); + HRESULT SetScalarParameter([in] HSTRING key, [in] FLOAT value); + HRESULT SetVector2Parameter([in] HSTRING key, [in] Windows.Foundation.Numerics.Vector2 value); + HRESULT SetVector3Parameter([in] HSTRING key, [in] Windows.Foundation.Numerics.Vector3 value); + HRESULT SetVector4Parameter([in] HSTRING key, [in] Windows.Foundation.Numerics.Vector4 value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + uuid(1c2c2999-e818-48d3-a6dd-d78c82f8ace9) + ] + interface ICompositionAnimationBase : IInspectable + { + } + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.CompositionAnimation), + uuid(10f6c4fb-6e51-4c25-bbd3-586a9bec3ef4) + ] + interface ICompositionAnimationFactory : IInspectable + { + } + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.CompositionObject), + uuid(bcb4ad45-7609-4550-934f-16002a68fded) + ] + interface ICompositionObject : IInspectable + { + [propget] HRESULT Compositor([out, retval] Windows.UI.Composition.Compositor **value); + [propget] HRESULT Dispatcher([out, retval] Windows.UI.Core.CoreDispatcher **value); + [propget] HRESULT Properties([out, retval] Windows.UI.Composition.CompositionPropertySet **value); + HRESULT StartAnimation([in] HSTRING name, [in] Windows.UI.Composition.CompositionAnimation *animation); + HRESULT StopAnimation([in] HSTRING name); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.CompositionObject), + uuid(51205c5e-558a-4f2a-8d39-37bfe1e20ddd) + ] + interface ICompositionObjectFactory : IInspectable + { + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.UI.Composition.CompositionBatchCompletedEventArgs), @@ -773,6 +848,21 @@ namespace Windows.UI.Composition { [default] interface Windows.UI.Composition.IColorKeyFrameAnimation; } + [ + composable(Windows.UI.Composition.ICompositionAnimationFactory, public, Windows.Foundation.UniversalApiContract, 2.0), + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass CompositionAnimation : Windows.UI.Composition.CompositionObject + { + [default] interface Windows.UI.Composition.ICompositionAnimation; + [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.UI.Composition.ICompositionAnimation2; + [contract(Windows.Foundation.UniversalApiContract, 5.0)] interface Windows.UI.Composition.ICompositionAnimation3; + [contract(Windows.Foundation.UniversalApiContract, 7.0)] interface Windows.UI.Composition.ICompositionAnimation4; + [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.UI.Composition.ICompositionAnimationBase; + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), marshaling_behavior(agile), @@ -858,6 +948,23 @@ namespace Windows.UI.Composition { [default] interface Windows.UI.Composition.ICompositionEffectFactory; } + [ + composable(Windows.UI.Composition.ICompositionObjectFactory, public, Windows.Foundation.UniversalApiContract, 2.0), + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + static(Windows.UI.Composition.ICompositionObjectStatics, Windows.Foundation.UniversalApiContract, 7.0), + threading(both) + ] + runtimeclass CompositionObject + { + [default] interface Windows.UI.Composition.ICompositionObject; + [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.UI.Composition.ICompositionObject2; + [contract(Windows.Foundation.UniversalApiContract, 5.0)] interface Windows.UI.Composition.ICompositionObject3; + [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.UI.Composition.ICompositionObject4; + interface Windows.Foundation.IClosable; + [contract(Windows.Foundation.UniversalApiContract, 7.0)] interface Windows.UI.Composition.IAnimationObject; + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), marshaling_behavior(agile),

1 0

Mohamad Al-Jaf : include: Add Windows.UI.Composition.CompositionCommitBatch definition.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: ee7ba9fb56a3ad54a45b17985973e6dab3836dfe URL: https://gitlab.winehq.org/wine/wine/-/commit/ee7ba9fb56a3ad54a45b17985973e6… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Apr 5 20:31:32 2023 -0400 include: Add Windows.UI.Composition.CompositionCommitBatch definition. Needed by Windows.UI.Composition.Compositor. --- include/windows.ui.composition.idl | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl index 0793b8fee1c..5b112ffa73e 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -51,6 +51,7 @@ namespace Windows.UI.Composition { interface ICompositionClip2; interface ICompositionClipFactory; interface ICompositionColorBrush; + interface ICompositionCommitBatch; interface ICompositionEasingFunction; interface ICompositionEasingFunctionFactory; interface ICompositionEasingFunctionStatics; @@ -91,6 +92,7 @@ namespace Windows.UI.Composition { runtimeclass CompositionBrush; runtimeclass CompositionClip; runtimeclass CompositionColorBrush; + runtimeclass CompositionCommitBatch; runtimeclass CompositionEasingFunction; runtimeclass CompositionEffectBrush; runtimeclass CompositionEffectFactory; @@ -297,6 +299,22 @@ namespace Windows.UI.Composition { [propput] HRESULT Color([in] Windows.UI.Color value); } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.CompositionCommitBatch), + uuid(0d00dad0-ca07-4400-8c8e-cb5db08559cc) + ] + interface ICompositionCommitBatch : IInspectable + { + [propget] HRESULT IsActive([out, retval] boolean *value); + [propget] HRESULT IsEnded([out, retval] boolean *value); + [eventadd] HRESULT Completed( + [in] Windows.Foundation.TypedEventHandler<IInspectable *, Windows.UI.Composition.CompositionBatchCompletedEventArgs *> *handler, + [out, retval] EventRegistrationToken *token + ); + [eventremove] HRESULT Completed([in] EventRegistrationToken token); + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.UI.Composition.CompositionEasingFunction), @@ -715,6 +733,16 @@ namespace Windows.UI.Composition { [default] interface Windows.UI.Composition.ICompositionColorBrush; } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass CompositionCommitBatch : Windows.UI.Composition.CompositionObject + { + [default] interface Windows.UI.Composition.ICompositionCommitBatch; + } + [ composable(Windows.UI.Composition.ICompositionEasingFunctionFactory, public, Windows.Foundation.UniversalApiContract, 2.0), contract(Windows.Foundation.UniversalApiContract, 2.0),

1 0

Mohamad Al-Jaf : include: Add Windows.UI.Composition.Vector3KeyFrameAnimation definition.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: 208971f1812936e8c529024c8a8d9f5c6b0c4971 URL: https://gitlab.winehq.org/wine/wine/-/commit/208971f1812936e8c529024c8a8d9f… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Apr 5 20:27:42 2023 -0400 include: Add Windows.UI.Composition.Vector3KeyFrameAnimation definition. Needed by Windows.UI.Composition.Compositor. --- include/windows.ui.composition.idl | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl index 090e506f2f0..23dba7d73b4 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -76,6 +76,7 @@ namespace Windows.UI.Composition { interface ISpriteVisual; interface ISpriteVisual2; interface IVector2KeyFrameAnimation; + interface IVector3KeyFrameAnimation; interface IVisual; interface IVisual2; interface IVisual3; @@ -107,6 +108,7 @@ namespace Windows.UI.Composition { runtimeclass ScalarKeyFrameAnimation; runtimeclass SpriteVisual; runtimeclass Vector2KeyFrameAnimation; + runtimeclass Vector3KeyFrameAnimation; runtimeclass Visual; runtimeclass VisualCollection; @@ -563,6 +565,20 @@ namespace Windows.UI.Composition { ); } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.Vector3KeyFrameAnimation), + uuid(c8039daa-a281-43c2-a73d-b68e3c533c40) + ] + interface IVector3KeyFrameAnimation : IInspectable + { + [overload("InsertKeyFrame")] HRESULT InsertKeyFrame([in] FLOAT key, [in] Windows.Foundation.Numerics.Vector3 value); + [overload("InsertKeyFrame")] HRESULT InsertKeyFrameWithEasingFunction( + [in] FLOAT key, [in] Windows.Foundation.Numerics.Vector3 value, + [in] Windows.UI.Composition.CompositionEasingFunction *function + ); + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.UI.Composition.Visual), @@ -851,6 +867,16 @@ namespace Windows.UI.Composition { [default] interface Windows.UI.Composition.IVector2KeyFrameAnimation; } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass Vector3KeyFrameAnimation : Windows.UI.Composition.KeyFrameAnimation + { + [default] interface Windows.UI.Composition.IVector3KeyFrameAnimation; + } + [ composable(Windows.UI.Composition.IVisualFactory, public, Windows.Foundation.UniversalApiContract, 2.0), contract(Windows.Foundation.UniversalApiContract, 2.0),

1 0

Mohamad Al-Jaf : include: Add Windows.UI.Composition.Vector2KeyFrameAnimation definition.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: 52478c30118e1f1520f2a490fd2f2e8d3b8894d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/52478c30118e1f1520f2a490fd2f2e… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Apr 5 20:25:42 2023 -0400 include: Add Windows.UI.Composition.Vector2KeyFrameAnimation definition. Needed by Windows.UI.Composition.Compositor. --- include/windows.ui.composition.idl | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl index 06fd23f28cc..090e506f2f0 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -75,6 +75,7 @@ namespace Windows.UI.Composition { interface IScalarKeyFrameAnimation; interface ISpriteVisual; interface ISpriteVisual2; + interface IVector2KeyFrameAnimation; interface IVisual; interface IVisual2; interface IVisual3; @@ -105,6 +106,7 @@ namespace Windows.UI.Composition { runtimeclass QuaternionKeyFrameAnimation; runtimeclass ScalarKeyFrameAnimation; runtimeclass SpriteVisual; + runtimeclass Vector2KeyFrameAnimation; runtimeclass Visual; runtimeclass VisualCollection; @@ -547,6 +549,20 @@ namespace Windows.UI.Composition { [propput] HRESULT Brush([in] Windows.UI.Composition.CompositionBrush *value); } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.Vector2KeyFrameAnimation), + uuid(df414515-4e29-4f11-b55e-bf2a6eb36294) + ] + interface IVector2KeyFrameAnimation : IInspectable + { + [overload("InsertKeyFrame")] HRESULT InsertKeyFrame([in] FLOAT key, [in] Windows.Foundation.Numerics.Vector2 value); + [overload("InsertKeyFrame")] HRESULT InsertKeyFrameWithEasingFunction( + [in] FLOAT key, [in] Windows.Foundation.Numerics.Vector2 value, + [in] Windows.UI.Composition.CompositionEasingFunction *function + ); + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.UI.Composition.Visual), @@ -825,6 +841,16 @@ namespace Windows.UI.Composition { [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.UI.Composition.ISpriteVisual2; } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass Vector2KeyFrameAnimation : Windows.UI.Composition.KeyFrameAnimation + { + [default] interface Windows.UI.Composition.IVector2KeyFrameAnimation; + } + [ composable(Windows.UI.Composition.IVisualFactory, public, Windows.Foundation.UniversalApiContract, 2.0), contract(Windows.Foundation.UniversalApiContract, 2.0),

1 0

Mohamad Al-Jaf : include: Add Windows.UI.Composition.CompositionScopedBatch definition.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: d3ac460cdd9b9081a4f25c7504936b22ae4a3e4b URL: https://gitlab.winehq.org/wine/wine/-/commit/d3ac460cdd9b9081a4f25c7504936b… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Apr 3 21:26:47 2023 -0400 include: Add Windows.UI.Composition.CompositionScopedBatch definition. Needed by Windows.UI.Composition.Compositor. --- include/windows.ui.composition.idl | 53 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl index bc1ca6bffb1..c99201ca995 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -44,6 +44,7 @@ namespace Windows.UI.Composition { typedef enum CompositionStretch CompositionStretch; interface IColorKeyFrameAnimation; + interface ICompositionBatchCompletedEventArgs; interface ICompositionBrush; interface ICompositionBrushFactory; interface ICompositionClip; @@ -57,6 +58,7 @@ namespace Windows.UI.Composition { interface ICompositionEffectFactory; interface ICompositionPropertySet; interface ICompositionPropertySet2; + interface ICompositionScopedBatch; interface ICompositionSurface; interface ICompositionSurfaceBrush; interface ICompositionSurfaceBrush2; @@ -80,6 +82,7 @@ namespace Windows.UI.Composition { runtimeclass ColorKeyFrameAnimation; runtimeclass CompositionAnimation; + runtimeclass CompositionBatchCompletedEventArgs; runtimeclass CompositionBrush; runtimeclass CompositionClip; runtimeclass CompositionColorBrush; @@ -88,6 +91,7 @@ namespace Windows.UI.Composition { runtimeclass CompositionEffectFactory; runtimeclass CompositionObject; runtimeclass CompositionPropertySet; + runtimeclass CompositionScopedBatch; runtimeclass CompositionSurfaceBrush; runtimeclass ContainerVisual; runtimeclass CubicBezierEasingFunction; @@ -106,6 +110,7 @@ namespace Windows.UI.Composition { interface Windows.Foundation.IAsyncOperation<Windows.UI.Composition.ICompositionSurface *>; interface Windows.Foundation.Collections.IIterable<Windows.UI.Composition.Visual *>; interface Windows.Foundation.Collections.IIterator<Windows.UI.Composition.Visual *>; + interface Windows.Foundation.TypedEventHandler<IInspectable *, Windows.UI.Composition.CompositionBatchCompletedEventArgs *>; } [ @@ -227,6 +232,15 @@ namespace Windows.UI.Composition { ); } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.CompositionBatchCompletedEventArgs), + uuid(0d00dad0-9464-450a-a562-2e2698b0a812) + ] + interface ICompositionBatchCompletedEventArgs : IInspectable + { + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.UI.Composition.CompositionBrush), @@ -358,6 +372,25 @@ namespace Windows.UI.Composition { ); } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.CompositionScopedBatch), + uuid(0d00dad0-fb07-46fd-8c72-6280d1a3d1dd) + ] + interface ICompositionScopedBatch : IInspectable + { + [propget] HRESULT IsActive([out, retval] boolean *value); + [propget] HRESULT IsEnded([out, retval] boolean *value); + HRESULT End(); + HRESULT Resume(); + HRESULT Suspend(); + [eventadd] HRESULT Completed( + [in] Windows.Foundation.TypedEventHandler<IInspectable *, Windows.UI.Composition.CompositionBatchCompletedEventArgs *> *handler, + [out, retval] EventRegistrationToken *token + ); + [eventremove] HRESULT Completed([in] EventRegistrationToken token); + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), uuid(1527540d-42c7-47a6-a408-668f79a90dfb) @@ -568,6 +601,16 @@ namespace Windows.UI.Composition { [default] interface Windows.UI.Composition.IColorKeyFrameAnimation; } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass CompositionBatchCompletedEventArgs : Windows.UI.Composition.CompositionObject + { + [default] interface Windows.UI.Composition.ICompositionBatchCompletedEventArgs; + } + [ composable(Windows.UI.Composition.ICompositionBrushFactory, public, Windows.Foundation.UniversalApiContract, 2.0), contract(Windows.Foundation.UniversalApiContract, 2.0), @@ -644,6 +687,16 @@ namespace Windows.UI.Composition { [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.UI.Composition.ICompositionPropertySet2; } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass CompositionScopedBatch : Windows.UI.Composition.CompositionObject + { + [default] interface Windows.UI.Composition.ICompositionScopedBatch; + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), marshaling_behavior(agile),

1 0

Mohamad Al-Jaf : include: Add Windows.UI.Composition.LinearEasingFunction definition.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: 438185ed215a3393cc0a7e55b3366e9dcf8de366 URL: https://gitlab.winehq.org/wine/wine/-/commit/438185ed215a3393cc0a7e55b3366e… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Apr 3 21:08:50 2023 -0400 include: Add Windows.UI.Composition.LinearEasingFunction definition. Needed by Windows.UI.Composition.Compositor. --- include/windows.ui.composition.idl | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl index 9b987418a07..11deb2ab5d7 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -63,6 +63,7 @@ namespace Windows.UI.Composition { interface ICubicBezierEasingFunction; interface IExpressionAnimation; interface IInsetClip; + interface ILinearEasingFunction; interface ISpriteVisual; interface ISpriteVisual2; interface IVisual; @@ -86,6 +87,7 @@ namespace Windows.UI.Composition { runtimeclass CubicBezierEasingFunction; runtimeclass ExpressionAnimation; runtimeclass InsetClip; + runtimeclass LinearEasingFunction; runtimeclass KeyFrameAnimation; runtimeclass SpriteVisual; runtimeclass Visual; @@ -380,6 +382,15 @@ namespace Windows.UI.Composition { [propput] HRESULT TopInset([in] FLOAT value); } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.LinearEasingFunction), + uuid(9400975a-c7a6-46b3-acf7-1a268a0a117d) + ] + interface ILinearEasingFunction : IInspectable + { + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.UI.Composition.SpriteVisual), @@ -586,6 +597,16 @@ namespace Windows.UI.Composition { [default] interface Windows.UI.Composition.IInsetClip; } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass LinearEasingFunction : Windows.UI.Composition.CompositionEasingFunction + { + [default] interface Windows.UI.Composition.ILinearEasingFunction; + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), marshaling_behavior(agile),

1 0

Mohamad Al-Jaf : include: Add Windows.UI.Composition.ScalarKeyFrameAnimation definition.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: b9878e0c2ed2d786286d13725893e53fafbf6a74 URL: https://gitlab.winehq.org/wine/wine/-/commit/b9878e0c2ed2d786286d13725893e5… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Apr 3 21:21:09 2023 -0400 include: Add Windows.UI.Composition.ScalarKeyFrameAnimation definition. Needed by Windows.UI.Composition.Compositor. --- include/windows.ui.composition.idl | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl index d5f94da5abd..bc1ca6bffb1 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -68,6 +68,7 @@ namespace Windows.UI.Composition { interface IInsetClip; interface ILinearEasingFunction; interface IQuaternionKeyFrameAnimation; + interface IScalarKeyFrameAnimation; interface ISpriteVisual; interface ISpriteVisual2; interface IVisual; @@ -95,6 +96,7 @@ namespace Windows.UI.Composition { runtimeclass LinearEasingFunction; runtimeclass KeyFrameAnimation; runtimeclass QuaternionKeyFrameAnimation; + runtimeclass ScalarKeyFrameAnimation; runtimeclass SpriteVisual; runtimeclass Visual; runtimeclass VisualCollection; @@ -464,6 +466,20 @@ namespace Windows.UI.Composition { ); } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.ScalarKeyFrameAnimation), + uuid(ae288fa9-252c-4b95-a725-bf85e38000a1) + ] + interface IScalarKeyFrameAnimation : IInspectable + { + [overload("InsertKeyFrame")] HRESULT InsertKeyFrame([in] FLOAT key, [in] FLOAT value); + [overload("InsertKeyFrame")] HRESULT InsertKeyFrameWithEasingFunction( + [in] FLOAT key, [in] FLOAT value, + [in] Windows.UI.Composition.CompositionEasingFunction *function + ); + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.UI.Composition.SpriteVisual), @@ -701,6 +717,16 @@ namespace Windows.UI.Composition { [default] interface Windows.UI.Composition.IQuaternionKeyFrameAnimation; } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass ScalarKeyFrameAnimation : Windows.UI.Composition.KeyFrameAnimation + { + [default] interface Windows.UI.Composition.IScalarKeyFrameAnimation; + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), marshaling_behavior(agile),

1 0

Mohamad Al-Jaf : include: Add Windows.UI.Composition.CompositionPropertySet definition.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: 76ffc7324f400b46ab2aa7c7f3e20347c8c3eb7e URL: https://gitlab.winehq.org/wine/wine/-/commit/76ffc7324f400b46ab2aa7c7f3e203… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Apr 3 21:13:19 2023 -0400 include: Add Windows.UI.Composition.CompositionPropertySet definition. Needed for mingw Firefox build and Windows.UI.Composition.Compositor. --- include/windows.ui.composition.idl | 68 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl index 11deb2ab5d7..c2c1dea6fec 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -40,6 +40,7 @@ namespace Windows.UI.Composition { typedef enum CompositionColorSpace CompositionColorSpace; typedef enum CompositionCompositeMode CompositionCompositeMode; typedef enum CompositionEffectFactoryLoadStatus CompositionEffectFactoryLoadStatus; + typedef enum CompositionGetValueStatus CompositionGetValueStatus; typedef enum CompositionStretch CompositionStretch; interface IColorKeyFrameAnimation; @@ -54,6 +55,8 @@ namespace Windows.UI.Composition { interface ICompositionEasingFunctionStatics; interface ICompositionEffectBrush; interface ICompositionEffectFactory; + interface ICompositionPropertySet; + interface ICompositionPropertySet2; interface ICompositionSurface; interface ICompositionSurfaceBrush; interface ICompositionSurfaceBrush2; @@ -82,6 +85,7 @@ namespace Windows.UI.Composition { runtimeclass CompositionEffectBrush; runtimeclass CompositionEffectFactory; runtimeclass CompositionObject; + runtimeclass CompositionPropertySet; runtimeclass CompositionSurfaceBrush; runtimeclass ContainerVisual; runtimeclass CubicBezierEasingFunction; @@ -182,6 +186,16 @@ namespace Windows.UI.Composition { Other = -1, }; + [ + contract(Windows.Foundation.UniversalApiContract, 2.0) + ] + enum CompositionGetValueStatus + { + Succeeded = 0, + TypeMismatch = 1, + NotFound = 2, + }; + [ contract(Windows.Foundation.UniversalApiContract, 2.0) ] @@ -297,6 +311,49 @@ namespace Windows.UI.Composition { [propget] HRESULT LoadStatus([out, retval] Windows.UI.Composition.CompositionEffectFactoryLoadStatus *value); } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.CompositionPropertySet), + uuid(c9d6d202-5f67-4453-9117-9eadd430d3c2) + ] + interface ICompositionPropertySet : IInspectable + { + HRESULT InsertColor([in] HSTRING name, [in] Windows.UI.Color value); + HRESULT InsertMatrix3x2([in] HSTRING name, [in] Windows.Foundation.Numerics.Matrix3x2 value); + HRESULT InsertMatrix4x4([in] HSTRING name, [in] Windows.Foundation.Numerics.Matrix4x4 value); + HRESULT InsertQuaternion([in] HSTRING name, [in] Windows.Foundation.Numerics.Quaternion value); + HRESULT InsertScalar([in] HSTRING name, [in] FLOAT value); + HRESULT InsertVector2([in] HSTRING name, [in] Windows.Foundation.Numerics.Vector2 value); + HRESULT InsertVector3([in] HSTRING name, [in] Windows.Foundation.Numerics.Vector3 value); + HRESULT InsertVector4([in] HSTRING name, [in] Windows.Foundation.Numerics.Vector4 value); + HRESULT TryGetColor([in] HSTRING name, [out] Windows.UI.Color *value, [out, retval] Windows.UI.Composition.CompositionGetValueStatus *result); + HRESULT TryGetMatrix3x2( + [in] HSTRING name, [out] Windows.Foundation.Numerics.Matrix3x2 *value, + [out, retval] Windows.UI.Composition.CompositionGetValueStatus *result + ); + HRESULT TryGetMatrix4x4( + [in] HSTRING name, [out] Windows.Foundation.Numerics.Matrix4x4 *value, + [out, retval] Windows.UI.Composition.CompositionGetValueStatus *result + ); + HRESULT TryGetQuaternion( + [in] HSTRING name, [out] Windows.Foundation.Numerics.Quaternion *value, + [out, retval] Windows.UI.Composition.CompositionGetValueStatus *result + ); + HRESULT TryGetScalar([in] HSTRING name, [out] FLOAT *value, [out, retval] Windows.UI.Composition.CompositionGetValueStatus *result); + HRESULT TryGetVector2( + [in] HSTRING name, [out] Windows.Foundation.Numerics.Vector2 *value, + [out, retval] Windows.UI.Composition.CompositionGetValueStatus *result + ); + HRESULT TryGetVector3( + [in] HSTRING name, [out] Windows.Foundation.Numerics.Vector3 *value, + [out, retval] Windows.UI.Composition.CompositionGetValueStatus *result + ); + HRESULT TryGetVector4( + [in] HSTRING name, [out] Windows.Foundation.Numerics.Vector4 *value, + [out, retval] Windows.UI.Composition.CompositionGetValueStatus *result + ); + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), uuid(1527540d-42c7-47a6-a408-668f79a90dfb) @@ -544,6 +601,17 @@ namespace Windows.UI.Composition { [default] interface Windows.UI.Composition.ICompositionEffectFactory; } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass CompositionPropertySet : Windows.UI.Composition.CompositionObject + { + [default] interface Windows.UI.Composition.ICompositionPropertySet; + [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.UI.Composition.ICompositionPropertySet2; + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), marshaling_behavior(agile),

1 0

Mohamad Al-Jaf : include: Add Windows.UI.Composition.CompositionTarget definition.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: dfbe81f7c223d9f406654c9d90d069a3f5a22085 URL: https://gitlab.winehq.org/wine/wine/-/commit/dfbe81f7c223d9f406654c9d90d069… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Apr 5 20:23:49 2023 -0400 include: Add Windows.UI.Composition.CompositionTarget definition. Needed by Windows.UI.Composition.Compositor. --- include/windows.ui.composition.idl | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl index c99201ca995..06fd23f28cc 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -63,6 +63,8 @@ namespace Windows.UI.Composition { interface ICompositionSurfaceBrush; interface ICompositionSurfaceBrush2; interface ICompositionSurfaceBrush3; + interface ICompositionTarget; + interface ICompositionTargetFactory; interface IContainerVisual; interface IContainerVisualFactory; interface ICubicBezierEasingFunction; @@ -93,6 +95,7 @@ namespace Windows.UI.Composition { runtimeclass CompositionPropertySet; runtimeclass CompositionScopedBatch; runtimeclass CompositionSurfaceBrush; + runtimeclass CompositionTarget; runtimeclass ContainerVisual; runtimeclass CubicBezierEasingFunction; runtimeclass ExpressionAnimation; @@ -418,6 +421,26 @@ namespace Windows.UI.Composition { [propput] HRESULT VerticalAlignmentRatio([in] FLOAT value); } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.CompositionTarget), + uuid(a1bea8ba-d726-4663-8129-6b5e7927ffa6) + ] + interface ICompositionTarget : IInspectable + { + [propget] HRESULT Root([out, retval] Windows.UI.Composition.Visual **value); + [propput] HRESULT Root([in] Windows.UI.Composition.Visual *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 5.0), + exclusiveto(Windows.UI.Composition.CompositionTarget), + uuid(93cd9d2b-8516-4b14-a8ce-f49e2119ec42) + ] + interface ICompositionTargetFactory : IInspectable + { + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.UI.Composition.ContainerVisual), @@ -709,6 +732,17 @@ namespace Windows.UI.Composition { [contract(Windows.Foundation.UniversalApiContract, 8.0)] interface Windows.UI.Composition.ICompositionSurfaceBrush3; } + [ + composable(Windows.UI.Composition.ICompositionTargetFactory, public, Windows.Foundation.UniversalApiContract, 5.0), + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass CompositionTarget : Windows.UI.Composition.CompositionObject + { + [default] interface Windows.UI.Composition.ICompositionTarget; + } + [ composable(Windows.UI.Composition.IContainerVisualFactory, public, Windows.Foundation.UniversalApiContract, 2.0), contract(Windows.Foundation.UniversalApiContract, 2.0),

1 0

Mohamad Al-Jaf : include: Add Windows.UI.Composition.QuaternionKeyFrameAnimation definition.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: ed5d87a5655d475822dbfc7e0208f3b9e3435b4a URL: https://gitlab.winehq.org/wine/wine/-/commit/ed5d87a5655d475822dbfc7e0208f3… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Apr 3 21:19:05 2023 -0400 include: Add Windows.UI.Composition.QuaternionKeyFrameAnimation definition. Needed by Windows.UI.Composition.Compositor. --- include/windows.ui.composition.idl | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl index c2c1dea6fec..d5f94da5abd 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -67,6 +67,7 @@ namespace Windows.UI.Composition { interface IExpressionAnimation; interface IInsetClip; interface ILinearEasingFunction; + interface IQuaternionKeyFrameAnimation; interface ISpriteVisual; interface ISpriteVisual2; interface IVisual; @@ -93,6 +94,7 @@ namespace Windows.UI.Composition { runtimeclass InsetClip; runtimeclass LinearEasingFunction; runtimeclass KeyFrameAnimation; + runtimeclass QuaternionKeyFrameAnimation; runtimeclass SpriteVisual; runtimeclass Visual; runtimeclass VisualCollection; @@ -448,6 +450,20 @@ namespace Windows.UI.Composition { { } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.QuaternionKeyFrameAnimation), + uuid(404e5835-ecf6-4240-8520-671279cf36bc) + ] + interface IQuaternionKeyFrameAnimation : IInspectable + { + [overload("InsertKeyFrame")] HRESULT InsertKeyFrame([in] FLOAT key, [in] Windows.Foundation.Numerics.Quaternion value); + [overload("InsertKeyFrame")] HRESULT InsertKeyFrameWithEasingFunction( + [in] FLOAT key, [in] Windows.Foundation.Numerics.Quaternion value, + [in] Windows.UI.Composition.CompositionEasingFunction *function + ); + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.UI.Composition.SpriteVisual), @@ -675,6 +691,16 @@ namespace Windows.UI.Composition { [default] interface Windows.UI.Composition.ILinearEasingFunction; } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass QuaternionKeyFrameAnimation : Windows.UI.Composition.KeyFrameAnimation + { + [default] interface Windows.UI.Composition.IQuaternionKeyFrameAnimation; + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), marshaling_behavior(agile),

1 0