[PATCH 0/2] MR5209: sapi: Implement more get/put functions for ISpeechVoice.

[PATCH 1/2] sapi: Implement ISpeechVoice::{get/put}_Volume.

[Shaun Ren]

From: Shaun Ren

---
 dlls/sapi/tests/tts.c |  9 ++++++++-
 dlls/sapi/tts.c       | 17 +++++++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c
index 4d565b35294..a5c950aa80b 100644
--- a/dlls/sapi/tests/tts.c
+++ b/dlls/sapi/tests/tts.c
@@ -434,7 +434,7 @@ static void test_spvoice(void)
     DWORD start, duration;
     ISpeechVoice *speech_voice;
     ISpeechObjectTokens *speech_tokens;
-    LONG count;
+    LONG count, volume_long;
     BSTR req = NULL, opt = NULL;
     UINT info_count;
     ITypeInfo *typeinfo;
@@ -717,6 +717,13 @@ static void test_spvoice(void)
     ok(count == 1, "got %ld.\n", count);
     ISpeechObjectTokens_Release(speech_tokens);

+    volume_long = 0xdeadbeef;
+    hr = ISpeechVoice_put_Volume(speech_voice, 80);
+    ok(hr == S_OK, "got %#lx.\n", hr);
+    hr = ISpeechVoice_get_Volume(speech_voice, &volume_long);
+    ok(hr == S_OK, "got %#lx.\n", hr);
+    ok(volume_long == 80, "got %ld.\n", volume_long);
+
     hr = ISpeechVoice_Speak(speech_voice, NULL, SVSFPurgeBeforeSpeak, NULL);
     ok(hr == S_OK, "got %#lx.\n", hr);

diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c
index d22ffd7a0da..325edaf04fb 100644
--- a/dlls/sapi/tts.c
+++ b/dlls/sapi/tts.c
@@ -291,16 +291,25 @@ static HRESULT WINAPI speech_voice_put_Rate(ISpeechVoice *iface, LONG rate)

static HRESULT WINAPI speech_voice_get_Volume(ISpeechVoice *iface, LONG *volume)
 {
-    FIXME("(%p, %p): stub.\n", iface, volume);
+    struct speech_voice *This = impl_from_ISpeechVoice(iface);
+    USHORT res = 0;
+    HRESULT hr;

-    return E_NOTIMPL;
+    TRACE("(%p, %p).\n", iface, volume);
+
+    if (!volume) return E_POINTER;
+    hr = ISpVoice_GetVolume(&This->ISpVoice_iface, &res);
+    *volume = res;
+    return hr;
 }

static HRESULT WINAPI speech_voice_put_Volume(ISpeechVoice *iface, LONG volume)
 {
-    FIXME("(%p, %ld): stub.\n", iface, volume);
+    struct speech_voice *This = impl_from_ISpeechVoice(iface);

-    return E_NOTIMPL;
+    TRACE("(%p, %ld).\n", iface, volume);
+
+    return ISpVoice_SetVolume(&This->ISpVoice_iface, (USHORT)volume);
 }

