July 2023 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : d3d11: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: 8f360d743497dc46eadd11505a75a57e57dd114e URL: https://gitlab.winehq.org/wine/wine/-/commit/8f360d743497dc46eadd11505a75a5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 12 17:41:25 2023 +1000 d3d11: Remove DECLSPEC_HIDDEN usage. --- dlls/d3d11/d3d11_private.h | 174 ++++++++++++++++++++++----------------------- 1 file changed, 87 insertions(+), 87 deletions(-)

1 0

Alistair Leslie-Hughes : d3dx10_43: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: f65705df9d19efdfdd3e4ae3edca961470dcc1b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/f65705df9d19efdfdd3e4ae3edca96… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 12 17:41:25 2023 +1000 d3dx10_43: Remove DECLSPEC_HIDDEN usage. --- dlls/d3dx10_43/dxhelpers.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx10_43/dxhelpers.h b/dlls/d3dx10_43/dxhelpers.h index 5d0cdb54c59..50d509973cd 100644 --- a/dlls/d3dx10_43/dxhelpers.h +++ b/dlls/d3dx10_43/dxhelpers.h @@ -16,18 +16,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -extern HRESULT load_file(const WCHAR *path, void **data, DWORD *size) DECLSPEC_HIDDEN; +extern HRESULT load_file(const WCHAR *path, void **data, DWORD *size); extern HRESULT load_resourceA(HMODULE module, const char *resource, - void **data, DWORD *size) DECLSPEC_HIDDEN; + void **data, DWORD *size); extern HRESULT load_resourceW(HMODULE module, const WCHAR *resource, - void **data, DWORD *size) DECLSPEC_HIDDEN; + void **data, DWORD *size); -extern HRESULT get_image_info(const void *data, SIZE_T size, D3DX10_IMAGE_INFO *img_info) DECLSPEC_HIDDEN; +extern HRESULT get_image_info(const void *data, SIZE_T size, D3DX10_IMAGE_INFO *img_info); extern void init_load_info(const D3DX10_IMAGE_LOAD_INFO *load_info, - D3DX10_IMAGE_LOAD_INFO *out) DECLSPEC_HIDDEN; + D3DX10_IMAGE_LOAD_INFO *out); /* Returns array of D3D10_SUBRESOURCE_DATA structures followed by textures data. */ extern HRESULT load_texture_data(const void *data, SIZE_T size, D3DX10_IMAGE_LOAD_INFO *load_info, - D3D10_SUBRESOURCE_DATA **resource_data) DECLSPEC_HIDDEN; + D3D10_SUBRESOURCE_DATA **resource_data); extern HRESULT create_d3d_texture(ID3D10Device *device, D3DX10_IMAGE_LOAD_INFO *load_info, - D3D10_SUBRESOURCE_DATA *resource_data, ID3D10Resource **texture) DECLSPEC_HIDDEN; + D3D10_SUBRESOURCE_DATA *resource_data, ID3D10Resource **texture);

1 0

Alistair Leslie-Hughes : d2d1: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: 85a88076f84b86a7c7136c4e3131f97bee8df46a URL: https://gitlab.winehq.org/wine/wine/-/commit/85a88076f84b86a7c7136c4e3131f9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 12 17:41:25 2023 +1000 d2d1: Remove DECLSPEC_HIDDEN usage. --- dlls/d2d1/d2d1_private.h | 134 +++++++++++++++++++++++------------------------ 1 file changed, 67 insertions(+), 67 deletions(-)

1 0

Alistair Leslie-Hughes : ddraw: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: 964025e279db2dd9853df8a1eaa8dd18d9bcda57 URL: https://gitlab.winehq.org/wine/wine/-/commit/964025e279db2dd9853df8a1eaa8dd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 12 17:41:26 2023 +1000 ddraw: Remove DECLSPEC_HIDDEN usage. --- dlls/ddraw/ddraw_private.h | 138 ++++++++++++++++++++++----------------------- 1 file changed, 69 insertions(+), 69 deletions(-)

1 0

