mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Rebase against ccec532879ec14b2e79da08288152a69221ec4d1
This commit is contained in:
Alistair Leslie-Hughes
parent
6f1ebb84a2
commit
6e793996ba
@ -52,7 +52,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "931408698859360e56cd85d532b142e789a6c274"
|
||||
echo "ccec532879ec14b2e79da08288152a69221ec4d1"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@ -281,7 +281,6 @@ patch_enable_all ()
|
||||
enable_shlwapi_UrlCombine="$1"
|
||||
enable_stdole32_idl_Typelib="$1"
|
||||
enable_stdole32_tlb_SLTG_Typelib="$1"
|
||||
enable_uianimation_stubs="$1"
|
||||
enable_user32_DM_SETDEFID="$1"
|
||||
enable_user32_Dialog_Paint_Event="$1"
|
||||
enable_user32_DrawMenuItem="$1"
|
||||
@ -967,9 +966,6 @@ patch_enable ()
|
||||
stdole32.tlb-SLTG_Typelib)
|
||||
enable_stdole32_tlb_SLTG_Typelib="$2"
|
||||
;;
|
||||
uianimation-stubs)
|
||||
enable_uianimation_stubs="$2"
|
||||
;;
|
||||
user32-DM_SETDEFID)
|
||||
enable_user32_DM_SETDEFID="$2"
|
||||
;;
|
||||
@ -6033,25 +6029,6 @@ if test "$enable_stdole32_tlb_SLTG_Typelib" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset uianimation-stubs
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#41369] Add UIAnimation and stubs interfaces
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/uianimation/Makefile.in, dlls/uianimation/main.c
|
||||
# |
|
||||
if test "$enable_uianimation_stubs" -eq 1; then
|
||||
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: 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
|
||||
|
||||
# Patchset user32-DM_SETDEFID
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
||||
@ -1,541 +0,0 @@
|
||||
From 52803bac152d1f9d8af2de718c1fa89047487991 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
|
||||
|
||||
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>
|
||||
---
|
||||
dlls/uianimation/Makefile.in | 3 +-
|
||||
dlls/uianimation/main.c | 461 +++++++++++++++++++++++++++++++++--
|
||||
2 files changed, 446 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/dlls/uianimation/Makefile.in b/dlls/uianimation/Makefile.in
|
||||
index d492faabde8..886898070c9 100644
|
||||
--- a/dlls/uianimation/Makefile.in
|
||||
+++ b/dlls/uianimation/Makefile.in
|
||||
@@ -1,5 +1,5 @@
|
||||
MODULE = uianimation.dll
|
||||
-IMPORTS = uuid
|
||||
+IMPORTS = uuid ole32
|
||||
|
||||
EXTRADLLFLAGS = -mno-cygwin
|
||||
|
||||
@@ -9,3 +9,4 @@ C_SRCS = \
|
||||
IDL_SRCS = \
|
||||
uianimation_reg.idl \
|
||||
uianimation_typelib.idl
|
||||
+
|
||||
diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c
|
||||
index 3f1c6a182bb..643a5aeea82 100644
|
||||
--- a/dlls/uianimation/main.c
|
||||
+++ b/dlls/uianimation/main.c
|
||||
@@ -21,6 +21,8 @@
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
+#define COBJMACROS
|
||||
+
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "objbase.h"
|
||||
@@ -38,22 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(uianimation);
|
||||
|
||||
static HINSTANCE hinstance;
|
||||
|
||||
-BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved )
|
||||
-{
|
||||
- TRACE("(%p %d %p)\n", dll, reason, reserved);
|
||||
-
|
||||
- switch (reason)
|
||||
- {
|
||||
- case DLL_WINE_PREATTACH:
|
||||
- return FALSE; /* prefer native version */
|
||||
- case DLL_PROCESS_ATTACH:
|
||||
- hinstance = dll;
|
||||
- DisableThreadLibraryCalls( dll );
|
||||
- break;
|
||||
- }
|
||||
- return TRUE;
|
||||
-}
|
||||
-
|
||||
struct class_factory
|
||||
{
|
||||
IClassFactory IClassFactory_iface;
|
||||
@@ -65,7 +51,8 @@ static inline struct class_factory *impl_from_IClassFactory( IClassFactory *ifac
|
||||
return CONTAINING_RECORD( iface, struct class_factory, IClassFactory_iface );
|
||||
}
|
||||
|
||||
-static HRESULT WINAPI class_factory_QueryInterface( IClassFactory *iface, REFIID iid, void **obj )
|
||||
+static HRESULT WINAPI class_factory_QueryInterface( IClassFactory *iface,
|
||||
+ REFIID iid, void **obj )
|
||||
{
|
||||
if (IsEqualIID( iid, &IID_IUnknown ) ||
|
||||
IsEqualIID( iid, &IID_IClassFactory ))
|
||||
@@ -118,6 +105,440 @@ static const struct IClassFactoryVtbl class_factory_vtbl =
|
||||
class_factory_LockServer
|
||||
};
|
||||
|
||||
+/***********************************************************************
|
||||
+ * IUIAnimationTransitionFactory
|
||||
+ */
|
||||
+struct tr_factory
|
||||
+{
|
||||
+ IUIAnimationTransitionFactory IUIAnimationTransitionFactory_iface;
|
||||
+ LONG ref;
|
||||
+};
|
||||
+
|
||||
+struct tr_factory *impl_from_IUIAnimationTransitionFactory( IUIAnimationTransitionFactory *iface )
|
||||
+{
|
||||
+ return CONTAINING_RECORD( iface, struct tr_factory, IUIAnimationTransitionFactory_iface );
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI tr_factory_QueryInterface( IUIAnimationTransitionFactory *iface,
|
||||
+ REFIID iid, void **obj )
|
||||
+{
|
||||
+ struct tr_factory *This = impl_from_IUIAnimationTransitionFactory( iface );
|
||||
+
|
||||
+ TRACE( "(%p)->(%s %p)\n", This, debugstr_guid( iid ), obj );
|
||||
+
|
||||
+ if (IsEqualIID( iid, &IID_IUnknown ) ||
|
||||
+ IsEqualIID( iid, &IID_IUIAnimationTransitionFactory ))
|
||||
+ {
|
||||
+ IUIAnimationTransitionFactory_AddRef( iface );
|
||||
+ *obj = iface;
|
||||
+ return S_OK;
|
||||
+ }
|
||||
+
|
||||
+ FIXME( "interface %s not implemented\n", debugstr_guid( iid ) );
|
||||
+ *obj = NULL;
|
||||
+ return E_NOINTERFACE;
|
||||
+}
|
||||
+
|
||||
+static ULONG WINAPI tr_factory_AddRef( IUIAnimationTransitionFactory *iface )
|
||||
+{
|
||||
+ struct tr_factory *This = impl_from_IUIAnimationTransitionFactory( iface );
|
||||
+ ULONG ref = InterlockedIncrement( &This->ref );
|
||||
+
|
||||
+ TRACE( "(%p) ref = %u\n", This, ref );
|
||||
+ return ref;
|
||||
+}
|
||||
+
|
||||
+static ULONG WINAPI tr_factory_Release( IUIAnimationTransitionFactory *iface )
|
||||
+{
|
||||
+ struct tr_factory *This = impl_from_IUIAnimationTransitionFactory( iface );
|
||||
+ ULONG ref = InterlockedDecrement(&This->ref);
|
||||
+
|
||||
+ TRACE( "(%p) ref = %u\n", This, ref );
|
||||
+
|
||||
+ if (!ref)
|
||||
+ heap_free( This );
|
||||
+
|
||||
+ return ref;
|
||||
+}
|
||||
+
|
||||
+ static HRESULT WINAPI tr_factory_CreateTransition(IUIAnimationTransitionFactory *iface,
|
||||
+ IUIAnimationInterpolator *interpolator, IUIAnimationTransition **transition)
|
||||
+{
|
||||
+ struct tr_factory *This = impl_from_IUIAnimationTransitionFactory( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+const struct IUIAnimationTransitionFactoryVtbl tr_factory_vtbl =
|
||||
+{
|
||||
+ tr_factory_QueryInterface,
|
||||
+ tr_factory_AddRef,
|
||||
+ tr_factory_Release,
|
||||
+ tr_factory_CreateTransition
|
||||
+};
|
||||
+
|
||||
+HRESULT tr_factory_create( IUnknown *outer, REFIID iid, void **obj )
|
||||
+{
|
||||
+ struct tr_factory *This = heap_alloc( sizeof(*This) );
|
||||
+ HRESULT hr;
|
||||
+
|
||||
+ if (!This) return E_OUTOFMEMORY;
|
||||
+ This->IUIAnimationTransitionFactory_iface.lpVtbl = &tr_factory_vtbl;
|
||||
+ This->ref = 1;
|
||||
+
|
||||
+ hr = IUIAnimationTransitionFactory_QueryInterface( &This->IUIAnimationTransitionFactory_iface, iid, obj );
|
||||
+
|
||||
+ IUIAnimationTransitionFactory_Release( &This->IUIAnimationTransitionFactory_iface );
|
||||
+ return hr;
|
||||
+}
|
||||
+
|
||||
+/***********************************************************************
|
||||
+ * IUIAnimationTransition
|
||||
+ */
|
||||
+struct animation_transition
|
||||
+{
|
||||
+ IUIAnimationTransition IUIAnimationTransition_iface;
|
||||
+ LONG ref;
|
||||
+};
|
||||
+
|
||||
+struct animation_transition *impl_from_IUIAnimationTransition( IUIAnimationTransition *iface )
|
||||
+{
|
||||
+ return CONTAINING_RECORD( iface, struct animation_transition, IUIAnimationTransition_iface );
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI WINAPI animation_transition_QueryInterface( IUIAnimationTransition *iface,
|
||||
+ REFIID iid, void **obj )
|
||||
+{
|
||||
+ struct animation_transition *This = impl_from_IUIAnimationTransition( iface );
|
||||
+
|
||||
+ TRACE( "(%p)->(%s %p)\n", This, debugstr_guid( iid ), obj );
|
||||
+
|
||||
+ if (IsEqualIID( iid, &IID_IUnknown ) ||
|
||||
+ IsEqualIID( iid, &IID_IUIAnimationTransition ))
|
||||
+ {
|
||||
+ IUIAnimationTransition_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_transition_AddRef( IUIAnimationTransition *iface )
|
||||
+{
|
||||
+ struct animation_transition *This = impl_from_IUIAnimationTransition( iface );
|
||||
+ ULONG ref = InterlockedIncrement( &This->ref );
|
||||
+
|
||||
+ TRACE( "(%p) ref = %u\n", This, ref );
|
||||
+ return ref;
|
||||
+}
|
||||
+
|
||||
+static ULONG WINAPI animation_transition_Release( IUIAnimationTransition *iface )
|
||||
+{
|
||||
+ struct animation_transition *This = impl_from_IUIAnimationTransition( iface );
|
||||
+ ULONG ref = InterlockedDecrement(&This->ref);
|
||||
+
|
||||
+ TRACE( "(%p) ref = %u\n", This, ref );
|
||||
+
|
||||
+ if (!ref)
|
||||
+ heap_free( This );
|
||||
+
|
||||
+ return ref;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_transition_SetInitialValue ( IUIAnimationTransition *iface, DOUBLE value)
|
||||
+{
|
||||
+ struct animation_transition *This = impl_from_IUIAnimationTransition( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_transition_SetInitialVelocity (IUIAnimationTransition *iface,DOUBLE velocity)
|
||||
+{
|
||||
+ struct animation_transition *This = impl_from_IUIAnimationTransition( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_transition_IsDurationKnown (IUIAnimationTransition *iface)
|
||||
+{
|
||||
+ struct animation_transition *This = impl_from_IUIAnimationTransition( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI animation_transition_GetDuration (IUIAnimationTransition *iface, UI_ANIMATION_SECONDS *duration)
|
||||
+{
|
||||
+ struct animation_transition *This = impl_from_IUIAnimationTransition( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+const struct IUIAnimationTransitionVtbl animation_transition_vtbl =
|
||||
+{
|
||||
+ animation_transition_QueryInterface,
|
||||
+ animation_transition_AddRef,
|
||||
+ animation_transition_Release,
|
||||
+ animation_transition_SetInitialValue,
|
||||
+ animation_transition_SetInitialVelocity,
|
||||
+ animation_transition_IsDurationKnown,
|
||||
+ animation_transition_GetDuration
|
||||
+};
|
||||
+
|
||||
+HRESULT animation_transition_create( IUnknown *outer, REFIID iid, void **obj )
|
||||
+{
|
||||
+ struct animation_transition *This = heap_alloc( sizeof(*This) );
|
||||
+ HRESULT hr;
|
||||
+
|
||||
+ if (!This) return E_OUTOFMEMORY;
|
||||
+ This->IUIAnimationTransition_iface.lpVtbl = &animation_transition_vtbl;
|
||||
+ This->ref = 1;
|
||||
+
|
||||
+ hr = IUIAnimationTransition_QueryInterface( &This->IUIAnimationTransition_iface, iid, obj );
|
||||
+
|
||||
+ IUIAnimationTransition_Release( &This->IUIAnimationTransition_iface );
|
||||
+ return hr;
|
||||
+}
|
||||
+
|
||||
+/***********************************************************************
|
||||
+ * IUITransitionLibrary
|
||||
+ */
|
||||
+struct tr_library
|
||||
+{
|
||||
+ IUIAnimationTransitionLibrary IUIAnimationTransitionLibrary_iface;
|
||||
+ LONG ref;
|
||||
+};
|
||||
+
|
||||
+struct tr_library *impl_from_IUIAnimationTransitionLibrary( IUIAnimationTransitionLibrary *iface )
|
||||
+{
|
||||
+ return CONTAINING_RECORD( iface, struct tr_library, IUIAnimationTransitionLibrary_iface );
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI WINAPI tr_library_QueryInterface( IUIAnimationTransitionLibrary *iface,
|
||||
+ REFIID iid, void **obj )
|
||||
+{
|
||||
+ struct tr_library *This = impl_from_IUIAnimationTransitionLibrary( iface );
|
||||
+
|
||||
+ TRACE( "(%p)->(%s %p)\n", This, debugstr_guid( iid ), obj );
|
||||
+
|
||||
+ if (IsEqualIID( iid, &IID_IUnknown ) ||
|
||||
+ IsEqualIID( iid, &IID_IUIAnimationTransitionLibrary ))
|
||||
+ {
|
||||
+ IUIAnimationTransitionLibrary_AddRef( iface );
|
||||
+ *obj = iface;
|
||||
+ return S_OK;
|
||||
+ }
|
||||
+
|
||||
+ FIXME( "interface %s not implemented\n", debugstr_guid( iid ) );
|
||||
+ *obj = NULL;
|
||||
+ return E_NOINTERFACE;
|
||||
+}
|
||||
+
|
||||
+static ULONG WINAPI tr_library_AddRef( IUIAnimationTransitionLibrary *iface )
|
||||
+{
|
||||
+ struct tr_library *This = impl_from_IUIAnimationTransitionLibrary( iface );
|
||||
+ ULONG ref = InterlockedIncrement( &This->ref );
|
||||
+
|
||||
+ TRACE( "(%p) ref = %u\n", This, ref );
|
||||
+ return ref;
|
||||
+}
|
||||
+
|
||||
+static ULONG WINAPI tr_library_Release( IUIAnimationTransitionLibrary *iface )
|
||||
+{
|
||||
+ struct tr_library *This = impl_from_IUIAnimationTransitionLibrary( iface );
|
||||
+ ULONG ref = InterlockedDecrement(&This->ref);
|
||||
+
|
||||
+ TRACE( "(%p) ref = %u\n", This, ref );
|
||||
+
|
||||
+ if (!ref)
|
||||
+ heap_free( This );
|
||||
+
|
||||
+ return ref;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI tr_library_CreateInstantaneousTransition(IUIAnimationTransitionLibrary *iface,
|
||||
+ double finalValue, IUIAnimationTransition **transition)
|
||||
+{
|
||||
+ struct tr_library *This = impl_from_IUIAnimationTransitionLibrary( iface );
|
||||
+ struct animation_transition *tr = heap_alloc( sizeof(*tr) );
|
||||
+ HRESULT hr;
|
||||
+
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+
|
||||
+ if (!tr) return E_OUTOFMEMORY;
|
||||
+ tr->IUIAnimationTransition_iface.lpVtbl = &animation_transition_vtbl;
|
||||
+ tr->ref = 1;
|
||||
+
|
||||
+ hr = animation_transition_QueryInterface( &tr->IUIAnimationTransition_iface, &IID_IUIAnimationTransition, (void **)transition );
|
||||
+
|
||||
+ IUIAnimationTransition_Release( &tr->IUIAnimationTransition_iface );
|
||||
+ return hr;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI tr_library_CreateConstantTransition(IUIAnimationTransitionLibrary *iface,
|
||||
+ double duration, IUIAnimationTransition **transition)
|
||||
+{
|
||||
+ struct tr_library *This = impl_from_IUIAnimationTransitionLibrary( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI tr_library_CreateDiscreteTransition(IUIAnimationTransitionLibrary *iface,
|
||||
+ double delay, double finalValue, double hold, IUIAnimationTransition **transition)
|
||||
+{
|
||||
+ struct tr_library *This = impl_from_IUIAnimationTransitionLibrary( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI tr_library_CreateLinearTransition(IUIAnimationTransitionLibrary *iface,
|
||||
+ double duration, double finalValue, IUIAnimationTransition **transition)
|
||||
+{
|
||||
+ struct tr_library *This = impl_from_IUIAnimationTransitionLibrary( iface );
|
||||
+ struct animation_transition *tr = heap_alloc( sizeof(*tr) );
|
||||
+ HRESULT hr;
|
||||
+
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+
|
||||
+ if (!tr) return E_OUTOFMEMORY;
|
||||
+ tr->IUIAnimationTransition_iface.lpVtbl = &animation_transition_vtbl;
|
||||
+ tr->ref = 1;
|
||||
+
|
||||
+ hr = animation_transition_QueryInterface( &tr->IUIAnimationTransition_iface, &IID_IUIAnimationTransition, (void **)transition );
|
||||
+
|
||||
+ IUIAnimationTransition_Release( &tr->IUIAnimationTransition_iface );
|
||||
+ return hr;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI tr_library_CreateLinearTransitionFromSpeed(IUIAnimationTransitionLibrary *iface,
|
||||
+ double speed, double finalValue, IUIAnimationTransition **transition)
|
||||
+{
|
||||
+ struct tr_library *This = impl_from_IUIAnimationTransitionLibrary( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI tr_library_CreateSinusoidalTransitionFromVelocity(IUIAnimationTransitionLibrary *iface,
|
||||
+ double duration, double period, IUIAnimationTransition **transition)
|
||||
+{
|
||||
+ struct tr_library *This = impl_from_IUIAnimationTransitionLibrary( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI tr_library_CreateSinusoidalTransitionFromRange(IUIAnimationTransitionLibrary *iface,
|
||||
+ double duration, double minimumValue, double maximumValue, double period,
|
||||
+ UI_ANIMATION_SLOPE slope, IUIAnimationTransition **transition)
|
||||
+{
|
||||
+ struct tr_library *This = impl_from_IUIAnimationTransitionLibrary( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI tr_library_CreateAccelerateDecelerateTransition(IUIAnimationTransitionLibrary *iface,
|
||||
+ double duration, double finalValue, double accelerationRatio, double decelerationRatio,
|
||||
+ IUIAnimationTransition **transition)
|
||||
+{
|
||||
+ struct tr_library *This = impl_from_IUIAnimationTransitionLibrary( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI tr_library_CreateReversalTransition(IUIAnimationTransitionLibrary *iface, double duration,
|
||||
+ IUIAnimationTransition **transition)
|
||||
+{
|
||||
+ struct tr_library *This = impl_from_IUIAnimationTransitionLibrary( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI tr_library_CreateCubicTransition(IUIAnimationTransitionLibrary *iface, double duration,
|
||||
+ double finalValue, double finalVelocity, IUIAnimationTransition **transition)
|
||||
+{
|
||||
+ struct tr_library *This = impl_from_IUIAnimationTransitionLibrary( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI tr_library_CreateSmoothStopTransition(IUIAnimationTransitionLibrary *iface,
|
||||
+ double maximumDuration, double finalValue, IUIAnimationTransition **transition)
|
||||
+{
|
||||
+ struct tr_library *This = impl_from_IUIAnimationTransitionLibrary( iface );
|
||||
+ struct animation_transition *tr = heap_alloc( sizeof(*tr) );
|
||||
+ HRESULT hr;
|
||||
+
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+
|
||||
+ if (!tr) return E_OUTOFMEMORY;
|
||||
+ tr->IUIAnimationTransition_iface.lpVtbl = &animation_transition_vtbl;
|
||||
+ tr->ref = 1;
|
||||
+
|
||||
+ hr = animation_transition_QueryInterface( &tr->IUIAnimationTransition_iface, &IID_IUIAnimationTransition, (void **)transition );
|
||||
+
|
||||
+ IUIAnimationTransition_Release( &tr->IUIAnimationTransition_iface );
|
||||
+ return hr;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI tr_library_CreateParabolicTransitionFromAcceleration(IUIAnimationTransitionLibrary *iface,
|
||||
+ double finalValue, double finalVelocity, double acceleration, IUIAnimationTransition **transition)
|
||||
+{
|
||||
+ struct tr_library *This = impl_from_IUIAnimationTransitionLibrary( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+const struct IUIAnimationTransitionLibraryVtbl tr_library_vtbl =
|
||||
+{
|
||||
+ tr_library_QueryInterface,
|
||||
+ tr_library_AddRef,
|
||||
+ tr_library_Release,
|
||||
+ tr_library_CreateInstantaneousTransition,
|
||||
+ tr_library_CreateConstantTransition,
|
||||
+ tr_library_CreateDiscreteTransition,
|
||||
+ tr_library_CreateLinearTransition,
|
||||
+ tr_library_CreateLinearTransitionFromSpeed,
|
||||
+ tr_library_CreateSinusoidalTransitionFromVelocity,
|
||||
+ tr_library_CreateSinusoidalTransitionFromRange,
|
||||
+ tr_library_CreateAccelerateDecelerateTransition,
|
||||
+ tr_library_CreateReversalTransition,
|
||||
+ tr_library_CreateCubicTransition,
|
||||
+ tr_library_CreateSmoothStopTransition,
|
||||
+ tr_library_CreateParabolicTransitionFromAcceleration,
|
||||
+};
|
||||
+
|
||||
+HRESULT tr_library_create( IUnknown *outer, REFIID iid, void **obj )
|
||||
+{
|
||||
+ struct tr_library *This = heap_alloc( sizeof(*This) );
|
||||
+ HRESULT hr;
|
||||
+
|
||||
+ if (!This) return E_OUTOFMEMORY;
|
||||
+ This->IUIAnimationTransitionLibrary_iface.lpVtbl = &tr_library_vtbl;
|
||||
+ This->ref = 1;
|
||||
+
|
||||
+ hr = IUIAnimationTransitionLibrary_QueryInterface( &This->IUIAnimationTransitionLibrary_iface, iid, obj );
|
||||
+
|
||||
+ IUIAnimationTransitionLibrary_Release( &This->IUIAnimationTransitionLibrary_iface );
|
||||
+ return hr;
|
||||
+}
|
||||
+
|
||||
+BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved )
|
||||
+{
|
||||
+ TRACE("(%p %d %p)\n", dll, reason, reserved);
|
||||
+
|
||||
+ switch (reason)
|
||||
+ {
|
||||
+ case DLL_WINE_PREATTACH:
|
||||
+ return FALSE; /* prefer native version */
|
||||
+ case DLL_PROCESS_ATTACH:
|
||||
+ hinstance = dll;
|
||||
+ DisableThreadLibraryCalls( dll );
|
||||
+ break;
|
||||
+ }
|
||||
+ return TRUE;
|
||||
+}
|
||||
+
|
||||
/***********************************************************************
|
||||
* IUIAnimationManager
|
||||
*/
|
||||
@@ -490,6 +911,8 @@ static HRESULT timer_create( IUnknown *outer, REFIID iid, void **obj )
|
||||
|
||||
static struct class_factory manager_cf = { { &class_factory_vtbl }, manager_create };
|
||||
static struct class_factory timer_cf = { { &class_factory_vtbl }, timer_create };
|
||||
+static struct class_factory tr_factory_cf = { { &class_factory_vtbl }, tr_factory_create };
|
||||
+static struct class_factory tr_library_cf = { { &class_factory_vtbl }, tr_library_create };
|
||||
|
||||
/******************************************************************
|
||||
* DllGetClassObject
|
||||
@@ -504,6 +927,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj )
|
||||
cf = &manager_cf.IClassFactory_iface;
|
||||
else if (IsEqualCLSID( clsid, &CLSID_UIAnimationTimer ))
|
||||
cf = &timer_cf.IClassFactory_iface;
|
||||
+ else if (IsEqualCLSID( clsid, &CLSID_UIAnimationTransitionFactory ))
|
||||
+ cf = &tr_factory_cf.IClassFactory_iface;
|
||||
+ else if (IsEqualCLSID( clsid, &CLSID_UIAnimationTransitionLibrary ))
|
||||
+ cf = &tr_library_cf.IClassFactory_iface;
|
||||
|
||||
if (!cf)
|
||||
return CLASS_E_CLASSNOTAVAILABLE;
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@ -1,253 +0,0 @@
|
||||
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
|
||||
|
||||
---
|
||||
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 cc5d9b36d68..c245f30b3e4 100644
|
||||
--- a/dlls/uianimation/main.c
|
||||
+++ b/dlls/uianimation/main.c
|
||||
@@ -676,6 +676,225 @@ BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved )
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
+/***********************************************************************
|
||||
+ * 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
|
||||
*/
|
||||
@@ -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)->(%p)\n", This, storyboard );
|
||||
- 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 )
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -1,226 +0,0 @@
|
||||
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 +++++++++++++++++++++++++++++++++++++++-
|
||||
1 file changed, 193 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c
|
||||
index c245f30b3e4..a49b2fe43df 100644
|
||||
--- a/dlls/uianimation/main.c
|
||||
+++ b/dlls/uianimation/main.c
|
||||
@@ -895,6 +895,197 @@ static HRESULT animation_storyboard_create( IUIAnimationStoryboard **obj )
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
+/***********************************************************************
|
||||
+ * 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
|
||||
*/
|
||||
@@ -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)->(%f, %p)\n", This, initial_value, variable );
|
||||
- return E_NOTIMPL;
|
||||
+ 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 )
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [41369] Add UIAnimation and stubs interfaces
|
||||
Loading…
Reference in New Issue
Block a user