[PATCH v3 9/9] windows.media.speech: Implement get/put voice on synthesizer.

[Eric Pouech]

From: Eric Pouech

Signed-off-by: Eric Pouech 
---
 dlls/windows.media.speech/synthesizer.c  | 56 ++++++++++++++++++++++--
 dlls/windows.media.speech/tests/speech.c | 22 +++++-----
 2 files changed, 62 insertions(+), 16 deletions(-)

diff --git a/dlls/windows.media.speech/synthesizer.c b/dlls/windows.media.speech/synthesizer.c
index a94447a9c49..0a607dda543 100644
--- a/dlls/windows.media.speech/synthesizer.c
+++ b/dlls/windows.media.speech/synthesizer.c
@@ -848,6 +848,7 @@ struct synthesizer
     LONG ref;

struct synthesizer_options *options;
+    IVoiceInformation *current_voice;
 };

/*
@@ -911,6 +912,8 @@ static ULONG WINAPI synthesizer_Release( ISpeechSynthesizer *iface )
     {
         if (impl->options)
             ISpeechSynthesizerOptions_Release(&impl->options->ISpeechSynthesizerOptions_iface);
+        if (impl->current_voice)
+            IVoiceInformation_Release(impl->current_voice);
         free(impl);
     }

@@ -963,14 +966,49 @@ static HRESULT WINAPI synthesizer_SynthesizeSsmlToStreamAsync( ISpeechSynthesize

static HRESULT WINAPI synthesizer_put_Voice( ISpeechSynthesizer *iface, IVoiceInformation *value )
 {
-    FIXME("iface %p, value %p stub.\n", iface, value);
-    return E_NOTIMPL;
+    struct synthesizer *impl = impl_from_ISpeechSynthesizer(iface);
+    IVoiceInformation *voice;
+    HSTRING id, id2;
+    HRESULT hr;
+    INT32 cmp, idx;
+
+    TRACE("iface %p, value %p semi-stub.\n", iface, value);
+
+    hr = IVoiceInformation_get_Id(value, &id);
+    if (FAILED(hr)) return hr;
+
+    for (idx = 0; ; idx++)
+    {
+        if (SUCCEEDED(hr = IVectorView_VoiceInformation_GetAt(&all_voices.IVectorView_VoiceInformation_iface, idx, &voice)))
+        {
+            if (SUCCEEDED(hr = IVoiceInformation_get_Id(voice, &id2)))
+            {
+                hr = WindowsCompareStringOrdinal(id, id2, &cmp);
+                WindowsDeleteString(id2);
+            }
+            IVoiceInformation_Release(voice);
+        }
+        if (FAILED(hr) || cmp == 0) break;
+    }
+    WindowsDeleteString(id);
+
+    if (SUCCEEDED(hr))
+    {
+        if (impl->current_voice)
+            IVoiceInformation_Release(impl->current_voice);
+        IVoiceInformation_AddRef(impl->current_voice = value);
+    }
+    return hr;
 }

static HRESULT WINAPI synthesizer_get_Voice( ISpeechSynthesizer *iface, IVoiceInformation **value )
 {
-    FIXME("iface %p, value %p stub.\n", iface, value);
-    return E_NOTIMPL;
+    struct synthesizer *impl = impl_from_ISpeechSynthesizer(iface);
+
+    TRACE("iface %p, value %p.\n", iface, value);
+    if (!impl->current_voice) return E_NOTIMPL;
+    IVoiceInformation_AddRef(*value = impl->current_voice);
+    return S_OK;
 }

static const struct ISpeechSynthesizerVtbl synthesizer_vtbl =
@@ -1135,6 +1173,7 @@ static HRESULT WINAPI factory_GetTrustLevel( IActivationFactory *iface, TrustLev

static HRESULT WINAPI factory_ActivateInstance( IActivationFactory *iface, IInspectable **instance )
 {
+    struct IVoiceInformation *static_voice;
     struct synthesizer *impl;
     HRESULT hr;

@@ -1155,6 +1194,15 @@ static HRESULT WINAPI factory_ActivateInstance( IActivationFactory *iface, IInsp
     impl->ISpeechSynthesizer_iface.lpVtbl = &synthesizer_vtbl;
     impl->ISpeechSynthesizer2_iface.lpVtbl = &synthesizer2_vtbl;
     impl->IClosable_iface.lpVtbl = &closable_vtbl;
+    /* assuming default is the first one... */
+    hr = IVectorView_VoiceInformation_GetAt(&all_voices.IVectorView_VoiceInformation_iface, 0, &static_voice);
+    if (SUCCEEDED(hr))
+        hr = voice_information_clone(static_voice, &impl->current_voice);
+    if (FAILED(hr))
+    {
+        free(impl);
+        return hr;
+    }
     impl->ref = 1;

*instance = (IInspectable *)&impl->ISpeechSynthesizer_iface;
diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c
index 9c5517adda8..6450fc29611 100644
--- a/dlls/windows.media.speech/tests/speech.c
+++ b/dlls/windows.media.speech/tests/speech.c
@@ -870,6 +870,7 @@ static void test_SpeechSynthesizer(void)
     UINT32 size, idx;
     BOOLEAN found;
     ULONG ref;
+    INT32 cmp;

hr = RoInitialize(RO_INIT_MULTITHREADED);
     ok(hr == S_OK, "RoInitialize failed, hr %#lx\n", hr);
@@ -1018,21 +1019,18 @@ static void test_SpeechSynthesizer(void)
     ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);

hr = ISpeechSynthesizer_get_Voice(synthesizer, &voice);
-    todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);

-    if (hr == S_OK)
-    {
-        INT32 cmp;
-        IVoiceInformation_get_Id(voice, &str);
-        ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
-        hr = WindowsCompareStringOrdinal(str, default_voice_id, &cmp);
-        ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+    hr = IVoiceInformation_get_Id(voice, &str);
+    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);

-        hr = WindowsDeleteString(str);
-        ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+    hr = WindowsCompareStringOrdinal(str, default_voice_id, &cmp);
+    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);

-        IVoiceInformation_Release(voice);
-    }
+    hr = WindowsDeleteString(str);
+    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+
+    IVoiceInformation_Release(voice);

hr = WindowsDeleteString(default_voice_id);
     ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);