mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Updated uianimation-stubs patchset
This commit is contained in:
parent
5020088406
commit
3878c8eb1b
@ -6242,11 +6242,15 @@ fi
|
||||
# | dlls/uianimation/uianimation_typelib.idl, include/uianimation.idl
|
||||
# |
|
||||
if test "$enable_uianimation_stubs" -eq 1; then
|
||||
patch_apply uianimation-stubs/0001-uianimation.idl-add-more-interfaces.patch
|
||||
patch_apply uianimation-stubs/0002-uianimation-add-stub-dll.patch
|
||||
patch_apply uianimation-stubs/0001-uianimation.idl-Add-more-interfaces.patch
|
||||
patch_apply uianimation-stubs/0002-uianimation-Add-stub-dll.patch
|
||||
patch_apply uianimation-stubs/0003-uianimation-Implement-IUIAnimationManager-CreateStor.patch
|
||||
patch_apply uianimation-stubs/0004-uianimation-Implement-IUIAnimationManager-CreateAnim.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Louis Lenders", "uianimation.idl: Add more interfaces.", 1 },';
|
||||
printf '%s\n' '+ { "Louis Lenders", "uianimation: Add stub dll.", 1 },';
|
||||
printf '%s\n' '+ { "Louis Lenders", "uianimation: Implement IUIAnimationManager CreateStoryboard.", 1 },';
|
||||
printf '%s\n' '+ { "Louis Lenders", "uianimation: Implement IUIAnimationManager CreateAnimationVariable.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
|
@ -1,15 +1,15 @@
|
||||
From 38a99520ce2f97b4a9a6deb1a5d7ba3b4c3819bd Mon Sep 17 00:00:00 2001
|
||||
From e42a57bc5ee1a09cfa7ad1fa672a0d3b565c1424 Mon Sep 17 00:00:00 2001
|
||||
From: Louis Lenders <xerox.xerox2000x@gmail.com>
|
||||
Date: Thu, 7 Jun 2018 11:52:54 +0200
|
||||
Subject: [PATCH] uianimation.idl: add more interfaces
|
||||
Subject: [PATCH] uianimation.idl: Add more interfaces
|
||||
|
||||
Signed-off-by: Louis Lenders <xerox.xerox2000x@gmail.com>
|
||||
---
|
||||
include/uianimation.idl | 271 +++++++++++++++++++++++++++++++++++++++-
|
||||
include/uianimation.idl | 271 +++++++++++++++++++++++++++++++++++++++++++++++-
|
||||
1 file changed, 270 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/uianimation.idl b/include/uianimation.idl
|
||||
index 6c026a6ced..557d931d3a 100644
|
||||
index 6c026a6..54bc490 100644
|
||||
--- a/include/uianimation.idl
|
||||
+++ b/include/uianimation.idl
|
||||
@@ -20,6 +20,13 @@ import "unknwn.idl";
|
||||
@ -61,11 +61,10 @@ index 6c026a6ced..557d931d3a 100644
|
||||
[
|
||||
local,
|
||||
object,
|
||||
@@ -334,6 +369,212 @@ interface IUIAnimationTimer : IUnknown
|
||||
[in] UINT32 fps);
|
||||
@@ -335,16 +370,250 @@ interface IUIAnimationTimer : IUnknown
|
||||
}
|
||||
|
||||
+[
|
||||
[
|
||||
+ local,
|
||||
+ object,
|
||||
+ uuid(9169896c-ac8d-4e7d-94e5-67fa4dc2f2e8),
|
||||
@ -74,24 +73,24 @@ index 6c026a6ced..557d931d3a 100644
|
||||
+interface IUIAnimationManager : IUnknown
|
||||
+{
|
||||
+ HRESULT CreateAnimationVariable(
|
||||
+ [in] double initialvalue,
|
||||
+ [in] UI_ANIMATION_SECONDS initialvalue,
|
||||
+ [out, retval] IUIAnimationVariable **variable);
|
||||
+
|
||||
+ HRESULT ScheduleTransition(
|
||||
+ [in] IUIAnimationVariable *variable,
|
||||
+ [in] IUIAnimationTransition *transition,
|
||||
+ [in] double timenow);
|
||||
+ [in] UI_ANIMATION_SECONDS timenow);
|
||||
+
|
||||
+ HRESULT CreateStoryboard(
|
||||
+ [out, retval] IUIAnimationStoryboard **storyboard);
|
||||
+
|
||||
+ HRESULT FinishAllStoryboards(
|
||||
+ [in] double deadline);
|
||||
+ [in] UI_ANIMATION_SECONDS deadline);
|
||||
+
|
||||
+ HRESULT AbandonAllStoryboards();
|
||||
+
|
||||
+ HRESULT Update(
|
||||
+ [in] double timenow,
|
||||
+ [in] UI_ANIMATION_SECONDS timenow,
|
||||
+ [out, defaultvalue(0)] UI_ANIMATION_UPDATE_RESULT *updateresult);
|
||||
+
|
||||
+ HRESULT GetVariableFromTag(
|
||||
@ -130,7 +129,7 @@ index 6c026a6ced..557d931d3a 100644
|
||||
+ [in] IUIAnimationPriorityComparison *comparison);
|
||||
+
|
||||
+ HRESULT SetDefaultLongestAcceptableDelay(
|
||||
+ [in] double delay);
|
||||
+ [in] UI_ANIMATION_SECONDS delay);
|
||||
+
|
||||
+ HRESULT Shutdown();
|
||||
+}
|
||||
@ -175,20 +174,20 @@ index 6c026a6ced..557d931d3a 100644
|
||||
+ [in] double initialvelocity);
|
||||
+
|
||||
+ HRESULT SetDuration(
|
||||
+ [in] double duration);
|
||||
+ [in] UI_ANIMATION_SECONDS duration);
|
||||
+
|
||||
+ HRESULT GetDuration(
|
||||
+ [out, retval] double *duration);
|
||||
+ [out, retval] UI_ANIMATION_SECONDS *duration);
|
||||
+
|
||||
+ HRESULT GetFinalValue(
|
||||
+ [out, retval] double *value);
|
||||
+
|
||||
+ HRESULT InterpolateValue(
|
||||
+ [in] double offset,
|
||||
+ [in] UI_ANIMATION_SECONDS offset,
|
||||
+ [out, retval] double *value);
|
||||
+
|
||||
+ HRESULT InterpolateVelocity(
|
||||
+ [in] double offset,
|
||||
+ [in] UI_ANIMATION_SECONDS offset,
|
||||
+ [out, retval] double *velocity);
|
||||
+
|
||||
+ HRESULT GetDependencies(
|
||||
@ -210,17 +209,17 @@ index 6c026a6ced..557d931d3a 100644
|
||||
+ [out, retval] IUIAnimationTransition **transition);
|
||||
+
|
||||
+ HRESULT CreateConstantTransition(
|
||||
+ [in] double duration,
|
||||
+ [in] UI_ANIMATION_SECONDS duration,
|
||||
+ [out, retval] IUIAnimationTransition **transition);
|
||||
+
|
||||
+ HRESULT CreateDiscreteTransition(
|
||||
+ [in] double delay,
|
||||
+ [in] UI_ANIMATION_SECONDS delay,
|
||||
+ [in] double finalvalue,
|
||||
+ [in] double hold,
|
||||
+ [in] UI_ANIMATION_SECONDS hold,
|
||||
+ [out, retval] IUIAnimationTransition **transition);
|
||||
+
|
||||
+ HRESULT CreateLinearTransition(
|
||||
+ [in] double duration,
|
||||
+ [in] UI_ANIMATION_SECONDS duration,
|
||||
+ [in] double finalvalue,
|
||||
+ [out, retval] IUIAnimationTransition **transition);
|
||||
+
|
||||
@ -230,51 +229,51 @@ index 6c026a6ced..557d931d3a 100644
|
||||
+ [out, retval] IUIAnimationTransition **transition);
|
||||
+
|
||||
+ HRESULT CreateSinusoidalTransitionFromVelocity(
|
||||
+ [in] double duration,
|
||||
+ [in] double period,
|
||||
+ [in] UI_ANIMATION_SECONDS duration,
|
||||
+ [in] UI_ANIMATION_SECONDS period,
|
||||
+ [out, retval] IUIAnimationTransition **transition);
|
||||
+
|
||||
+ HRESULT CreateSinusoidalTransitionFromRange(
|
||||
+ [in] double duration,
|
||||
+ [in] UI_ANIMATION_SECONDS duration,
|
||||
+ [in] double minimumvalue,
|
||||
+ [in] double maximumvalue,
|
||||
+ [in] double period,
|
||||
+ [in] UI_ANIMATION_SECONDS period,
|
||||
+ [in] UI_ANIMATION_SLOPE slope,
|
||||
+ [out, retval] IUIAnimationTransition **transition);
|
||||
+
|
||||
+ HRESULT CreateAccelerateDecelerateTransition(
|
||||
+ [in] double duration,
|
||||
+ [in] UI_ANIMATION_SECONDS duration,
|
||||
+ [in] double finalvalue,
|
||||
+ [in] double accelerationratio,
|
||||
+ [in] double decelerationratio,
|
||||
+ [out, retval] IUIAnimationTransition **transition);
|
||||
+
|
||||
+ HRESULT CreateReversalTransition(
|
||||
+ [in] double duration,
|
||||
+ [in] UI_ANIMATION_SECONDS duration,
|
||||
+ [out, retval] IUIAnimationTransition **transition);
|
||||
+
|
||||
+ HRESULT CreateCubicTransition(
|
||||
+ [in] double duration,
|
||||
+ [in] UI_ANIMATION_SECONDS duration,
|
||||
+ [in] double finalvalue,
|
||||
+ [in] double finalvelocity,
|
||||
+ [out, retval] IUIAnimationTransition **transition);
|
||||
+
|
||||
+ HRESULT CreateSmoothStopTransition(
|
||||
+ [in] double maximumduration,
|
||||
+ [in] UI_ANIMATION_SECONDS maximumduration,
|
||||
+ [in] double finalvalue,
|
||||
+ [out, retval] IUIAnimationTransition **transition);
|
||||
+
|
||||
+ HRESULT CreateParabolicTransitionFromAcceleration(
|
||||
+ [in] double finalvalue,
|
||||
+ [in] UI_ANIMATION_SECONDS finalvalue,
|
||||
+ [in] double finalvelocity,
|
||||
+ [in] double acceleration,
|
||||
+ [out, retval] IUIAnimationTransition **transition);
|
||||
+}
|
||||
+
|
||||
[
|
||||
+[
|
||||
uuid(44ca24db-1a92-4149-bab5-fb14d64b401e),
|
||||
version(1.0)
|
||||
@@ -341,10 +582,38 @@ interface IUIAnimationTimer : IUnknown
|
||||
]
|
||||
library UIAnimation
|
||||
{
|
||||
[
|
||||
@ -300,7 +299,7 @@ index 6c026a6ced..557d931d3a 100644
|
||||
+ uuid(8a9b1cdd-fcd7-419c-8b44-42fd17db1887),
|
||||
+ threading(both)
|
||||
+ ]
|
||||
+ coclass UIAnimationTransitionFactory
|
||||
+ coclass UIAnimationTransitionFactory
|
||||
+ {
|
||||
+ [default] interface IUIAnimationTransitionFactory;
|
||||
+ }
|
||||
@ -309,11 +308,11 @@ index 6c026a6ced..557d931d3a 100644
|
||||
+ uuid(1d6322ad-aa85-4ef5-a828-86d71067d145),
|
||||
+ threading(both)
|
||||
+ ]
|
||||
+ coclass UIAnimationTransitionLibrary
|
||||
+ coclass UIAnimationTransitionLibrary
|
||||
+ {
|
||||
+ [default] interface IUIAnimationTransitionLibrary;
|
||||
+ }
|
||||
}
|
||||
--
|
||||
2.17.1
|
||||
1.9.1
|
||||
|
@ -1,27 +1,28 @@
|
||||
From 1f72ae3bb68ea11fab39e3b30205ea613f77876e Mon Sep 17 00:00:00 2001
|
||||
From e95f5c6de6b725baabf59a4767c722b4589bd7cc Mon Sep 17 00:00:00 2001
|
||||
From: Louis Lenders <xerox.xerox2000x@gmail.com>
|
||||
Date: Thu, 7 Jun 2018 11:51:01 +0200
|
||||
Subject: [PATCH] uianimation: add stub dll
|
||||
Subject: [PATCH] uianimation: Add stub dll
|
||||
|
||||
Reordered code to stop the need of forwards declare.
|
||||
Removed private header.
|
||||
Split into multiple changes.
|
||||
|
||||
Signed-off-by: Louis Lenders <xerox.xerox2000x@gmail.com>
|
||||
---
|
||||
configure | 2 +
|
||||
configure.ac | 1 +
|
||||
dlls/uianimation/Makefile.in | 7 +
|
||||
dlls/uianimation/main.c | 1393 ++++++++++++++++++++++
|
||||
dlls/uianimation/uianimation.spec | 4 +
|
||||
dlls/uianimation/uianimation_typelib.idl | 23 +
|
||||
6 files changed, 1430 insertions(+)
|
||||
configure | 2 +
|
||||
configure.ac | 1 +
|
||||
dlls/uianimation/Makefile.in | 7 +
|
||||
dlls/uianimation/main.c | 959 +++++++++++++++++++++++++++++++
|
||||
dlls/uianimation/uianimation.spec | 4 +
|
||||
dlls/uianimation/uianimation_typelib.idl | 23 +
|
||||
6 files changed, 996 insertions(+)
|
||||
create mode 100644 dlls/uianimation/Makefile.in
|
||||
create mode 100644 dlls/uianimation/main.c
|
||||
create mode 100644 dlls/uianimation/uianimation.spec
|
||||
create mode 100644 dlls/uianimation/uianimation_typelib.idl
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 4807d0a2..6f73764c 100755
|
||||
index dd1d347..bb4025c 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -1547,6 +1547,7 @@ enable_traffic
|
||||
@ -32,7 +33,7 @@ index 4807d0a2..6f73764c 100755
|
||||
enable_uiautomationcore
|
||||
enable_uiribbon
|
||||
enable_unicows
|
||||
@@ -19876,6 +19877,7 @@ wine_fn_config_makefile dlls/typelib.dll16 enable_win16
|
||||
@@ -19983,6 +19984,7 @@ wine_fn_config_makefile dlls/typelib.dll16 enable_win16
|
||||
wine_fn_config_makefile dlls/tzres enable_tzres
|
||||
wine_fn_config_makefile dlls/ucrtbase enable_ucrtbase
|
||||
wine_fn_config_makefile dlls/ucrtbase/tests enable_tests
|
||||
@ -41,10 +42,10 @@ index 4807d0a2..6f73764c 100755
|
||||
wine_fn_config_makefile dlls/uiribbon enable_uiribbon
|
||||
wine_fn_config_makefile dlls/unicows enable_unicows
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 08fbc3c1..9d98005c 100644
|
||||
index 119c4ce..584a2d7 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3714,6 +3714,7 @@ WINE_CONFIG_MAKEFILE(dlls/typelib.dll16,enable_win16)
|
||||
@@ -3722,6 +3722,7 @@ WINE_CONFIG_MAKEFILE(dlls/typelib.dll16,enable_win16)
|
||||
WINE_CONFIG_MAKEFILE(dlls/tzres)
|
||||
WINE_CONFIG_MAKEFILE(dlls/ucrtbase)
|
||||
WINE_CONFIG_MAKEFILE(dlls/ucrtbase/tests)
|
||||
@ -54,7 +55,7 @@ index 08fbc3c1..9d98005c 100644
|
||||
WINE_CONFIG_MAKEFILE(dlls/unicows)
|
||||
diff --git a/dlls/uianimation/Makefile.in b/dlls/uianimation/Makefile.in
|
||||
new file mode 100644
|
||||
index 00000000..bc303b30
|
||||
index 0000000..bc303b3
|
||||
--- /dev/null
|
||||
+++ b/dlls/uianimation/Makefile.in
|
||||
@@ -0,0 +1,7 @@
|
||||
@ -67,10 +68,10 @@ index 00000000..bc303b30
|
||||
+ uianimation_typelib.idl
|
||||
diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c
|
||||
new file mode 100644
|
||||
index 00000000..28687b63
|
||||
index 0000000..6101827
|
||||
--- /dev/null
|
||||
+++ b/dlls/uianimation/main.c
|
||||
@@ -0,0 +1,1393 @@
|
||||
@@ -0,0 +1,959 @@
|
||||
+/*
|
||||
+ * Uianimation main file.
|
||||
+ *
|
||||
@ -179,418 +180,6 @@ index 00000000..28687b63
|
||||
+};
|
||||
+
|
||||
+/***********************************************************************
|
||||
+ * IUIAnimationVariable
|
||||
+ */
|
||||
+struct animation_var
|
||||
+{
|
||||
+ IUIAnimationVariable IUIAnimationVariable_iface;
|
||||
+ LONG ref;
|
||||
+};
|
||||
+
|
||||
+struct animation_var *impl_from_IUIAnimationVariable( IUIAnimationVariable *iface )
|
||||
+{
|
||||
+ return CONTAINING_RECORD( iface, struct animation_var, IUIAnimationVariable_iface );
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI WINAPI animation_var_QueryInterface( IUIAnimationVariable *iface,
|
||||
+ REFIID iid, void **obj )
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+
|
||||
+ TRACE( "(%p)->(%s %p)\n", This, debugstr_guid( iid ), obj );
|
||||
+
|
||||
+ if (IsEqualIID( iid, &IID_IUnknown ) ||
|
||||
+ IsEqualIID( iid, &IID_IUIAnimationVariable ))
|
||||
+ {
|
||||
+ IUIAnimationVariable_AddRef( iface );
|
||||
+ *obj = iface;
|
||||
+ return S_OK;
|
||||
+ }
|
||||
+
|
||||
+ FIXME( "interface %s not implemented\n", debugstr_guid( iid ) );
|
||||
+ *obj = NULL;
|
||||
+ return E_NOINTERFACE;
|
||||
+}
|
||||
+
|
||||
+static ULONG WINAPI animation_var_AddRef( IUIAnimationVariable *iface )
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+ ULONG ref = InterlockedIncrement( &This->ref );
|
||||
+
|
||||
+ TRACE( "(%p) ref = %u\n", This, ref );
|
||||
+ return ref;
|
||||
+}
|
||||
+
|
||||
+static ULONG WINAPI animation_var_Release( IUIAnimationVariable *iface )
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+ ULONG ref = InterlockedDecrement(&This->ref);
|
||||
+
|
||||
+ TRACE( "(%p) ref = %u\n", This, ref );
|
||||
+
|
||||
+ if (!ref)
|
||||
+ heap_free( This );
|
||||
+
|
||||
+ return ref;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_var_GetValue ( IUIAnimationVariable *iface, DOUBLE *value)
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This);
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_var_GetFinalValue ( IUIAnimationVariable *iface, DOUBLE *value)
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_var_GetPreviousValue ( IUIAnimationVariable *iface, DOUBLE *value)
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_var_GetIntegerValue ( IUIAnimationVariable *iface, INT32 *value)
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_var_GetFinalIntegerValue ( IUIAnimationVariable *iface, INT32 *value)
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_var_GetPreviousIntegerValue ( IUIAnimationVariable *iface, INT32 *value)
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_var_GetCurrentStoryboard ( IUIAnimationVariable *iface, IUIAnimationStoryboard **storyboard)
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_var_SetLowerBound ( IUIAnimationVariable *iface, DOUBLE bound)
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_var_SetUpperBound ( IUIAnimationVariable *iface, DOUBLE bound)
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_var_SetRoundingMode ( IUIAnimationVariable *iface,UI_ANIMATION_ROUNDING_MODE mode)
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return S_OK;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_var_SetTag ( IUIAnimationVariable *iface, IUnknown *object, UINT32 id)
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_var_GetTag ( IUIAnimationVariable *iface, IUnknown **object, UINT32 *id)
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_var_SetVariableChangeHandler ( IUIAnimationVariable *iface, IUIAnimationVariableChangeHandler *handler)
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return S_OK;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_var_SetVariableIntegerChangeHandler ( IUIAnimationVariable *iface,
|
||||
+ IUIAnimationVariableIntegerChangeHandler *handler)
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return S_OK;
|
||||
+}
|
||||
+
|
||||
+const struct IUIAnimationVariableVtbl animation_var_vtbl =
|
||||
+{
|
||||
+ animation_var_QueryInterface,
|
||||
+ animation_var_AddRef,
|
||||
+ animation_var_Release,
|
||||
+ animation_var_GetValue,
|
||||
+ animation_var_GetFinalValue,
|
||||
+ animation_var_GetPreviousValue,
|
||||
+ animation_var_GetIntegerValue,
|
||||
+ animation_var_GetFinalIntegerValue,
|
||||
+ animation_var_GetPreviousIntegerValue,
|
||||
+ animation_var_GetCurrentStoryboard,
|
||||
+ animation_var_SetLowerBound,
|
||||
+ animation_var_SetUpperBound,
|
||||
+ animation_var_SetRoundingMode,
|
||||
+ animation_var_SetTag,
|
||||
+ animation_var_GetTag,
|
||||
+ animation_var_SetVariableChangeHandler,
|
||||
+ animation_var_SetVariableIntegerChangeHandler,
|
||||
+};
|
||||
+
|
||||
+HRESULT animation_var_create( IUnknown *outer, REFIID iid, void **obj )
|
||||
+{
|
||||
+ struct animation_var *This = heap_alloc( sizeof(*This) );
|
||||
+ HRESULT hr;
|
||||
+
|
||||
+ if (!This) return E_OUTOFMEMORY;
|
||||
+ This->IUIAnimationVariable_iface.lpVtbl = &animation_var_vtbl;
|
||||
+ This->ref = 1;
|
||||
+
|
||||
+ hr = IUIAnimationVariable_QueryInterface( &This->IUIAnimationVariable_iface, iid, obj );
|
||||
+
|
||||
+ IUIAnimationVariable_Release( &This->IUIAnimationVariable_iface );
|
||||
+ return hr;
|
||||
+}
|
||||
+
|
||||
+/***********************************************************************
|
||||
+ * IUIAnimationStoryboard
|
||||
+ */
|
||||
+struct animation_storyboard
|
||||
+{
|
||||
+ IUIAnimationStoryboard IUIAnimationStoryboard_iface;
|
||||
+ LONG ref;
|
||||
+};
|
||||
+
|
||||
+struct animation_storyboard *impl_from_IUIAnimationStoryboard( IUIAnimationStoryboard *iface )
|
||||
+{
|
||||
+ return CONTAINING_RECORD( iface, struct animation_storyboard, IUIAnimationStoryboard_iface );
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI WINAPI animation_storyboard_QueryInterface( IUIAnimationStoryboard *iface,
|
||||
+ REFIID iid, void **obj )
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+
|
||||
+ TRACE( "(%p)->(%s %p)\n", This, debugstr_guid( iid ), obj );
|
||||
+
|
||||
+ if (IsEqualIID( iid, &IID_IUnknown ) ||
|
||||
+ IsEqualIID( iid, &IID_IUIAnimationStoryboard ))
|
||||
+ {
|
||||
+ IUIAnimationStoryboard_AddRef( iface );
|
||||
+ *obj = iface;
|
||||
+ return S_OK;
|
||||
+ }
|
||||
+
|
||||
+ FIXME( "interface %s not implemented\n", debugstr_guid( iid ) );
|
||||
+ *obj = NULL;
|
||||
+ return E_NOINTERFACE;
|
||||
+}
|
||||
+
|
||||
+static ULONG WINAPI animation_storyboard_AddRef( IUIAnimationStoryboard *iface )
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ ULONG ref = InterlockedIncrement( &This->ref );
|
||||
+
|
||||
+ TRACE( "(%p) ref = %u\n", This, ref );
|
||||
+ return ref;
|
||||
+}
|
||||
+
|
||||
+static ULONG WINAPI animation_storyboard_Release( IUIAnimationStoryboard *iface )
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ ULONG ref = InterlockedDecrement(&This->ref);
|
||||
+
|
||||
+ TRACE( "(%p) ref = %u\n", This, ref );
|
||||
+
|
||||
+ if (!ref)
|
||||
+ heap_free( This );
|
||||
+
|
||||
+ return ref;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_AddTransition (IUIAnimationStoryboard *iface, IUIAnimationVariable *variable,
|
||||
+ IUIAnimationTransition *transition)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return S_OK;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_AddKeyframeAtOffset (IUIAnimationStoryboard *iface, UI_ANIMATION_KEYFRAME existingframe,
|
||||
+ UI_ANIMATION_SECONDS offset, UI_ANIMATION_KEYFRAME *keyframe)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_AddKeyframeAfterTransition (IUIAnimationStoryboard *iface,IUIAnimationTransition *transition,
|
||||
+ UI_ANIMATION_KEYFRAME *keyframe)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return S_OK;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_AddTransitionAtKeyframe (IUIAnimationStoryboard *iface, IUIAnimationVariable *variable,
|
||||
+ IUIAnimationTransition *transition, UI_ANIMATION_KEYFRAME start_key)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_AddTransitionBetweenKeyframes (IUIAnimationStoryboard *iface, IUIAnimationVariable *variable,
|
||||
+ IUIAnimationTransition *transition, UI_ANIMATION_KEYFRAME start_key, UI_ANIMATION_KEYFRAME end_key)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_RepeatBetweenKeyframes (IUIAnimationStoryboard *iface, UI_ANIMATION_KEYFRAME start_key,
|
||||
+ UI_ANIMATION_KEYFRAME end_key, INT32 count)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return S_OK;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_HoldVariable (IUIAnimationStoryboard *iface, IUIAnimationVariable *variable)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_SetLongestAcceptableDelay (IUIAnimationStoryboard *iface, UI_ANIMATION_SECONDS delay)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_Schedule (IUIAnimationStoryboard *iface, UI_ANIMATION_SECONDS now,
|
||||
+ UI_ANIMATION_SCHEDULING_RESULT *result)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_Conclude (IUIAnimationStoryboard *iface)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_Finish (IUIAnimationStoryboard *iface, UI_ANIMATION_SECONDS deadline)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_Abandon (IUIAnimationStoryboard *iface)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_SetTag(IUIAnimationStoryboard *iface, IUnknown *object, UINT32 id)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_GetTag (IUIAnimationStoryboard *iface, IUnknown **object, UINT32 *id)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_GetStatus (IUIAnimationStoryboard *iface, UI_ANIMATION_STORYBOARD_STATUS *status)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_GetElapsedTime (IUIAnimationStoryboard *iface, UI_ANIMATION_SECONDS *elapsed)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_SetStoryboardEventHandler (IUIAnimationStoryboard *iface, IUIAnimationStoryboardEventHandler *handler)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return S_OK;
|
||||
+}
|
||||
+
|
||||
+const struct IUIAnimationStoryboardVtbl animation_storyboard_vtbl =
|
||||
+{
|
||||
+ animation_storyboard_QueryInterface,
|
||||
+ animation_storyboard_AddRef,
|
||||
+ animation_storyboard_Release,
|
||||
+ animation_storyboard_AddTransition,
|
||||
+ animation_storyboard_AddKeyframeAtOffset,
|
||||
+ animation_storyboard_AddKeyframeAfterTransition,
|
||||
+ animation_storyboard_AddTransitionAtKeyframe,
|
||||
+ animation_storyboard_AddTransitionBetweenKeyframes,
|
||||
+ animation_storyboard_RepeatBetweenKeyframes,
|
||||
+ animation_storyboard_HoldVariable,
|
||||
+ animation_storyboard_SetLongestAcceptableDelay,
|
||||
+ animation_storyboard_Schedule ,
|
||||
+ animation_storyboard_Conclude ,
|
||||
+ animation_storyboard_Finish ,
|
||||
+ animation_storyboard_Abandon,
|
||||
+ animation_storyboard_SetTag,
|
||||
+ animation_storyboard_GetTag ,
|
||||
+ animation_storyboard_GetStatus ,
|
||||
+ animation_storyboard_GetElapsedTime,
|
||||
+ animation_storyboard_SetStoryboardEventHandler
|
||||
+};
|
||||
+
|
||||
+HRESULT animation_storyboard_create( IUnknown *outer, REFIID iid, void **obj )
|
||||
+{
|
||||
+ struct animation_storyboard *This = heap_alloc( sizeof(*This) );
|
||||
+ HRESULT hr;
|
||||
+
|
||||
+ if (!This) return E_OUTOFMEMORY;
|
||||
+ This->IUIAnimationStoryboard_iface.lpVtbl = &animation_storyboard_vtbl;
|
||||
+ This->ref = 1;
|
||||
+
|
||||
+ hr = IUIAnimationStoryboard_QueryInterface( &This->IUIAnimationStoryboard_iface, iid, obj );
|
||||
+
|
||||
+ IUIAnimationStoryboard_Release( &This->IUIAnimationStoryboard_iface );
|
||||
+ return hr;
|
||||
+}
|
||||
+
|
||||
+/***********************************************************************
|
||||
+ * IUIAnimationManager
|
||||
+ */
|
||||
+struct manager
|
||||
@ -650,19 +239,8 @@ index 00000000..28687b63
|
||||
+static HRESULT WINAPI manager_CreateAnimationVariable( IUIAnimationManager *iface, DOUBLE initial_value, IUIAnimationVariable **variable )
|
||||
+{
|
||||
+ struct manager *This = impl_from_IUIAnimationManager( iface );
|
||||
+ struct animation_var *var = heap_alloc( sizeof(*var) );
|
||||
+ HRESULT hr;
|
||||
+
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+
|
||||
+ if (!var) return E_OUTOFMEMORY;
|
||||
+ var->IUIAnimationVariable_iface.lpVtbl = &animation_var_vtbl;
|
||||
+ var->ref = 1;
|
||||
+
|
||||
+ hr = animation_var_QueryInterface( &var->IUIAnimationVariable_iface, &IID_IUIAnimationVariable, (void **)variable );
|
||||
+
|
||||
+ IUIAnimationVariable_Release( &var->IUIAnimationVariable_iface );
|
||||
+ return hr;
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI manager_ScheduleTransition( IUIAnimationManager *iface, IUIAnimationVariable *variable, IUIAnimationTransition *transition, UI_ANIMATION_SECONDS current_time )
|
||||
@ -675,19 +253,8 @@ index 00000000..28687b63
|
||||
+static HRESULT WINAPI manager_CreateStoryboard( IUIAnimationManager *iface, IUIAnimationStoryboard **storyboard )
|
||||
+{
|
||||
+ struct manager *This = impl_from_IUIAnimationManager( iface );
|
||||
+ struct animation_storyboard *board = heap_alloc( sizeof(*board) );
|
||||
+ HRESULT hr;
|
||||
+
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+
|
||||
+ if (!board) return E_OUTOFMEMORY;
|
||||
+ board->IUIAnimationStoryboard_iface.lpVtbl = &animation_storyboard_vtbl;
|
||||
+ board->ref = 1;
|
||||
+
|
||||
+ hr = animation_storyboard_QueryInterface( &board->IUIAnimationStoryboard_iface, &IID_IUIAnimationStoryboard, (void **)storyboard );
|
||||
+
|
||||
+ IUIAnimationStoryboard_Release( &board->IUIAnimationStoryboard_iface );
|
||||
+ return hr;
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI manager_FinishAllStoryboards( IUIAnimationManager *iface, UI_ANIMATION_SECONDS max_time )
|
||||
@ -1466,7 +1033,7 @@ index 00000000..28687b63
|
||||
+}
|
||||
diff --git a/dlls/uianimation/uianimation.spec b/dlls/uianimation/uianimation.spec
|
||||
new file mode 100644
|
||||
index 00000000..b16365d0
|
||||
index 0000000..b16365d
|
||||
--- /dev/null
|
||||
+++ b/dlls/uianimation/uianimation.spec
|
||||
@@ -0,0 +1,4 @@
|
||||
@ -1476,7 +1043,7 @@ index 00000000..b16365d0
|
||||
+@ stdcall -private DllUnregisterServer()
|
||||
diff --git a/dlls/uianimation/uianimation_typelib.idl b/dlls/uianimation/uianimation_typelib.idl
|
||||
new file mode 100644
|
||||
index 00000000..9066c09a
|
||||
index 0000000..9066c09
|
||||
--- /dev/null
|
||||
+++ b/dlls/uianimation/uianimation_typelib.idl
|
||||
@@ -0,0 +1,23 @@
|
||||
@ -1504,5 +1071,5 @@ index 00000000..9066c09a
|
||||
+
|
||||
+#include "uianimation.idl"
|
||||
--
|
||||
2.19.1
|
||||
1.9.1
|
||||
|
@ -0,0 +1,254 @@
|
||||
From e0d49da97e6b83da2de26dacc7932dd0094c6c2a Mon Sep 17 00:00:00 2001
|
||||
From: Louis Lenders <xerox.xerox2000x@gmail.com>
|
||||
Date: Mon, 17 Dec 2018 15:40:25 +1100
|
||||
Subject: [PATCH] uianimation: Implement IUIAnimationManager
|
||||
CreateStoryboard
|
||||
|
||||
---
|
||||
dlls/uianimation/main.c | 223 +++++++++++++++++++++++++++++++++++++++++++++++-
|
||||
1 file changed, 221 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c
|
||||
index 6101827..7a6c68c 100644
|
||||
--- a/dlls/uianimation/main.c
|
||||
+++ b/dlls/uianimation/main.c
|
||||
@@ -106,6 +106,225 @@ static const struct IClassFactoryVtbl class_factory_vtbl =
|
||||
};
|
||||
|
||||
/***********************************************************************
|
||||
+ * IUIAnimationStoryboard
|
||||
+ */
|
||||
+struct animation_storyboard
|
||||
+{
|
||||
+ IUIAnimationStoryboard IUIAnimationStoryboard_iface;
|
||||
+ LONG ref;
|
||||
+};
|
||||
+
|
||||
+struct animation_storyboard *impl_from_IUIAnimationStoryboard( IUIAnimationStoryboard *iface )
|
||||
+{
|
||||
+ return CONTAINING_RECORD( iface, struct animation_storyboard, IUIAnimationStoryboard_iface );
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI WINAPI animation_storyboard_QueryInterface( IUIAnimationStoryboard *iface,
|
||||
+ REFIID iid, void **obj )
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+
|
||||
+ TRACE( "(%p)->(%s %p)\n", This, debugstr_guid( iid ), obj );
|
||||
+
|
||||
+ if (IsEqualIID( iid, &IID_IUnknown ) ||
|
||||
+ IsEqualIID( iid, &IID_IUIAnimationStoryboard ))
|
||||
+ {
|
||||
+ IUIAnimationStoryboard_AddRef( iface );
|
||||
+ *obj = iface;
|
||||
+ return S_OK;
|
||||
+ }
|
||||
+
|
||||
+ FIXME( "interface %s not implemented\n", debugstr_guid( iid ) );
|
||||
+ *obj = NULL;
|
||||
+ return E_NOINTERFACE;
|
||||
+}
|
||||
+
|
||||
+static ULONG WINAPI animation_storyboard_AddRef( IUIAnimationStoryboard *iface )
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ ULONG ref = InterlockedIncrement( &This->ref );
|
||||
+
|
||||
+ TRACE( "(%p) ref = %u\n", This, ref );
|
||||
+ return ref;
|
||||
+}
|
||||
+
|
||||
+static ULONG WINAPI animation_storyboard_Release( IUIAnimationStoryboard *iface )
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ ULONG ref = InterlockedDecrement(&This->ref);
|
||||
+
|
||||
+ TRACE( "(%p) ref = %u\n", This, ref );
|
||||
+
|
||||
+ if (!ref)
|
||||
+ heap_free( This );
|
||||
+
|
||||
+ return ref;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_AddTransition (IUIAnimationStoryboard *iface, IUIAnimationVariable *variable,
|
||||
+ IUIAnimationTransition *transition)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return S_OK;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_AddKeyframeAtOffset (IUIAnimationStoryboard *iface, UI_ANIMATION_KEYFRAME existingframe,
|
||||
+ UI_ANIMATION_SECONDS offset, UI_ANIMATION_KEYFRAME *keyframe)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_AddKeyframeAfterTransition (IUIAnimationStoryboard *iface,IUIAnimationTransition *transition,
|
||||
+ UI_ANIMATION_KEYFRAME *keyframe)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return S_OK;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_AddTransitionAtKeyframe (IUIAnimationStoryboard *iface, IUIAnimationVariable *variable,
|
||||
+ IUIAnimationTransition *transition, UI_ANIMATION_KEYFRAME start_key)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_AddTransitionBetweenKeyframes (IUIAnimationStoryboard *iface, IUIAnimationVariable *variable,
|
||||
+ IUIAnimationTransition *transition, UI_ANIMATION_KEYFRAME start_key, UI_ANIMATION_KEYFRAME end_key)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_RepeatBetweenKeyframes (IUIAnimationStoryboard *iface, UI_ANIMATION_KEYFRAME start_key,
|
||||
+ UI_ANIMATION_KEYFRAME end_key, INT32 count)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return S_OK;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_HoldVariable (IUIAnimationStoryboard *iface, IUIAnimationVariable *variable)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_SetLongestAcceptableDelay (IUIAnimationStoryboard *iface, UI_ANIMATION_SECONDS delay)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_Schedule (IUIAnimationStoryboard *iface, UI_ANIMATION_SECONDS now,
|
||||
+ UI_ANIMATION_SCHEDULING_RESULT *result)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_Conclude (IUIAnimationStoryboard *iface)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_Finish (IUIAnimationStoryboard *iface, UI_ANIMATION_SECONDS deadline)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_Abandon (IUIAnimationStoryboard *iface)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_SetTag(IUIAnimationStoryboard *iface, IUnknown *object, UINT32 id)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_GetTag (IUIAnimationStoryboard *iface, IUnknown **object, UINT32 *id)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_GetStatus (IUIAnimationStoryboard *iface, UI_ANIMATION_STORYBOARD_STATUS *status)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_GetElapsedTime (IUIAnimationStoryboard *iface, UI_ANIMATION_SECONDS *elapsed)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_storyboard_SetStoryboardEventHandler (IUIAnimationStoryboard *iface, IUIAnimationStoryboardEventHandler *handler)
|
||||
+{
|
||||
+ struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return S_OK;
|
||||
+}
|
||||
+
|
||||
+const struct IUIAnimationStoryboardVtbl animation_storyboard_vtbl =
|
||||
+{
|
||||
+ animation_storyboard_QueryInterface,
|
||||
+ animation_storyboard_AddRef,
|
||||
+ animation_storyboard_Release,
|
||||
+ animation_storyboard_AddTransition,
|
||||
+ animation_storyboard_AddKeyframeAtOffset,
|
||||
+ animation_storyboard_AddKeyframeAfterTransition,
|
||||
+ animation_storyboard_AddTransitionAtKeyframe,
|
||||
+ animation_storyboard_AddTransitionBetweenKeyframes,
|
||||
+ animation_storyboard_RepeatBetweenKeyframes,
|
||||
+ animation_storyboard_HoldVariable,
|
||||
+ animation_storyboard_SetLongestAcceptableDelay,
|
||||
+ animation_storyboard_Schedule ,
|
||||
+ animation_storyboard_Conclude ,
|
||||
+ animation_storyboard_Finish ,
|
||||
+ animation_storyboard_Abandon,
|
||||
+ animation_storyboard_SetTag,
|
||||
+ animation_storyboard_GetTag ,
|
||||
+ animation_storyboard_GetStatus ,
|
||||
+ animation_storyboard_GetElapsedTime,
|
||||
+ animation_storyboard_SetStoryboardEventHandler
|
||||
+};
|
||||
+
|
||||
+static HRESULT animation_storyboard_create( IUIAnimationStoryboard **obj )
|
||||
+{
|
||||
+ struct animation_storyboard *This = heap_alloc( sizeof(*This) );
|
||||
+
|
||||
+ if (!This) return E_OUTOFMEMORY;
|
||||
+ This->IUIAnimationStoryboard_iface.lpVtbl = &animation_storyboard_vtbl;
|
||||
+ This->ref = 1;
|
||||
+
|
||||
+ *obj = &This->IUIAnimationStoryboard_iface;
|
||||
+
|
||||
+ return S_OK;
|
||||
+}
|
||||
+
|
||||
+/***********************************************************************
|
||||
* IUIAnimationManager
|
||||
*/
|
||||
struct manager
|
||||
@@ -179,8 +398,8 @@ static HRESULT WINAPI manager_ScheduleTransition( IUIAnimationManager *iface, IU
|
||||
static HRESULT WINAPI manager_CreateStoryboard( IUIAnimationManager *iface, IUIAnimationStoryboard **storyboard )
|
||||
{
|
||||
struct manager *This = impl_from_IUIAnimationManager( iface );
|
||||
- FIXME( "stub (%p)->( )\n", This );
|
||||
- return E_NOTIMPL;
|
||||
+ TRACE( "(%p)->(%p)\n", This, storyboard );
|
||||
+ return animation_storyboard_create(storyboard);
|
||||
}
|
||||
|
||||
static HRESULT WINAPI manager_FinishAllStoryboards( IUIAnimationManager *iface, UI_ANIMATION_SECONDS max_time )
|
||||
--
|
||||
1.9.1
|
||||
|
@ -0,0 +1,226 @@
|
||||
From 364510214da84841cbf9b8cb4546ab7c84824115 Mon Sep 17 00:00:00 2001
|
||||
From: Louis Lenders <xerox.xerox2000x@gmail.com>
|
||||
Date: Mon, 17 Dec 2018 15:44:49 +1100
|
||||
Subject: [PATCH] uianimation: Implement IUIAnimationManager
|
||||
CreateAnimationVariable
|
||||
|
||||
---
|
||||
dlls/uianimation/main.c | 195 +++++++++++++++++++++++++++++++++++++++++++++++-
|
||||
1 file changed, 193 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c
|
||||
index 7a6c68c..3dc9e30 100644
|
||||
--- a/dlls/uianimation/main.c
|
||||
+++ b/dlls/uianimation/main.c
|
||||
@@ -325,6 +325,197 @@ static HRESULT animation_storyboard_create( IUIAnimationStoryboard **obj )
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
+ * IUIAnimationVariable
|
||||
+ */
|
||||
+struct animation_var
|
||||
+{
|
||||
+ IUIAnimationVariable IUIAnimationVariable_iface;
|
||||
+ LONG ref;
|
||||
+ DOUBLE initial;
|
||||
+};
|
||||
+
|
||||
+struct animation_var *impl_from_IUIAnimationVariable( IUIAnimationVariable *iface )
|
||||
+{
|
||||
+ return CONTAINING_RECORD( iface, struct animation_var, IUIAnimationVariable_iface );
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI WINAPI animation_var_QueryInterface( IUIAnimationVariable *iface,
|
||||
+ REFIID iid, void **obj )
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+
|
||||
+ TRACE( "(%p)->(%s %p)\n", This, debugstr_guid( iid ), obj );
|
||||
+
|
||||
+ if (IsEqualIID( iid, &IID_IUnknown ) ||
|
||||
+ IsEqualIID( iid, &IID_IUIAnimationVariable ))
|
||||
+ {
|
||||
+ IUIAnimationVariable_AddRef( iface );
|
||||
+ *obj = iface;
|
||||
+ return S_OK;
|
||||
+ }
|
||||
+
|
||||
+ FIXME( "interface %s not implemented\n", debugstr_guid( iid ) );
|
||||
+ *obj = NULL;
|
||||
+ return E_NOINTERFACE;
|
||||
+}
|
||||
+
|
||||
+static ULONG WINAPI animation_var_AddRef( IUIAnimationVariable *iface )
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+ ULONG ref = InterlockedIncrement( &This->ref );
|
||||
+
|
||||
+ TRACE( "(%p) ref = %u\n", This, ref );
|
||||
+ return ref;
|
||||
+}
|
||||
+
|
||||
+static ULONG WINAPI animation_var_Release( IUIAnimationVariable *iface )
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+ ULONG ref = InterlockedDecrement(&This->ref);
|
||||
+
|
||||
+ TRACE( "(%p) ref = %u\n", This, ref );
|
||||
+
|
||||
+ if (!ref)
|
||||
+ heap_free( This );
|
||||
+
|
||||
+ return ref;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_var_GetValue ( IUIAnimationVariable *iface, DOUBLE *value)
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This);
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_var_GetFinalValue ( IUIAnimationVariable *iface, DOUBLE *value)
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_var_GetPreviousValue ( IUIAnimationVariable *iface, DOUBLE *value)
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_var_GetIntegerValue ( IUIAnimationVariable *iface, INT32 *value)
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_var_GetFinalIntegerValue ( IUIAnimationVariable *iface, INT32 *value)
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_var_GetPreviousIntegerValue ( IUIAnimationVariable *iface, INT32 *value)
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_var_GetCurrentStoryboard ( IUIAnimationVariable *iface, IUIAnimationStoryboard **storyboard)
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_var_SetLowerBound ( IUIAnimationVariable *iface, DOUBLE bound)
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_var_SetUpperBound ( IUIAnimationVariable *iface, DOUBLE bound)
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_var_SetRoundingMode ( IUIAnimationVariable *iface,UI_ANIMATION_ROUNDING_MODE mode)
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return S_OK;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_var_SetTag ( IUIAnimationVariable *iface, IUnknown *object, UINT32 id)
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_var_GetTag ( IUIAnimationVariable *iface, IUnknown **object, UINT32 *id)
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_var_SetVariableChangeHandler ( IUIAnimationVariable *iface, IUIAnimationVariableChangeHandler *handler)
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return S_OK;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_var_SetVariableIntegerChangeHandler ( IUIAnimationVariable *iface,
|
||||
+ IUIAnimationVariableIntegerChangeHandler *handler)
|
||||
+{
|
||||
+ struct animation_var *This = impl_from_IUIAnimationVariable( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return S_OK;
|
||||
+}
|
||||
+
|
||||
+const struct IUIAnimationVariableVtbl animation_var_vtbl =
|
||||
+{
|
||||
+ animation_var_QueryInterface,
|
||||
+ animation_var_AddRef,
|
||||
+ animation_var_Release,
|
||||
+ animation_var_GetValue,
|
||||
+ animation_var_GetFinalValue,
|
||||
+ animation_var_GetPreviousValue,
|
||||
+ animation_var_GetIntegerValue,
|
||||
+ animation_var_GetFinalIntegerValue,
|
||||
+ animation_var_GetPreviousIntegerValue,
|
||||
+ animation_var_GetCurrentStoryboard,
|
||||
+ animation_var_SetLowerBound,
|
||||
+ animation_var_SetUpperBound,
|
||||
+ animation_var_SetRoundingMode,
|
||||
+ animation_var_SetTag,
|
||||
+ animation_var_GetTag,
|
||||
+ animation_var_SetVariableChangeHandler,
|
||||
+ animation_var_SetVariableIntegerChangeHandler,
|
||||
+};
|
||||
+
|
||||
+static HRESULT animation_var_create(DOUBLE initial, IUIAnimationVariable **obj )
|
||||
+{
|
||||
+ struct animation_var *This = heap_alloc( sizeof(*This) );
|
||||
+
|
||||
+ if (!This) return E_OUTOFMEMORY;
|
||||
+ This->IUIAnimationVariable_iface.lpVtbl = &animation_var_vtbl;
|
||||
+ This->ref = 1;
|
||||
+ This->initial = initial;
|
||||
+
|
||||
+ *obj = &This->IUIAnimationVariable_iface;
|
||||
+
|
||||
+ return S_OK;
|
||||
+}
|
||||
+
|
||||
+/***********************************************************************
|
||||
* IUIAnimationManager
|
||||
*/
|
||||
struct manager
|
||||
@@ -384,8 +575,8 @@ static ULONG WINAPI manager_Release( IUIAnimationManager *iface )
|
||||
static HRESULT WINAPI manager_CreateAnimationVariable( IUIAnimationManager *iface, DOUBLE initial_value, IUIAnimationVariable **variable )
|
||||
{
|
||||
struct manager *This = impl_from_IUIAnimationManager( iface );
|
||||
- FIXME( "stub (%p)->( )\n", This );
|
||||
- return E_NOTIMPL;
|
||||
+ TRACE( "(%p)->(%p)\n", This, variable );
|
||||
+ return animation_var_create(initial_value, variable);
|
||||
}
|
||||
|
||||
static HRESULT WINAPI manager_ScheduleTransition( IUIAnimationManager *iface, IUIAnimationVariable *variable, IUIAnimationTransition *transition, UI_ANIMATION_SECONDS current_time )
|
||||
--
|
||||
1.9.1
|
||||
|
Loading…
x
Reference in New Issue
Block a user