[PATCH 4/4] sapi/tts: Support allow_format_changes in ISpVoice::SetOutput.

[Shaun Ren]

From: Shaun Ren

---
 dlls/sapi/tts.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c
index 54537d927be..159635a4559 100644
--- a/dlls/sapi/tts.c
+++ b/dlls/sapi/tts.c
@@ -49,6 +49,7 @@ struct speech_voice

ISpStreamFormat *output;
     IMFTransform *resampler;
+    BOOL allow_format_changes;
     ISpObjectToken *engine_token;
     ISpTTSEngine *engine;
     LONG cur_stream_num;
@@ -683,9 +684,6 @@ static HRESULT WINAPI spvoice_SetOutput(ISpVoice *iface, IUnknown *unk, BOOL all

TRACE("(%p, %p, %d).\n", iface, unk, allow_format_changes);

-    if (!allow_format_changes)
-        FIXME("ignoring allow_format_changes = FALSE.\n");
-
     if (FAILED(hr = async_start_queue(&This->queue)))
         return hr;

@@ -719,6 +717,8 @@ static HRESULT WINAPI spvoice_SetOutput(ISpVoice *iface, IUnknown *unk, BOOL all
         ISpStreamFormat_Release(This->output);
     This->output = stream;

+    This->allow_format_changes = allow_format_changes;
+
     LeaveCriticalSection(&This->cs);

return S_OK;
@@ -925,7 +925,8 @@ static HRESULT set_output_format(struct speech_voice *voice, GUID *fmtid, WAVEFO
     if (memcmp(output_wfx, *engine_wfx, sizeof(WAVEFORMATEX)) ||
         memcmp(output_wfx + 1, *engine_wfx + 1, output_wfx->cbSize))
     {
-        if (SUCCEEDED(ISpStreamFormat_QueryInterface(voice->output, &IID_ISpAudio, (void **)&audio)))
+        if (voice->allow_format_changes &&
+            SUCCEEDED(ISpStreamFormat_QueryInterface(voice->output, &IID_ISpAudio, (void **)&audio)))
         {
             hr = ISpAudio_SetFormat(audio, &SPDFID_WaveFormatEx, *engine_wfx);
             if (hr == SPERR_UNSUPPORTED_FORMAT)
@@ -1706,6 +1707,7 @@ HRESULT speech_voice_create(IUnknown *outer, REFIID iid, void **obj)

This->output = NULL;
     This->resampler = NULL;
+    This->allow_format_changes = TRUE;
     This->engine_token = NULL;
     This->engine = NULL;
     This->cur_stream_num = 0;