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

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

Mohamad Al-Jaf : include: Add ICompositionSurface interface definition.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: 9129c338b8d459add544447318ddafea5f95d66f URL: https://gitlab.winehq.org/wine/wine/-/commit/9129c338b8d459add544447318ddaf… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Apr 3 19:40:58 2023 -0400 include: Add ICompositionSurface interface definition. Needed for mingw Firefox build. --- include/windows.ui.composition.idl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl index 4a0669368d5..568a8b92af6 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -39,11 +39,17 @@ namespace Windows.UI.Composition { interface ICompositionEasingFunction; interface ICompositionEasingFunctionFactory; interface ICompositionEasingFunctionStatics; + interface ICompositionSurface; runtimeclass CompositionBrush; runtimeclass CompositionEasingFunction; runtimeclass CompositionObject; + declare { + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.UI.Composition.ICompositionSurface *>; + interface Windows.Foundation.IAsyncOperation<Windows.UI.Composition.ICompositionSurface *>; + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.UI.Composition.CompositionBrush), @@ -80,6 +86,14 @@ namespace Windows.UI.Composition { { } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + uuid(1527540d-42c7-47a6-a408-668f79a90dfb) + ] + interface ICompositionSurface : IInspectable + { + } + [ 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.CompositionClip definition.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: 89c1dc71b5ce38b37ab9108c2735d2d8e514d233 URL: https://gitlab.winehq.org/wine/wine/-/commit/89c1dc71b5ce38b37ab9108c2735d2… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Apr 3 19:48:50 2023 -0400 include: Add Windows.UI.Composition.CompositionClip definition. Needed for mingw Firefox build. --- 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 11cb4535d14..75d466b5908 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -39,6 +39,9 @@ namespace Windows.UI.Composition { interface ICompositionBrush; interface ICompositionBrushFactory; + interface ICompositionClip; + interface ICompositionClip2; + interface ICompositionClipFactory; interface ICompositionEasingFunction; interface ICompositionEasingFunctionFactory; interface ICompositionEasingFunctionStatics; @@ -50,6 +53,7 @@ namespace Windows.UI.Composition { interface ISpriteVisual2; runtimeclass CompositionBrush; + runtimeclass CompositionClip; runtimeclass CompositionEasingFunction; runtimeclass CompositionObject; runtimeclass CompositionSurfaceBrush; @@ -115,6 +119,24 @@ namespace Windows.UI.Composition { { } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.CompositionClip), + uuid(1ccd2a52-cfc7-4ace-9983-146bb8eb6a3c) + ] + interface ICompositionClip : IInspectable + { + } + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.CompositionClip), + uuid(b9484caf-20c7-4aed-ac4a-9c78ba1302cf) + ] + interface ICompositionClipFactory : IInspectable + { + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.UI.Composition.CompositionEasingFunction), @@ -182,6 +204,18 @@ namespace Windows.UI.Composition { [default] interface Windows.UI.Composition.ICompositionBrush; } + [ + composable(Windows.UI.Composition.ICompositionClipFactory, public, Windows.Foundation.UniversalApiContract, 2.0), + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass CompositionClip : Windows.UI.Composition.CompositionObject + { + [default] interface Windows.UI.Composition.ICompositionClip; + [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.UI.Composition.ICompositionClip2; + } + [ 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.CompositionBrush definition.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: 06133eaf0cd3fe2767ec6b5b224ebe184c62018b URL: https://gitlab.winehq.org/wine/wine/-/commit/06133eaf0cd3fe2767ec6b5b224ebe… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Apr 3 19:36:59 2023 -0400 include: Add Windows.UI.Composition.CompositionBrush definition. Needed for mingw Firefox build. --- include/windows.ui.composition.idl | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl index 304b9c4e042..4a0669368d5 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -34,13 +34,34 @@ import "windows.ui.idl"; import "windows.ui.core.idl"; namespace Windows.UI.Composition { + interface ICompositionBrush; + interface ICompositionBrushFactory; interface ICompositionEasingFunction; interface ICompositionEasingFunctionFactory; interface ICompositionEasingFunctionStatics; + runtimeclass CompositionBrush; runtimeclass CompositionEasingFunction; runtimeclass CompositionObject; + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.CompositionBrush), + uuid(ab0d7608-30c0-40e9-b568-b60a6bd1fb46) + ] + interface ICompositionBrush : IInspectable + { + } + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.CompositionBrush), + uuid(da53fb4c-4650-47c4-ad76-765379607ed6) + ] + interface ICompositionBrushFactory : IInspectable + { + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.UI.Composition.CompositionEasingFunction), @@ -59,6 +80,17 @@ namespace Windows.UI.Composition { { } + [ + composable(Windows.UI.Composition.ICompositionBrushFactory, public, Windows.Foundation.UniversalApiContract, 2.0), + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass CompositionBrush : Windows.UI.Composition.CompositionObject + { + [default] interface Windows.UI.Composition.ICompositionBrush; + } + [ 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.idl file.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: 6637e1d8faf3b7dfbccf86b6af5a1bcfefe10aa8 URL: https://gitlab.winehq.org/wine/wine/-/commit/6637e1d8faf3b7dfbccf86b6af5a1b… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Jan 29 23:05:42 2023 -0500 include: Add windows.ui.composition.idl file. Needed for mingw Firefox build. --- include/Makefile.in | 1 + include/windows.ui.composition.idl | 73 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index dcf6c016313..f52314e745d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -837,6 +837,7 @@ SOURCES = \ windows.system.profile.systemmanufacturers.idl \ windows.system.threading.idl \ windows.system.userprofile.idl \ + windows.ui.composition.idl \ windows.ui.core.idl \ windows.ui.idl \ windows.ui.viewmanagement.idl \ diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl new file mode 100644 index 00000000000..304b9c4e042 --- /dev/null +++ b/include/windows.ui.composition.idl @@ -0,0 +1,73 @@ +/* + * 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.graphics.idl"; */ +import "windows.graphics.directx.idl"; +import "windows.graphics.effects.idl"; +import "windows.system.idl"; +import "windows.ui.idl"; +import "windows.ui.core.idl"; + +namespace Windows.UI.Composition { + interface ICompositionEasingFunction; + interface ICompositionEasingFunctionFactory; + interface ICompositionEasingFunctionStatics; + + runtimeclass CompositionEasingFunction; + runtimeclass CompositionObject; + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.CompositionEasingFunction), + uuid(5145e356-bf79-4ea8-8cc2-6b5b472e6c9a) + ] + interface ICompositionEasingFunction : IInspectable + { + } + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.CompositionEasingFunction), + uuid(60840774-3da0-4949-8200-7206c00190a0) + ] + interface ICompositionEasingFunctionFactory : IInspectable + { + } + + [ + composable(Windows.UI.Composition.ICompositionEasingFunctionFactory, public, Windows.Foundation.UniversalApiContract, 2.0), + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + static(Windows.UI.Composition.ICompositionEasingFunctionStatics, Windows.Foundation.UniversalApiContract, 12.0), + threading(both) + ] + runtimeclass CompositionEasingFunction : Windows.UI.Composition.CompositionObject + { + [default] interface Windows.UI.Composition.ICompositionEasingFunction; + } +}

