[PATCH 2/9] windows.media.speech: Refactor function params in synthesizer.c.

[Bernhard Kölbl]

From: Bernhard Kölbl

Signed-off-by: Bernhard Kölbl 
---
 dlls/windows.media.speech/synthesizer.c | 141 +++++++++---------------
 1 file changed, 52 insertions(+), 89 deletions(-)

diff --git a/dlls/windows.media.speech/synthesizer.c b/dlls/windows.media.speech/synthesizer.c
index edd71e60bc0..cbcb7df1481 100644
--- a/dlls/windows.media.speech/synthesizer.c
+++ b/dlls/windows.media.speech/synthesizer.c
@@ -29,13 +29,12 @@ struct voice_information_vector
     LONG ref;
 };

-static inline struct voice_information_vector *impl_from_IVectorView_VoiceInformation(IVectorView_VoiceInformation *iface)
+static inline struct voice_information_vector *impl_from_IVectorView_VoiceInformation( IVectorView_VoiceInformation *iface )
 {
     return CONTAINING_RECORD(iface, struct voice_information_vector, IVectorView_VoiceInformation_iface);
 }

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

@@ -53,8 +52,7 @@ static HRESULT WINAPI vector_view_voice_information_QueryInterface(
     return E_NOINTERFACE;
 }

