Bernhard Kölbl : windows.media.speech: Simplify QueryInterface functions in synthesizer.c.

[Alexandre Julliard]

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

Author: Bernhard Kölbl 
Date:   Thu Jun  2 15:49:36 2022 +0200

windows.media.speech: Simplify QueryInterface functions in synthesizer.c.

Signed-off-by: Bernhard Kölbl

---

dlls/windows.media.speech/synthesizer.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/dlls/windows.media.speech/synthesizer.c b/dlls/windows.media.speech/synthesizer.c
index 3b9e9377394..4b158d7e8e4 100644
--- a/dlls/windows.media.speech/synthesizer.c
+++ b/dlls/windows.media.speech/synthesizer.c
@@ -36,14 +36,15 @@ static inline struct voice_information_vector *impl_from_IVectorView_VoiceInform

static HRESULT WINAPI vector_view_voice_information_QueryInterface( IVectorView_VoiceInformation *iface, REFIID iid, void **out )
 {
+    struct voice_information_vector *impl = impl_from_IVectorView_VoiceInformation(iface);
+
     TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out);

if (IsEqualGUID(iid, &IID_IUnknown) ||
         IsEqualGUID(iid, &IID_IInspectable) ||
         IsEqualGUID(iid, &IID_IVectorView_VoiceInformation))
     {
-        IUnknown_AddRef(iface);
-        *out = iface;
+        IInspectable_AddRef((*out = &impl->IVectorView_VoiceInformation_iface));
         return S_OK;
     }

@@ -162,22 +163,19 @@ static HRESULT WINAPI synthesizer_QueryInterface( ISpeechSynthesizer *iface, REF
         IsEqualGUID(iid, &IID_IInspectable) ||
         IsEqualGUID(iid, &IID_ISpeechSynthesizer))
     {
-        IUnknown_AddRef(iface);
-        *out = iface;
+        IInspectable_AddRef((*out = &impl->ISpeechSynthesizer_iface));
         return S_OK;
     }

if (IsEqualGUID(iid, &IID_ISpeechSynthesizer2))
     {
-        IUnknown_AddRef(iface);
-        *out = &impl->ISpeechSynthesizer2_iface;
+        IInspectable_AddRef((*out = &impl->ISpeechSynthesizer2_iface));
         return S_OK;
     }

if (IsEqualGUID(iid, &IID_IClosable))
     {
-        IUnknown_AddRef(iface);
-        *out = &impl->IClosable_iface;
+        IInspectable_AddRef((*out = &impl->IClosable_iface));
         return S_OK;
     }

@@ -345,15 +343,13 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID
         IsEqualGUID(iid, &IID_IAgileObject) ||
         IsEqualGUID(iid, &IID_IActivationFactory))
     {
-        IUnknown_AddRef(iface);
-        *out = iface;
+        IInspectable_AddRef((*out = &impl->IActivationFactory_iface));
         return S_OK;
     }

if (IsEqualGUID(iid, &IID_IInstalledVoicesStatic))
     {
-        IUnknown_AddRef(iface);
-        *out = &impl->IInstalledVoicesStatic_iface;
+        IInspectable_AddRef((*out = &impl->IInstalledVoicesStatic_iface));
         return S_OK;
     }