Alistair Leslie-Hughes : d3dx9_36: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: 36ef8327ac5bdfaba9200a86391d79ce575dee1d URL: https://gitlab.winehq.org/wine/wine/-/commit/36ef8327ac5bdfaba9200a86391d79… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 12 17:41:26 2023 +1000 d3dx9_36: Remove DECLSPEC_HIDDEN usage. --- dlls/d3dx9_36/d3dx9_private.h | 60 +++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index 34ce272de1a..5d8f5b332f8 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -72,8 +72,8 @@ struct d3dx_include_from_file ID3DXInclude ID3DXInclude_iface; }; -extern CRITICAL_SECTION from_file_mutex DECLSPEC_HIDDEN; -extern const struct ID3DXIncludeVtbl d3dx_include_from_file_vtbl DECLSPEC_HIDDEN; +extern CRITICAL_SECTION from_file_mutex; +extern const struct ID3DXIncludeVtbl d3dx_include_from_file_vtbl; static inline BOOL is_conversion_from_supported(const struct pixel_format_desc *format) { @@ -91,50 +91,50 @@ static inline BOOL is_conversion_to_supported(const struct pixel_format_desc *fo return !!format->from_rgba; } -HRESULT map_view_of_file(const WCHAR *filename, void **buffer, DWORD *length) DECLSPEC_HIDDEN; -HRESULT load_resource_into_memory(HMODULE module, HRSRC resinfo, void **buffer, DWORD *length) DECLSPEC_HIDDEN; +HRESULT map_view_of_file(const WCHAR *filename, void **buffer, DWORD *length); +HRESULT load_resource_into_memory(HMODULE module, HRSRC resinfo, void **buffer, DWORD *length); -HRESULT write_buffer_to_file(const WCHAR *filename, ID3DXBuffer *buffer) DECLSPEC_HIDDEN; +HRESULT write_buffer_to_file(const WCHAR *filename, ID3DXBuffer *buffer); -const struct pixel_format_desc *get_format_info(D3DFORMAT format) DECLSPEC_HIDDEN; -const struct pixel_format_desc *get_format_info_idx(int idx) DECLSPEC_HIDDEN; +const struct pixel_format_desc *get_format_info(D3DFORMAT format); +const struct pixel_format_desc *get_format_info_idx(int idx); void format_to_vec4(const struct pixel_format_desc *format, const BYTE *src, struct vec4 *dst); void copy_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pitch, BYTE *dst, UINT dst_row_pitch, UINT dst_slice_pitch, const struct volume *size, - const struct pixel_format_desc *format) DECLSPEC_HIDDEN; + const struct pixel_format_desc *format); void convert_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pitch, const struct volume *src_size, const struct pixel_format_desc *src_format, BYTE *dst, UINT dst_row_pitch, UINT dst_slice_pitch, const struct volume *dst_size, - const struct pixel_format_desc *dst_format, D3DCOLOR color_key, const PALETTEENTRY *palette) DECLSPEC_HIDDEN; + const struct pixel_format_desc *dst_format, D3DCOLOR color_key, const PALETTEENTRY *palette); void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pitch, const struct volume *src_size, const struct pixel_format_desc *src_format, BYTE *dst, UINT dst_row_pitch, UINT dst_slice_pitch, const struct volume *dst_size, - const struct pixel_format_desc *dst_format, D3DCOLOR color_key, const PALETTEENTRY *palette) DECLSPEC_HIDDEN; + const struct pixel_format_desc *dst_format, D3DCOLOR color_key, const PALETTEENTRY *palette); HRESULT load_texture_from_dds(IDirect3DTexture9 *texture, const void *src_data, const PALETTEENTRY *palette, DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info, unsigned int skip_levels, - unsigned int *loaded_miplevels) DECLSPEC_HIDDEN; + unsigned int *loaded_miplevels); HRESULT load_cube_texture_from_dds(IDirect3DCubeTexture9 *cube_texture, const void *src_data, - const PALETTEENTRY *palette, DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info) DECLSPEC_HIDDEN; + const PALETTEENTRY *palette, DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info); HRESULT load_volume_from_dds(IDirect3DVolume9 *dst_volume, const PALETTEENTRY *dst_palette, const D3DBOX *dst_box, const void *src_data, const D3DBOX *src_box, DWORD filter, D3DCOLOR color_key, - const D3DXIMAGE_INFO *src_info) DECLSPEC_HIDDEN; + const D3DXIMAGE_INFO *src_info); HRESULT load_volume_texture_from_dds(IDirect3DVolumeTexture9 *volume_texture, const void *src_data, - const PALETTEENTRY *palette, DWORD filter, DWORD color_key, const D3DXIMAGE_INFO *src_info) DECLSPEC_HIDDEN; + const PALETTEENTRY *palette, DWORD filter, DWORD color_key, const D3DXIMAGE_INFO *src_info); HRESULT lock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLOCKED_RECT *lock, - IDirect3DSurface9 **temp_surface, BOOL write) DECLSPEC_HIDDEN; + IDirect3DSurface9 **temp_surface, BOOL write); HRESULT unlock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, - IDirect3DSurface9 *temp_surface, BOOL update) DECLSPEC_HIDDEN; + IDirect3DSurface9 *temp_surface, BOOL update); -unsigned short float_32_to_16(const float in) DECLSPEC_HIDDEN; -float float_16_to_32(const unsigned short in) DECLSPEC_HIDDEN; +unsigned short float_32_to_16(const float in); +float float_16_to_32(const unsigned short in); /* debug helpers */ -const char *debug_d3dxparameter_class(D3DXPARAMETER_CLASS c) DECLSPEC_HIDDEN; -const char *debug_d3dxparameter_type(D3DXPARAMETER_TYPE t) DECLSPEC_HIDDEN; -const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) DECLSPEC_HIDDEN; +const char *debug_d3dxparameter_class(D3DXPARAMETER_CLASS c); +const char *debug_d3dxparameter_type(D3DXPARAMETER_TYPE t); +const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r); /* parameter type conversion helpers */ static inline BOOL get_bool(D3DXPARAMETER_TYPE type, const void *data) @@ -396,10 +396,10 @@ struct d3dx_parameters_store unsigned int full_name_tmp_size; }; -HRESULT d3dx_init_parameters_store(struct d3dx_parameters_store *store, unsigned int count) DECLSPEC_HIDDEN; -void d3dx_parameters_store_cleanup(struct d3dx_parameters_store *store) DECLSPEC_HIDDEN; +HRESULT d3dx_init_parameters_store(struct d3dx_parameters_store *store, unsigned int count); +void d3dx_parameters_store_cleanup(struct d3dx_parameters_store *store); struct d3dx_parameter *get_parameter_by_name(struct d3dx_parameters_store *store, - struct d3dx_parameter *parameter, const char *name) DECLSPEC_HIDDEN; + struct d3dx_parameter *parameter, const char *name); #define SET_D3D_STATE_(manager, device, method, ...) (manager ? manager->lpVtbl->method(manager, __VA_ARGS__) \ : device->lpVtbl->method(device, __VA_ARGS__)) @@ -408,13 +408,13 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx_parameters_store *store HRESULT d3dx_create_param_eval(struct d3dx_parameters_store *parameters, void *byte_code, unsigned int byte_code_size, D3DXPARAMETER_TYPE type, struct d3dx_param_eval **peval, ULONG64 *version_counter, - const char **skip_constants, unsigned int skip_constants_count) DECLSPEC_HIDDEN; -void d3dx_free_param_eval(struct d3dx_param_eval *peval) DECLSPEC_HIDDEN; + const char **skip_constants, unsigned int skip_constants_count); +void d3dx_free_param_eval(struct d3dx_param_eval *peval); HRESULT d3dx_evaluate_parameter(struct d3dx_param_eval *peval, - const struct d3dx_parameter *param, void *param_value) DECLSPEC_HIDDEN; + const struct d3dx_parameter *param, void *param_value); HRESULT d3dx_param_eval_set_shader_constants(ID3DXEffectStateManager *manager, struct IDirect3DDevice9 *device, - struct d3dx_param_eval *peval, BOOL update_all) DECLSPEC_HIDDEN; -BOOL is_param_eval_input_dirty(struct d3dx_param_eval *peval, ULONG64 update_version) DECLSPEC_HIDDEN; + struct d3dx_param_eval *peval, BOOL update_all); +BOOL is_param_eval_input_dirty(struct d3dx_param_eval *peval, ULONG64 update_version); struct ctab_constant { D3DXCONSTANT_DESC desc; @@ -423,6 +423,6 @@ struct ctab_constant { }; const struct ctab_constant *d3dx_shader_get_ctab_constant(ID3DXConstantTable *iface, - D3DXHANDLE constant) DECLSPEC_HIDDEN; + D3DXHANDLE constant); #endif /* __WINE_D3DX9_PRIVATE_H */

