Rebase against 5b62f89baa82daecd430897de0bb5cab32c5fc5e

This commit is contained in:
Alistair Leslie-Hughes
2019-10-29 09:50:40 +11:00
parent 086d99f83e
commit bc4e00ae02
6 changed files with 100 additions and 558 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -1,21 +1,21 @@
From e0d49da97e6b83da2de26dacc7932dd0094c6c2a Mon Sep 17 00:00:00 2001
From 4ef814d720b7b3ad1073a549e58a2c6d10e49905 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
Subject: [PATCH] uianimation: Implement IUIAnimationManager CreateStoryboard
---
dlls/uianimation/main.c | 223 +++++++++++++++++++++++++++++++++++++++++++++++-
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
index cc5d9b36d68..c245f30b3e4 100644
--- a/dlls/uianimation/main.c
+++ b/dlls/uianimation/main.c
@@ -106,6 +106,225 @@ static const struct IClassFactoryVtbl class_factory_vtbl =
};
@@ -676,6 +676,225 @@ BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved )
return TRUE;
}
/***********************************************************************
+/***********************************************************************
+ * IUIAnimationStoryboard
+ */
+struct animation_storyboard
@@ -234,15 +234,14 @@ index 6101827..7a6c68c 100644
+ return S_OK;
+}
+
+/***********************************************************************
/***********************************************************************
* IUIAnimationManager
*/
struct manager
@@ -179,8 +398,8 @@ static HRESULT WINAPI manager_ScheduleTransition( IUIAnimationManager *iface, IU
@@ -750,8 +969,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 );
- FIXME( "stub (%p)->(%p)\n", This, storyboard );
- return E_NOTIMPL;
+ TRACE( "(%p)->(%p)\n", This, storyboard );
+ return animation_storyboard_create(storyboard);
@@ -250,5 +249,5 @@ index 6101827..7a6c68c 100644
static HRESULT WINAPI manager_FinishAllStoryboards( IUIAnimationManager *iface, UI_ANIMATION_SECONDS max_time )
--
1.9.1
2.17.1

View File

@@ -1,21 +1,22 @@
From 364510214da84841cbf9b8cb4546ab7c84824115 Mon Sep 17 00:00:00 2001
From 61ad3dcf4ffee22d1d8b000c82c3779280303766 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 +++++++++++++++++++++++++++++++++++++++++++++++-
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
index c245f30b3e4..a49b2fe43df 100644
--- a/dlls/uianimation/main.c
+++ b/dlls/uianimation/main.c
@@ -325,6 +325,197 @@ static HRESULT animation_storyboard_create( IUIAnimationStoryboard **obj )
@@ -895,6 +895,197 @@ static HRESULT animation_storyboard_create( IUIAnimationStoryboard **obj )
return S_OK;
}
/***********************************************************************
+/***********************************************************************
+ * IUIAnimationVariable
+ */
+struct animation_var
@@ -206,21 +207,20 @@ index 7a6c68c..3dc9e30 100644
+ return S_OK;
+}
+
+/***********************************************************************
/***********************************************************************
* IUIAnimationManager
*/
struct manager
@@ -384,8 +575,8 @@ static ULONG WINAPI manager_Release( IUIAnimationManager *iface )
@@ -955,8 +1146,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 );
- FIXME( "stub (%p)->(%f, %p)\n", This, initial_value, variable );
- return E_NOTIMPL;
+ TRACE( "(%p)->(%p)\n", This, variable );
+ TRACE( "(%p)->(%f, %p)\n", This, initial_value, 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
2.17.1