From: Paul Gofman pgofman@codeweavers.com
--- dlls/windows.media.speech/async.c | 62 ++++++++++++--------- dlls/windows.media.speech/async_private.idl | 2 +- dlls/windows.media.speech/recognizer.c | 14 +++-- dlls/windows.media.speech/synthesizer.c | 8 ++- 4 files changed, 52 insertions(+), 34 deletions(-)
diff --git a/dlls/windows.media.speech/async.c b/dlls/windows.media.speech/async.c index 4e84afec2a5..fb8614546e6 100644 --- a/dlls/windows.media.speech/async.c +++ b/dlls/windows.media.speech/async.c @@ -175,6 +175,39 @@ static HRESULT WINAPI async_impl_get_Result( IAsyncInfoImpl *iface, PROPVARIANT return hr; }
+static BOOL async_info_complete( struct async_info *impl, BOOL called_async ) +{ + IInspectable *operation = impl->IInspectable_outer; + PROPVARIANT result = {0}; + HRESULT hr; + + hr = impl->callback( impl->invoker, impl->param, &result, called_async ); + if (!called_async && hr == STATUS_PENDING) return FALSE; + + EnterCriticalSection( &impl->cs ); + if (impl->status != Closed) impl->status = FAILED(hr) ? Error : Completed; + PropVariantCopy( &impl->result, &result ); + impl->hr = hr; + + if (impl->handler != NULL && impl->handler != HANDLER_NOT_SET) + { + IAsyncOperationCompletedHandlerImpl *handler = impl->handler; + AsyncStatus status = impl->status; + impl->handler = NULL; /* Prevent concurrent invoke. */ + LeaveCriticalSection( &impl->cs ); + + IAsyncOperationCompletedHandlerImpl_Invoke( handler, operation, status ); + IAsyncOperationCompletedHandlerImpl_Release( handler ); + } + else LeaveCriticalSection( &impl->cs ); + + /* release refcount acquired in Start */ + IInspectable_Release( operation ); + + PropVariantClear( &result ); + return TRUE; +} + static HRESULT WINAPI async_impl_Start( IAsyncInfoImpl *iface ) { struct async_info *impl = impl_from_IAsyncInfoImpl( iface ); @@ -183,7 +216,7 @@ static HRESULT WINAPI async_impl_Start( IAsyncInfoImpl *iface )
/* keep the async alive in the callback */ IInspectable_AddRef( impl->IInspectable_outer ); - SubmitThreadpoolWork( impl->async_run_work ); + if (!async_info_complete( impl, FALSE )) SubmitThreadpoolWork( impl->async_run_work );
return S_OK; } @@ -305,33 +338,8 @@ static const struct IAsyncInfoVtbl async_info_vtbl = static void CALLBACK async_info_callback( TP_CALLBACK_INSTANCE *instance, void *iface, TP_WORK *work ) { struct async_info *impl = impl_from_IAsyncInfoImpl( iface ); - IInspectable *operation = impl->IInspectable_outer; - PROPVARIANT result = {0}; - HRESULT hr; - - hr = impl->callback( impl->invoker, impl->param, &result ); - - EnterCriticalSection( &impl->cs ); - if (impl->status != Closed) impl->status = FAILED(hr) ? Error : Completed; - PropVariantCopy( &impl->result, &result ); - impl->hr = hr;
- if (impl->handler != NULL && impl->handler != HANDLER_NOT_SET) - { - IAsyncOperationCompletedHandlerImpl *handler = impl->handler; - AsyncStatus status = impl->status; - impl->handler = NULL; /* Prevent concurrent invoke. */ - LeaveCriticalSection( &impl->cs ); - - IAsyncOperationCompletedHandlerImpl_Invoke( handler, operation, status ); - IAsyncOperationCompletedHandlerImpl_Release( handler ); - } - else LeaveCriticalSection( &impl->cs ); - - /* release refcount acquired in Start */ - IInspectable_Release( operation ); - - PropVariantClear( &result ); + async_info_complete( impl, TRUE ); }
static HRESULT async_info_create( IUnknown *invoker, IUnknown *param, async_operation_callback callback, diff --git a/dlls/windows.media.speech/async_private.idl b/dlls/windows.media.speech/async_private.idl index 10741572601..40ea63ca4c1 100644 --- a/dlls/windows.media.speech/async_private.idl +++ b/dlls/windows.media.speech/async_private.idl @@ -42,5 +42,5 @@ namespace Wine.Internal { HRESULT Start(); }
- typedef HRESULT (*async_operation_callback)( IUnknown *invoker, IUnknown *param, PROPVARIANT *result ); + typedef HRESULT (*async_operation_callback)( IUnknown *invoker, IUnknown *param, PROPVARIANT *result, BOOL called_async ); } diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c index 1b365f0f39d..37147463de5 100644 --- a/dlls/windows.media.speech/recognizer.c +++ b/dlls/windows.media.speech/recognizer.c @@ -382,8 +382,10 @@ static HRESULT WINAPI session_set_AutoStopSilenceTimeout( ISpeechContinuousRecog return E_NOTIMPL; }
-static HRESULT session_start_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result ) +static HRESULT session_start_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result, BOOL called_async ) { + if (!called_async) return STATUS_PENDING; + return S_OK; }
@@ -431,8 +433,9 @@ static HRESULT WINAPI session_StartWithModeAsync( ISpeechContinuousRecognitionSe return E_NOTIMPL; }
-static HRESULT session_stop_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result ) +static HRESULT session_stop_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result, BOOL called_async ) { + if (!called_async) return STATUS_PENDING; return S_OK; }
@@ -487,8 +490,9 @@ static HRESULT WINAPI session_CancelAsync( ISpeechContinuousRecognitionSession * return E_NOTIMPL; }
-static HRESULT session_pause_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result ) +static HRESULT session_pause_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result, BOOL called_async ) { + if (!called_async) return STATUS_PENDING; return S_OK; }
@@ -725,11 +729,13 @@ static HRESULT WINAPI recognizer_get_UIOptions( ISpeechRecognizer *iface, ISpeec return E_NOTIMPL; }
-static HRESULT recognizer_compile_constraints_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result ) +static HRESULT recognizer_compile_constraints_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result, BOOL called_async ) { ISpeechRecognitionCompilationResult *compilation; HRESULT hr;
+ if (!called_async) return STATUS_PENDING; + if (SUCCEEDED(hr = compilation_result_create(SpeechRecognitionResultStatus_Success, &compilation))) { result->vt = VT_UNKNOWN; diff --git a/dlls/windows.media.speech/synthesizer.c b/dlls/windows.media.speech/synthesizer.c index 67f028dc52f..d463bf1e6aa 100644 --- a/dlls/windows.media.speech/synthesizer.c +++ b/dlls/windows.media.speech/synthesizer.c @@ -838,11 +838,13 @@ static HRESULT WINAPI synthesizer_GetTrustLevel( ISpeechSynthesizer *iface, Trus return E_NOTIMPL; }
-static HRESULT synthesizer_synthesize_text_to_stream_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result ) +static HRESULT synthesizer_synthesize_text_to_stream_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result, BOOL called_async ) { ISpeechSynthesisStream *stream; HRESULT hr;
+ if (!called_async) return STATUS_PENDING; + if (SUCCEEDED(hr = synthesis_stream_create(&stream))) { result->vt = VT_UNKNOWN; @@ -859,11 +861,13 @@ static HRESULT WINAPI synthesizer_SynthesizeTextToStreamAsync( ISpeechSynthesize synthesizer_synthesize_text_to_stream_async, (IAsyncOperation_IInspectable **)operation); }
-static HRESULT synthesizer_synthesize_ssml_to_stream_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result ) +static HRESULT synthesizer_synthesize_ssml_to_stream_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result, BOOL called_async ) { ISpeechSynthesisStream *stream; HRESULT hr;
+ if (!called_async) return STATUS_PENDING; + if (SUCCEEDED(hr = synthesis_stream_create(&stream))) { result->vt = VT_UNKNOWN;