1 0

Shaun Ren : include: Fix ISpTTSEngineSite::GetActions return type.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: 5f3dee9702f965c1906f7b466fd18451a0a1a87b URL: https://gitlab.winehq.org/wine/wine/-/commit/5f3dee9702f965c1906f7b466fd184… Author: Shaun Ren <sren(a)codeweavers.com> Date: Wed Jun 28 02:10:48 2023 -0400 include: Fix ISpTTSEngineSite::GetActions return type. --- include/sapiddk.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/sapiddk.idl b/include/sapiddk.idl index 46aebbb9a12..8f9abf4e117 100644 --- a/include/sapiddk.idl +++ b/include/sapiddk.idl @@ -72,7 +72,7 @@ typedef enum SPVESACTIONS ] interface ISpTTSEngineSite : ISpEventSink { - HRESULT GetActions(); + DWORD GetActions(); HRESULT Write([in] const void *pBuff, [in] ULONG cb, [out] ULONG *pcbWritten);

1 0

Shaun Ren : sapi: Handle queue not initialized in async_empty_queue.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: 4bfd0a2370a24c2038e03454ca6511534aac0d20 URL: https://gitlab.winehq.org/wine/wine/-/commit/4bfd0a2370a24c2038e03454ca6511… Author: Shaun Ren <sren(a)codeweavers.com> Date: Wed Jul 19 12:46:04 2023 -0400 sapi: Handle queue not initialized in async_empty_queue. --- dlls/sapi/async.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/sapi/async.c b/dlls/sapi/async.c index 57ae89ad723..e09c6c64f9a 100644 --- a/dlls/sapi/async.c +++ b/dlls/sapi/async.c @@ -52,6 +52,8 @@ void async_empty_queue(struct async_queue *queue) { struct async_task *task, *next; + if (!queue->init) return; + EnterCriticalSection(&queue->cs); LIST_FOR_EACH_ENTRY_SAFE(task, next, &queue->tasks, struct async_task, entry) {

