- Wine-Commits - list.winehq.org

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

April 6, 2023

Module: wine Branch: master Commit: 779d6b2d3ce6b2f6a10954cf005936cad2b6c03c URL: https://gitlab.winehq.org/wine/wine/-/commit/779d6b2d3ce6b2f6a10954cf005936… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Apr 3 21:00:38 2023 -0400 include: Add Windows.UI.Composition.CompositionEffectFactory definition. Needed by Windows.UI.Composition.Compositor. --- include/windows.ui.composition.idl | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl index da139da3695..9e40d74fd46 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -39,6 +39,7 @@ namespace Windows.UI.Composition { typedef enum CompositionBorderMode CompositionBorderMode; typedef enum CompositionColorSpace CompositionColorSpace; typedef enum CompositionCompositeMode CompositionCompositeMode; + typedef enum CompositionEffectFactoryLoadStatus CompositionEffectFactoryLoadStatus; typedef enum CompositionStretch CompositionStretch; interface IColorKeyFrameAnimation; @@ -52,6 +53,7 @@ namespace Windows.UI.Composition { interface ICompositionEasingFunctionFactory; interface ICompositionEasingFunctionStatics; interface ICompositionEffectBrush; + interface ICompositionEffectFactory; interface ICompositionSurface; interface ICompositionSurfaceBrush; interface ICompositionSurfaceBrush2; @@ -74,6 +76,7 @@ namespace Windows.UI.Composition { runtimeclass CompositionColorBrush; runtimeclass CompositionEasingFunction; runtimeclass CompositionEffectBrush; + runtimeclass CompositionEffectFactory; runtimeclass CompositionObject; runtimeclass CompositionSurfaceBrush; runtimeclass ContainerVisual; @@ -161,6 +164,17 @@ namespace Windows.UI.Composition { MinBlend = 3, }; + [ + contract(Windows.Foundation.UniversalApiContract, 2.0) + ] + enum CompositionEffectFactoryLoadStatus + { + Success = 0, + EffectTooComplex = 1, + Pending = 2, + Other = -1, + }; + [ contract(Windows.Foundation.UniversalApiContract, 2.0) ] @@ -264,6 +278,18 @@ namespace Windows.UI.Composition { HRESULT SetSourceParameter([in] HSTRING name, [in] Windows.UI.Composition.CompositionBrush *source); } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.CompositionEffectFactory), + uuid(be5624af-ba7e-4510-9850-41c0b4ff74df) + ] + interface ICompositionEffectFactory : IInspectable + { + HRESULT CreateBrush([out, retval] Windows.UI.Composition.CompositionEffectBrush **result); + [propget] HRESULT ExtendedError([out, retval] HRESULT *value); + [propget] HRESULT LoadStatus([out, retval] Windows.UI.Composition.CompositionEffectFactoryLoadStatus *value); + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), uuid(1527540d-42c7-47a6-a408-668f79a90dfb) @@ -464,6 +490,16 @@ namespace Windows.UI.Composition { [default] interface Windows.UI.Composition.ICompositionEffectBrush; } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass CompositionEffectFactory : Windows.UI.Composition.CompositionObject + { + [default] interface Windows.UI.Composition.ICompositionEffectFactory; + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), marshaling_behavior(agile),

1 0

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

April 6, 2023

Module: wine Branch: master Commit: 6b173e51e516c8ef7477f68d9939239974ef3161 URL: https://gitlab.winehq.org/wine/wine/-/commit/6b173e51e516c8ef7477f68d993923… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Apr 3 21:04:17 2023 -0400 include: Add Windows.UI.Composition.ExpressionAnimation definition. Needed by Windows.UI.Composition.Compositor. --- include/windows.ui.composition.idl | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl index 9e40d74fd46..3d4aa635b2b 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -61,6 +61,7 @@ namespace Windows.UI.Composition { interface IContainerVisual; interface IContainerVisualFactory; interface ICubicBezierEasingFunction; + interface IExpressionAnimation; interface ISpriteVisual; interface ISpriteVisual2; interface IVisual; @@ -71,6 +72,7 @@ namespace Windows.UI.Composition { interface IVisualFactory; runtimeclass ColorKeyFrameAnimation; + runtimeclass CompositionAnimation; runtimeclass CompositionBrush; runtimeclass CompositionClip; runtimeclass CompositionColorBrush; @@ -81,6 +83,7 @@ namespace Windows.UI.Composition { runtimeclass CompositionSurfaceBrush; runtimeclass ContainerVisual; runtimeclass CubicBezierEasingFunction; + runtimeclass ExpressionAnimation; runtimeclass KeyFrameAnimation; runtimeclass SpriteVisual; runtimeclass Visual; @@ -347,6 +350,17 @@ namespace Windows.UI.Composition { [propget] HRESULT ControlPoint2([out, retval] Windows.Foundation.Numerics.Vector2 *value); } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.ExpressionAnimation), + uuid(6acc5431-7d3d-4bf3-abb6-f44bdc4888c1) + ] + interface IExpressionAnimation : IInspectable + { + [propget] HRESULT Expression([out, retval] HSTRING *value); + [propput] HRESULT Expression([in] HSTRING value); + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.UI.Composition.SpriteVisual), @@ -533,6 +547,16 @@ namespace Windows.UI.Composition { [default] interface Windows.UI.Composition.ICubicBezierEasingFunction; } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass ExpressionAnimation : Windows.UI.Composition.CompositionAnimation + { + [default] interface Windows.UI.Composition.IExpressionAnimation; + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), marshaling_behavior(agile),

