From: Rémi Bernon rbernon@codeweavers.com
--- dlls/windows.gaming.input/controller.c | 49 ++++++-------------------- include/wine/comimpl.h | 35 ++++++++++++++++++ 2 files changed, 45 insertions(+), 39 deletions(-)
diff --git a/dlls/windows.gaming.input/controller.c b/dlls/windows.gaming.input/controller.c index 72abbb6b417..510ccddbd27 100644 --- a/dlls/windows.gaming.input/controller.c +++ b/dlls/windows.gaming.input/controller.c @@ -63,7 +63,7 @@ struct controller IRawGameController IRawGameController_iface; IRawGameController2 IRawGameController2_iface; IGameController *IGameController_outer; - LONG ref; + LONG refcount;
IGameControllerProvider *provider; IWineGameControllerProvider *wine_provider; @@ -108,31 +108,15 @@ static HRESULT WINAPI controller_QueryInterface( IGameControllerImpl *iface, REF return E_NOINTERFACE; }
-static ULONG WINAPI controller_AddRef( IGameControllerImpl *iface ) +static void controller_destroy( struct controller *impl ) { - struct controller *impl = controller_from_IGameControllerImpl( iface ); - ULONG ref = InterlockedIncrement( &impl->ref ); - TRACE( "iface %p increasing refcount to %lu.\n", iface, ref ); - return ref; + if (impl->wine_provider) IWineGameControllerProvider_Release( impl->wine_provider ); + IGameControllerProvider_Release( impl->provider ); + free( impl ); }
-static ULONG WINAPI controller_Release( IGameControllerImpl *iface ) -{ - struct controller *impl = controller_from_IGameControllerImpl( iface ); - ULONG ref = InterlockedDecrement( &impl->ref ); - - TRACE( "iface %p decreasing refcount to %lu.\n", iface, ref ); - - if (!ref) - { - if (impl->wine_provider) - IWineGameControllerProvider_Release( impl->wine_provider ); - IGameControllerProvider_Release( impl->provider ); - free( impl ); - } - - return ref; -} +IUNKNOWN_IMPL_ADDREF( controller, IGameControllerImpl ); +IUNKNOWN_IMPL_RELEASE( controller, IGameControllerImpl );
static HRESULT WINAPI controller_GetIids( IGameControllerImpl *iface, ULONG *iid_count, IID **iids ) { @@ -341,7 +325,6 @@ struct controller_statics IActivationFactory IActivationFactory_iface; IRawGameControllerStatics IRawGameControllerStatics_iface; ICustomGameControllerFactory ICustomGameControllerFactory_iface; - LONG ref; };
INTERFACE_IMPL_FROM( controller_statics, IActivationFactory ); @@ -378,21 +361,8 @@ static HRESULT WINAPI controller_statics_QueryInterface( IActivationFactory *ifa return E_NOINTERFACE; }
-static ULONG WINAPI controller_statics_AddRef( IActivationFactory *iface ) -{ - struct controller_statics *impl = controller_statics_from_IActivationFactory( iface ); - ULONG ref = InterlockedIncrement( &impl->ref ); - TRACE( "iface %p increasing refcount to %lu.\n", iface, ref ); - return ref; -} - -static ULONG WINAPI controller_statics_Release( IActivationFactory *iface ) -{ - struct controller_statics *impl = controller_statics_from_IActivationFactory( iface ); - ULONG ref = InterlockedDecrement( &impl->ref ); - TRACE( "iface %p decreasing refcount to %lu.\n", iface, ref ); - return ref; -} +IUNKNOWN_IMPL_STATIC_ADDREF( controller_statics, IActivationFactory ); +IUNKNOWN_IMPL_STATIC_RELEASE( controller_statics, IActivationFactory );
static HRESULT WINAPI controller_statics_GetIids( IActivationFactory *iface, ULONG *iid_count, IID **iids ) { @@ -512,6 +482,7 @@ controller_statics_ICustomGameControllerFactory_CreateGameController( ICustomGam impl->IGameControllerInputSink_iface.lpVtbl = &controller_IGameControllerInputSink_vtbl; impl->IRawGameController_iface.lpVtbl = &controller_IRawGameController_vtbl; impl->IRawGameController2_iface.lpVtbl = &controller_IRawGameController2_vtbl; + impl->refcount = 1;
TRACE( "created RawGameController %p\n", impl );
diff --git a/include/wine/comimpl.h b/include/wine/comimpl.h index c8078f40827..5eff3b5ff02 100644 --- a/include/wine/comimpl.h +++ b/include/wine/comimpl.h @@ -38,6 +38,41 @@ return CONTAINING_RECORD( iface, struct type, iface_mem ); \ }
+#define IUNKNOWN_IMPL_ADDREF( type, name ) IUNKNOWN_IMPL_ADDREF_( type, name, type ## _from_ ## name ) +#define IUNKNOWN_IMPL_ADDREF_( type, name, impl_from ) \ + static ULONG WINAPI type ## _AddRef( name *iface ) \ + { \ + struct type *object = impl_from( iface ); \ + ULONG ref = InterlockedIncrement( &object->refcount ); \ + TRACE( "object %p increasing refcount to %lu.\n", object, ref ); \ + return ref; \ + } +#define IUNKNOWN_IMPL_STATIC_ADDREF( type, name ) \ + static ULONG WINAPI type ## _AddRef( name *iface ) \ + { \ + return 2; \ + } + +#define IUNKNOWN_IMPL_RELEASE( type, name ) IUNKNOWN_IMPL_RELEASE_( type, name, type ## _from_ ## name ) +#define IUNKNOWN_IMPL_RELEASE_( type, name, impl_from ) \ + static ULONG WINAPI type ## _Release( name *iface ) \ + { \ + struct type *object = impl_from( iface ); \ + ULONG ref = InterlockedDecrement( &object->refcount ); \ + TRACE( "object %p decreasing refcount to %lu.\n", object, ref); \ + if (!ref) \ + { \ + InterlockedIncrement( &object->refcount ); /* guard against re-entry when aggregated */ \ + type ## _destroy( object ); \ + } \ + return ref; \ + } +#define IUNKNOWN_IMPL_STATIC_RELEASE( type, name ) \ + static ULONG WINAPI type ## _Release( name *iface ) \ + { \ + return 1; \ + } + #define IUNKNOWN_FWD( type, name, base, expr ) IUNKNOWN_FWD_( type, name, base, expr, type ## _from_ ## name, type ## _ ## name ) #define IUNKNOWN_FWD_( type, name, base, expr, impl_from, prefix ) \ static HRESULT WINAPI prefix ## _QueryInterface( name *iface, REFIID iid, void **out ) \