-static ULONG WINAPI vector_view_voice_information_AddRef(
-        IVectorView_VoiceInformation *iface)
+static ULONG WINAPI vector_view_voice_information_AddRef( IVectorView_VoiceInformation *iface )
 {
     struct voice_information_vector *impl = impl_from_IVectorView_VoiceInformation(iface);
     ULONG ref = InterlockedIncrement(&impl->ref);
@@ -62,8 +60,7 @@ static ULONG WINAPI vector_view_voice_information_AddRef(
     return ref;
 }

-static ULONG WINAPI vector_view_voice_information_Release(
-        IVectorView_VoiceInformation *iface)
+static ULONG WINAPI vector_view_voice_information_Release( IVectorView_VoiceInformation *iface )
 {
     struct voice_information_vector *impl = impl_from_IVectorView_VoiceInformation(iface);
     ULONG ref = InterlockedDecrement(&impl->ref);
@@ -71,45 +68,40 @@ static ULONG WINAPI vector_view_voice_information_Release(
     return ref;
 }

-static HRESULT WINAPI vector_view_voice_information_GetIids(
-        IVectorView_VoiceInformation *iface, ULONG *iid_count, IID **iids)
+static HRESULT WINAPI vector_view_voice_information_GetIids( IVectorView_VoiceInformation *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 vector_view_voice_information_GetRuntimeClassName(
-        IVectorView_VoiceInformation *iface, HSTRING *class_name)
+static HRESULT WINAPI vector_view_voice_information_GetRuntimeClassName( IVectorView_VoiceInformation *iface, HSTRING *class_name )
 {
     FIXME("iface %p, class_name %p stub!\n", iface, class_name);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI vector_view_voice_information_GetTrustLevel(
-        IVectorView_VoiceInformation *iface, TrustLevel *trust_level)
+static HRESULT WINAPI vector_view_voice_information_GetTrustLevel( IVectorView_VoiceInformation *iface, TrustLevel *trust_level )
 {
     FIXME("iface %p, trust_level %p stub!\n", iface, trust_level);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI vector_view_voice_information_GetAt(
-        IVectorView_VoiceInformation *iface, UINT32 index, IVoiceInformation **value)
+static HRESULT WINAPI vector_view_voice_information_GetAt( IVectorView_VoiceInformation *iface, UINT32 index, IVoiceInformation **value )
 {
     FIXME("iface %p, index %#x, value %p stub!\n", iface, index, value);
     *value = NULL;
     return E_BOUNDS;
 }

-static HRESULT WINAPI vector_view_voice_information_get_Size(
-        IVectorView_VoiceInformation *iface, UINT32 *value)
+static HRESULT WINAPI vector_view_voice_information_get_Size( IVectorView_VoiceInformation *iface, UINT32 *value )
 {
     FIXME("iface %p, value %p stub!\n", iface, value);
     *value = 0;
     return S_OK;
 }

-static HRESULT WINAPI vector_view_voice_information_IndexOf(
-        IVectorView_VoiceInformation *iface, IVoiceInformation *element, UINT32 *index, BOOLEAN *found)
+static HRESULT WINAPI vector_view_voice_information_IndexOf( IVectorView_VoiceInformation *iface,
+                                                             IVoiceInformation *element, UINT32 *index, BOOLEAN *found )
 {
     FIXME("iface %p, element %p, index %p, found %p stub!\n", iface, element, index, found);
     *index = 0;
@@ -117,9 +109,8 @@ static HRESULT WINAPI vector_view_voice_information_IndexOf(
     return S_OK;
 }

-static HRESULT WINAPI vector_view_voice_information_GetMany(
-        IVectorView_VoiceInformation *iface, UINT32 start_index,
-        UINT32 items_size, IVoiceInformation **items, UINT *value)
+static HRESULT WINAPI vector_view_voice_information_GetMany( IVectorView_VoiceInformation *iface, UINT32 start_index,
+                                                             UINT32 items_size, IVoiceInformation **items, UINT *value )
 {
     FIXME("iface %p, start_index %#x, items %p, value %p stub!\n", iface, start_index, items, value);
     *value = 0;
@@ -156,18 +147,17 @@ struct speech_synthesizer
     LONG ref;
 };

-static inline struct speech_synthesizer *impl_from_ISpeechSynthesizer(ISpeechSynthesizer *iface)
+static inline struct speech_synthesizer *impl_from_ISpeechSynthesizer( ISpeechSynthesizer *iface )
 {
     return CONTAINING_RECORD(iface, struct speech_synthesizer, ISpeechSynthesizer_iface);
 }

-static inline struct speech_synthesizer *impl_from_IClosable(IClosable *iface)
+static inline struct speech_synthesizer *impl_from_IClosable( IClosable *iface )
 {
     return CONTAINING_RECORD(iface, struct speech_synthesizer, IClosable_iface);
 }

-static HRESULT WINAPI speech_synthesizer_QueryInterface(
-        ISpeechSynthesizer *iface, REFIID iid, void **out)
+static HRESULT WINAPI speech_synthesizer_QueryInterface( ISpeechSynthesizer *iface, REFIID iid, void **out )
 {
     struct speech_synthesizer *impl = impl_from_ISpeechSynthesizer(iface);

@@ -201,8 +191,7 @@ static HRESULT WINAPI speech_synthesizer_QueryInterface(
     return E_NOINTERFACE;
 }

-static ULONG WINAPI speech_synthesizer_AddRef(
-        ISpeechSynthesizer *iface)
+static ULONG WINAPI speech_synthesizer_AddRef( ISpeechSynthesizer *iface )
 {
     struct speech_synthesizer *impl = impl_from_ISpeechSynthesizer(iface);
     ULONG ref = InterlockedIncrement(&impl->ref);
@@ -212,8 +201,7 @@ static ULONG WINAPI speech_synthesizer_AddRef(
     return ref;
 }

-static ULONG WINAPI speech_synthesizer_Release(
-        ISpeechSynthesizer *iface)
+static ULONG WINAPI speech_synthesizer_Release( ISpeechSynthesizer *iface )
 {
     struct speech_synthesizer *impl = impl_from_ISpeechSynthesizer(iface);
     ULONG ref = InterlockedDecrement(&impl->ref);
@@ -226,54 +214,51 @@ static ULONG WINAPI speech_synthesizer_Release(
     return ref;
 }

-static HRESULT WINAPI speech_synthesizer_GetIids(
-        ISpeechSynthesizer *iface, ULONG *iid_count, IID **iids)
+static HRESULT WINAPI speech_synthesizer_GetIids( ISpeechSynthesizer *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 speech_synthesizer_GetRuntimeClassName(
-        ISpeechSynthesizer *iface, HSTRING *class_name)
+static HRESULT WINAPI speech_synthesizer_GetRuntimeClassName( ISpeechSynthesizer *iface, HSTRING *class_name )
 {
     FIXME("iface %p, class_name %p stub.\n", iface, class_name);

return E_NOTIMPL;
 }

-static HRESULT WINAPI speech_synthesizer_GetTrustLevel(
-        ISpeechSynthesizer *iface, TrustLevel *trust_level)
+static HRESULT WINAPI speech_synthesizer_GetTrustLevel( ISpeechSynthesizer *iface, TrustLevel *trust_level )
 {
     FIXME("iface %p, trust_level %p stub.\n", iface, trust_level);

return E_NOTIMPL;
 }

-static HRESULT WINAPI speech_synthesizer_SynthesizeTextToStreamAsync(ISpeechSynthesizer *iface,
-        HSTRING text, IAsyncOperation_SpeechSynthesisStream **operation)
+static HRESULT WINAPI speech_synthesizer_SynthesizeTextToStreamAsync( ISpeechSynthesizer *iface, HSTRING text,
+                                                                      IAsyncOperation_SpeechSynthesisStream **operation )
 {
     FIXME("iface %p, text %p, operation %p stub.\n", iface, text, operation);

return E_NOTIMPL;
 }

-static HRESULT WINAPI speech_synthesizer_SynthesizeSsmlToStreamAsync(ISpeechSynthesizer *iface,
-        HSTRING ssml, IAsyncOperation_SpeechSynthesisStream **operation)
+static HRESULT WINAPI speech_synthesizer_SynthesizeSsmlToStreamAsync( ISpeechSynthesizer *iface, HSTRING ssml,
+                                                                      IAsyncOperation_SpeechSynthesisStream **operation )
 {
     FIXME("iface %p, text %p, operation %p stub.\n", iface, ssml, operation);

return E_NOTIMPL;
 }

-static HRESULT WINAPI speech_synthesizer_put_Voice(ISpeechSynthesizer *iface, IVoiceInformation *value)
+static HRESULT WINAPI speech_synthesizer_put_Voice( ISpeechSynthesizer *iface, IVoiceInformation *value )
 {
     FIXME("iface %p, value %p stub.\n", iface, value);

return E_NOTIMPL;
 }

-static HRESULT WINAPI speech_synthesizer_get_Voice(ISpeechSynthesizer *iface, IVoiceInformation **value)
+static HRESULT WINAPI speech_synthesizer_get_Voice( ISpeechSynthesizer *iface, IVoiceInformation **value )
 {
     FIXME("iface %p, value %p stub.\n", iface, value);

@@ -299,7 +284,7 @@ static const struct ISpeechSynthesizerVtbl speech_synthesizer_vtbl =

DEFINE_IINSPECTABLE(speech_synthesizer2, ISpeechSynthesizer2, struct speech_synthesizer, ISpeechSynthesizer_iface)

-static HRESULT WINAPI speech_synthesizer2_get_Options(ISpeechSynthesizer2 *iface, ISpeechSynthesizerOptions **value)
+static HRESULT WINAPI speech_synthesizer2_get_Options( ISpeechSynthesizer2 *iface, ISpeechSynthesizerOptions **value )
 {
     FIXME("iface %p, value %p stub.\n", iface, value);

@@ -320,16 +305,14 @@ static const struct ISpeechSynthesizer2Vtbl speech_synthesizer2_vtbl =
     speech_synthesizer2_get_Options,
 };

-static HRESULT WINAPI closable_QueryInterface(
-        IClosable *iface, REFIID iid, void **out)
+static HRESULT WINAPI closable_QueryInterface( IClosable *iface, REFIID iid, void **out )
 {
     struct speech_synthesizer *impl = impl_from_IClosable(iface);

return ISpeechSynthesizer_QueryInterface(&impl->ISpeechSynthesizer_iface, iid, out);
 }

-static ULONG WINAPI closable_AddRef(
-        IClosable *iface)
+static ULONG WINAPI closable_AddRef( IClosable *iface )
 {
     struct speech_synthesizer *impl = impl_from_IClosable(iface);
     ULONG ref = InterlockedIncrement(&impl->ref);
@@ -339,8 +322,7 @@ static ULONG WINAPI closable_AddRef(
     return ref;
 }

-static ULONG WINAPI closable_Release(
-        IClosable *iface)
+static ULONG WINAPI closable_Release( IClosable *iface )
 {
     struct speech_synthesizer *impl = impl_from_IClosable(iface);
     ULONG ref = InterlockedDecrement(&impl->ref);
@@ -353,32 +335,28 @@ static ULONG WINAPI closable_Release(
     return ref;
 }

-static HRESULT WINAPI closable_GetIids(
-        IClosable *iface, ULONG *iid_count, IID **iids)
+static HRESULT WINAPI closable_GetIids( IClosable *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 closable_GetRuntimeClassName(
-        IClosable *iface, HSTRING *class_name)
+static HRESULT WINAPI closable_GetRuntimeClassName( IClosable *iface, HSTRING *class_name )
 {
     FIXME("iface %p, class_name %p stub.\n", iface, class_name);

return E_NOTIMPL;
 }

-static HRESULT WINAPI closable_GetTrustLevel(
-        IClosable *iface, TrustLevel *trust_level)
+static HRESULT WINAPI closable_GetTrustLevel( IClosable *iface, TrustLevel *trust_level )
 {
     FIXME("iface %p, trust_level %p stub.\n", iface, trust_level);

return E_NOTIMPL;
 }

-static HRESULT WINAPI closable_Close(
-        IClosable *iface)
+static HRESULT WINAPI closable_Close( IClosable *iface )
 {
     FIXME("iface %p stub.\n", iface);

@@ -406,18 +384,17 @@ struct synthesizer_statics
     LONG ref;
 };

-static inline struct synthesizer_statics *impl_from_IActivationFactory(IActivationFactory *iface)
+static inline struct synthesizer_statics *impl_from_IActivationFactory( IActivationFactory *iface )
 {
     return CONTAINING_RECORD(iface, struct synthesizer_statics, IActivationFactory_iface);
 }

-static inline struct synthesizer_statics *impl_from_IInstalledVoicesStatic(IInstalledVoicesStatic *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)
+static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID iid, void **out )
 {
     struct synthesizer_statics *impl = impl_from_IActivationFactory(iface);

@@ -445,8 +422,7 @@ static HRESULT WINAPI factory_QueryInterface(
     return E_NOINTERFACE;
 }

-static ULONG WINAPI factory_AddRef(
-        IActivationFactory *iface)
+static ULONG WINAPI factory_AddRef( IActivationFactory *iface )
 {
     struct synthesizer_statics *impl = impl_from_IActivationFactory(iface);
     ULONG ref = InterlockedIncrement(&impl->ref);
@@ -454,8 +430,7 @@ static ULONG WINAPI factory_AddRef(
     return ref;
 }

-static ULONG WINAPI factory_Release(
-        IActivationFactory *iface)
+static ULONG WINAPI factory_Release( IActivationFactory *iface )
 {
     struct synthesizer_statics *impl = impl_from_IActivationFactory(iface);
     ULONG ref = InterlockedDecrement(&impl->ref);
@@ -463,29 +438,25 @@ static ULONG WINAPI factory_Release(
     return ref;
 }

-static HRESULT WINAPI factory_GetIids(
-        IActivationFactory *iface, ULONG *iid_count, IID **iids)
+static HRESULT WINAPI factory_GetIids( IActivationFactory *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 factory_GetRuntimeClassName(
-        IActivationFactory *iface, HSTRING *class_name)
+static HRESULT WINAPI factory_GetRuntimeClassName( IActivationFactory *iface, HSTRING *class_name )
 {
     FIXME("iface %p, class_name %p stub!\n", iface, class_name);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI factory_GetTrustLevel(
-        IActivationFactory *iface, TrustLevel *trust_level)
+static HRESULT WINAPI factory_GetTrustLevel( IActivationFactory *iface, TrustLevel *trust_level )
 {
     FIXME("iface %p, trust_level %p stub!\n", iface, trust_level);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI factory_ActivateInstance(
-        IActivationFactory *iface, IInspectable **instance)
+static HRESULT WINAPI factory_ActivateInstance( IActivationFactory *iface, IInspectable **instance )
 {
     struct speech_synthesizer *obj;

@@ -518,50 +489,43 @@ static const struct IActivationFactoryVtbl factory_vtbl =
     factory_ActivateInstance,
 };

-static HRESULT WINAPI installed_voices_static_QueryInterface(
-        IInstalledVoicesStatic *iface, REFIID iid, void **out)
+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)
+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)
+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)
+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)
+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)
+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;
 }

-static HRESULT WINAPI installed_voices_static_get_AllVoices(
-    IInstalledVoicesStatic *iface, IVectorView_VoiceInformation **value)
+static HRESULT WINAPI installed_voices_static_get_AllVoices( IInstalledVoicesStatic *iface, IVectorView_VoiceInformation **value )
 {
     TRACE("iface %p, value %p.\n", iface, value);
     *value = &all_voices.IVectorView_VoiceInformation_iface;
@@ -569,8 +533,7 @@ static HRESULT WINAPI installed_voices_static_get_AllVoices(
     return S_OK;
 }

-static HRESULT WINAPI installed_voices_static_get_DefaultVoice(
-    IInstalledVoicesStatic *iface, IVoiceInformation **value)
+static HRESULT WINAPI installed_voices_static_get_DefaultVoice( IInstalledVoicesStatic *iface, IVoiceInformation **value )
 {
     FIXME("iface %p, value %p stub!\n", iface, value);
     return E_NOTIMPL;