1 0

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

April 6, 2023

Module: wine Branch: master Commit: c5de4c43573db417ed3ab48f68faf39ce20aa8c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/c5de4c43573db417ed3ab48f68faf3… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Apr 3 21:06:53 2023 -0400 include: Add Windows.UI.Composition.InsetClip definition. Needed by Windows.UI.Composition.Compositor. --- include/windows.ui.composition.idl | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl index 3d4aa635b2b..9b987418a07 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -62,6 +62,7 @@ namespace Windows.UI.Composition { interface IContainerVisualFactory; interface ICubicBezierEasingFunction; interface IExpressionAnimation; + interface IInsetClip; interface ISpriteVisual; interface ISpriteVisual2; interface IVisual; @@ -84,6 +85,7 @@ namespace Windows.UI.Composition { runtimeclass ContainerVisual; runtimeclass CubicBezierEasingFunction; runtimeclass ExpressionAnimation; + runtimeclass InsetClip; runtimeclass KeyFrameAnimation; runtimeclass SpriteVisual; runtimeclass Visual; @@ -361,6 +363,23 @@ namespace Windows.UI.Composition { [propput] HRESULT Expression([in] HSTRING value); } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.InsetClip), + uuid(1e73e647-84c7-477a-b474-5880e0442e15) + ] + interface IInsetClip : IInspectable + { + [propget] HRESULT BottomInset([out, retval] FLOAT *value); + [propput] HRESULT BottomInset([in] FLOAT value); + [propget] HRESULT LeftInset([out, retval] FLOAT *value); + [propput] HRESULT LeftInset([in] FLOAT value); + [propget] HRESULT RightInset([out, retval] FLOAT *value); + [propput] HRESULT RightInset([in] FLOAT value); + [propget] HRESULT TopInset([out, retval] FLOAT *value); + [propput] HRESULT TopInset([in] FLOAT value); + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.UI.Composition.SpriteVisual), @@ -557,6 +576,16 @@ namespace Windows.UI.Composition { [default] interface Windows.UI.Composition.IExpressionAnimation; } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass InsetClip : Windows.UI.Composition.CompositionClip + { + [default] interface Windows.UI.Composition.IInsetClip; + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), marshaling_behavior(agile),

1 0

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

April 6, 2023