1 0

Shaun Ren : sapi: Reset empty event after queuing a task in async_queue_task.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: 9d407a111781548db23d1a38ca61fd6b8f50fdf8 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d407a111781548db23d1a38ca61fd… Author: Shaun Ren <sren(a)codeweavers.com> Date: Wed Jul 19 12:47:00 2023 -0400 sapi: Reset empty event after queuing a task in async_queue_task. --- dlls/sapi/async.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/sapi/async.c b/dlls/sapi/async.c index e09c6c64f9a..491ca657c1a 100644 --- a/dlls/sapi/async.c +++ b/dlls/sapi/async.c @@ -165,6 +165,7 @@ HRESULT async_queue_task(struct async_queue *queue, struct async_task *task) list_add_tail(&queue->tasks, &task->entry); LeaveCriticalSection(&queue->cs); + ResetEvent(queue->empty); SetEvent(queue->wait); return S_OK;

1 0

Shaun Ren : sapi: Implement ISpVoice::Speak SPF_PURGEBEFORESPEAK.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: f9dff8a6fa759cd1a2d9f32dcafe9588e80a5469 URL: https://gitlab.winehq.org/wine/wine/-/commit/f9dff8a6fa759cd1a2d9f32dcafe95… Author: Shaun Ren <sren(a)codeweavers.com> Date: Wed Jul 19 12:57:49 2023 -0400 sapi: Implement ISpVoice::Speak SPF_PURGEBEFORESPEAK. Also introduce an async task queue. --- dlls/sapi/tests/tts.c | 9 +++++++++ dlls/sapi/tts.c | 37 +++++++++++++++++++++++++++++++++++-- 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c index 534e5842f39..586869aa33e 100644 --- a/dlls/sapi/tests/tts.c +++ b/dlls/sapi/tests/tts.c @@ -102,6 +102,7 @@ static void test_spvoice(void) WCHAR *token_id = NULL, *default_token_id = NULL; LONG rate; USHORT volume; + ULONG stream_num; HRESULT hr; if (waveOutGetNumDevs() == 0) { @@ -204,6 +205,14 @@ static void test_spvoice(void) hr = ISpVoice_SetVolume(voice, 101); ok(hr == E_INVALIDARG, "got %#lx.\n", hr); + hr = ISpVoice_Speak(voice, NULL, SPF_PURGEBEFORESPEAK, NULL); + ok(hr == S_OK, "got %#lx.\n", hr); + + stream_num = 0xdeadbeef; + hr = ISpVoice_Speak(voice, NULL, SPF_PURGEBEFORESPEAK, &stream_num); + ok(hr == S_OK, "got %#lx.\n", hr); + ok(stream_num == 0xdeadbeef, "got %lu.\n", stream_num); + ISpVoice_Release(voice); ISpMMSysAudio_Release(audio_out); } diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index b0b3bbd2eff..98d74a11f2d 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -45,6 +45,7 @@ struct speech_voice ISpTTSEngine *engine; USHORT volume; LONG rate; + struct async_queue queue; CRITICAL_SECTION cs; }; @@ -143,6 +144,7 @@ static ULONG WINAPI speech_voice_Release(ISpeechVoice *iface) if (!ref) { + async_cancel_queue(&This->queue); if (This->output) ISpStreamFormat_Release(This->output); if (This->engine) ISpTTSEngine_Release(This->engine); DeleteCriticalSection(&This->cs); @@ -697,9 +699,39 @@ static HRESULT WINAPI spvoice_GetVoice(ISpVoice *iface, ISpObjectToken **token) return hr; } -static HRESULT WINAPI spvoice_Speak(ISpVoice *iface, const WCHAR *contents, DWORD flags, ULONG *number) +static HRESULT WINAPI spvoice_Speak(ISpVoice *iface, const WCHAR *contents, DWORD flags, ULONG *stream_num_out) { - FIXME("(%p, %p, %#lx, %p): stub.\n", iface, contents, flags, number); + struct speech_voice *This = impl_from_ISpVoice(iface); + + FIXME("(%p, %p, %#lx, %p): semi-stub.\n", iface, contents, flags, stream_num_out); + + if (flags & ~SPF_PURGEBEFORESPEAK) + { + FIXME("flags %#lx not implemented.\n", flags & ~SPF_PURGEBEFORESPEAK); + return E_NOTIMPL; + } + + if (flags & SPF_PURGEBEFORESPEAK) + { + ISpAudio *audio; + + EnterCriticalSection(&This->cs); + + if (This->output && SUCCEEDED(ISpStreamFormat_QueryInterface(This->output, &IID_ISpAudio, (void **)&audio))) + { + ISpAudio_SetState(audio, SPAS_CLOSED, 0); + ISpAudio_Release(audio); + } + + LeaveCriticalSection(&This->cs); + + async_empty_queue(&This->queue); + + if (!contents || !*contents) + return S_OK; + } + else if (!contents) + return E_POINTER; return E_NOTIMPL; } @@ -962,6 +994,7 @@ HRESULT speech_voice_create(IUnknown *outer, REFIID iid, void **obj) This->engine = NULL; This->volume = 100; This->rate = 0; + memset(&This->queue, 0, sizeof(This->queue)); InitializeCriticalSection(&This->cs);

