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

Rémi Bernon : dinput/tests: Mark some tests as flaky to work around fvwm bug.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: 3fad9cac5bd9ee69e0f1d37881aaf8f4c6fc40ba URL: https://gitlab.winehq.org/wine/wine/-/commit/3fad9cac5bd9ee69e0f1d37881aaf8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 6 10:06:45 2023 +0200 dinput/tests: Mark some tests as flaky to work around fvwm bug. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54594 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54713 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54774 --- dlls/dinput/tests/device8.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c index a649fe53b41..523c2506a39 100644 --- a/dlls/dinput/tests/device8.c +++ b/dlls/dinput/tests/device8.c @@ -395,11 +395,13 @@ void test_overlapped_format( DWORD version ) /* press D */ keybd_event( 0, DIK_D, KEYEVENTF_SCANCODE, 0 ); res = WaitForSingleObject( event, 5000 ); + flaky_wine_if( GetForegroundWindow() != hwnd && version == 0x800 ) /* FIXME: fvwm sometimes steals input focus */ ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#lx\n", res ); count = 10; hr = IDirectInputDevice_GetDeviceData( keyboard, data_size, NULL, &count, 0 ); ok( hr == DI_OK, "GetDeviceData returned %#lx\n", hr ); + flaky_wine_if( GetForegroundWindow() != hwnd && version == 0x800 ) /* FIXME: fvwm sometimes steals input focus */ ok( count == 1, "got count %lu\n", count ); memset( &state, 0xFF, sizeof(state) ); @@ -415,11 +417,13 @@ void test_overlapped_format( DWORD version ) /* release D */ keybd_event( 0, DIK_D, KEYEVENTF_SCANCODE | KEYEVENTF_KEYUP, 0 ); res = WaitForSingleObject( event, 5000 ); + flaky_wine_if( GetForegroundWindow() != hwnd && version == 0x800 ) /* FIXME: fvwm sometimes steals input focus */ ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#lx\n", res ); count = 10; hr = IDirectInputDevice_GetDeviceData( keyboard, data_size, NULL, &count, 0 ); ok( hr == DI_OK, "GetDeviceData returned %#lx\n", hr ); + flaky_wine_if( GetForegroundWindow() != hwnd && version == 0x800 ) /* FIXME: fvwm sometimes steals input focus */ ok( count == 1, "got count %lu\n", count ); @@ -682,14 +686,19 @@ static void test_mouse_keyboard(void) IDirectInputDevice8_SetCooperativeLevel(di_keyboard, hwnd, DISCL_FOREGROUND|DISCL_EXCLUSIVE); hr = IDirectInputDevice8_Acquire(di_keyboard); + flaky_wine_if( GetForegroundWindow() != hwnd ) /* FIXME: fvwm sometimes steals input focus */ ok(SUCCEEDED(hr), "IDirectInputDevice8_Acquire failed: %#lx\n", hr); hr = IDirectInputDevice8_Acquire(di_mouse); + flaky_wine_if( GetForegroundWindow() != hwnd ) /* FIXME: fvwm sometimes steals input focus */ ok(SUCCEEDED(hr), "IDirectInputDevice8_Acquire failed: %#lx\n", hr); raw_devices_count = ARRAY_SIZE(raw_devices); memset(raw_devices, 0, sizeof(raw_devices)); hr = GetRegisteredRawInputDevices(raw_devices, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + flaky_wine_if( GetForegroundWindow() != hwnd ) /* FIXME: fvwm sometimes steals input focus */ ok(hr == 3, "GetRegisteredRawInputDevices returned %ld, raw_devices_count: %d\n", hr, raw_devices_count); + flaky_wine_if( GetForegroundWindow() != hwnd ) /* FIXME: fvwm sometimes steals input focus */ ok(raw_devices[0].dwFlags == (RIDEV_CAPTUREMOUSE|RIDEV_NOLEGACY), "Unexpected raw device flags: %#lx\n", raw_devices[0].dwFlags); + flaky_wine_if( GetForegroundWindow() != hwnd ) /* FIXME: fvwm sometimes steals input focus */ ok(raw_devices[2].dwFlags == (RIDEV_NOHOTKEYS|RIDEV_NOLEGACY), "Unexpected raw device flags: %#lx\n", raw_devices[1].dwFlags); hr = IDirectInputDevice8_Unacquire(di_keyboard); ok(SUCCEEDED(hr), "IDirectInputDevice8_Acquire failed: %#lx\n", hr); @@ -1581,7 +1590,7 @@ cleanup: localized = old_localized; } -static void test_dik_codes( IDirectInputDevice8W *device, HANDLE event, HWND hwnd ) +static void test_dik_codes( IDirectInputDevice8W *device, HANDLE event, HWND hwnd, DWORD version ) { static const struct key2dik { @@ -1685,6 +1694,7 @@ static void test_dik_codes( IDirectInputDevice8W *device, HANDLE event, HWND hwn keybd_event( vkey, scan, KEYEVENTF_KEYUP, 0 ); res = WaitForSingleObject( event, 5000 ); + flaky_wine_if( GetForegroundWindow() != hwnd && version == 0x800 ) /* FIXME: fvwm sometimes steals input focus */ ok( !res, "WaitForSingleObject returned %#lx\n", res ); winetest_pop_context(); @@ -2190,7 +2200,7 @@ skip_key_tests: ActivateKeyboardLayout( old_hkl, 0 ); UnloadKeyboardLayout( hkl ); - test_dik_codes( device, event, hwnd ); + test_dik_codes( device, event, hwnd, version ); CloseHandle( event ); DestroyWindow( hwnd );