Module: wine Branch: master Commit: 7dc5eee13c4800b3b2d270abeb6bcd171d193e5c URL: https://gitlab.winehq.org/wine/wine/-/commit/7dc5eee13c4800b3b2d270abeb6bcd… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Apr 3 20:11:41 2023 -0400 include: Add Windows.UI.Composition.ColorKeyFrameAnimation definition. Needed for mingw Firefox build. --- include/windows.ui.composition.idl | 44 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl index c9fa5fad828..57963655207 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -37,9 +37,11 @@ namespace Windows.UI.Composition { typedef enum CompositionBackfaceVisibility CompositionBackfaceVisibility; typedef enum CompositionBitmapInterpolationMode CompositionBitmapInterpolationMode; typedef enum CompositionBorderMode CompositionBorderMode; + typedef enum CompositionColorSpace CompositionColorSpace; typedef enum CompositionCompositeMode CompositionCompositeMode; typedef enum CompositionStretch CompositionStretch; + interface IColorKeyFrameAnimation; interface ICompositionBrush; interface ICompositionBrushFactory; interface ICompositionClip; @@ -63,12 +65,14 @@ namespace Windows.UI.Composition { interface IVisualCollection; interface IVisualFactory; + runtimeclass ColorKeyFrameAnimation; runtimeclass CompositionBrush; runtimeclass CompositionClip; runtimeclass CompositionEasingFunction; runtimeclass CompositionObject; runtimeclass CompositionSurfaceBrush; runtimeclass ContainerVisual; + runtimeclass KeyFrameAnimation; runtimeclass SpriteVisual; runtimeclass Visual; runtimeclass VisualCollection; @@ -125,6 +129,20 @@ namespace Windows.UI.Composition { Hard = 2, }; + [ + contract(Windows.Foundation.UniversalApiContract, 2.0) + ] + enum CompositionColorSpace + { + Auto = 0, + Hsl = 1, + Rgb = 2, + [contract(Windows.Foundation.UniversalApiContract, 5.0)] + HslLinear = 3, + [contract(Windows.Foundation.UniversalApiContract, 5.0)] + RgbLinear = 4, + }; + [ contract(Windows.Foundation.UniversalApiContract, 2.0) ] @@ -148,6 +166,22 @@ namespace Windows.UI.Composition { UniformToFill = 3, }; + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.ColorKeyFrameAnimation), + uuid(93adb5e9-8e05-4593-84a3-dca152781e56) + ] + interface IColorKeyFrameAnimation : IInspectable + { + [propget] HRESULT InterpolationColorSpace([out, retval] Windows.UI.Composition.CompositionColorSpace *value); + [propput] HRESULT InterpolationColorSpace([in] Windows.UI.Composition.CompositionColorSpace value); + [overload("InsertKeyFrame")] HRESULT InsertKeyFrame([in] FLOAT key, [in] Windows.UI.Color value); + [overload("InsertKeyFrame")] HRESULT InsertKeyFrameWithEasingFunction( + [in] FLOAT key, [in] Windows.UI.Color value, + [in] Windows.UI.Composition.CompositionEasingFunction *function + ); + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.UI.Composition.CompositionBrush), @@ -326,6 +360,16 @@ namespace Windows.UI.Composition { HRESULT RemoveAll(); } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass ColorKeyFrameAnimation : Windows.UI.Composition.KeyFrameAnimation + { + [default] interface Windows.UI.Composition.IColorKeyFrameAnimation; + } + [ composable(Windows.UI.Composition.ICompositionBrushFactory, public, Windows.Foundation.UniversalApiContract, 2.0), contract(Windows.Foundation.UniversalApiContract, 2.0),

1 0

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

April 6, 2023

Module: wine Branch: master Commit: 69848689f1f9c29fb89f29ccf665d023f609f82a URL: https://gitlab.winehq.org/wine/wine/-/commit/69848689f1f9c29fb89f29ccf665d0… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Apr 3 20:16:30 2023 -0400 include: Add Windows.UI.Composition.CompositionColorBrush definition. Needed for mingw Firefox build. --- include/windows.ui.composition.idl | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl index 57963655207..0f570e4a041 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -47,6 +47,7 @@ namespace Windows.UI.Composition { interface ICompositionClip; interface ICompositionClip2; interface ICompositionClipFactory; + interface ICompositionColorBrush; interface ICompositionEasingFunction; interface ICompositionEasingFunctionFactory; interface ICompositionEasingFunctionStatics; @@ -68,6 +69,7 @@ namespace Windows.UI.Composition { runtimeclass ColorKeyFrameAnimation; runtimeclass CompositionBrush; runtimeclass CompositionClip; + runtimeclass CompositionColorBrush; runtimeclass CompositionEasingFunction; runtimeclass CompositionObject; runtimeclass CompositionSurfaceBrush; @@ -218,6 +220,17 @@ namespace Windows.UI.Composition { { } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.CompositionColorBrush), + uuid(2b264c5e-bf35-4831-8642-cf70c20fff2f) + ] + interface ICompositionColorBrush : IInspectable + { + [propget] HRESULT Color([out, retval] Windows.UI.Color *value); + [propput] HRESULT Color([in] Windows.UI.Color value); + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.UI.Composition.CompositionEasingFunction), @@ -393,6 +406,16 @@ namespace Windows.UI.Composition { [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.UI.Composition.ICompositionClip2; } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass CompositionColorBrush : Windows.UI.Composition.CompositionBrush + { + [default] interface Windows.UI.Composition.ICompositionColorBrush; + } + [ 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.Visual definition.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: 00eff2447c39e43c325106ebc3baa597a5314cab URL: https://gitlab.winehq.org/wine/wine/-/commit/00eff2447c39e43c325106ebc3baa5… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Apr 3 20:05:33 2023 -0400 include: Add Windows.UI.Composition.Visual definition. Needed for mingw Firefox build. --- include/windows.ui.composition.idl | 169 +++++++++++++++++++++++++++++++++++++ 1 file changed, 169 insertions(+)

