[PATCH v3 4/4] sapi: Implement ISpVoice::Set/GetVolume.

[Shaun Ren]

From: Shaun Ren

---
 dlls/sapi/tests/tts.c | 25 +++++++++++++++++++++++++
 dlls/sapi/tts.c       | 25 +++++++++++++++++++++----
 2 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c
index 8564d049949..534e5842f39 100644
--- a/dlls/sapi/tests/tts.c
+++ b/dlls/sapi/tests/tts.c
@@ -101,6 +101,7 @@ static void test_spvoice(void)
     ISpObjectToken *token;
     WCHAR *token_id = NULL, *default_token_id = NULL;
     LONG rate;
+    USHORT volume;
     HRESULT hr;

if (waveOutGetNumDevs() == 0) {
@@ -179,6 +180,30 @@ static void test_spvoice(void)
     ok(hr == S_OK, "got %#lx.\n", hr);
     ok(rate == 1000, "rate = %ld\n", rate);

+    volume = 0xbeef;
+    hr = ISpVoice_GetVolume(voice, &volume);
+    ok(hr == S_OK, "got %#lx.\n", hr);
+    ok(volume == 100, "volume = %d\n", volume);
+
+    hr = ISpVoice_SetVolume(voice, 0);
+    ok(hr == S_OK, "got %#lx.\n", hr);
+
+    volume = 0xbeef;
+    hr = ISpVoice_GetVolume(voice, &volume);
+    ok(hr == S_OK, "got %#lx.\n", hr);
+    ok(volume == 0, "volume = %d\n", volume);
+
+    hr = ISpVoice_SetVolume(voice, 100);
+    ok(hr == S_OK, "got %#lx.\n", hr);
+
+    volume = 0xbeef;
+    hr = ISpVoice_GetVolume(voice, &volume);
+    ok(hr == S_OK, "got %#lx.\n", hr);
+    ok(volume == 100, "volume = %d\n", volume);
+
+    hr = ISpVoice_SetVolume(voice, 101);
+    ok(hr == E_INVALIDARG, "got %#lx.\n", hr);
+
     ISpVoice_Release(voice);
     ISpMMSysAudio_Release(audio_out);
 }
diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c
index 32d3aa31335..147734cc9a9 100644
--- a/dlls/sapi/tts.c
+++ b/dlls/sapi/tts.c
@@ -43,6 +43,7 @@ struct speech_voice

ISpStreamFormat *output;
     ISpTTSEngine *engine;
+    USHORT volume;
     LONG rate;
     CRITICAL_SECTION cs;
 };
@@ -779,16 +780,31 @@ static HRESULT WINAPI spvoice_GetRate(ISpVoice *iface, LONG *rate)

static HRESULT WINAPI spvoice_SetVolume(ISpVoice *iface, USHORT volume)
 {
-    FIXME("(%p, %d): stub.\n", iface, volume);
+    struct speech_voice *This = impl_from_ISpVoice(iface);

-    return E_NOTIMPL;
+    TRACE("(%p, %d).\n", iface, volume);
+
+    if (volume > 100)
+        return E_INVALIDARG;
+
+    EnterCriticalSection(&This->cs);
+    This->volume = volume;
+    LeaveCriticalSection(&This->cs);
+
+    return S_OK;
 }

static HRESULT WINAPI spvoice_GetVolume(ISpVoice *iface, USHORT *volume)
 {
-    FIXME("(%p, %p): stub.\n", iface, volume);
+    struct speech_voice *This = impl_from_ISpVoice(iface);

-    return E_NOTIMPL;
+    TRACE("(%p, %p).\n", iface, volume);
+
+    EnterCriticalSection(&This->cs);
+    *volume = This->volume;
+    LeaveCriticalSection(&This->cs);
+
+    return S_OK;
 }

static HRESULT WINAPI spvoice_WaitUntilDone(ISpVoice *iface, ULONG timeout)
@@ -943,6 +959,7 @@ HRESULT speech_voice_create(IUnknown *outer, REFIID iid, void **obj)

This->output = NULL;
     This->engine = NULL;
+    This->volume = 100;
     This->rate = 0;

InitializeCriticalSection(&This->cs);