Commit 754452dd authored by Bernhard Kölbl's avatar Bernhard Kölbl Committed by Alexandre Julliard

windows.media.speech: Do not force calling convention on internal callbacks.

parent e203d3be
...@@ -69,8 +69,8 @@ struct vector_iids ...@@ -69,8 +69,8 @@ struct vector_iids
const GUID *view; const GUID *view;
}; };
typedef HRESULT (WINAPI *async_action_callback)( IInspectable *invoker ); typedef HRESULT (*async_action_callback)( IInspectable *invoker );
typedef HRESULT (WINAPI *async_operation_inspectable_callback)( IInspectable *invoker, IInspectable **result ); typedef HRESULT (*async_operation_inspectable_callback)( IInspectable *invoker, IInspectable **result );
HRESULT async_action_create( IInspectable *invoker, async_action_callback callback, IAsyncAction **out ); HRESULT async_action_create( IInspectable *invoker, async_action_callback callback, IAsyncAction **out );
HRESULT async_operation_inspectable_create( const GUID *iid, IInspectable *invoker, async_operation_inspectable_callback callback, HRESULT async_operation_inspectable_create( const GUID *iid, IInspectable *invoker, async_operation_inspectable_callback callback,
......
...@@ -247,7 +247,7 @@ static HRESULT WINAPI session_set_AutoStopSilenceTimeout( ISpeechContinuousRecog ...@@ -247,7 +247,7 @@ static HRESULT WINAPI session_set_AutoStopSilenceTimeout( ISpeechContinuousRecog
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI start_callback( IInspectable *invoker ) static HRESULT session_start_async( IInspectable *invoker )
{ {
return S_OK; return S_OK;
} }
...@@ -255,7 +255,7 @@ static HRESULT WINAPI start_callback( IInspectable *invoker ) ...@@ -255,7 +255,7 @@ static HRESULT WINAPI start_callback( IInspectable *invoker )
static HRESULT WINAPI session_StartAsync( ISpeechContinuousRecognitionSession *iface, IAsyncAction **action ) static HRESULT WINAPI session_StartAsync( ISpeechContinuousRecognitionSession *iface, IAsyncAction **action )
{ {
FIXME("iface %p, action %p stub!\n", iface, action); FIXME("iface %p, action %p stub!\n", iface, action);
return async_action_create(NULL, start_callback, action); return async_action_create(NULL, session_start_async, action);
} }
static HRESULT WINAPI session_StartWithModeAsync( ISpeechContinuousRecognitionSession *iface, static HRESULT WINAPI session_StartWithModeAsync( ISpeechContinuousRecognitionSession *iface,
...@@ -479,7 +479,7 @@ static HRESULT WINAPI recognizer_get_UIOptions( ISpeechRecognizer *iface, ISpeec ...@@ -479,7 +479,7 @@ static HRESULT WINAPI recognizer_get_UIOptions( ISpeechRecognizer *iface, ISpeec
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI compile_callback( IInspectable *invoker, IInspectable **result ) static HRESULT recognizer_compile_constraints_async( IInspectable *invoker, IInspectable **result )
{ {
return compilation_result_create(SpeechRecognitionResultStatus_Success, (ISpeechRecognitionCompilationResult **) result); return compilation_result_create(SpeechRecognitionResultStatus_Success, (ISpeechRecognitionCompilationResult **) result);
} }
...@@ -489,7 +489,7 @@ static HRESULT WINAPI recognizer_CompileConstraintsAsync( ISpeechRecognizer *ifa ...@@ -489,7 +489,7 @@ static HRESULT WINAPI recognizer_CompileConstraintsAsync( ISpeechRecognizer *ifa
{ {
IAsyncOperation_IInspectable **value = (IAsyncOperation_IInspectable **)operation; IAsyncOperation_IInspectable **value = (IAsyncOperation_IInspectable **)operation;
FIXME("iface %p, operation %p semi-stub!\n", iface, operation); FIXME("iface %p, operation %p semi-stub!\n", iface, operation);
return async_operation_inspectable_create(&IID_IAsyncOperation_SpeechRecognitionCompilationResult, NULL, compile_callback, value); return async_operation_inspectable_create(&IID_IAsyncOperation_SpeechRecognitionCompilationResult, NULL, recognizer_compile_constraints_async, value);
} }
static HRESULT WINAPI recognizer_RecognizeAsync( ISpeechRecognizer *iface, static HRESULT WINAPI recognizer_RecognizeAsync( ISpeechRecognizer *iface,
......
...@@ -375,7 +375,7 @@ static HRESULT WINAPI synthesizer_GetTrustLevel( ISpeechSynthesizer *iface, Trus ...@@ -375,7 +375,7 @@ static HRESULT WINAPI synthesizer_GetTrustLevel( ISpeechSynthesizer *iface, Trus
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT CALLBACK text_to_stream_operation( IInspectable *invoker, IInspectable **result ) static HRESULT synthesizer_synthesize_text_to_stream_async( IInspectable *invoker, IInspectable **result )
{ {
return synthesis_stream_create((ISpeechSynthesisStream **)result); return synthesis_stream_create((ISpeechSynthesisStream **)result);
} }
...@@ -385,10 +385,10 @@ static HRESULT WINAPI synthesizer_SynthesizeTextToStreamAsync( ISpeechSynthesize ...@@ -385,10 +385,10 @@ static HRESULT WINAPI synthesizer_SynthesizeTextToStreamAsync( ISpeechSynthesize
{ {
TRACE("iface %p, text %p, operation %p.\n", iface, text, operation); TRACE("iface %p, text %p, operation %p.\n", iface, text, operation);
return async_operation_inspectable_create(&IID_IAsyncOperation_SpeechSynthesisStream, NULL, return async_operation_inspectable_create(&IID_IAsyncOperation_SpeechSynthesisStream, NULL,
text_to_stream_operation, (IAsyncOperation_IInspectable **)operation); synthesizer_synthesize_text_to_stream_async, (IAsyncOperation_IInspectable **)operation);
} }
static HRESULT CALLBACK ssml_to_stream_operation( IInspectable *invoker, IInspectable **result ) static HRESULT synthesizer_synthesize_ssml_to_stream_async( IInspectable *invoker, IInspectable **result )
{ {
return synthesis_stream_create((ISpeechSynthesisStream **)result); return synthesis_stream_create((ISpeechSynthesisStream **)result);
} }
...@@ -398,7 +398,7 @@ static HRESULT WINAPI synthesizer_SynthesizeSsmlToStreamAsync( ISpeechSynthesize ...@@ -398,7 +398,7 @@ static HRESULT WINAPI synthesizer_SynthesizeSsmlToStreamAsync( ISpeechSynthesize
{ {
TRACE("iface %p, ssml %p, operation %p.\n", iface, ssml, operation); TRACE("iface %p, ssml %p, operation %p.\n", iface, ssml, operation);
return async_operation_inspectable_create(&IID_IAsyncOperation_SpeechSynthesisStream, NULL, return async_operation_inspectable_create(&IID_IAsyncOperation_SpeechSynthesisStream, NULL,
ssml_to_stream_operation, (IAsyncOperation_IInspectable **)operation); synthesizer_synthesize_ssml_to_stream_async, (IAsyncOperation_IInspectable **)operation);
} }
static HRESULT WINAPI synthesizer_put_Voice( ISpeechSynthesizer *iface, IVoiceInformation *value ) static HRESULT WINAPI synthesizer_put_Voice( ISpeechSynthesizer *iface, IVoiceInformation *value )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment