October 2019 - Wine-commits

Alexandre Julliard : webservices: Use _control87() instead of directly manipulating the FPU register.
by Alexandre Julliard 31 Oct '19

31 Oct '19

Module: wine Branch: master Commit: 311f6c8453f4d3c62b0a3f3ecbde2a76acc1b72d URL: https://source.winehq.org/git/wine.git/?a=commit;h=311f6c8453f4d3c62b0a3f3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 31 22:18:32 2019 +0100 webservices: Use _control87() instead of directly manipulating the FPU register. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 32 ++++----------------------- dlls/webservices/tests/writer.c | 40 +++++++--------------------------- dlls/webservices/webservices_private.h | 2 -- dlls/webservices/writer.c | 7 +++--- 4 files changed, 16 insertions(+), 65 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 664bfbeb63..181739650e 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -18,6 +18,7 @@ #include <stdarg.h> #include <assert.h> +#include <float.h> #include "windef.h" #include "winbase.h" @@ -3723,31 +3724,6 @@ static HRESULT str_to_uint64( const unsigned char *str, ULONG len, UINT64 max, U return S_OK; } -BOOL set_fpword( unsigned short new, unsigned short *old ) -{ -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) - unsigned short fpword; - - __asm__ __volatile__( "fstcw %0" : "=m" (fpword) ); - *old = fpword; - fpword = new; - __asm__ __volatile__( "fldcw %0" : : "m" (fpword) ); - return TRUE; -#else - FIXME( "not implemented\n" ); - return FALSE; -#endif -} - -void restore_fpword( unsigned short fpword ) -{ -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) - __asm__ __volatile__( "fldcw %0" : : "m" (fpword) ); -#else - FIXME( "not implemented\n" ); -#endif -} - static HRESULT str_to_double( const unsigned char *str, ULONG len, double *ret ) { static const unsigned __int64 nan = 0xfff8000000000000; @@ -3758,7 +3734,7 @@ static HRESULT str_to_double( const unsigned char *str, ULONG len, double *ret ) int sign = 1, exp_sign = 1, exp = 0, exp_tmp = 0, neg_exp, i, nb_digits, have_digits; unsigned __int64 val = 0, tmp; long double exp_val = 1.0, exp_mul = 10.0; - unsigned short fpword; + unsigned int fpword = _control87( 0, 0 ); while (len && read_isspace( *p )) { p++; len--; } while (len && read_isspace( p[len - 1] )) { len--; } @@ -3789,7 +3765,7 @@ static HRESULT str_to_double( const unsigned char *str, ULONG len, double *ret ) else if (*p == '+') { p++; len--; }; if (!len) return S_OK; - if (!set_fpword( 0x37f, &fpword )) return E_NOTIMPL; + _control87( _MCW_EM | _RC_NEAR | _PC_64, _MCW_EM | _MCW_RC | _MCW_PC ); q = p; while (len && isdigit( *q )) { q++; len--; } @@ -3860,7 +3836,7 @@ static HRESULT str_to_double( const unsigned char *str, ULONG len, double *ret ) hr = S_OK; done: - restore_fpword( fpword ); + _control87( fpword, _MCW_EM | _MCW_RC | _MCW_PC ); return hr; } diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 18c4b7e284..65e672a424 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -18,6 +18,7 @@ #include <stdio.h> #include <math.h> +#include <float.h> #include "windows.h" #include "rpc.h" #include "webservices.h" @@ -2220,28 +2221,10 @@ static void test_text_types(void) WsFreeWriter( writer ); } -static BOOL get_fpword( unsigned short *ret ) -{ -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) - unsigned short fpword; - __asm__ __volatile__( "fstcw %0" : "=m" (fpword) ); - *ret = fpword; - return TRUE; -#endif - return FALSE; -} - -static void set_fpword( unsigned short fpword ) -{ -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) - __asm__ __volatile__( "fldcw %0" : : "m" (fpword) ); -#endif -} - static void test_double(void) { WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}; - unsigned short fpword; + unsigned int fpword, fpword_orig; static const struct { double val; @@ -2329,16 +2312,9 @@ static void test_double(void) ok( hr == S_OK, "got %08x\n", hr ); check_output( writer, "<t>-INF</t>", __LINE__ ); - if (!get_fpword( &fpword )) - { - skip( "can't get floating point control word\n" ); - WsFreeWriter( writer ); - return; - } - ok( fpword == 0x27f, "got %04x\n", fpword ); - set_fpword( 0x1f7f ); - get_fpword( &fpword ); - ok( fpword == 0x1f7f, "got %04x\n", fpword ); + fpword_orig = _control87( 0, 0 ); + fpword = _control87( _MCW_EM | _RC_CHOP | _PC_64, _MCW_EM | _MCW_RC | _MCW_PC ); + ok( fpword == (_MCW_EM | _RC_CHOP | _PC_64), "got %08x\n", fpword ); hr = set_output( writer ); ok( hr == S_OK, "got %08x\n", hr ); @@ -2353,9 +2329,9 @@ static void test_double(void) ok( hr == S_OK, "got %08x\n", hr ); check_output( writer, "<t>100000000000000</t>", __LINE__ ); - get_fpword( &fpword ); - ok( fpword == 0x1f7f, "got %04x\n", fpword ); - set_fpword( 0x27f ); + fpword = _control87( 0, 0 ); + ok( fpword == (_MCW_EM | _RC_CHOP | _PC_64), "got %08x\n", fpword ); + _control87( fpword_orig, _MCW_EM | _MCW_RC | _MCW_PC ); WsFreeWriter( writer ); } diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 9ca470c82b..b12032060f 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -65,8 +65,6 @@ void free_xml_string( WS_XML_STRING * ) DECLSPEC_HIDDEN; HRESULT append_attribute( WS_XML_ELEMENT_NODE *, WS_XML_ATTRIBUTE * ) DECLSPEC_HIDDEN; void free_attribute( WS_XML_ATTRIBUTE * ) DECLSPEC_HIDDEN; WS_TYPE map_value_type( WS_VALUE_TYPE ) DECLSPEC_HIDDEN; -BOOL set_fpword( unsigned short, unsigned short * ) DECLSPEC_HIDDEN; -void restore_fpword( unsigned short ) DECLSPEC_HIDDEN; ULONG get_type_size( WS_TYPE, const void * ) DECLSPEC_HIDDEN; HRESULT read_header( WS_XML_READER *, const WS_XML_STRING *, const WS_XML_STRING *, WS_TYPE, const void *, WS_READ_OPTION, WS_HEAP *, void *, ULONG ) DECLSPEC_HIDDEN; diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index f750859fbc..021c961c94 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -19,6 +19,7 @@ #include <assert.h> #include <stdarg.h> #include <stdio.h> +#include <float.h> #include <math.h> #include "windef.h" @@ -1193,12 +1194,12 @@ HRESULT text_to_utf8text( const WS_XML_TEXT *text, const WS_XML_UTF8_TEXT *old, { const WS_XML_DOUBLE_TEXT *double_text = (const WS_XML_DOUBLE_TEXT *)text; unsigned char buf[32]; /* "-1.1111111111111111E-308", oversized to address Valgrind limitations */ - unsigned short fpword; + unsigned int fpword = _control87( 0, 0 ); ULONG len; - if (!set_fpword( 0x37f, &fpword )) return E_NOTIMPL; + _control87( _MCW_EM | _RC_NEAR | _PC_64, _MCW_EM | _MCW_RC | _MCW_PC ); len = format_double( &double_text->value, buf ); - restore_fpword( fpword ); + _control87( fpword, _MCW_EM | _MCW_RC | _MCW_PC ); if (!len) return E_NOTIMPL; if (!(*ret = alloc_utf8_text( NULL, len_old + len ))) return E_OUTOFMEMORY;

