October 2019 - Wine-devel - list.winehq.org

[PATCH v4 1/7] ddraw: Give exact name for devices in Enumdevices
by David Adam 31 Oct '19

31 Oct '19

This patch allows the game Donald Duck couak attack to start. Bug was spotted by Andrew D'Addesio in bug 19153

1 0

[PATCH 5/5] uianimation/tests: Add more tests
by Alistair Leslie-Hughes 30 Oct '19

30 Oct '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/uianimation/tests/uianimation.c | 60 ++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/uianimation/tests/uianimation.c b/dlls/uianimation/tests/uianimation.c index 4f3fe39b2d..e8d113a625 100644 --- a/dlls/uianimation/tests/uianimation.c +++ b/dlls/uianimation/tests/uianimation.c @@ -31,6 +31,7 @@ static void test_UIAnimationManager(void) HRESULT hr; IUIAnimationManager *manager; IUIAnimationVariable *variable; + IUIAnimationStoryboard *storyboard; hr = CoCreateInstance( &CLSID_UIAnimationManager, NULL, CLSCTX_ALL, &IID_IUIAnimationManager, (LPVOID*)&manager); if(FAILED(hr)) @@ -44,6 +45,11 @@ static void test_UIAnimationManager(void) if (hr == S_OK) IUIAnimationVariable_Release(variable); + hr = IUIAnimationManager_CreateStoryboard(manager, &storyboard); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) + IUIAnimationStoryboard_Release(storyboard); + IUIAnimationManager_Release(manager); } @@ -83,6 +89,58 @@ static void test_IUIAnimationTimer(void) IUIAnimationTimer_Release(timer); } +static void test_IUIAnimationTransitionFactory(void) +{ + HRESULT hr; + IUIAnimationTransitionFactory *factory; + IUIAnimationTransition *transition = NULL; + + hr = CoCreateInstance( &CLSID_UIAnimationTransitionFactory, NULL, CLSCTX_ALL, + &IID_IUIAnimationTransitionFactory, (void**)&factory); + if (FAILED(hr)) + { + win_skip("IUIAnimationTransitionFactory not found\n"); + return; + } + + hr = IUIAnimationTransitionFactory_CreateTransition(factory, NULL, &transition); + todo_wine ok(hr == E_POINTER, "got 0x%08x\n", hr); + + IUIAnimationTransitionFactory_Release(factory); +} + +static void test_IUIAnimationTransitionLibrary(void) +{ + HRESULT hr; + IUIAnimationTransitionLibrary *library; + IUIAnimationTransition *instantaneous, *linear, *smooth; + + hr = CoCreateInstance( &CLSID_UIAnimationTransitionLibrary, NULL, CLSCTX_ALL, + &IID_IUIAnimationTransitionLibrary, (void**)&library); + if (FAILED(hr)) + { + win_skip("IUIAnimationTransitionLibrary not found\n"); + return; + } + + hr = IUIAnimationTransitionLibrary_CreateInstantaneousTransition(library, 100.0, &instantaneous); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) + IUIAnimationTransition_Release(instantaneous); + + hr = IUIAnimationTransitionLibrary_CreateLinearTransition(library, 500.0, 100.0, &linear); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) + IUIAnimationTransition_Release(linear); + + hr = IUIAnimationTransitionLibrary_CreateSmoothStopTransition(library, 500.0, 100.0, &smooth); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) + IUIAnimationTransition_Release(smooth); + + IUIAnimationTransitionLibrary_Release(library); +} + START_TEST(uianimation) { HRESULT hr; @@ -94,6 +152,8 @@ START_TEST(uianimation) test_UIAnimationManager(); test_IUIAnimationTimer(); + test_IUIAnimationTransitionFactory(); + test_IUIAnimationTransitionLibrary(); CoUninitialize(); } -- 2.17.1

1 0

[PATCH 4/5] uianimation: Implement IUIAnimationManager CreateAnimationVariable
by Alistair Leslie-Hughes 30 Oct '19

30 Oct '19

