October 2019 - Wine-Commits

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

Oct. 31, 2019

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 IUIAnimationTransitionLibrary stubbed interface.
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

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

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

Oct. 31, 2019

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

Louis Lenders : uianimation: Implement IUIAnimationManager::CreateAnimationVariable.
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

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

Louis Lenders : uianimation: Implement IUIAnimationManager::CreateStoryboard.
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

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

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

Oct. 31, 2019

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

Louis Lenders : uianimation: Add IUIAnimationTransitionFactory stubbed interface.
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

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

Serge Gautherie : atl: Fix a MSVC x64 printf warning.
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

Module: wine Branch: master Commit: eecaf487af5bdc7f4f0c5ef111d8e24716146f9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=eecaf487af5bdc7f4f0c5ef1… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Wed Oct 30 04:13:21 2019 +0100 atl: Fix a MSVC x64 printf warning. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl/atl30.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/atl/atl30.c b/dlls/atl/atl30.c index c2db138a50..29b29d4cbe 100644 --- a/dlls/atl/atl30.c +++ b/dlls/atl/atl30.c @@ -313,7 +313,7 @@ ATOM WINAPI AtlModuleRegisterWndClassInfoA(_ATL_MODULEA *pm, _ATL_WNDCLASSINFOA if (!wci->m_wc.lpszClassName) { - sprintf(wci->m_szAutoName, "ATL%08lx", (UINT_PTR)wci); + sprintf(wci->m_szAutoName, "ATL%08x", PtrToUint(wci)); TRACE("auto-generated class name %s\n", wci->m_szAutoName); wci->m_wc.lpszClassName = wci->m_szAutoName; } @@ -372,8 +372,8 @@ ATOM WINAPI AtlModuleRegisterWndClassInfoW(_ATL_MODULEW *pm, _ATL_WNDCLASSINFOW if (!wci->m_wc.lpszClassName) { - static const WCHAR szFormat[] = {'A','T','L','%','0','8','l','x',0}; - swprintf(wci->m_szAutoName, ARRAY_SIZE(wci->m_szAutoName), szFormat, (UINT_PTR)wci); + static const WCHAR szFormat[] = {'A','T','L','%','0','8','x',0}; + swprintf(wci->m_szAutoName, ARRAY_SIZE(wci->m_szAutoName), szFormat, PtrToUint(wci)); TRACE("auto-generated class name %s\n", debugstr_w(wci->m_szAutoName)); wci->m_wc.lpszClassName = wci->m_szAutoName; }

1 0

Fabian Maurer : find: First implementation.
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

Module: wine Branch: master Commit: e1bcf2d88a09348ea67596fd12cdca14918c8d4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1bcf2d88a09348ea67596fd… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Oct 25 18:55:42 2019 +0200 find: First implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44975 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/find/Makefile.in | 3 + programs/find/find.c | 170 +++++++++++++++++++++++++++++++++++++++++++-- programs/find/find.rc | 25 +++++++ programs/find/resources.h | 27 +++++++ programs/find/tests/find.c | 6 +- 5 files changed, 225 insertions(+), 6 deletions(-) diff --git a/programs/find/Makefile.in b/programs/find/Makefile.in index 0c6b334f29..ae2105be82 100644 --- a/programs/find/Makefile.in +++ b/programs/find/Makefile.in @@ -1,5 +1,8 @@ MODULE = find.exe +IMPORTS = user32 EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = find.c + +RC_SRCS = find.rc diff --git a/programs/find/find.c b/programs/find/find.c index 0c8ba1fcd7..3794a8190f 100644 --- a/programs/find/find.c +++ b/programs/find/find.c @@ -16,18 +16,180 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windows.h> +#include <stdlib.h> +#include <shlwapi.h> + +#include "wine/heap.h" #include "wine/debug.h" +#include "resources.h" WINE_DEFAULT_DEBUG_CHANNEL(find); +static BOOL read_char_from_handle(HANDLE handle, char *char_out) +{ + static char buffer[4096]; + static UINT buffer_max = 0; + static UINT buffer_pos = 0; + + /* Read next content into buffer */ + if (buffer_pos >= buffer_max) + { + BOOL success = ReadFile(handle, buffer, 4096, &buffer_max, NULL); + if (!success) + return FALSE; + buffer_pos = 0; + } + + *char_out = buffer[buffer_pos++]; + return TRUE; +} + +/* Read a line from a handle, returns NULL if the end is reached */ +static WCHAR* read_line_from_handle(HANDLE handle) +{ + int line_max = 4096; + int length = 0; + WCHAR *line_converted; + int line_converted_length; + BOOL success; + char *line = heap_alloc(line_max); + + for (;;) + { + char c; + success = read_char_from_handle(handle, &c); + + /* Check for EOF */ + if (!success) + { + if (length == 0) + return NULL; + else + break; + } + + if (c == '\n') + break; + + /* Make sure buffer is large enough */ + if (length + 1 >= line_max) + { + line_max *= 2; + line = heap_realloc(line, line_max); + } + + line[length++] = c; + } + + line[length] = 0; + if (length - 1 >= 0 && line[length - 1] == '\r') /* Strip \r of windows line endings */ + line[length - 1] = 0; + + line_converted_length = MultiByteToWideChar(CP_ACP, 0, line, -1, 0, 0); + line_converted = heap_alloc(line_converted_length * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, line, -1, line_converted, line_converted_length); + + heap_free(line); + + return line_converted; +} + +static void write_to_stdout(const WCHAR *str) +{ + char *str_converted; + UINT str_converted_length; + DWORD bytes_written; + UINT str_length = lstrlenW(str); + int codepage = CP_ACP; + + str_converted_length = WideCharToMultiByte(codepage, 0, str, str_length, NULL, 0, NULL, NULL); + str_converted = heap_alloc(str_converted_length); + WideCharToMultiByte(codepage, 0, str, str_length, str_converted, str_converted_length, NULL, NULL); + + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), str_converted, str_converted_length, &bytes_written, NULL); + if (bytes_written < str_converted_length) + ERR("Failed to write output\n"); + + heap_free(str_converted); +} + +static BOOL run_find_for_line(const WCHAR *line, const WCHAR *tofind) +{ + void *found; + WCHAR lineending[] = {'\r', '\n', 0}; + + if (lstrlenW(line) == 0 || lstrlenW(tofind) == 0) + return FALSE; + + found = wcsstr(line, tofind); + + if (found) + { + write_to_stdout(line); + write_to_stdout(lineending); + return TRUE; + } + + return FALSE; +} + +static void output_resource_message(int id) +{ + WCHAR buffer[64]; + LoadStringW(GetModuleHandleW(NULL), id, buffer, ARRAY_SIZE(buffer)); + write_to_stdout(buffer); +} + int __cdecl wmain(int argc, WCHAR *argv[]) { + WCHAR *line; + WCHAR *tofind = NULL; int i; + int exitcode; + HANDLE input; - WINE_FIXME("stub:"); + TRACE("running find:"); for (i = 0; i < argc; i++) - WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); - WINE_FIXME("\n"); + { + TRACE(" %s", wine_dbgstr_w(argv[i])); + } + TRACE("\n"); + + input = GetStdHandle(STD_INPUT_HANDLE); + + for (i = 1; i < argc; i++) + { + if (argv[i][0] == '/') + { + output_resource_message(IDS_INVALID_SWITCH); + return 2; + } + else if(tofind == NULL) + { + tofind = argv[i]; + } + else + { + FIXME("Searching files not supported yet\n"); + return 1000; + } + } + + if (tofind == NULL) + { + output_resource_message(IDS_INVALID_PARAMETER); + return 2; + } + + exitcode = 1; + while ((line = read_line_from_handle(input)) != NULL) + { + if (run_find_for_line(line, tofind)) + exitcode = 0; + + heap_free(line); + } - return 0; + return exitcode; } diff --git a/programs/find/find.rc b/programs/find/find.rc new file mode 100644 index 0000000000..8c358c8677 --- /dev/null +++ b/programs/find/find.rc @@ -0,0 +1,25 @@ +/* + * Copyright 2019 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resources.h" + +STRINGTABLE +{ + IDS_INVALID_PARAMETER "FIND: Parameter format not correct\r\n" + IDS_INVALID_SWITCH "FIND: Invalid switch\r\n" +} diff --git a/programs/find/resources.h b/programs/find/resources.h new file mode 100644 index 0000000000..2ebe197b7d --- /dev/null +++ b/programs/find/resources.h @@ -0,0 +1,27 @@ +/* + * Resource IDs + * + * Copyright 2019 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_FIND_RESOURCES_H +#define __WINE_FIND_RESOURCES_H + +#define IDS_INVALID_PARAMETER 1000 +#define IDS_INVALID_SWITCH 1001 + +#endif /* __WINE_FIND_RESOURCES_H */ diff --git a/programs/find/tests/find.c b/programs/find/tests/find.c index 8af21a53fa..147b59c8ce 100644 --- a/programs/find/tests/find.c +++ b/programs/find/tests/find.c @@ -90,7 +90,6 @@ static void check_find_output(const BYTE *child_output, int child_output_len, co } - todo_wine_if(out_expected_len != 0) ok_(file, line)(strings_are_equal, "\n#################### Expected:\n" "%s\n" "#################### But got:\n" @@ -176,7 +175,6 @@ static void run_find_stdin_(const WCHAR *commandline, const BYTE *input, int inp check_find_output(child_output, child_output_len, out_expected, out_expected_len, file, line); - todo_wine_if(exitcode_expected != 0) ok_(file, line)(exitcode == exitcode_expected, "Expected exitcode %d, got %d\n", exitcode_expected, exitcode); heap_free(child_output); @@ -227,7 +225,9 @@ static void run_find_stdin_unicode_(const BYTE *input, int input_len, const BYTE static void test_errors(void) { run_find_stdin_str("", "", "FIND: Parameter format not correct\r\n", 2); + todo_wine /* Quotes are not properly passed into wine yet */ run_find_stdin_str("test", "", "FIND: Parameter format not correct\r\n", 2); + todo_wine /* Quotes are not properly passed into wine yet */ run_find_stdin_str("\"test", "", "FIND: Parameter format not correct\r\n", 2); run_find_stdin_str("\"test\" /XYZ", "", "FIND: Invalid switch\r\n", 2); } @@ -238,6 +238,7 @@ static void test_singleline_without_switches(void) run_find_stdin_str("\"test\"", "", "", 1); run_find_stdin_str("\"test\"", "test", "test\r\n", 0); run_find_stdin_str("\"test\"", "test2", "test2\r\n", 0); + run_find_stdin_str("\"test\"", "test\r2", "test\r2\r\n", 0); run_find_stdin_str("\"test2\"", "test", "", 1); } @@ -297,6 +298,7 @@ static void test_unicode_support(void) run_find_stdin_unicode(str_jap_utf16be_nobom, str_empty, 1); /* Test utf16le */ + todo_wine run_find_stdin_unicode(str_jap_utf16le_bom, str_jap_utf16le_bom, 0); }

1 0

Zhiyi Zhang : winex11.drv: Use underscore style for struct x11drv_display_device_handler.
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

Module: wine Branch: master Commit: de94cfa775f9f41d1d65cbd8e7bf861cd7f9a871 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de94cfa775f9f41d1d65cbd8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 25 21:40:09 2019 +0800 winex11.drv: Use underscore style for struct x11drv_display_device_handler. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 16 ++++++++-------- dlls/winex11.drv/x11drv.h | 26 +++++++++++++------------- dlls/winex11.drv/xinerama.c | 12 ++++++------ dlls/winex11.drv/xrandr.c | 12 ++++++------ 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 107719a26f..6c4097a790 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -470,7 +470,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) monitor_devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_MONITOR, NULL); /* Initialize GPUs */ - if (!handler.pGetGpus(&gpus, &gpu_count)) + if (!handler.get_gpus(&gpus, &gpu_count)) goto done; TRACE("GPU count: %d\n", gpu_count); @@ -480,13 +480,13 @@ void X11DRV_DisplayDevices_Init(BOOL force) goto done; /* Initialize adapters */ - if (!handler.pGetAdapters(gpus[gpu].id, &adapters, &adapter_count)) + if (!handler.get_adapters(gpus[gpu].id, &adapters, &adapter_count)) goto done; TRACE("GPU: %#lx %s, adapter count: %d\n", gpus[gpu].id, wine_dbgstr_w(gpus[gpu].name), adapter_count); for (adapter = 0; adapter < adapter_count; adapter++) { - if (!handler.pGetMonitors(adapters[adapter].id, &monitors, &monitor_count)) + if (!handler.get_monitors(adapters[adapter].id, &monitors, &monitor_count)) goto done; TRACE("adapter: %#lx, monitor count: %d\n", adapters[adapter].id, monitor_count); @@ -502,12 +502,12 @@ void X11DRV_DisplayDevices_Init(BOOL force) goto done; } - handler.pFreeMonitors(monitors); + handler.free_monitors(monitors); monitors = NULL; video_index++; } - handler.pFreeAdapters(adapters); + handler.free_adapters(adapters); adapters = NULL; } @@ -522,9 +522,9 @@ done: ReleaseMutex(mutex); CloseHandle(mutex); if (gpus) - handler.pFreeGpus(gpus); + handler.free_gpus(gpus); if (adapters) - handler.pFreeAdapters(adapters); + handler.free_adapters(adapters); if (monitors) - handler.pFreeMonitors(monitors); + handler.free_monitors(monitors); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e5e9dfc9f7..a06cf3ffd8 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -715,34 +715,34 @@ struct x11drv_display_device_handler /* A name to tell what host driver is used */ const char *name; - /* Higher priority can override handlers with lower proprity */ + /* Higher priority can override handlers with lower priority */ INT priority; - /* pGetGpus will be called to get a list of GPUs. First GPU has to be where the primary adapter is. + /* get_gpus will be called to get a list of GPUs. First GPU has to be where the primary adapter is. * * Return FALSE on failure with parameters unchanged */ - BOOL (*pGetGpus)(struct x11drv_gpu **gpus, int *count); + BOOL (*get_gpus)(struct x11drv_gpu **gpus, int *count); - /* pGetAdapters will be called to get a list of adapters in EnumDisplayDevices context under a GPU. + /* get_adapters will be called to get a list of adapters in EnumDisplayDevices context under a GPU. * The first adapter has to be primary if GPU is primary. * * Return FALSE on failure with parameters unchanged */ - BOOL (*pGetAdapters)(ULONG_PTR gpu_id, struct x11drv_adapter **adapters, int *count); + BOOL (*get_adapters)(ULONG_PTR gpu_id, struct x11drv_adapter **adapters, int *count); - /* pGetMonitors will be called to get a list of monitors in EnumDisplayDevices context under an adapter. + /* get_monitors will be called to get a list of monitors in EnumDisplayDevices context under an adapter. * The first monitor has to be primary if adapter is primary. * * Return FALSE on failure with parameters unchanged */ - BOOL (*pGetMonitors)(ULONG_PTR adapter_id, struct x11drv_monitor **monitors, int *count); + BOOL (*get_monitors)(ULONG_PTR adapter_id, struct x11drv_monitor **monitors, int *count); - /* pFreeGpus will be called to free a GPU list from pGetGpus */ - void (*pFreeGpus)(struct x11drv_gpu *gpus); + /* free_gpus will be called to free a GPU list from get_gpus */ + void (*free_gpus)(struct x11drv_gpu *gpus); - /* pFreeAdapters will be called to free an adapter list from pGetAdapters */ - void (*pFreeAdapters)(struct x11drv_adapter *adapters); + /* free_adapters will be called to free an adapter list from get_adapters */ + void (*free_adapters)(struct x11drv_adapter *adapters); - /* pFreeMonitors will be called to free a monitor list from pGetMonitors */ - void (*pFreeMonitors)(struct x11drv_monitor *monitors); + /* free_monitors will be called to free a monitor list from get_monitors */ + void (*free_monitors)(struct x11drv_monitor *monitors); }; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 61c422e835..b5620d3403 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -338,11 +338,11 @@ void xinerama_init( unsigned int width, unsigned int height ) handler.name = desktop_mode ? "Desktop" : "Xinerama"; handler.priority = desktop_mode ? 1000 : 100; - handler.pGetGpus = xinerama_get_gpus; - handler.pGetAdapters = xinerama_get_adapters; - handler.pGetMonitors = xinerama_get_monitors; - handler.pFreeGpus = xinerama_free_gpus; - handler.pFreeAdapters = xinerama_free_adapters; - handler.pFreeMonitors = xinerama_free_monitors; + handler.get_gpus = xinerama_get_gpus; + handler.get_adapters = xinerama_get_adapters; + handler.get_monitors = xinerama_get_monitors; + handler.free_gpus = xinerama_free_gpus; + handler.free_adapters = xinerama_free_adapters; + handler.free_monitors = xinerama_free_monitors; X11DRV_DisplayDevices_SetHandler( &handler ); } diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 85da5efea3..412400e3f6 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1109,12 +1109,12 @@ void X11DRV_XRandR_Init(void) { handler.name = "XRandR 1.4"; handler.priority = 200; - handler.pGetGpus = xrandr14_get_gpus; - handler.pFreeGpus = xrandr14_free_gpus; - handler.pGetAdapters = xrandr14_get_adapters; - handler.pFreeAdapters = xrandr14_free_adapters; - handler.pGetMonitors = xrandr14_get_monitors; - handler.pFreeMonitors = xrandr14_free_monitors; + handler.get_gpus = xrandr14_get_gpus; + handler.get_adapters = xrandr14_get_adapters; + handler.get_monitors = xrandr14_get_monitors; + handler.free_gpus = xrandr14_free_gpus; + handler.free_adapters = xrandr14_free_adapters; + handler.free_monitors = xrandr14_free_monitors; X11DRV_DisplayDevices_SetHandler( &handler ); pXRRSelectInput( thread_init_display(), root_window,

1 0