1 0

Alexandre Julliard : msvcrt: Implement _control87() and _statusfp() for ARM64.
by Alexandre Julliard 31 Oct '19

31 Oct '19

Module: wine Branch: master Commit: 6f912787a0292ccb2897fbd75ccb751c1906442a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f912787a0292ccb2897fbd7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 31 22:20:14 2019 +0100 msvcrt: Implement _control87() and _statusfp() for ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 63 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 0779a8f022..f56ec9dcf0 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -971,16 +971,27 @@ void CDECL _statusfp2( unsigned int *x86_sw, unsigned int *sse2_sw ) */ unsigned int CDECL _statusfp(void) { + unsigned int flags = 0; #if defined(__i386__) || defined(__x86_64__) unsigned int x86_sw, sse2_sw; _statusfp2( &x86_sw, &sse2_sw ); /* FIXME: there's no definition for ambiguous status, just return all status bits for now */ - return x86_sw | sse2_sw; + flags = x86_sw | sse2_sw; +#elif defined(__aarch64__) + unsigned long fpsr; + + __asm__ __volatile__( "mrs %0, fpsr" : "=r" (fpsr) ); + if (fpsr & 0x1) flags |= MSVCRT__SW_INVALID; + if (fpsr & 0x2) flags |= MSVCRT__SW_ZERODIVIDE; + if (fpsr & 0x4) flags |= MSVCRT__SW_OVERFLOW; + if (fpsr & 0x8) flags |= MSVCRT__SW_UNDERFLOW; + if (fpsr & 0x10) flags |= MSVCRT__SW_INEXACT; + if (fpsr & 0x80) flags |= MSVCRT__SW_DENORMAL; #else FIXME( "not implemented\n" ); - return 0; #endif + return flags; } /********************************************************************* @@ -1012,6 +1023,18 @@ unsigned int CDECL _clearfp(void) fpword &= ~0x3f; __asm__ __volatile__( "ldmxcsr %0" : : "m" (fpword) ); } +#elif defined(__aarch64__) + unsigned long fpsr; + + __asm__ __volatile__( "mrs %0, fpsr" : "=r" (fpsr) ); + if (fpsr & 0x1) flags |= MSVCRT__SW_INVALID; + if (fpsr & 0x2) flags |= MSVCRT__SW_ZERODIVIDE; + if (fpsr & 0x4) flags |= MSVCRT__SW_OVERFLOW; + if (fpsr & 0x8) flags |= MSVCRT__SW_UNDERFLOW; + if (fpsr & 0x10) flags |= MSVCRT__SW_INEXACT; + if (fpsr & 0x80) flags |= MSVCRT__SW_DENORMAL; + fpsr &= ~0x9f; + __asm__ __volatile__( "msr fpsr, %0" :: "r" (fpsr) ); #else FIXME( "not implemented\n" ); #endif @@ -1201,17 +1224,48 @@ int CDECL __control87_2( unsigned int newval, unsigned int mask, */ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) { + unsigned int flags = 0; #if defined(__i386__) || defined(__x86_64__) - unsigned int x86_cw, sse2_cw; - - __control87_2( newval, mask, &x86_cw, &sse2_cw ); - - if ((x86_cw ^ sse2_cw) & (MSVCRT__MCW_EM | MSVCRT__MCW_RC)) x86_cw |= MSVCRT__EM_AMBIGUOUS; - return x86_cw; + unsigned int sse2_cw; + + __control87_2( newval, mask, &flags, &sse2_cw ); + + if ((flags ^ sse2_cw) & (MSVCRT__MCW_EM | MSVCRT__MCW_RC)) flags |= MSVCRT__EM_AMBIGUOUS; +#elif defined(__aarch64__) + unsigned long fpcr; + + __asm__ __volatile__( "mrs %0, fpcr" : "=r" (fpcr) ); + if (!(fpcr & 0x100)) flags |= MSVCRT__EM_INVALID; + if (!(fpcr & 0x200)) flags |= MSVCRT__EM_ZERODIVIDE; + if (!(fpcr & 0x400)) flags |= MSVCRT__EM_OVERFLOW; + if (!(fpcr & 0x800)) flags |= MSVCRT__EM_UNDERFLOW; + if (!(fpcr & 0x1000)) flags |= MSVCRT__EM_INEXACT; + if (!(fpcr & 0x8000)) flags |= MSVCRT__EM_DENORMAL; + switch (fpcr & 0xc00000) + { + case 0x400000: flags |= MSVCRT__RC_UP; break; + case 0x800000: flags |= MSVCRT__RC_DOWN; break; + case 0xc00000: flags |= MSVCRT__RC_CHOP; break; + } + flags = (flags & ~mask) | (newval & mask); + fpcr &= ~0xc09f00ul; + if (!(flags & MSVCRT__EM_INVALID)) fpcr |= 0x100; + if (!(flags & MSVCRT__EM_ZERODIVIDE)) fpcr |= 0x200; + if (!(flags & MSVCRT__EM_OVERFLOW)) fpcr |= 0x400; + if (!(flags & MSVCRT__EM_UNDERFLOW)) fpcr |= 0x800; + if (!(flags & MSVCRT__EM_INEXACT)) fpcr |= 0x1000; + if (!(flags & MSVCRT__EM_DENORMAL)) fpcr |= 0x8000; + switch (flags & MSVCRT__MCW_RC) + { + case MSVCRT__RC_CHOP: fpcr |= 0xc00000; break; + case MSVCRT__RC_UP: fpcr |= 0x400000; break; + case MSVCRT__RC_DOWN: fpcr |= 0x800000; break; + } + __asm__ __volatile__( "msr fpcr, %0" :: "r" (fpcr) ); #else FIXME( "not implemented\n" ); - return 0; #endif + return flags; } /*********************************************************************

1 0

Louis Lenders : uianimation: Add IUIAnimationTransitionFactory stubbed interface.
by Alexandre Julliard 31 Oct '19

31 Oct '19

Module: wine Branch: master Commit: 0022e4a5d98f07e63df3352e352675c75c48b4a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0022e4a5d98f07e63df3352e… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Oct 30 23:28:08 2019 +0000 uianimation: Add IUIAnimationTransitionFactory stubbed interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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;

1 0

Louis Lenders : uianimation: Add IUIAnimationTransitionLibrary stubbed interface.
by Alexandre Julliard 31 Oct '19

31 Oct '19

Module: wine Branch: master Commit: cc9b62ae9ebb8947698225bff73d7f96a94a4789 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc9b62ae9ebb8947698225bf… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Oct 30 23:28:10 2019 +0000 uianimation: Add IUIAnimationTransitionLibrary stubbed interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uianimation/main.c | 191 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 191 insertions(+) diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c index b8bd75fb0c..b26042a5e2 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, %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, %f, %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, %f, %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;

1 0

Louis Lenders : uianimation: Implement IUIAnimationManager::CreateStoryboard.
by Alexandre Julliard 31 Oct '19

31 Oct '19

Module: wine Branch: master Commit: b31cd326388599508cd5cf9a87d04795d9450147 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b31cd326388599508cd5cf9a… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Oct 30 23:28:11 2019 +0000 uianimation: Implement IUIAnimationManager::CreateStoryboard. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 b26042a5e2..da0cb48257 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 )