From: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/uianimation/main.c | 195 ++++++++++++++++++++++++++- dlls/uianimation/tests/uianimation.c | 2 +- 2 files changed, 194 insertions(+), 3 deletions(-) diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c index 8d9f4019b3..d71099c6b3 100644 --- a/dlls/uianimation/main.c +++ b/dlls/uianimation/main.c @@ -337,6 +337,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 */ @@ -397,8 +588,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 ) diff --git a/dlls/uianimation/tests/uianimation.c b/dlls/uianimation/tests/uianimation.c index 5c85e8f4dc..4f3fe39b2d 100644 --- a/dlls/uianimation/tests/uianimation.c +++ b/dlls/uianimation/tests/uianimation.c @@ -40,7 +40,7 @@ static void test_UIAnimationManager(void) } hr = IUIAnimationManager_CreateAnimationVariable(manager, 1.0f, &variable); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) IUIAnimationVariable_Release(variable); -- 2.17.1

1 0

[PATCH 3/5] uianimation: Implement IUIAnimationManager CreateStoryboard
by Alistair Leslie-Hughes 30 Oct '19

30 Oct '19

From: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- 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 eece200a87..8d9f4019b3 100644 --- a/dlls/uianimation/main.c +++ b/dlls/uianimation/main.c @@ -118,6 +118,225 @@ static const struct IClassFactoryVtbl class_factory_vtbl = class_factory_LockServer }; +/*********************************************************************** + * 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 */ @@ -192,8 +411,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 0

[PATCH 2/5] uianimation: Add IUIAnimationTransitionLibrary stubbed interface.
by Alistair Leslie-Hughes 30 Oct '19

30 Oct '19