static HRESULT WINAPI speech_voice_put_AllowAudioOutputFormatChangesOnNextSet(ISpeechVoice *iface,

[PATCH 2/2] sapi: Implement ISpeechVoice::{get/putref}_Voice.

[Shaun Ren]

From: Shaun Ren

---
 dlls/sapi/tests/tts.c | 22 +++++++++++++++++++++-
 dlls/sapi/tts.c       | 26 ++++++++++++++++++++++----
 2 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c
index a5c950aa80b..38c69e6144a 100644
--- a/dlls/sapi/tests/tts.c
+++ b/dlls/sapi/tests/tts.c
@@ -424,7 +424,7 @@ static void test_spvoice(void)
     IUnknown *dummy;
     ISpMMSysAudio *audio_out;
     ISpObjectTokenCategory *token_cat;
-    ISpObjectToken *token;
+    ISpObjectToken *token, *token2;
     WCHAR *token_id = NULL, *default_token_id = NULL;
     ISpDataKey *attrs_key;
     LONG rate;
@@ -435,6 +435,7 @@ static void test_spvoice(void)
     ISpeechVoice *speech_voice;
     ISpeechObjectTokens *speech_tokens;
     LONG count, volume_long;
+    ISpeechObjectToken *speech_token;
     BSTR req = NULL, opt = NULL;
     UINT info_count;
     ITypeInfo *typeinfo;
@@ -724,6 +725,25 @@ static void test_spvoice(void)
     ok(hr == S_OK, "got %#lx.\n", hr);
     ok(volume_long == 80, "got %ld.\n", volume_long);

+    hr = ISpObjectToken_QueryInterface(token, &IID_ISpeechObjectToken, (void **)&speech_token);
+    ok(hr == S_OK, "got %#lx.\n", hr);
+    hr = ISpeechVoice_putref_Voice(speech_voice, speech_token);
+    ok(hr == S_OK, "got %#lx.\n", hr);
+    ISpeechObjectToken_Release(speech_token);
+
+    speech_token = (ISpeechObjectToken *)0xdeadbeef;
+    hr = ISpeechVoice_get_Voice(speech_voice, &speech_token);
+    ok(hr == S_OK, "got %#lx.\n", hr);
+    ok(speech_token && speech_token != (ISpeechObjectToken *)0xdeadbeef, "got %p.\n", speech_token);
+    hr = ISpeechObjectToken_QueryInterface(speech_token, &IID_ISpObjectToken, (void **)&token2);
+    ok(hr == S_OK, "got %#lx.\n", hr);
+    token_id = NULL;
+    hr = ISpObjectToken_GetId(token2, &token_id);
+    ok(hr == S_OK, "got %#lx.\n", hr);
+    ok(!wcscmp(token_id, test_token_id), "got %s.\n", wine_dbgstr_w(token_id));
+    CoTaskMemFree(token_id);
+    ISpObjectToken_Release(token2);
+
     hr = ISpeechVoice_Speak(speech_voice, NULL, SVSFPurgeBeforeSpeak, NULL);
     ok(hr == S_OK, "got %#lx.\n", hr);

diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c
index 325edaf04fb..c474a118981 100644
--- a/dlls/sapi/tts.c
+++ b/dlls/sapi/tts.c
@@ -235,16 +235,34 @@ static HRESULT WINAPI speech_voice_get_Status(ISpeechVoice *iface, ISpeechVoiceS

static HRESULT WINAPI speech_voice_get_Voice(ISpeechVoice *iface, ISpeechObjectToken **voice)
 {
-    FIXME("(%p, %p): stub.\n", iface, voice);
+    struct speech_voice *This = impl_from_ISpeechVoice(iface);
+    ISpObjectToken *token;
+    HRESULT hr;

-    return E_NOTIMPL;
+    TRACE("(%p, %p).\n", iface, voice);
+
+    if (!voice) return E_POINTER;
+    if (FAILED(hr = ISpVoice_GetVoice(&This->ISpVoice_iface, &token)))
+        return hr;
+    hr = ISpObjectToken_QueryInterface(token, &IID_ISpeechObjectToken, (void **)voice);
+    ISpObjectToken_Release(token);
+    return hr;
 }

static HRESULT WINAPI speech_voice_putref_Voice(ISpeechVoice *iface, ISpeechObjectToken *voice)
 {
-    FIXME("(%p, %p): stub.\n", iface, voice);
+    struct speech_voice *This = impl_from_ISpeechVoice(iface);
+    ISpObjectToken *token;
+    HRESULT hr;

-    return E_NOTIMPL;
+    TRACE("(%p, %p).\n", iface, voice);
+
+    if (!voice) return E_INVALIDARG;
+    if (FAILED(hr = ISpeechObjectToken_QueryInterface(voice, &IID_ISpObjectToken, (void **)&token)))
+        return hr;
+    hr = ISpVoice_SetVoice(&This->ISpVoice_iface, token);
+    ISpObjectToken_Release(token);
+    return hr;
 }

static HRESULT WINAPI speech_voice_get_AudioOutput(ISpeechVoice *iface, ISpeechObjectToken **output)

[PATCH 0/2] MR5209: sapi: Implement more get/put functions for ISpeechVoice. - approved

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.