1 0

Louis Lenders : uianimation: Implement IUIAnimationManager::CreateAnimationVariable.
by Alexandre Julliard 31 Oct '19

31 Oct '19

Module: wine Branch: master Commit: df66cf6dd9da4ea694441a4d7d520c5c4cbfac48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df66cf6dd9da4ea694441a4d… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Oct 30 23:28:12 2019 +0000 uianimation: Implement IUIAnimationManager::CreateAnimationVariable. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 da0cb48257..492c1b757a 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);

1 0

Alistair Leslie-Hughes : uianimation/tests: Add more tests.
by Alexandre Julliard 31 Oct '19

31 Oct '19

Module: wine Branch: master Commit: ccec532879ec14b2e79da08288152a69221ec4d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccec532879ec14b2e79da082… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 30 23:28:14 2019 +0000 uianimation/tests: Add more tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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(); }

1 0

Zebediah Figura : d3d8: Handle stateblocks in d3d8_device_SetMaterial().
by Alexandre Julliard 31 Oct '19

31 Oct '19

Module: wine Branch: master Commit: f64feb17bc5a477565f004e934f0f919c294bf05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f64feb17bc5a477565f004e9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 30 21:34:40 2019 -0500 d3d8: Handle stateblocks in d3d8_device_SetMaterial(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 680c75cb0f..0aa326fad5 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1717,7 +1717,9 @@ static HRESULT WINAPI d3d8_device_SetMaterial(IDirect3DDevice8 *iface, const D3D /* Note: D3DMATERIAL8 is compatible with struct wined3d_material. */ wined3d_mutex_lock(); - wined3d_device_set_material(device->wined3d_device, (const struct wined3d_material *)material); + wined3d_stateblock_set_material(device->update_state, (const struct wined3d_material *)material); + if (!device->recording) + wined3d_device_set_material(device->wined3d_device, (const struct wined3d_material *)material); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : ddraw: Handle stateblocks in d3d_device7_SetMaterial().
by Alexandre Julliard 31 Oct '19

31 Oct '19

Module: wine Branch: master Commit: 47fdb6d9144cfaf9bb4585e7573aa57ade067a8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=47fdb6d9144cfaf9bb4585e7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 30 21:34:41 2019 -0500 ddraw: Handle stateblocks in d3d_device7_SetMaterial(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 525dd98d78..cef865948b 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5448,7 +5448,9 @@ static HRESULT d3d_device7_SetMaterial(IDirect3DDevice7 *iface, D3DMATERIAL7 *ma wined3d_mutex_lock(); /* Note: D3DMATERIAL7 is compatible with struct wined3d_material. */ - wined3d_device_set_material(device->wined3d_device, (struct wined3d_material *)material); + wined3d_stateblock_set_material(device->update_state, (const struct wined3d_material *)material); + if (!device->recording) + wined3d_device_set_material(device->wined3d_device, (const struct wined3d_material *)material); wined3d_mutex_unlock(); return D3D_OK;

1 0

Paul Gofman : d3d11: Mind DSV flags when checking for conflicting SRV.
by Alexandre Julliard 31 Oct '19

31 Oct '19

Module: wine Branch: master Commit: 600f39d4ad8ff4efa8e63126fe0f43c1998497ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=600f39d4ad8ff4efa8e63126… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Oct 31 16:23:40 2019 +0300 d3d11: Mind DSV flags when checking for conflicting SRV. Fixes a regression introduced by commit 3f698b950f52bf731d397c04ad68d240d28d7e2b. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/view.c | 5 +++++ dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 11 ++++++----- dlls/wined3d/utils.c | 15 ++++++++++++--- dlls/wined3d/view.c | 6 ++++-- dlls/wined3d/wined3d_private.h | 13 +++++++++++-- include/wine/wined3d.h | 2 ++ 7 files changed, 41 insertions(+), 13 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index a6eddf59ce..40037989eb 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -1216,6 +1216,11 @@ static void wined3d_depth_stencil_view_desc_from_d3d11(struct wined3d_view_desc FIXME("Unhandled depth stencil view flags %#x.\n", desc->Flags); wined3d_desc->flags = 0; + if (desc->Flags & D3D11_DSV_READ_ONLY_DEPTH) + wined3d_desc->flags |= WINED3D_VIEW_READ_ONLY_DEPTH; + if (desc->Flags & D3D11_DSV_READ_ONLY_STENCIL) + wined3d_desc->flags |= WINED3D_VIEW_READ_ONLY_STENCIL; + wined3d_desc->u.texture.level_count = 1; switch (desc->ViewDimension) { diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e9750c41c5..f4c0d46f8e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3696,7 +3696,7 @@ static void context_preload_texture(struct wined3d_context *context, if (!(texture = state->textures[idx])) return; - if (wined3d_resource_check_fbo_attached(state, &texture->resource)) + if (wined3d_resource_check_fbo_attached(state, &texture->resource, NULL)) context->uses_fbo_attached_resources = 1; wined3d_texture_load(texture, context, is_srgb_enabled(state->sampler_states[idx])); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b2aa33af41..2a4d377848 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2239,7 +2239,7 @@ static void wined3d_device_set_shader_resource_view(struct wined3d_device *devic if (view == prev) return; - if (view && wined3d_resource_check_fbo_attached(&device->state, view->resource)) + if (view && wined3d_resource_check_fbo_attached(&device->state, view->resource, view->format)) { WARN("Application is trying to bind resource which is attached as render target.\n"); view = NULL; @@ -4991,7 +4991,7 @@ struct wined3d_rendertarget_view * CDECL wined3d_device_get_depth_stencil_view(c } static void wined3d_unbind_srv_for_rtv(struct wined3d_device *device, - const struct wined3d_rendertarget_view *view) + const struct wined3d_rendertarget_view *view, BOOL dsv) { if (view && view->resource->srv_bind_count_device) { @@ -5003,7 +5003,8 @@ static void wined3d_unbind_srv_for_rtv(struct wined3d_device *device, for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) for (j = 0; j < MAX_SHADER_RESOURCE_VIEWS; ++j) - if ((srv = device->state.shader_resource_view[i][j]) && srv->resource == resource) + if ((srv = device->state.shader_resource_view[i][j]) && srv->resource == resource + && (!dsv || wined3d_dsv_srv_conflict(view, srv->format))) wined3d_device_set_shader_resource_view(device, i, j, NULL); } } @@ -5066,7 +5067,7 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device if (prev) wined3d_rendertarget_view_decref(prev); - wined3d_unbind_srv_for_rtv(device, view); + wined3d_unbind_srv_for_rtv(device, view, FALSE); return WINED3D_OK; } @@ -5098,7 +5099,7 @@ HRESULT CDECL wined3d_device_set_depth_stencil_view(struct wined3d_device *devic if (prev) wined3d_rendertarget_view_decref(prev); - wined3d_unbind_srv_for_rtv(device, view); + wined3d_unbind_srv_for_rtv(device, view, TRUE); return WINED3D_OK; } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index cc217c7322..ac821ce732 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3785,18 +3785,27 @@ static BOOL init_typeless_formats(const struct wined3d_adapter *adapter) typeless_format->flags[j] &= ~(WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); } - if ((format_id = typeless_depth_stencil_formats[i].depth_view_id) - && typeless_depth_stencil_formats[i].separate_depth_view_format) + if ((format_id = typeless_depth_stencil_formats[i].depth_view_id)) { if (!(depth_view_format = get_format_internal(adapter, format_id))) return FALSE; - copy_format(adapter, depth_view_format, ds_format); + if (typeless_depth_stencil_formats[i].separate_depth_view_format) + { + copy_format(adapter, depth_view_format, ds_format); + depth_view_format->stencil_size = 0; + } + else + { + depth_view_format->depth_size = ds_format->depth_size; + } } if ((format_id = typeless_depth_stencil_formats[i].stencil_view_id)) { if (!(stencil_view_format = get_format_internal(adapter, format_id))) return FALSE; copy_format(adapter, stencil_view_format, ds_format); + if (typeless_depth_stencil_formats[i].separate_depth_view_format) + stencil_view_format->depth_size = 0; } } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 6710abb270..eeca7c868b 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -65,11 +65,13 @@ static GLenum get_texture_view_target(const struct wined3d_gl_info *gl_info, {GL_TEXTURE_1D_ARRAY, 0, GL_TEXTURE_1D}, {GL_TEXTURE_1D_ARRAY, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_1D_ARRAY}, }; + unsigned int flags = desc->flags & (WINED3D_VIEW_BUFFER_RAW | WINED3D_VIEW_BUFFER_APPEND + | WINED3D_VIEW_BUFFER_COUNTER | WINED3D_VIEW_TEXTURE_CUBE | WINED3D_VIEW_TEXTURE_ARRAY); unsigned int i; for (i = 0; i < ARRAY_SIZE(view_types); ++i) { - if (view_types[i].texture_target != texture_gl->target || view_types[i].view_flags != desc->flags) + if (view_types[i].texture_target != texture_gl->target || view_types[i].view_flags != flags) continue; if (gl_info->supported[view_types[i].extension]) return view_types[i].view_target; @@ -77,7 +79,7 @@ static GLenum get_texture_view_target(const struct wined3d_gl_info *gl_info, FIXME("Extension %#x not supported.\n", view_types[i].extension); } - FIXME("Unhandled view flags %#x for texture target %#x.\n", desc->flags, texture_gl->target); + FIXME("Unhandled view flags %#x for texture target %#x.\n", flags, texture_gl->target); return texture_gl->target; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4f48687f7d..82161c9034 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5289,14 +5289,23 @@ static inline void wined3d_context_copy_bo_address(struct wined3d_context *conte dst, dst_bind_flags, src, src_bind_flags, size); } +static inline BOOL wined3d_dsv_srv_conflict(const struct wined3d_rendertarget_view *dsv, + const struct wined3d_format *srv_format) +{ + return srv_format && ((srv_format->depth_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_DEPTH)) + || (srv_format->stencil_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_STENCIL))); +} + static inline BOOL wined3d_resource_check_fbo_attached(const struct wined3d_state *state, - const struct wined3d_resource *resource) + const struct wined3d_resource *resource, const struct wined3d_format *srv_format) { struct wined3d_rendertarget_view * const *rts = &state->fb->render_targets[0]; + const struct wined3d_rendertarget_view *dsv; unsigned int i; if ((resource->bind_flags & WINED3D_BIND_DEPTH_STENCIL) - && state->fb->depth_stencil && state->fb->depth_stencil->resource == resource) + && (dsv = state->fb->depth_stencil) && dsv->resource == resource + && wined3d_dsv_srv_conflict(dsv, srv_format)) return TRUE; if (!(resource->bind_flags & WINED3D_BIND_RENDER_TARGET)) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 27a0e58a28..0b535475d0 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1579,6 +1579,8 @@ enum wined3d_shader_type #define WINED3D_VIEW_BUFFER_COUNTER 0x00000004 #define WINED3D_VIEW_TEXTURE_CUBE 0x00000008 #define WINED3D_VIEW_TEXTURE_ARRAY 0x00000010 +#define WINED3D_VIEW_READ_ONLY_DEPTH 0x00000020 +#define WINED3D_VIEW_READ_ONLY_STENCIL 0x00000040 #define WINED3D_MAX_VIEWPORTS 16

1 0