1 0

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

April 6, 2023

Module: wine Branch: master Commit: 7ba9a384566504a9c36c6f6857d9e269ca17cc72 URL: https://gitlab.winehq.org/wine/wine/-/commit/7ba9a384566504a9c36c6f6857d9e2… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Apr 3 19:44:02 2023 -0400 include: Add Windows.UI.Composition.CompositionSurfaceBrush definition. Needed for mingw Firefox build. --- include/windows.ui.composition.idl | 74 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl index 568a8b92af6..691da23c4f2 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -34,22 +34,65 @@ import "windows.ui.idl"; import "windows.ui.core.idl"; namespace Windows.UI.Composition { + typedef enum CompositionBitmapInterpolationMode CompositionBitmapInterpolationMode; + typedef enum CompositionStretch CompositionStretch; + interface ICompositionBrush; interface ICompositionBrushFactory; interface ICompositionEasingFunction; interface ICompositionEasingFunctionFactory; interface ICompositionEasingFunctionStatics; interface ICompositionSurface; + interface ICompositionSurfaceBrush; + interface ICompositionSurfaceBrush2; + interface ICompositionSurfaceBrush3; runtimeclass CompositionBrush; runtimeclass CompositionEasingFunction; runtimeclass CompositionObject; + runtimeclass CompositionSurfaceBrush; declare { interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.UI.Composition.ICompositionSurface *>; interface Windows.Foundation.IAsyncOperation<Windows.UI.Composition.ICompositionSurface *>; } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0) + ] + enum CompositionBitmapInterpolationMode + { + NearestNeighbor = 0, + Linear = 1, + [contract(Windows.Foundation.UniversalApiContract, 8.0)] + MagLinearMinLinearMipLinear = 2, + [contract(Windows.Foundation.UniversalApiContract, 8.0)] + MagLinearMinLinearMipNearest = 3, + [contract(Windows.Foundation.UniversalApiContract, 8.0)] + MagLinearMinNearestMipLinear = 4, + [contract(Windows.Foundation.UniversalApiContract, 8.0)] + MagLinearMinNearestMipNearest = 5, + [contract(Windows.Foundation.UniversalApiContract, 8.0)] + MagNearestMinLinearMipLinear = 6, + [contract(Windows.Foundation.UniversalApiContract, 8.0)] + MagNearestMinLinearMipNearest = 7, + [contract(Windows.Foundation.UniversalApiContract, 8.0)] + MagNearestMinNearestMipLinear = 8, + [contract(Windows.Foundation.UniversalApiContract, 8.0)] + MagNearestMinNearestMipNearest = 9, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0) + ] + enum CompositionStretch + { + None = 0, + Fill = 1, + Uniform = 2, + UniformToFill = 3, + }; + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.UI.Composition.CompositionBrush), @@ -94,6 +137,25 @@ namespace Windows.UI.Composition { { } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.CompositionSurfaceBrush), + uuid(ad016d79-1e4c-4c0d-9c29-83338c87c162) + ] + interface ICompositionSurfaceBrush : IInspectable + { + [propget] HRESULT BitmapInterpolationMode([out, retval] Windows.UI.Composition.CompositionBitmapInterpolationMode *value); + [propput] HRESULT BitmapInterpolationMode([in] Windows.UI.Composition.CompositionBitmapInterpolationMode value); + [propget] HRESULT HorizontalAlignmentRatio([out, retval] FLOAT *value); + [propput] HRESULT HorizontalAlignmentRatio([in] FLOAT value); + [propget] HRESULT Stretch([out, retval] Windows.UI.Composition.CompositionStretch *value); + [propput] HRESULT Stretch([in] Windows.UI.Composition.CompositionStretch value); + [propget] HRESULT Surface([out, retval] Windows.UI.Composition.ICompositionSurface **value); + [propput] HRESULT Surface([in] Windows.UI.Composition.ICompositionSurface *value); + [propget] HRESULT VerticalAlignmentRatio([out, retval] FLOAT *value); + [propput] HRESULT VerticalAlignmentRatio([in] FLOAT value); + } + [ composable(Windows.UI.Composition.ICompositionBrushFactory, public, Windows.Foundation.UniversalApiContract, 2.0), contract(Windows.Foundation.UniversalApiContract, 2.0), @@ -116,4 +178,16 @@ namespace Windows.UI.Composition { { [default] interface Windows.UI.Composition.ICompositionEasingFunction; } + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass CompositionSurfaceBrush : Windows.UI.Composition.CompositionBrush + { + [default] interface Windows.UI.Composition.ICompositionSurfaceBrush; + [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.UI.Composition.ICompositionSurfaceBrush2; + [contract(Windows.Foundation.UniversalApiContract, 8.0)] interface Windows.UI.Composition.ICompositionSurfaceBrush3; + } }

1 0