From: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/uianimation/main.c | 191 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 191 insertions(+) diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c index b8bd75fb0c..eece200a87 100644 --- a/dlls/uianimation/main.c +++ b/dlls/uianimation/main.c @@ -574,9 +574,198 @@ static HRESULT transition_create( IUnknown *outer, REFIID iid, void **obj ) 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 ); + FIXME( "stub (%p)->(%f, %p)\n", This, finalValue, transition ); + return E_NOTIMPL; +} + +static HRESULT WINAPI tr_library_CreateConstantTransition(IUIAnimationTransitionLibrary *iface, + double duration, IUIAnimationTransition **transition) +{ + struct tr_library *This = impl_from_IUIAnimationTransitionLibrary( iface ); + FIXME( "stub (%p)->(%f, %p)\n", This, duration, transition ); + 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 ); + FIXME( "stub (%p)->(%f, %f, %p)\n", This, duration, finalValue, transition ); + return E_NOTIMPL; +} + +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)->(%f, %f, %p)\n", This, speed, finalValue, transition ); + 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)->(%f, %f, %p)\n", This, duration, period, transition ); + 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)->(%f, %f, %f, %f, %d, %p)\n", This, duration, minimumValue, maximumValue, period, slope, transition ); + 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)->(%f, %f, %f, %f, %d, %p)\n", This, duration, finalValue, accelerationRatio, decelerationRatio, transition ); + 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)->(%f, %p)\n", This, duration, transition ); + 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)->(%f, %f, %d, %p)\n", This, duration, finalValue, finalVelocity, transition ); + 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 ); + FIXME( "stub (%p)->(%f, %d, %p)\n", This, maximumDuration, finalValue, transition ); + return E_NOTIMPL; +} + +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, +}; + +static HRESULT 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; +} + 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 transition_cf = { { &class_factory_vtbl }, transition_create }; +static struct class_factory library_cf = { { &class_factory_vtbl }, library_create }; /****************************************************************** * DllGetClassObject @@ -593,6 +782,8 @@ HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj ) cf = &timer_cf.IClassFactory_iface; else if (IsEqualCLSID( clsid, &CLSID_UIAnimationTransitionFactory )) cf = &transition_cf.IClassFactory_iface; + else if (IsEqualCLSID( clsid, &CLSID_UIAnimationTransitionLibrary )) + cf = &library_cf.IClassFactory_iface; if (!cf) return CLASS_E_CLASSNOTAVAILABLE; -- 2.17.1

1 0

[PATCH 1/5] uianimation: Add IUIAnimationTransitionFactory stubbed interface.
by Alistair Leslie-Hughes 30 Oct '19

30 Oct '19

From: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/uianimation/main.c | 89 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c index 3f1c6a182b..b8bd75fb0c 100644 --- a/dlls/uianimation/main.c +++ b/dlls/uianimation/main.c @@ -488,8 +488,95 @@ static HRESULT timer_create( IUnknown *outer, REFIID iid, void **obj ) return hr; } +/*********************************************************************** + * 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)->(%p, %p)\n", This, interpolator, transition ); + return E_NOTIMPL; +} + +const struct IUIAnimationTransitionFactoryVtbl tr_factory_vtbl = +{ + tr_factory_QueryInterface, + tr_factory_AddRef, + tr_factory_Release, + tr_factory_CreateTransition +}; + +static HRESULT transition_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; +} + 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 transition_cf = { { &class_factory_vtbl }, transition_create }; /****************************************************************** * DllGetClassObject @@ -504,6 +591,8 @@ 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 = &transition_cf.IClassFactory_iface; if (!cf) return CLASS_E_CLASSNOTAVAILABLE; -- 2.17.1

1 0

[PATCH] winevulkan: Don't process struct alias' in pNext conversion chains.
by Derek Lesho 30 Oct '19

30 Oct '19

Fixes parsing of Vulkan 1.1.106+ Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 4f1c03cc7c..8e043538c8 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2955,9 +2955,10 @@ class VkRegistry(object): for struct in structs: struct.set_type_info(self.types) - for structextend in struct.structextends: - s = self.types[structextend]["data"] - s.struct_extensions.append(struct) + if struct.alias is None: + for structextend in struct.structextends: + s = self.types[structextend]["data"] + s.struct_extensions.append(struct) # Guarantee everything is sorted, so code generation doesn't have # to deal with this. -- 2.23.0

2 1

[PATCH] winevulkan: Add support for the uint16_t type in make_vulkan.
by Derek Lesho 30 Oct '19

30 Oct '19

Vulkan headers use this type as of Vulkan 1.1.117, due to the inclusion of VK_EXT_line_rasterization. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 8e043538c8..2af98fbd6f 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1312,8 +1312,10 @@ class VkParam(object): elif self.type == "size_t": self.format_str = "0x%s" self.format_conv = "wine_dbgstr_longlong({0})" - elif self.type in ["uint32_t", "VkBool32"]: + elif self.type in ["uint32_t", "VkBool32", "uint16_t"]: self.format_str = "%u" + if self.type == "uint16_t": + self.format_conv = "(unsigned int){0}" elif self.type in ["uint64_t", "VkDeviceSize"]: self.format_str = "0x%s" self.format_conv = "wine_dbgstr_longlong({0})" @@ -1501,7 +1503,7 @@ class VkParam(object): return "int64" if self.type == "float": return "float" - if self.type in ["int", "int32_t", "size_t", "uint32_t", "VkBool32"]: + if self.type in ["int", "int32_t", "size_t", "uint32_t", "VkBool32", "uint16_t"]: return "long" if self.type in ["uint64_t", "VkDeviceSize"]: return "int64" -- 2.23.0

3 2

[PATCH 1/6] winevulkan: Don't add alias structs to struct-extensions list
by Liam Middlebrook 30 Oct '19

30 Oct '19

This resolves compilation errors relating to duplicate case values for alias structures when building against spec version 1.1.106. An example of one of these errors has been included below: vulkan_thunks.c: In function ‘convert_VkDeviceCreateInfo_struct_chain’: vulkan_thunks.c:1997:9: error: duplicate case value case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES: ^~~~ vulkan_thunks.c:1377:9: note: previously used here case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES: ^~~~ Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Reviewed-by: Daniel Koch <dkoch(a)nvidia.com> --- dlls/winevulkan/make_vulkan | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 4f1c03cc7c..058c5e41e9 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2955,6 +2955,13 @@ class VkRegistry(object): for struct in structs: struct.set_type_info(self.types) + # Alias structures have enum values equivalent to those of the + # structure which they are aliased against. we need to ignore alias + # structs when populating the struct extensions list, otherwise we + # will create duplicate case entries. + if struct.alias: + continue + for structextend in struct.structextends: s = self.types[structextend]["data"] s.struct_extensions.append(struct) -- 2.17.1

1 5

[PATCH 4/4] user32: Support RIDI_PREPARSEDDATA in GetRawInputDeviceInfo
by Andrew Eikum 30 Oct '19

30 Oct '19

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/user32/rawinput.c | 18 +++++++++++++++ dlls/user32/tests/Makefile.in | 2 +- dlls/user32/tests/input.c | 41 +++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 770ec910963..85ff0c5e809 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -33,6 +33,7 @@ #include "ddk/hidsdi.h" #include "wine/debug.h" #include "wine/server.h" +#include "wine/hid.h" #include "user_private.h" @@ -467,6 +468,23 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT to_copy = &info; break; + case RIDI_PREPARSEDDATA: + avail_bytes = *data_size; + if (device == WINE_MOUSE_HANDLE || + device == WINE_KEYBOARD_HANDLE) + { + to_copy_bytes = 0; + *data_size = 0; + to_copy = NULL; + } + else + { + to_copy_bytes = ((WINE_HIDP_PREPARSED_DATA*)hid_device->data)->dwSize; + *data_size = to_copy_bytes; + to_copy = hid_device->data; + } + break; + default: FIXME("command %#x not supported\n", command); return ~0U; diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in index 7149dc824ea..dd101d69f3c 100644 --- a/dlls/user32/tests/Makefile.in +++ b/dlls/user32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = user32.dll -IMPORTS = user32 gdi32 advapi32 +IMPORTS = user32 gdi32 advapi32 hid C_SRCS = \ broadcast.c \ diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 5723af3fd2b..1e6be311eeb 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -55,6 +55,7 @@ #include "winbase.h" #include "winuser.h" #include "winnls.h" +#include "ddk/hidsdi.h" #include "wine/test.h" @@ -1605,6 +1606,7 @@ static void test_GetRawInputDeviceList(void) RAWINPUTDEVICELIST devices[32]; UINT ret, oret, devcount, odevcount, i; DWORD err; + BOOLEAN br; SetLastError(0xdeadbeef); ret = pGetRawInputDeviceList(NULL, NULL, 0); @@ -1642,6 +1644,7 @@ static void test_GetRawInputDeviceList(void) UINT sz, len; RID_DEVICE_INFO info; HANDLE file; + char *ppd; /* get required buffer size */ name[0] = '\0'; @@ -1688,6 +1691,44 @@ static void test_GetRawInputDeviceList(void) file = CreateFileW(name, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); todo_wine_if(info.dwType != RIM_TYPEHID) ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u\n", wine_dbgstr_w(name), GetLastError()); + + sz = 0; + ret = pGetRawInputDeviceInfoW(devices[i].hDevice, RIDI_PREPARSEDDATA, NULL, &sz); + ok(ret == 0, "GetRawInputDeviceInfo gave wrong return: %u\n", ret); + ok((info.dwType == RIM_TYPEHID && sz != 0) || + (info.dwType != RIM_TYPEHID && sz == 0), + "Got wrong PPD size for type 0x%x: %u\n", info.dwType, sz); + + ppd = HeapAlloc(GetProcessHeap(), 0, sz); + ret = pGetRawInputDeviceInfoW(devices[i].hDevice, RIDI_PREPARSEDDATA, ppd, &sz); + ok(ret == sz, "GetRawInputDeviceInfo gave wrong return: %u, should be %u\n", ret, sz); + + if (file != INVALID_HANDLE_VALUE && ret == sz) + { + PHIDP_PREPARSED_DATA preparsed; + + if (info.dwType == RIM_TYPEHID) + { + br = HidD_GetPreparsedData(file, &preparsed); + ok(br == TRUE, "HidD_GetPreparsedData failed\n"); + + if (br) + ok(!memcmp(preparsed, ppd, sz), "Expected to get same preparsed data\n"); + } + else + { + /* succeeds on hardware, fails in some VMs */ + br = HidD_GetPreparsedData(file, &preparsed); + todo_wine + ok(br == TRUE || broken(br == FALSE), "HidD_GetPreparsedData failed\n"); + } + + if (br) + HidD_FreePreparsedData(preparsed); + } + + HeapFree(GetProcessHeap(), 0, ppd); + CloseHandle(file); } -- 2.23.0

2 1