From: Rémi Bernon rbernon@codeweavers.com
--- dlls/windows.gaming.input/async.c | 2 +- dlls/windows.gaming.input/condition_effect.c | 2 +- dlls/windows.gaming.input/constant_effect.c | 2 +- dlls/windows.gaming.input/controller.c | 4 ++-- dlls/windows.gaming.input/force_feedback.c | 4 ++-- dlls/windows.gaming.input/gamepad.c | 4 ++-- dlls/windows.gaming.input/manager.c | 2 +- dlls/windows.gaming.input/periodic_effect.c | 2 +- dlls/windows.gaming.input/provider.c | 2 +- dlls/windows.gaming.input/racing_wheel.c | 4 ++-- dlls/windows.gaming.input/ramp_effect.c | 2 +- include/wine/comimpl.h | 10 +++++----- 12 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/dlls/windows.gaming.input/async.c b/dlls/windows.gaming.input/async.c index 1b03cfac761..47e30a0db0c 100644 --- a/dlls/windows.gaming.input/async.c +++ b/dlls/windows.gaming.input/async.c @@ -60,7 +60,7 @@ static void async_info_destroy( struct async_info *impl ) free( impl ); }
-INTERFACE_IMPL_OUTER_IWineAsyncInfoImpl( async_info, IAgileObject, IAsyncInfo, END ); +INTERFACE_IMPL_OUTER_IWineAsyncInfoImpl( async_info, IAgileObject, IAsyncInfo, END, FIXME );
static HRESULT WINAPI async_info_put_Completed( IWineAsyncInfoImpl *iface, IWineAsyncOperationCompletedHandler *handler ) { diff --git a/dlls/windows.gaming.input/condition_effect.c b/dlls/windows.gaming.input/condition_effect.c index 82506f9b506..78d11a41d5f 100644 --- a/dlls/windows.gaming.input/condition_effect.c +++ b/dlls/windows.gaming.input/condition_effect.c @@ -96,7 +96,7 @@ struct condition_factory const WCHAR *class_name; };
-INTERFACE_IMPL_STATIC_IActivationFactory( condition_factory, IConditionForceEffectFactory, IAgileObject, END ); +INTERFACE_IMPL_STATIC_IActivationFactory( condition_factory, IConditionForceEffectFactory, IAgileObject, END, FIXME );
static HRESULT WINAPI condition_factory_ActivateInstance( IActivationFactory *iface, IInspectable **instance ) { diff --git a/dlls/windows.gaming.input/constant_effect.c b/dlls/windows.gaming.input/constant_effect.c index d20be1ad13f..13e8f76bf9f 100644 --- a/dlls/windows.gaming.input/constant_effect.c +++ b/dlls/windows.gaming.input/constant_effect.c @@ -114,7 +114,7 @@ struct constant_factory const WCHAR *class_name; };
-INTERFACE_IMPL_STATIC_IActivationFactory( constant_factory, IAgileObject, END ); +INTERFACE_IMPL_STATIC_IActivationFactory( constant_factory, IAgileObject, END, FIXME );
static HRESULT WINAPI constant_factory_ActivateInstance( IActivationFactory *iface, IInspectable **instance ) { diff --git a/dlls/windows.gaming.input/controller.c b/dlls/windows.gaming.input/controller.c index 0c6efe2714b..f1631b83f5c 100644 --- a/dlls/windows.gaming.input/controller.c +++ b/dlls/windows.gaming.input/controller.c @@ -78,7 +78,7 @@ static void controller_destroy( struct controller *impl ) }
INTERFACE_IMPL_OUTER_IGameControllerImpl( controller, IGameControllerInputSink, - IRawGameController, IRawGameController2, END ); + IRawGameController, IRawGameController2, END, FIXME );
static HRESULT WINAPI controller_Initialize( IGameControllerImpl *iface, IGameController *outer, IGameControllerProvider *provider ) @@ -267,7 +267,7 @@ struct controller_statics };
INTERFACE_IMPL_STATIC_IActivationFactory( controller_statics, IRawGameControllerStatics, - ICustomGameControllerFactory, IAgileObject, END ); + ICustomGameControllerFactory, IAgileObject, END, FIXME );
static HRESULT WINAPI controller_statics_ActivateInstance( IActivationFactory *iface, IInspectable **instance ) { diff --git a/dlls/windows.gaming.input/force_feedback.c b/dlls/windows.gaming.input/force_feedback.c index bf98a4702fb..0c5ecff7146 100644 --- a/dlls/windows.gaming.input/force_feedback.c +++ b/dlls/windows.gaming.input/force_feedback.c @@ -62,7 +62,7 @@ static void effect_destroy( struct effect *impl ) free( impl ); }
-INTERFACE_IMPL_OUTER_IWineForceFeedbackEffectImpl( effect, IForceFeedbackEffect, IAgileObject, END ); +INTERFACE_IMPL_OUTER_IWineForceFeedbackEffectImpl( effect, IForceFeedbackEffect, IAgileObject, END, FIXME );
static int effect_reorient_direction( const WineForceFeedbackEffectParameters *params, Vector3 *direction ) { @@ -377,7 +377,7 @@ static void motor_destroy( struct motor *impl ) free( impl ); }
-INTERFACE_IMPL_IForceFeedbackMotor( motor, IAgileObject, END ); +INTERFACE_IMPL_IForceFeedbackMotor( motor, IAgileObject, END, FIXME );
static HRESULT WINAPI motor_get_AreEffectsPaused( IForceFeedbackMotor *iface, BOOLEAN *value ) { diff --git a/dlls/windows.gaming.input/gamepad.c b/dlls/windows.gaming.input/gamepad.c index 2712152f99f..92b1bc554b9 100644 --- a/dlls/windows.gaming.input/gamepad.c +++ b/dlls/windows.gaming.input/gamepad.c @@ -78,7 +78,7 @@ static void gamepad_destroy( struct gamepad *impl ) free( impl ); }
-INTERFACE_IMPL_OUTER_IGameControllerImpl( gamepad, IGameControllerInputSink, IGamepad, IGamepad2, END ); +INTERFACE_IMPL_OUTER_IGameControllerImpl( gamepad, IGameControllerInputSink, IGamepad, IGamepad2, END, FIXME );
static HRESULT WINAPI gamepad_Initialize( IGameControllerImpl *iface, IGameController *outer, IGameControllerProvider *provider ) @@ -241,7 +241,7 @@ struct gamepad_statics };
INTERFACE_IMPL_STATIC_IActivationFactory( gamepad_statics, IGamepadStatics, IGamepadStatics2, - ICustomGameControllerFactory, IAgileObject, END ); + ICustomGameControllerFactory, IAgileObject, END, FIXME );
static HRESULT WINAPI gamepad_statics_ActivateInstance( IActivationFactory *iface, IInspectable **instance ) { diff --git a/dlls/windows.gaming.input/manager.c b/dlls/windows.gaming.input/manager.c index 1a3640a2b0f..c339baba794 100644 --- a/dlls/windows.gaming.input/manager.c +++ b/dlls/windows.gaming.input/manager.c @@ -174,7 +174,7 @@ struct manager_statics };
INTERFACE_IMPL_STATIC_IActivationFactory( manager_statics, IGameControllerFactoryManagerStatics, - IGameControllerFactoryManagerStatics2, IAgileObject, END ) + IGameControllerFactoryManagerStatics2, IAgileObject, END, FIXME )
static HRESULT WINAPI manager_statics_ActivateInstance( IActivationFactory *iface, IInspectable **instance ) { diff --git a/dlls/windows.gaming.input/periodic_effect.c b/dlls/windows.gaming.input/periodic_effect.c index c3a07e090a6..491c2a4e9c7 100644 --- a/dlls/windows.gaming.input/periodic_effect.c +++ b/dlls/windows.gaming.input/periodic_effect.c @@ -133,7 +133,7 @@ struct periodic_factory const WCHAR *class_name; };
-INTERFACE_IMPL_STATIC_IActivationFactory( periodic_factory, IPeriodicForceEffectFactory, IAgileObject, END ) +INTERFACE_IMPL_STATIC_IActivationFactory( periodic_factory, IPeriodicForceEffectFactory, IAgileObject, END, FIXME )
static HRESULT WINAPI periodic_factory_ActivateInstance( IActivationFactory *iface, IInspectable **instance ) { diff --git a/dlls/windows.gaming.input/provider.c b/dlls/windows.gaming.input/provider.c index a7e49918513..348b6f1be7b 100644 --- a/dlls/windows.gaming.input/provider.c +++ b/dlls/windows.gaming.input/provider.c @@ -76,7 +76,7 @@ static void provider_destroy( struct provider *impl ) free( impl ); }
-INTERFACE_IMPL_IWineGameControllerProvider( provider, IGameControllerProvider, IAgileObject, END ); +INTERFACE_IMPL_IWineGameControllerProvider( provider, IGameControllerProvider, IAgileObject, END, FIXME );
static BOOL CALLBACK count_ffb_axes( const DIDEVICEOBJECTINSTANCEW *obj, void *args ) { diff --git a/dlls/windows.gaming.input/racing_wheel.c b/dlls/windows.gaming.input/racing_wheel.c index e6045be9665..14bc609a838 100644 --- a/dlls/windows.gaming.input/racing_wheel.c +++ b/dlls/windows.gaming.input/racing_wheel.c @@ -76,7 +76,7 @@ static void racing_wheel_destroy( struct racing_wheel *impl ) free( impl ); }
-INTERFACE_IMPL_OUTER_IGameControllerImpl( racing_wheel, IGameControllerInputSink, IRacingWheel, END ); +INTERFACE_IMPL_OUTER_IGameControllerImpl( racing_wheel, IGameControllerInputSink, IRacingWheel, END, FIXME );
static HRESULT WINAPI racing_wheel_Initialize( IGameControllerImpl *iface, IGameController *outer, IGameControllerProvider *provider ) @@ -182,7 +182,7 @@ struct racing_wheel_statics };
INTERFACE_IMPL_STATIC_IActivationFactory( racing_wheel_statics, IRacingWheelStatics, IRacingWheelStatics2, - ICustomGameControllerFactory, IAgileObject, END ); + ICustomGameControllerFactory, IAgileObject, END, FIXME );
static HRESULT WINAPI racing_wheel_statics_ActivateInstance( IActivationFactory *iface, IInspectable **instance ) { diff --git a/dlls/windows.gaming.input/ramp_effect.c b/dlls/windows.gaming.input/ramp_effect.c index eb2aef856a5..5dd9b7d14d7 100644 --- a/dlls/windows.gaming.input/ramp_effect.c +++ b/dlls/windows.gaming.input/ramp_effect.c @@ -117,7 +117,7 @@ struct ramp_factory const WCHAR *class_name; };
-INTERFACE_IMPL_STATIC_IActivationFactory( ramp_factory, IAgileObject, END ); +INTERFACE_IMPL_STATIC_IActivationFactory( ramp_factory, IAgileObject, END, FIXME );
static HRESULT WINAPI ramp_factory_ActivateInstance( IActivationFactory *iface, IInspectable **instance ) { diff --git a/include/wine/comimpl.h b/include/wine/comimpl.h index 6b21fa4c16e..7e9478bd196 100644 --- a/include/wine/comimpl.h +++ b/include/wine/comimpl.h @@ -31,11 +31,14 @@ #include <windef.h> #include <winbase.h>
-#define QUERY_INTERFACES_END( object, iid, out, ... ) #define QUERY_INTERFACES( object, iid, out, X, ... ) QUERY_INTERFACES_ ## X( object, iid, out, __VA_ARGS__ ) +#define QUERY_INTERFACES_END( object, iid, out, X, ... ) \ + *out = NULL; \ + X( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid) ); \ + return E_NOINTERFACE;
-#define INTERFACES_FWD_END( type, base, expr, ... ) #define INTERFACES_FWD( type, base, expr, X, ... ) INTERFACES_FWD_ ## X( type, base, expr, __VA_ARGS__ ) +#define INTERFACES_FWD_END( type, base, expr, ... )
#define INTERFACE_IMPL_FROM( type, name ) INTERFACE_IMPL_FROM_( type, name, type ## _from_ ## name, name ## _iface ) #define INTERFACE_IMPL_FROM_( type, name, impl_from, iface_mem ) \ @@ -51,9 +54,6 @@ struct type *object = impl_from( iface ); \ TRACE( "object %p, iid %s, out %p.\n", object, debugstr_guid(iid), out ); \ QUERY_INTERFACES( object, iid, out, name, __VA_ARGS__ ); \ - *out = NULL; \ - WARN( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid) ); \ - return E_NOINTERFACE; \ }
#define IUNKNOWN_IMPL_ADDREF( type, name ) IUNKNOWN_IMPL_ADDREF_( type, name, type ## _from_ ## name )