1 0

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

April 6, 2023

Module: wine Branch: master Commit: 0b5bc1ffd909b231c395f71a21a29d695be549e5 URL: https://gitlab.winehq.org/wine/wine/-/commit/0b5bc1ffd909b231c395f71a21a29d… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Apr 3 20:58:11 2023 -0400 include: Add Windows.UI.Composition.CompositionEffectBrush definition. Needed by Windows.UI.Composition.CompositionEffectFactory. --- include/windows.ui.composition.idl | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl index be2b6875579..da139da3695 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -51,6 +51,7 @@ namespace Windows.UI.Composition { interface ICompositionEasingFunction; interface ICompositionEasingFunctionFactory; interface ICompositionEasingFunctionStatics; + interface ICompositionEffectBrush; interface ICompositionSurface; interface ICompositionSurfaceBrush; interface ICompositionSurfaceBrush2; @@ -72,6 +73,7 @@ namespace Windows.UI.Composition { runtimeclass CompositionClip; runtimeclass CompositionColorBrush; runtimeclass CompositionEasingFunction; + runtimeclass CompositionEffectBrush; runtimeclass CompositionObject; runtimeclass CompositionSurfaceBrush; runtimeclass ContainerVisual; @@ -251,6 +253,17 @@ namespace Windows.UI.Composition { { } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.CompositionEffectBrush), + uuid(bf7f795e-83cc-44bf-a447-3e3c071789ec) + ] + interface ICompositionEffectBrush : IInspectable + { + HRESULT GetSourceParameter([in] HSTRING name, [out, retval] Windows.UI.Composition.CompositionBrush **result); + HRESULT SetSourceParameter([in] HSTRING name, [in] Windows.UI.Composition.CompositionBrush *source); + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), uuid(1527540d-42c7-47a6-a408-668f79a90dfb) @@ -441,6 +454,16 @@ namespace Windows.UI.Composition { [default] interface Windows.UI.Composition.ICompositionEasingFunction; } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass CompositionEffectBrush : Windows.UI.Composition.CompositionBrush + { + [default] interface Windows.UI.Composition.ICompositionEffectBrush; + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), marshaling_behavior(agile),

1 0

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

April 6, 2023

Module: wine Branch: master Commit: a2f13c76e64cbf6603fc2fdcbf4603bc6d302208 URL: https://gitlab.winehq.org/wine/wine/-/commit/a2f13c76e64cbf6603fc2fdcbf4603… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Apr 3 20:26:02 2023 -0400 include: Add Windows.UI.Composition.CubicBezierEasingFunction definition. Needed for mingw Firefox build. --- include/windows.ui.composition.idl | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl index 0f570e4a041..be2b6875579 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -57,6 +57,7 @@ namespace Windows.UI.Composition { interface ICompositionSurfaceBrush3; interface IContainerVisual; interface IContainerVisualFactory; + interface ICubicBezierEasingFunction; interface ISpriteVisual; interface ISpriteVisual2; interface IVisual; @@ -74,6 +75,7 @@ namespace Windows.UI.Composition { runtimeclass CompositionObject; runtimeclass CompositionSurfaceBrush; runtimeclass ContainerVisual; + runtimeclass CubicBezierEasingFunction; runtimeclass KeyFrameAnimation; runtimeclass SpriteVisual; runtimeclass Visual; @@ -295,6 +297,17 @@ namespace Windows.UI.Composition { { } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.CubicBezierEasingFunction), + uuid(32350666-c1e8-44f9-96b8-c98acf0ae698) + ] + interface ICubicBezierEasingFunction : IInspectable + { + [propget] HRESULT ControlPoint1([out, retval] Windows.Foundation.Numerics.Vector2 *value); + [propget] HRESULT ControlPoint2([out, retval] Windows.Foundation.Numerics.Vector2 *value); + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.UI.Composition.SpriteVisual), @@ -451,6 +464,16 @@ namespace Windows.UI.Composition { [default] interface Windows.UI.Composition.IContainerVisual; } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass CubicBezierEasingFunction : Windows.UI.Composition.CompositionEasingFunction + { + [default] interface Windows.UI.Composition.ICubicBezierEasingFunction; + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), marshaling_behavior(agile),