1 0

Shaun Ren : sapi: Partially implement ISpVoice::Speak SPF_ASYNC.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: a234bbc748a0e02b00f059e739dc3ca8135264a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/a234bbc748a0e02b00f059e739dc3c… Author: Shaun Ren <sren(a)codeweavers.com> Date: Wed Jul 19 13:49:09 2023 -0400 sapi: Partially implement ISpVoice::Speak SPF_ASYNC. --- dlls/sapi/tts.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 72 insertions(+), 3 deletions(-) diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index 98d74a11f2d..bc4a225a3f5 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -699,15 +699,34 @@ static HRESULT WINAPI spvoice_GetVoice(ISpVoice *iface, ISpObjectToken **token) return hr; } +struct speak_task +{ + struct async_task task; + + struct speech_voice *voice; + SPVTEXTFRAG *frag_list; + DWORD flags; +}; + +static void speak_proc(struct async_task *task) +{ + FIXME("(%p): stub.\n", task); +} + static HRESULT WINAPI spvoice_Speak(ISpVoice *iface, const WCHAR *contents, DWORD flags, ULONG *stream_num_out) { struct speech_voice *This = impl_from_ISpVoice(iface); + SPVTEXTFRAG *frag; + struct speak_task *speak_task = NULL; + size_t contents_len, contents_size; + HRESULT hr; FIXME("(%p, %p, %#lx, %p): semi-stub.\n", iface, contents, flags, stream_num_out); - if (flags & ~SPF_PURGEBEFORESPEAK) + flags &= ~SPF_IS_NOT_XML; + if (flags & ~(SPF_ASYNC | SPF_PURGEBEFORESPEAK | SPF_NLP_SPEAK_PUNC)) { - FIXME("flags %#lx not implemented.\n", flags & ~SPF_PURGEBEFORESPEAK); + FIXME("flags %#lx not implemented.\n", flags & ~(SPF_ASYNC | SPF_PURGEBEFORESPEAK | SPF_NLP_SPEAK_PUNC)); return E_NOTIMPL; } @@ -733,7 +752,57 @@ static HRESULT WINAPI spvoice_Speak(ISpVoice *iface, const WCHAR *contents, DWOR else if (!contents) return E_POINTER; - return E_NOTIMPL; + if (!(flags & SPF_ASYNC)) + { + FIXME("Synchronous Speak not implemented.\n"); + return E_NOTIMPL; + } + + contents_len = wcslen(contents); + contents_size = sizeof(WCHAR) * (contents_len + 1); + + if (!This->output) + { + /* Create a new output stream with the default output. */ + if (FAILED(hr = ISpVoice_SetOutput(iface, NULL, TRUE))) + return hr; + } + + if (!This->engine) + { + /* Create a new engine with the default voice. */ + if (FAILED(hr = ISpVoice_SetVoice(iface, NULL))) + return hr; + } + + if (!(frag = heap_alloc(sizeof(*frag) + contents_size))) + return E_OUTOFMEMORY; + memset(frag, 0, sizeof(*frag)); + memcpy(frag + 1, contents, contents_size); + frag->State.eAction = SPVA_Speak; + frag->State.Volume = 100; + frag->pTextStart = (WCHAR *)(frag + 1); + frag->ulTextLen = contents_len; + frag->ulTextSrcOffset = 0; + speak_task = heap_alloc(sizeof(*speak_task)); + + speak_task->task.proc = speak_proc; + speak_task->voice = This; + speak_task->frag_list = frag; + speak_task->flags = flags & SPF_NLP_SPEAK_PUNC; + + if (FAILED(hr = async_queue_task(&This->queue, (struct async_task *)speak_task))) + { + WARN("Failed to queue task: %#lx.\n", hr); + goto fail; + } + + if (flags & SPF_ASYNC) + return S_OK; +fail: + heap_free(frag); + heap_free(speak_task); + return hr; } static HRESULT WINAPI spvoice_SpeakStream(ISpVoice *iface, IStream *stream, DWORD flags, ULONG *number)

1 0