1 0

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

April 6, 2023

Module: wine Branch: master Commit: 048b0421ffa3e31dccfdd4ff6cd25b18a8857e5f URL: https://gitlab.winehq.org/wine/wine/-/commit/048b0421ffa3e31dccfdd4ff6cd25b… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Apr 5 21:01:47 2023 -0400 include: Add Windows.UI.Composition.CompositionGraphicsDevice definition. Needed for mingw Firefox build. --- include/windows.ui.composition.idl | 59 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl index b3919711934..92ca136c05a 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -68,6 +68,10 @@ namespace Windows.UI.Composition { interface ICompositionEasingFunctionStatics; interface ICompositionEffectBrush; interface ICompositionEffectFactory; + interface ICompositionGraphicsDevice; + interface ICompositionGraphicsDevice2; + interface ICompositionGraphicsDevice3; + interface ICompositionGraphicsDevice4; interface ICompositionObject; interface ICompositionObject2; interface ICompositionObject3; @@ -102,6 +106,7 @@ namespace Windows.UI.Composition { interface IInsetClip; interface ILinearEasingFunction; interface IQuaternionKeyFrameAnimation; + interface IRenderingDeviceReplacedEventArgs; interface IScalarKeyFrameAnimation; interface ISpriteVisual; interface ISpriteVisual2; @@ -126,6 +131,7 @@ namespace Windows.UI.Composition { runtimeclass CompositionEasingFunction; runtimeclass CompositionEffectBrush; runtimeclass CompositionEffectFactory; + runtimeclass CompositionGraphicsDevice; runtimeclass CompositionObject; runtimeclass CompositionPropertySet; runtimeclass CompositionScopedBatch; @@ -139,6 +145,7 @@ namespace Windows.UI.Composition { runtimeclass LinearEasingFunction; runtimeclass KeyFrameAnimation; runtimeclass QuaternionKeyFrameAnimation; + runtimeclass RenderingDeviceReplacedEventArgs; runtimeclass ScalarKeyFrameAnimation; runtimeclass SpriteVisual; runtimeclass Vector2KeyFrameAnimation; @@ -155,6 +162,7 @@ namespace Windows.UI.Composition { 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 *>; + interface Windows.Foundation.TypedEventHandler<Windows.UI.Composition.CompositionGraphicsDevice *, Windows.UI.Composition.RenderingDeviceReplacedEventArgs *>; } [ @@ -485,6 +493,24 @@ namespace Windows.UI.Composition { [propget] HRESULT LoadStatus([out, retval] Windows.UI.Composition.CompositionEffectFactoryLoadStatus *value); } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.CompositionGraphicsDevice), + uuid(fb22c6e1-80a2-4667-9936-dbeaf6eefe95) + ] + interface ICompositionGraphicsDevice : IInspectable + { + HRESULT CreateDrawingSurface( + [in] Windows.Foundation.Size pixels, [in] Windows.Graphics.DirectX.DirectXPixelFormat format, + [in] Windows.Graphics.DirectX.DirectXAlphaMode mode, [out, retval] Windows.UI.Composition.CompositionDrawingSurface **result + ); + [eventadd] HRESULT RenderingDeviceReplaced( + [in] Windows.Foundation.TypedEventHandler<Windows.UI.Composition.CompositionGraphicsDevice *, Windows.UI.Composition.RenderingDeviceReplacedEventArgs *> *handler, + [out, retval] EventRegistrationToken *token + ); + [eventremove] HRESULT RenderingDeviceReplaced([in] EventRegistrationToken token); + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.UI.Composition.CompositionPropertySet), @@ -729,6 +755,16 @@ namespace Windows.UI.Composition { ); } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.RenderingDeviceReplacedEventArgs), + uuid(3a31ac7d-28bf-4e7a-8524-71679d480f38) + ] + interface IRenderingDeviceReplacedEventArgs : IInspectable + { + [propget] HRESULT GraphicsDevice([out, retval] Windows.UI.Composition.CompositionGraphicsDevice **value); + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.UI.Composition.ScalarKeyFrameAnimation), @@ -986,6 +1022,19 @@ namespace Windows.UI.Composition { [default] interface Windows.UI.Composition.ICompositionEffectFactory; } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass CompositionGraphicsDevice : Windows.UI.Composition.CompositionObject + { + [default] interface Windows.UI.Composition.ICompositionGraphicsDevice; + [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.UI.Composition.ICompositionGraphicsDevice2; + [contract(Windows.Foundation.UniversalApiContract, 8.0)] interface Windows.UI.Composition.ICompositionGraphicsDevice3; + [contract(Windows.Foundation.UniversalApiContract, 12.0)] interface Windows.UI.Composition.ICompositionGraphicsDevice4; + } + [ composable(Windows.UI.Composition.ICompositionObjectFactory, public, Windows.Foundation.UniversalApiContract, 2.0), contract(Windows.Foundation.UniversalApiContract, 2.0), @@ -1131,6 +1180,16 @@ namespace Windows.UI.Composition { [default] interface Windows.UI.Composition.IQuaternionKeyFrameAnimation; } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass RenderingDeviceReplacedEventArgs : Windows.UI.Composition.CompositionObject + { + [default] interface Windows.UI.Composition.IRenderingDeviceReplacedEventArgs; + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), marshaling_behavior(agile),