1 0

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

April 6, 2023

Module: wine Branch: master Commit: 0eaafd2dcf664bbd8adc6b2128712b67a037f84d URL: https://gitlab.winehq.org/wine/wine/-/commit/0eaafd2dcf664bbd8adc6b2128712b… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Apr 3 19:46:47 2023 -0400 include: Add Windows.UI.Composition.SpriteVisual definition. Needed for mingw Firefox build. --- 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 691da23c4f2..11cb4535d14 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -46,11 +46,15 @@ namespace Windows.UI.Composition { interface ICompositionSurfaceBrush; interface ICompositionSurfaceBrush2; interface ICompositionSurfaceBrush3; + interface ISpriteVisual; + interface ISpriteVisual2; runtimeclass CompositionBrush; runtimeclass CompositionEasingFunction; runtimeclass CompositionObject; runtimeclass CompositionSurfaceBrush; + runtimeclass ContainerVisual; + runtimeclass SpriteVisual; declare { interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.UI.Composition.ICompositionSurface *>; @@ -156,6 +160,17 @@ namespace Windows.UI.Composition { [propput] HRESULT VerticalAlignmentRatio([in] FLOAT value); } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.SpriteVisual), + uuid(08e05581-1ad1-4f97-9757-402d76e4233b) + ] + interface ISpriteVisual : IInspectable + { + [propget] HRESULT Brush([out, retval] Windows.UI.Composition.CompositionBrush **value); + [propput] HRESULT Brush([in] Windows.UI.Composition.CompositionBrush *value); + } + [ composable(Windows.UI.Composition.ICompositionBrushFactory, public, Windows.Foundation.UniversalApiContract, 2.0), contract(Windows.Foundation.UniversalApiContract, 2.0), @@ -190,4 +205,15 @@ namespace Windows.UI.Composition { [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.UI.Composition.ICompositionSurfaceBrush2; [contract(Windows.Foundation.UniversalApiContract, 8.0)] interface Windows.UI.Composition.ICompositionSurfaceBrush3; } + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass SpriteVisual : Windows.UI.Composition.ContainerVisual + { + [default] interface Windows.UI.Composition.ISpriteVisual; + [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.UI.Composition.ISpriteVisual2; + } }

1 0

Zebediah Figura : advapi32: Print ReportEvent() messages one line at a time.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: 95258873a5dba2c28196c017ce3832fff6d64dd0 URL: https://gitlab.winehq.org/wine/wine/-/commit/95258873a5dba2c28196c017ce3832… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 23 01:34:15 2022 -0500 advapi32: Print ReportEvent() messages one line at a time. .NET Framework passes multiline backtraces to ReportEvent(), which get cut off when passed to debugstr_w(). --- dlls/advapi32/eventlog.c | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index f7fbfc6d547..d21d3452591 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -642,20 +642,34 @@ BOOL WINAPI ReportEventW( HANDLE hEventLog, WORD wType, WORD wCategory, DWORD dw for (i = 0; i < wNumStrings; i++) { - switch (wType) + const WCHAR *line = lpStrings[i]; + + while (*line) { - case EVENTLOG_SUCCESS: - TRACE_(eventlog)("%s\n", debugstr_w(lpStrings[i])); - break; - case EVENTLOG_ERROR_TYPE: - ERR_(eventlog)("%s\n", debugstr_w(lpStrings[i])); - break; - case EVENTLOG_WARNING_TYPE: - WARN_(eventlog)("%s\n", debugstr_w(lpStrings[i])); - break; - default: - TRACE_(eventlog)("%s\n", debugstr_w(lpStrings[i])); - break; + const WCHAR *next = wcschr( line, '\n' ); + + if (next) + ++next; + else + next = line + wcslen( line ); + + switch (wType) + { + case EVENTLOG_SUCCESS: + TRACE_(eventlog)("%s\n", debugstr_wn(line, next - line)); + break; + case EVENTLOG_ERROR_TYPE: + ERR_(eventlog)("%s\n", debugstr_wn(line, next - line)); + break; + case EVENTLOG_WARNING_TYPE: + WARN_(eventlog)("%s\n", debugstr_wn(line, next - line)); + break; + default: + TRACE_(eventlog)("%s\n", debugstr_wn(line, next - line)); + break; + } + + line = next; } } return TRUE;

1 0