Bernhard Kölbl : windows.media.speech: Make use of DEFINE_IINSPECTABLE for IInstalledVoicesStatic from SpeechSynthesizer statics.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f450d538b370974f5021f08b586d2a314d5537c1
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=f450d538b370974f5021f08b5...

Author: Bernhard Kölbl 
Date:   Thu Jun  2 12:58:13 2022 +0200

windows.media.speech: Make use of DEFINE_IINSPECTABLE for IInstalledVoicesStatic from SpeechSynthesizer statics.

Signed-off-by: Bernhard Kölbl

---

dlls/windows.media.speech/synthesizer.c | 41 +--------------------------------
 1 file changed, 1 insertion(+), 40 deletions(-)

diff --git a/dlls/windows.media.speech/synthesizer.c b/dlls/windows.media.speech/synthesizer.c
index 4299750adf6..3b9e9377394 100644
--- a/dlls/windows.media.speech/synthesizer.c
+++ b/dlls/windows.media.speech/synthesizer.c
@@ -334,11 +334,6 @@ static inline struct synthesizer_statics *impl_from_IActivationFactory( IActivat
     return CONTAINING_RECORD(iface, struct synthesizer_statics, IActivationFactory_iface);
 }

-static inline struct synthesizer_statics *impl_from_IInstalledVoicesStatic( IInstalledVoicesStatic *iface )
-{
-    return CONTAINING_RECORD(iface, struct synthesizer_statics, IInstalledVoicesStatic_iface);
-}
-
 static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID iid, void **out )
 {
     struct synthesizer_statics *impl = impl_from_IActivationFactory(iface);
@@ -434,41 +429,7 @@ static const struct IActivationFactoryVtbl factory_vtbl =
     factory_ActivateInstance,
 };

-static HRESULT WINAPI installed_voices_static_QueryInterface( IInstalledVoicesStatic *iface, REFIID iid, void **out )
-{
-    struct synthesizer_statics *impl = impl_from_IInstalledVoicesStatic(iface);
-    return IActivationFactory_QueryInterface(&impl->IActivationFactory_iface, iid, out);
-}
-
-static ULONG WINAPI installed_voices_static_AddRef( IInstalledVoicesStatic *iface )
-{
-    struct synthesizer_statics *impl = impl_from_IInstalledVoicesStatic(iface);
-    return IActivationFactory_AddRef(&impl->IActivationFactory_iface);
-}
-
-static ULONG WINAPI installed_voices_static_Release( IInstalledVoicesStatic *iface )
-{
-    struct synthesizer_statics *impl = impl_from_IInstalledVoicesStatic(iface);
-    return IActivationFactory_Release(&impl->IActivationFactory_iface);
-}
-
-static HRESULT WINAPI installed_voices_static_GetIids( IInstalledVoicesStatic *iface, ULONG *iid_count, IID **iids )
-{
-    FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids);
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI installed_voices_static_GetRuntimeClassName( IInstalledVoicesStatic *iface, HSTRING *class_name )
-{
-    FIXME("iface %p, class_name %p stub!\n", iface, class_name);
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI installed_voices_static_GetTrustLevel( IInstalledVoicesStatic *iface, TrustLevel *trust_level )
-{
-    FIXME("iface %p, trust_level %p stub!\n", iface, trust_level);
-    return E_NOTIMPL;
-}
+DEFINE_IINSPECTABLE(installed_voices_static, IInstalledVoicesStatic, struct synthesizer_statics, IActivationFactory_iface)

static HRESULT WINAPI installed_voices_static_get_AllVoices( IInstalledVoicesStatic *iface, IVectorView_VoiceInformation **value )
 {