1 0

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

April 6, 2023

Module: wine Branch: master Commit: 191dbcc807b281fac7e2d01d716bb2371581062e URL: https://gitlab.winehq.org/wine/wine/-/commit/191dbcc807b281fac7e2d01d716bb2… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Apr 5 20:56:08 2023 -0400 include: Add Windows.UI.Composition.CompositionDrawingSurface definition. Needed by Windows.UI.Composition.CompositionGraphicsDevice. --- include/windows.ui.composition.idl | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl index cfe665501f7..b3919711934 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -60,6 +60,9 @@ namespace Windows.UI.Composition { interface ICompositionClipFactory; interface ICompositionColorBrush; interface ICompositionCommitBatch; + interface ICompositionDrawingSurface; + interface ICompositionDrawingSurface2; + interface ICompositionDrawingSurfaceFactory; interface ICompositionEasingFunction; interface ICompositionEasingFunctionFactory; interface ICompositionEasingFunctionStatics; @@ -119,6 +122,7 @@ namespace Windows.UI.Composition { runtimeclass CompositionClip; runtimeclass CompositionColorBrush; runtimeclass CompositionCommitBatch; + runtimeclass CompositionDrawingSurface; runtimeclass CompositionEasingFunction; runtimeclass CompositionEffectBrush; runtimeclass CompositionEffectFactory; @@ -419,6 +423,27 @@ namespace Windows.UI.Composition { [eventremove] HRESULT Completed([in] EventRegistrationToken token); } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.CompositionDrawingSurface), + uuid(a166c300-fad0-4d11-9e67-e433162ff49e) + ] + interface ICompositionDrawingSurface : IInspectable + { + [propget] HRESULT AlphaMode([out, retval] Windows.Graphics.DirectX.DirectXAlphaMode *value); + [propget] HRESULT PixelFormat([out, retval] Windows.Graphics.DirectX.DirectXPixelFormat *value); + [propget] HRESULT Size([out, retval] Windows.Foundation.Size *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + exclusiveto(Windows.UI.Composition.CompositionDrawingSurface), + uuid(9497b00a-312d-46b9-9db3-412fd79464c8) + ] + interface ICompositionDrawingSurfaceFactory : IInspectable + { + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.UI.Composition.CompositionEasingFunction), @@ -916,6 +941,19 @@ namespace Windows.UI.Composition { [default] interface Windows.UI.Composition.ICompositionCommitBatch; } + [ + composable(Windows.UI.Composition.ICompositionDrawingSurfaceFactory, public, Windows.Foundation.UniversalApiContract, 4.0), + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass CompositionDrawingSurface : Windows.UI.Composition.CompositionObject + { + [default] interface Windows.UI.Composition.ICompositionDrawingSurface; + [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.UI.Composition.ICompositionDrawingSurface2; + interface Windows.UI.Composition.ICompositionSurface; + } + [ 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.Vector4KeyFrameAnimation definition.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: 62ac0262861eab1d92d479dfd070ef0d89136624 URL: https://gitlab.winehq.org/wine/wine/-/commit/62ac0262861eab1d92d479dfd070ef… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Apr 5 20:29:07 2023 -0400 include: Add Windows.UI.Composition.Vector4KeyFrameAnimation 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 23dba7d73b4..0793b8fee1c 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -77,6 +77,7 @@ namespace Windows.UI.Composition { interface ISpriteVisual2; interface IVector2KeyFrameAnimation; interface IVector3KeyFrameAnimation; + interface IVector4KeyFrameAnimation; interface IVisual; interface IVisual2; interface IVisual3; @@ -109,6 +110,7 @@ namespace Windows.UI.Composition { runtimeclass SpriteVisual; runtimeclass Vector2KeyFrameAnimation; runtimeclass Vector3KeyFrameAnimation; + runtimeclass Vector4KeyFrameAnimation; runtimeclass Visual; runtimeclass VisualCollection; @@ -579,6 +581,20 @@ namespace Windows.UI.Composition { ); } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.Vector4KeyFrameAnimation), + uuid(2457945b-addd-4385-9606-b6a3d5e4e1b9) + ] + interface IVector4KeyFrameAnimation : IInspectable + { + [overload("InsertKeyFrame")] HRESULT InsertKeyFrame([in] FLOAT key, [in] Windows.Foundation.Numerics.Vector4 value); + [overload("InsertKeyFrame")] HRESULT InsertKeyFrameWithEasingFunction( + [in] FLOAT key, [in] Windows.Foundation.Numerics.Vector4 value, + [in] Windows.UI.Composition.CompositionEasingFunction *function + ); + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.UI.Composition.Visual), @@ -877,6 +893,16 @@ namespace Windows.UI.Composition { [default] interface Windows.UI.Composition.IVector3KeyFrameAnimation; } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass Vector4KeyFrameAnimation : Windows.UI.Composition.KeyFrameAnimation + { + [default] interface Windows.UI.Composition.IVector4KeyFrameAnimation; + } + [ 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.Compositor definition.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: 3de1dab6574ffedec41afbc4be17ba7f1769618f URL: https://gitlab.winehq.org/wine/wine/-/commit/3de1dab6574ffedec41afbc4be17ba… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Apr 5 20:39:17 2023 -0400 include: Add Windows.UI.Composition.Compositor definition. Needed for mingw Firefox build. --- include/windows.ui.composition.idl | 106 +++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl index 5b112ffa73e..927a793d223 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -35,6 +35,7 @@ import "windows.ui.core.idl"; namespace Windows.UI.Composition { typedef enum CompositionBackfaceVisibility CompositionBackfaceVisibility; + typedef enum CompositionBatchTypes CompositionBatchTypes; typedef enum CompositionBitmapInterpolationMode CompositionBitmapInterpolationMode; typedef enum CompositionBorderMode CompositionBorderMode; typedef enum CompositionColorSpace CompositionColorSpace; @@ -66,6 +67,18 @@ namespace Windows.UI.Composition { interface ICompositionSurfaceBrush3; interface ICompositionTarget; interface ICompositionTargetFactory; + interface ICompositor; + interface ICompositor2; + interface ICompositor3; + interface ICompositor4; + interface ICompositor5; + interface ICompositor6; + interface ICompositor7; + interface ICompositorStatics; + interface ICompositorWithBlurredWallpaperBackdropBrush; + interface ICompositorWithProjectedShadow; + interface ICompositorWithRadialGradient; + interface ICompositorWithVisualSurface; interface IContainerVisual; interface IContainerVisualFactory; interface ICubicBezierEasingFunction; @@ -101,6 +114,7 @@ namespace Windows.UI.Composition { runtimeclass CompositionScopedBatch; runtimeclass CompositionSurfaceBrush; runtimeclass CompositionTarget; + runtimeclass Compositor; runtimeclass ContainerVisual; runtimeclass CubicBezierEasingFunction; runtimeclass ExpressionAnimation; @@ -134,6 +148,21 @@ namespace Windows.UI.Composition { Hidden = 2, }; + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + flags + ] + enum CompositionBatchTypes + { + None = 0x0, + Animation = 0x1, + Effect = 0x2, + [contract(Windows.Foundation.UniversalApiContract, 7.0)] + InfiniteAnimation = 0x4, + [contract(Windows.Foundation.UniversalApiContract, 7.0)] + AllAnimations = 0x5, + }; + [ contract(Windows.Foundation.UniversalApiContract, 2.0) ] @@ -465,6 +494,60 @@ namespace Windows.UI.Composition { { } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.Compositor), + uuid(b403ca50-7f8c-4e83-985f-cc45060036d8) + ] + interface ICompositor : IInspectable + { + HRESULT CreateColorKeyFrameAnimation([out, retval] Windows.UI.Composition.ColorKeyFrameAnimation **result); + [overload("CreateColorBrush")] HRESULT CreateColorBrush([out, retval] Windows.UI.Composition.CompositionColorBrush **result); + [overload("CreateColorBrush")] HRESULT CreateColorBrushWithColor( + [in] Windows.UI.Color color, [out, retval] Windows.UI.Composition.CompositionColorBrush **result + ); + HRESULT CreateContainerVisual([out, retval] Windows.UI.Composition.ContainerVisual **result); + HRESULT CreateCubicBezierEasingFunction( + [in] Windows.Foundation.Numerics.Vector2 point1, [in] Windows.Foundation.Numerics.Vector2 point2, + [out, retval] Windows.UI.Composition.CubicBezierEasingFunction **result + ); + [overload("CreateEffectFactory")] HRESULT CreateEffectFactory( + [in] Windows.Graphics.Effects.IGraphicsEffect *effect, [out, retval] Windows.UI.Composition.CompositionEffectFactory **result + ); + [overload("CreateEffectFactory")] HRESULT CreateEffectFactoryWithProperties( + [in] Windows.Graphics.Effects.IGraphicsEffect *effect, [in] Windows.Foundation.Collections.IIterable<HSTRING> *animatable, + [out, retval] Windows.UI.Composition.CompositionEffectFactory **result + ); + [overload("CreateExpressionAnimation")] HRESULT CreateExpressionAnimation([out, retval] Windows.UI.Composition.ExpressionAnimation **result); + [overload("CreateExpressionAnimation")] HRESULT CreateExpressionAnimationWithExpression( + [in] HSTRING expression, [out, retval] Windows.UI.Composition.ExpressionAnimation **result + ); + [overload("CreateInsetClip")] HRESULT CreateInsetClip([out, retval] Windows.UI.Composition.InsetClip **result); + [overload("CreateInsetClip")] HRESULT CreateInsetClipWithInsets( + [in] FLOAT left, [in] FLOAT top, [in] FLOAT right, [in] FLOAT bottom, + [out, retval] Windows.UI.Composition.InsetClip **result + ); + HRESULT CreateLinearEasingFunction([out, retval] Windows.UI.Composition.LinearEasingFunction **result); + HRESULT CreatePropertySet([out, retval] Windows.UI.Composition.CompositionPropertySet **result); + HRESULT CreateQuaternionKeyFrameAnimation([out, retval] Windows.UI.Composition.QuaternionKeyFrameAnimation **result); + HRESULT CreateScalarKeyFrameAnimation([out, retval] Windows.UI.Composition.ScalarKeyFrameAnimation **result); + HRESULT CreateScopedBatch( + [in] Windows.UI.Composition.CompositionBatchTypes type, [out, retval] Windows.UI.Composition.CompositionScopedBatch **result + ); + HRESULT CreateSpriteVisual([out, retval] Windows.UI.Composition.SpriteVisual **result); + [overload("CreateSurfaceBrush")] HRESULT CreateSurfaceBrush([out, retval] Windows.UI.Composition.CompositionSurfaceBrush **result); + [overload("CreateSurfaceBrush")] HRESULT CreateSurfaceBrushWithSurface( + [in] Windows.UI.Composition.ICompositionSurface *surface, [out, retval] Windows.UI.Composition.CompositionSurfaceBrush **result + ); + HRESULT CreateTargetForCurrentView([out, retval] Windows.UI.Composition.CompositionTarget **result); + HRESULT CreateVector2KeyFrameAnimation([out, retval] Windows.UI.Composition.Vector2KeyFrameAnimation **result); + HRESULT CreateVector3KeyFrameAnimation([out, retval] Windows.UI.Composition.Vector3KeyFrameAnimation **result); + HRESULT CreateVector4KeyFrameAnimation([out, retval] Windows.UI.Composition.Vector4KeyFrameAnimation **result); + HRESULT GetCommitBatch( + [in] Windows.UI.Composition.CompositionBatchTypes type, [out, retval] Windows.UI.Composition.CompositionCommitBatch **result + ); + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.UI.Composition.ContainerVisual), @@ -819,6 +902,29 @@ namespace Windows.UI.Composition { [default] interface Windows.UI.Composition.ICompositionTarget; } + [ + activatable(Windows.Foundation.UniversalApiContract, 2.0), + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + static(Windows.UI.Composition.ICompositorStatics, Windows.Foundation.UniversalApiContract, 6.0), + threading(both) + ] + runtimeclass Compositor + { + [default] interface Windows.UI.Composition.ICompositor; + [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.UI.Composition.ICompositor2; + [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.UI.Composition.ICompositor3; + [contract(Windows.Foundation.UniversalApiContract, 5.0)] interface Windows.UI.Composition.ICompositor4; + [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.UI.Composition.ICompositor5; + [contract(Windows.Foundation.UniversalApiContract, 7.0)] interface Windows.UI.Composition.ICompositor6; + [contract(Windows.Foundation.UniversalApiContract, 8.0)] interface Windows.UI.Composition.ICompositorWithProjectedShadow; + [contract(Windows.Foundation.UniversalApiContract, 8.0)] interface Windows.UI.Composition.ICompositorWithRadialGradient; + [contract(Windows.Foundation.UniversalApiContract, 8.0)] interface Windows.UI.Composition.ICompositorWithVisualSurface; + [contract(Windows.Foundation.UniversalApiContract, 12.0)] interface Windows.UI.Composition.ICompositor7; + [contract(Windows.Foundation.UniversalApiContract, 13.0)] interface Windows.UI.Composition.ICompositorWithBlurredWallpaperBackdropBrush; + interface Windows.Foundation.IClosable; + } + [ 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.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