- Wine-Commits - list.winehq.org

Piotr Caban : msvcrt: Pass correct buffer to locale_to_sname helper in create_locinfo.
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: master Commit: 092e68b2e0654affb8a13aa5f5222315726e6278 URL: https://gitlab.winehq.org/wine/wine/-/commit/092e68b2e0654affb8a13aa5f52223… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 21 16:46:41 2023 +0200 msvcrt: Pass correct buffer to locale_to_sname helper in create_locinfo. --- dlls/msvcrt/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 10682990bfc..7e94d7bf2a8 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1339,7 +1339,7 @@ static pthreadlocinfo create_locinfo(int category, locale_len[i] = p-locale; } } else { - locale_found = locale_to_sname(buf, &cp[i], &sname_match, wbuf, LOCALE_NAME_MAX_LENGTH); + locale_found = locale_to_sname(locale, &cp[i], &sname_match, wbuf, LOCALE_NAME_MAX_LENGTH); locale_sname[i] = wcsdup(wbuf); if(sname_match) { locale_name[i] = locale;

1 0

Billy Laws : ntdll: Add aarch64 DWARF register definitions.
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: master Commit: b7d6e0a4165037dee3b87ea61158996cee2add05 URL: https://gitlab.winehq.org/wine/wine/-/commit/b7d6e0a4165037dee3b87ea6115899… Author: Billy Laws <blaws05(a)gmail.com> Date: Fri Jul 21 12:45:19 2023 +0100 ntdll: Add aarch64 DWARF register definitions. --- dlls/ntdll/unix/dwarf.h | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/dwarf.h b/dlls/ntdll/unix/dwarf.h index d53bf321916..de9b1b02499 100644 --- a/dlls/ntdll/unix/dwarf.h +++ b/dlls/ntdll/unix/dwarf.h @@ -1048,7 +1048,31 @@ static void apply_frame_state( CONTEXT *context, struct frame_state *state, #define DW_REG_r15 0x0f #define DW_REG_rip 0x10 -#endif /* defined(__x86_64__) */ +#elif defined(__aarch64__) + +#define DW_REG_x19 19 +#define DW_REG_x20 20 +#define DW_REG_x21 21 +#define DW_REG_x22 22 +#define DW_REG_x23 23 +#define DW_REG_x24 24 +#define DW_REG_x25 25 +#define DW_REG_x26 26 +#define DW_REG_x27 27 +#define DW_REG_x28 28 +#define DW_REG_x29 29 +#define DW_REG_x30 30 +#define DW_REG_sp 31 +#define DW_REG_v8 72 +#define DW_REG_v9 73 +#define DW_REG_v10 74 +#define DW_REG_v11 75 +#define DW_REG_v12 76 +#define DW_REG_v13 77 +#define DW_REG_v14 78 +#define DW_REG_v15 79 + +#endif /* defined(__aarch64__) */ #define __ASM_CFI_STR(...) #__VA_ARGS__ #define __ASM_CFI_ESC(...) \

1 0

Maxim Karasev : include: Add more Kerberos cache info types.
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: master Commit: 9e09d0a7624c049a2043e81467ce00e0a473d1fb URL: https://gitlab.winehq.org/wine/wine/-/commit/9e09d0a7624c049a2043e81467ce00… Author: Maxim Karasev <mxkrsv(a)etersoft.ru> Date: Mon Jul 17 23:50:29 2023 +0300 include: Add more Kerberos cache info types. --- include/ntsecapi.h | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/include/ntsecapi.h b/include/ntsecapi.h index 2b78156bdfb..992aebf66d2 100644 --- a/include/ntsecapi.h +++ b/include/ntsecapi.h @@ -427,6 +427,54 @@ typedef struct _KERB_TICKET_CACHE_INFO ULONG TicketFlags; } KERB_TICKET_CACHE_INFO, *PKERB_TICKET_CACHE_INFO; +typedef struct _KERB_TICKET_CACHE_INFO_EX +{ + UNICODE_STRING ClientName; + UNICODE_STRING ClientRealm; + + UNICODE_STRING ServerName; + UNICODE_STRING ServerRealm; + LARGE_INTEGER StartTime; + LARGE_INTEGER EndTime; + LARGE_INTEGER RenewTime; + LONG EncryptionType; + ULONG TicketFlags; +} KERB_TICKET_CACHE_INFO_EX, *PKERB_TICKET_CACHE_INFO_EX; + +typedef struct _KERB_TICKET_CACHE_INFO_EX2 +{ + UNICODE_STRING ClientName; + UNICODE_STRING ClientRealm; + UNICODE_STRING ServerName; + UNICODE_STRING ServerRealm; + LARGE_INTEGER StartTime; + LARGE_INTEGER EndTime; + LARGE_INTEGER RenewTime; + LONG EncryptionType; + ULONG TicketFlags; + + ULONG SessionKeyType; + ULONG BranchId; +} KERB_TICKET_CACHE_INFO_EX2, *PKERB_TICKET_CACHE_INFO_EX2; + +typedef struct _KERB_TICKET_CACHE_INFO_EX3 +{ + UNICODE_STRING ClientName; + UNICODE_STRING ClientRealm; + UNICODE_STRING ServerName; + UNICODE_STRING ServerRealm; + LARGE_INTEGER StartTime; + LARGE_INTEGER EndTime; + LARGE_INTEGER RenewTime; + LONG EncryptionType; + ULONG TicketFlags; + ULONG SessionKeyType; + ULONG BranchId; + + ULONG CacheFlags; + UNICODE_STRING KdcCalled; +} KERB_TICKET_CACHE_INFO_EX3, *PKERB_TICKET_CACHE_INFO_EX3; + typedef struct _KERB_CRYPTO_KEY { LONG KeyType; @@ -474,6 +522,27 @@ typedef struct _KERB_QUERY_TKT_CACHE_RESPONSE KERB_TICKET_CACHE_INFO Tickets[ANYSIZE_ARRAY]; } KERB_QUERY_TKT_CACHE_RESPONSE, *PKERB_QUERY_TKT_CACHE_RESPONSE; +typedef struct _KERB_QUERY_TKT_CACHE_EX_RESPONSE +{ + KERB_PROTOCOL_MESSAGE_TYPE MessageType; + ULONG CountOfTickets; + KERB_TICKET_CACHE_INFO_EX Tickets[ANYSIZE_ARRAY]; +} KERB_QUERY_TKT_CACHE_EX_RESPONSE, *PKERB_QUERY_TKT_CACHE_EX_RESPONSE; + +typedef struct _KERB_QUERY_TKT_CACHE_EX2_RESPONSE +{ + KERB_PROTOCOL_MESSAGE_TYPE MessageType; + ULONG CountOfTickets; + KERB_TICKET_CACHE_INFO_EX2 Tickets[ANYSIZE_ARRAY]; +} KERB_QUERY_TKT_CACHE_EX2_RESPONSE, *PKERB_QUERY_TKT_CACHE_EX2_RESPONSE; + +typedef struct _KERB_QUERY_TKT_CACHE_EX3_RESPONSE +{ + KERB_PROTOCOL_MESSAGE_TYPE MessageType; + ULONG CountOfTickets; + KERB_TICKET_CACHE_INFO_EX3 Tickets[ANYSIZE_ARRAY]; +} KERB_QUERY_TKT_CACHE_EX3_RESPONSE, *PKERB_QUERY_TKT_CACHE_EX3_RESPONSE; + typedef struct _KERB_RETRIEVE_TKT_REQUEST { KERB_PROTOCOL_MESSAGE_TYPE MessageType;

1 0

Maxim Karasev : klist: Add a program that lists Kerberos tickets.
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: master Commit: c29dc0064ec9703f279de68592d89750a80b091f URL: https://gitlab.winehq.org/wine/wine/-/commit/c29dc0064ec9703f279de68592d897… Author: Maxim Karasev <mxkrsv(a)etersoft.ru> Date: Mon Jul 17 16:05:37 2023 +0300 klist: Add a program that lists Kerberos tickets. It's a clean-room reimplementation that mimics Windows 10 program's output format. It prints all the information that is available via KerbQueryTicketCacheMessage. Also tested to work on Windows if dynamically linked + built with winegcc. For further extension of the functionality, implementing KerbQueryTicketCacheEx{,2,3}Message is required. --- configure | 2 + configure.ac | 1 + po/ar.po | 50 +++++++- po/ast.po | 47 ++++++- po/bg.po | 43 ++++++- po/ca.po | 51 +++++++- po/cs.po | 50 +++++++- po/da.po | 50 +++++++- po/de.po | 51 +++++++- po/el.po | 40 +++++- po/en.po | 38 +++++- po/en_US.po | 38 +++++- po/eo.po | 46 ++++++- po/es.po | 51 +++++++- po/fa.po | 41 +++++- po/fi.po | 51 +++++++- po/fr.po | 51 +++++++- po/he.po | 46 ++++++- po/hi.po | 38 +++++- po/hr.po | 50 +++++++- po/hu.po | 50 +++++++- po/it.po | 50 +++++++- po/ja.po | 51 +++++++- po/ka.po | 51 +++++++- po/ko.po | 51 +++++++- po/lt.po | 51 +++++++- po/ml.po | 38 +++++- po/nb_NO.po | 50 +++++++- po/nl.po | 51 +++++++- po/or.po | 38 +++++- po/pa.po | 38 +++++- po/pl.po | 51 +++++++- po/pt_BR.po | 51 +++++++- po/pt_PT.po | 50 +++++++- po/rm.po | 38 +++++- po/ro.po | 50 +++++++- po/ru.po | 51 +++++++- po/si.po | 51 +++++++- po/sk.po | 46 ++++++- po/sl.po | 50 +++++++- po/sr_RS(a)cyrillic.po | 45 ++++++- po/sr_RS(a)latin.po | 45 ++++++- po/sv.po | 50 +++++++- po/ta.po | 42 ++++++- po/te.po | 38 +++++- po/th.po | 42 ++++++- po/tr.po | 51 +++++++- po/uk.po | 51 +++++++- po/wa.po | 40 +++++- po/wine.pot | 38 +++++- po/zh_CN.po | 51 +++++++- po/zh_TW.po | 51 +++++++- programs/klist/Makefile.in | 10 ++ programs/klist/klist.rc | 37 ++++++ programs/klist/main.c | 308 +++++++++++++++++++++++++++++++++++++++++++++ programs/klist/resources.h | 30 +++++ 56 files changed, 2671 insertions(+), 50 deletions(-)

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.3.258.
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: master Commit: eb5be00eb005a30df1b7f828269e3c8f002e1e82 URL: https://gitlab.winehq.org/wine/wine/-/commit/eb5be00eb005a30df1b7f828269e3c… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Jul 21 13:19:31 2023 +0200 winevulkan: Update to VK spec version 1.3.258. This does not enable VK_NV_device_generated_commands_compute because the extension will likely see an API breaking naming fix. --- dlls/winevulkan/loader_thunks.c | 62 ++++ dlls/winevulkan/loader_thunks.h | 42 +++ dlls/winevulkan/make_vulkan | 5 +- dlls/winevulkan/vulkan_thunks.c | 689 ++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 10 + dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 235 ++++++++++++-- 7 files changed, 1019 insertions(+), 26 deletions(-)

1 0

Shaun Ren : sapi: Implement ISpTTSEngineSite::Write.
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: master Commit: 0d09ab378e98b7b5da1ac78439fec09d1ce30994 URL: https://gitlab.winehq.org/wine/wine/-/commit/0d09ab378e98b7b5da1ac78439fec0… Author: Shaun Ren <sren(a)codeweavers.com> Date: Thu Jul 13 19:51:16 2023 -0400 sapi: Implement ISpTTSEngineSite::Write. --- dlls/sapi/tests/tts.c | 14 +++++++++++++- dlls/sapi/tts.c | 10 ++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c index c17e4f5b7c3..d2b98e6fbfb 100644 --- a/dlls/sapi/tests/tts.c +++ b/dlls/sapi/tests/tts.c @@ -206,12 +206,24 @@ static HRESULT WINAPI test_engine_Speak(ISpTTSEngine *iface, DWORD flags, REFGUI ISpTTSEngineSite *site) { struct test_engine *engine = impl_from_ISpTTSEngine(iface); + char *buf; + int i; + HRESULT hr; engine->flags = flags; engine->fmtid = *fmtid; copy_frag_list(frag_list, &engine->frag_list); engine->speak_called = TRUE; + buf = calloc(1, 22050 * 2 / 5); + for (i = 0; i < 5; i++) + { + hr = ISpTTSEngineSite_Write(site, buf, 22050 * 2 / 5, NULL); + ok(hr == S_OK, "got %#lx.\n", hr); + Sleep(100); + } + free(buf); + return S_OK; } @@ -509,7 +521,7 @@ static void test_spvoice(void) ok(!wcsncmp(test_text, test_engine.frag_list->pTextStart, wcslen(test_text)), "got %s.\n", wine_dbgstr_w(test_engine.frag_list->pTextStart)); ok(stream_num == 1, "got %lu.\n", stream_num); - ok(duration < 500, "took %lu ms.\n", duration); + ok(duration > 800 && duration < 3000, "took %lu ms.\n", duration); reset_engine_params(&test_engine); stream_num = 0xdeadbeef; diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index 9a022aca73c..acbef907646 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -27,6 +27,7 @@ #include "objbase.h" #include "sapiddk.h" +#include "sperror.h" #include "wine/debug.h" @@ -1211,9 +1212,14 @@ static DWORD WINAPI ttsenginesite_GetActions(ISpTTSEngineSite *iface) static HRESULT WINAPI ttsenginesite_Write(ISpTTSEngineSite *iface, const void *buf, ULONG cb, ULONG *cb_written) { - FIXME("(%p, %p, %ld, %p): stub.\n", iface, buf, cb, cb_written); + struct tts_engine_site *This = impl_from_ISpTTSEngineSite(iface); - return E_NOTIMPL; + TRACE("(%p, %p, %ld, %p).\n", iface, buf, cb, cb_written); + + if (!This->voice->output) + return SPERR_UNINITIALIZED; + + return ISpStreamFormat_Write(This->voice->output, buf, cb, cb_written); } static HRESULT WINAPI ttsenginesite_GetRate(ISpTTSEngineSite *iface, LONG *rate)

1 0

Shaun Ren : sapi: Return wait status in async_wait_queue_empty.
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: master Commit: b89c5361bbf7cd14b2e62194da4242069ee7a8c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/b89c5361bbf7cd14b2e62194da4242… Author: Shaun Ren <sren(a)codeweavers.com> Date: Thu Jul 20 17:24:56 2023 -0400 sapi: Return wait status in async_wait_queue_empty. --- dlls/sapi/async.c | 6 +++--- dlls/sapi/sapi_private.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/sapi/async.c b/dlls/sapi/async.c index 491ca657c1a..b02778ae7ba 100644 --- a/dlls/sapi/async.c +++ b/dlls/sapi/async.c @@ -171,8 +171,8 @@ HRESULT async_queue_task(struct async_queue *queue, struct async_task *task) return S_OK; } -void async_wait_queue_empty(struct async_queue *queue, DWORD timeout) +HRESULT async_wait_queue_empty(struct async_queue *queue, DWORD timeout) { - if (!queue->init) return; - WaitForSingleObject(queue->empty, timeout); + if (!queue->init) return WAIT_OBJECT_0; + return WaitForSingleObject(queue->empty, timeout); } diff --git a/dlls/sapi/sapi_private.h b/dlls/sapi/sapi_private.h index 94046926b2e..3cdb59b36a8 100644 --- a/dlls/sapi/sapi_private.h +++ b/dlls/sapi/sapi_private.h @@ -42,7 +42,7 @@ HRESULT async_start_queue(struct async_queue *queue); void async_empty_queue(struct async_queue *queue); void async_cancel_queue(struct async_queue *queue); HRESULT async_queue_task(struct async_queue *queue, struct async_task *task); -void async_wait_queue_empty(struct async_queue *queue, DWORD timeout); +HRESULT async_wait_queue_empty(struct async_queue *queue, DWORD timeout); HRESULT data_key_create( IUnknown *outer, REFIID iid, void **obj ); HRESULT file_stream_create( IUnknown *outer, REFIID iid, void **obj );

1 0

Shaun Ren : sapi: Implement ISpTTSEngineSite::GetActions/Rate/Volume.
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: master Commit: ee8c8f6533583f1603a292d0d33d939b815beb22 URL: https://gitlab.winehq.org/wine/wine/-/commit/ee8c8f6533583f1603a292d0d33d93… Author: Shaun Ren <sren(a)codeweavers.com> Date: Thu Jul 13 19:51:36 2023 -0400 sapi: Implement ISpTTSEngineSite::GetActions/Rate/Volume. --- dlls/sapi/tests/tts.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- dlls/sapi/tts.c | 51 +++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 87 insertions(+), 8 deletions(-) diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c index d2b98e6fbfb..86a9312a37b 100644 --- a/dlls/sapi/tests/tts.c +++ b/dlls/sapi/tests/tts.c @@ -112,6 +112,8 @@ struct test_engine DWORD flags; GUID fmtid; SPVTEXTFRAG *frag_list; + LONG rate; + USHORT volume; }; static void copy_frag_list(const SPVTEXTFRAG *frag_list, SPVTEXTFRAG **ret_frag_list) @@ -154,6 +156,8 @@ static void reset_engine_params(struct test_engine *engine) engine->speak_called = FALSE; engine->flags = 0xdeadbeef; memset(&engine->fmtid, 0xde, sizeof(engine->fmtid)); + engine->rate = 0xdeadbeef; + engine->volume = 0xbeef; for (frag = engine->frag_list; frag; frag = next) { @@ -206,6 +210,7 @@ static HRESULT WINAPI test_engine_Speak(ISpTTSEngine *iface, DWORD flags, REFGUI ISpTTSEngineSite *site) { struct test_engine *engine = impl_from_ISpTTSEngine(iface); + DWORD actions; char *buf; int i; HRESULT hr; @@ -215,11 +220,26 @@ static HRESULT WINAPI test_engine_Speak(ISpTTSEngine *iface, DWORD flags, REFGUI copy_frag_list(frag_list, &engine->frag_list); engine->speak_called = TRUE; + actions = ISpTTSEngineSite_GetActions(site); + ok(actions == (SPVES_CONTINUE | SPVES_RATE | SPVES_VOLUME), "got %#lx.\n", actions); + + hr = ISpTTSEngineSite_GetRate(site, &engine->rate); + ok(hr == S_OK, "got %#lx.\n", hr); + actions = ISpTTSEngineSite_GetActions(site); + ok(actions == (SPVES_CONTINUE | SPVES_VOLUME), "got %#lx.\n", actions); + + hr = ISpTTSEngineSite_GetVolume(site, &engine->volume); + ok(hr == S_OK, "got %#lx.\n", hr); + actions = ISpTTSEngineSite_GetActions(site); + ok(actions == SPVES_CONTINUE, "got %#lx.\n", actions); + buf = calloc(1, 22050 * 2 / 5); for (i = 0; i < 5; i++) { + if (ISpTTSEngineSite_GetActions(site) & SPVES_ABORT) + break; hr = ISpTTSEngineSite_Write(site, buf, 22050 * 2 / 5, NULL); - ok(hr == S_OK, "got %#lx.\n", hr); + ok(hr == S_OK || hr == SP_AUDIO_STOPPED, "got %#lx.\n", hr); Sleep(100); } free(buf); @@ -507,7 +527,10 @@ static void test_spvoice(void) ok(hr == S_OK, "got %#lx.\n", hr); ok(stream_num == 0xdeadbeef, "got %lu.\n", stream_num); - test_engine.speak_called = FALSE; + ISpVoice_SetRate(voice, 0); + ISpVoice_SetVolume(voice, 100); + + reset_engine_params(&test_engine); stream_num = 0xdeadbeef; start = GetTickCount(); hr = ISpVoice_Speak(voice, test_text, SPF_DEFAULT, &stream_num); @@ -520,6 +543,8 @@ static void test_spvoice(void) ok(test_engine.frag_list->ulTextLen == wcslen(test_text), "got %lu.\n", test_engine.frag_list->ulTextLen); ok(!wcsncmp(test_text, test_engine.frag_list->pTextStart, wcslen(test_text)), "got %s.\n", wine_dbgstr_w(test_engine.frag_list->pTextStart)); + ok(test_engine.rate == 0, "got %ld.\n", test_engine.rate); + ok(test_engine.volume == 100, "got %d.\n", test_engine.volume); ok(stream_num == 1, "got %lu.\n", stream_num); ok(duration > 800 && duration < 3000, "took %lu ms.\n", duration); @@ -540,6 +565,21 @@ static void test_spvoice(void) ok(test_engine.frag_list->ulTextLen == wcslen(test_text), "got %lu.\n", test_engine.frag_list->ulTextLen); ok(!wcsncmp(test_text, test_engine.frag_list->pTextStart, wcslen(test_text)), "got %s.\n", wine_dbgstr_w(test_engine.frag_list->pTextStart)); + ok(test_engine.rate == 0, "got %ld.\n", test_engine.rate); + ok(test_engine.volume == 100, "got %d.\n", test_engine.volume); + + Sleep(2000); + + reset_engine_params(&test_engine); + hr = ISpVoice_Speak(voice, test_text, SPF_DEFAULT | SPF_ASYNC, NULL); + ok(hr == S_OK, "got %#lx.\n", hr); + + Sleep(200); + start = GetTickCount(); + hr = ISpVoice_Speak(voice, NULL, SPF_PURGEBEFORESPEAK, NULL); + duration = GetTickCount() - start; + ok(hr == S_OK, "got %#lx.\n", hr); + ok(duration < 300, "took %lu ms.\n", duration); done: reset_engine_params(&test_engine); diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index acbef907646..432a021ea1c 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -45,6 +45,7 @@ struct speech_voice ISpStreamFormat *output; ISpTTSEngine *engine; LONG cur_stream_num; + DWORD actions; USHORT volume; LONG rate; struct async_queue queue; @@ -777,6 +778,13 @@ static void speak_proc(struct async_task *task) EnterCriticalSection(&This->cs); + if (This->actions & SPVES_ABORT) + { + LeaveCriticalSection(&This->cs); + hr = S_OK; + goto done; + } + if (FAILED(hr = set_output_format(This->output, This->engine, &fmtid, &wfx))) { LeaveCriticalSection(&This->cs); @@ -789,6 +797,8 @@ static void speak_proc(struct async_task *task) if (SUCCEEDED(ISpStreamFormat_QueryInterface(This->output, &IID_ISpAudio, (void **)&audio))) ISpAudio_SetState(audio, SPAS_RUN, 0); + This->actions = SPVES_RATE | SPVES_VOLUME; + LeaveCriticalSection(&This->cs); hr = ISpTTSEngine_Speak(engine, speak_task->flags, &fmtid, wfx, speak_task->frag_list, speak_task->site); @@ -847,6 +857,7 @@ static HRESULT WINAPI spvoice_Speak(ISpVoice *iface, const WCHAR *contents, DWOR EnterCriticalSection(&This->cs); + This->actions = SPVES_ABORT; if (This->output && SUCCEEDED(ISpStreamFormat_QueryInterface(This->output, &IID_ISpAudio, (void **)&audio))) { ISpAudio_SetState(audio, SPAS_CLOSED, 0); @@ -857,6 +868,10 @@ static HRESULT WINAPI spvoice_Speak(ISpVoice *iface, const WCHAR *contents, DWOR async_empty_queue(&This->queue); + EnterCriticalSection(&This->cs); + This->actions = SPVES_CONTINUE; + LeaveCriticalSection(&This->cs); + if (!contents || !*contents) return S_OK; } @@ -1007,6 +1022,7 @@ static HRESULT WINAPI spvoice_SetRate(ISpVoice *iface, LONG rate) EnterCriticalSection(&This->cs); This->rate = rate; + This->actions |= SPVES_RATE; LeaveCriticalSection(&This->cs); return S_OK; @@ -1036,6 +1052,7 @@ static HRESULT WINAPI spvoice_SetVolume(ISpVoice *iface, USHORT volume) EnterCriticalSection(&This->cs); This->volume = volume; + This->actions |= SPVES_VOLUME; LeaveCriticalSection(&This->cs); return S_OK; @@ -1205,9 +1222,16 @@ static HRESULT WINAPI ttsenginesite_GetEventInterest(ISpTTSEngineSite *iface, UL static DWORD WINAPI ttsenginesite_GetActions(ISpTTSEngineSite *iface) { - FIXME("(%p): stub.\n", iface); + struct tts_engine_site *This = impl_from_ISpTTSEngineSite(iface); + DWORD actions; + + TRACE("(%p).\n", iface); + + EnterCriticalSection(&This->voice->cs); + actions = This->voice->actions; + LeaveCriticalSection(&This->voice->cs); - return SPVES_CONTINUE; + return actions; } static HRESULT WINAPI ttsenginesite_Write(ISpTTSEngineSite *iface, const void *buf, ULONG cb, ULONG *cb_written) @@ -1224,16 +1248,30 @@ static HRESULT WINAPI ttsenginesite_Write(ISpTTSEngineSite *iface, const void *b static HRESULT WINAPI ttsenginesite_GetRate(ISpTTSEngineSite *iface, LONG *rate) { - FIXME("(%p, %p): stub.\n", iface, rate); + struct tts_engine_site *This = impl_from_ISpTTSEngineSite(iface); - return E_NOTIMPL; + TRACE("(%p, %p).\n", iface, rate); + + EnterCriticalSection(&This->voice->cs); + *rate = This->voice->rate; + This->voice->actions &= ~SPVES_RATE; + LeaveCriticalSection(&This->voice->cs); + + return S_OK; } static HRESULT WINAPI ttsenginesite_GetVolume(ISpTTSEngineSite *iface, USHORT *volume) { - FIXME("(%p, %p): stub.\n", iface, volume); + struct tts_engine_site *This = impl_from_ISpTTSEngineSite(iface); - return E_NOTIMPL; + TRACE("(%p, %p).\n", iface, volume); + + EnterCriticalSection(&This->voice->cs); + *volume = This->voice->volume; + This->voice->actions &= ~SPVES_VOLUME; + LeaveCriticalSection(&This->voice->cs); + + return S_OK; } static HRESULT WINAPI ttsenginesite_GetSkipInfo(ISpTTSEngineSite *iface, SPVSKIPTYPE *type, LONG *skip_count) @@ -1351,6 +1389,7 @@ HRESULT speech_voice_create(IUnknown *outer, REFIID iid, void **obj) This->output = NULL; This->engine = NULL; This->cur_stream_num = 0; + This->actions = SPVES_CONTINUE; This->volume = 100; This->rate = 0; memset(&This->queue, 0, sizeof(This->queue));

1 0

Shaun Ren : sapi: Implement ISpVoice::WaitUntilDone.
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: master Commit: 61ad9174e28530b9e31daf7683ce17dfa68287e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/61ad9174e28530b9e31daf7683ce17… Author: Shaun Ren <sren(a)codeweavers.com> Date: Thu Jul 20 17:27:12 2023 -0400 sapi: Implement ISpVoice::WaitUntilDone. --- dlls/sapi/tests/tts.c | 17 ++++++++++++++--- dlls/sapi/tts.c | 11 +++++++++-- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c index 86a9312a37b..39f62ac551e 100644 --- a/dlls/sapi/tests/tts.c +++ b/dlls/sapi/tests/tts.c @@ -548,6 +548,12 @@ static void test_spvoice(void) ok(stream_num == 1, "got %lu.\n", stream_num); ok(duration > 800 && duration < 3000, "took %lu ms.\n", duration); + start = GetTickCount(); + hr = ISpVoice_WaitUntilDone(voice, INFINITE); + duration = GetTickCount() - start; + ok(hr == S_OK, "got %#lx.\n", hr); + ok(duration < 200, "took %lu ms.\n", duration); + reset_engine_params(&test_engine); stream_num = 0xdeadbeef; start = GetTickCount(); @@ -557,7 +563,14 @@ static void test_spvoice(void) todo_wine ok(stream_num == 1, "got %lu.\n", stream_num); ok(duration < 500, "took %lu ms.\n", duration); - Sleep(200); + hr = ISpVoice_WaitUntilDone(voice, 100); + ok(hr == S_FALSE, "got %#lx.\n", hr); + + hr = ISpVoice_WaitUntilDone(voice, INFINITE); + duration = GetTickCount() - start; + ok(hr == S_OK, "got %#lx.\n", hr); + ok(duration > 800 && duration < 3000, "took %lu ms.\n", duration); + ok(test_engine.speak_called, "ISpTTSEngine::Speak was not called.\n"); ok(test_engine.flags == SPF_NLP_SPEAK_PUNC, "got %#lx.\n", test_engine.flags); ok(test_engine.frag_list != NULL, "frag_list is NULL.\n"); @@ -568,8 +581,6 @@ static void test_spvoice(void) ok(test_engine.rate == 0, "got %ld.\n", test_engine.rate); ok(test_engine.volume == 100, "got %d.\n", test_engine.volume); - Sleep(2000); - reset_engine_params(&test_engine); hr = ISpVoice_Speak(voice, test_text, SPF_DEFAULT | SPF_ASYNC, NULL); ok(hr == S_OK, "got %#lx.\n", hr); diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index 432a021ea1c..4763ef9f324 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -1073,9 +1073,16 @@ static HRESULT WINAPI spvoice_GetVolume(ISpVoice *iface, USHORT *volume) static HRESULT WINAPI spvoice_WaitUntilDone(ISpVoice *iface, ULONG timeout) { - FIXME("(%p, %ld): stub.\n", iface, timeout); + struct speech_voice *This = impl_from_ISpVoice(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("(%p, %ld).\n", iface, timeout); + + hr = async_wait_queue_empty(&This->queue, timeout); + + if (hr == WAIT_OBJECT_0) return S_OK; + else if (hr == WAIT_TIMEOUT) return S_FALSE; + return hr; } static HRESULT WINAPI spvoice_SetSyncSpeakTimeout(ISpVoice *iface, ULONG timeout)

1 0

Shaun Ren : sapi: Implement ISpVoice::Speak speak_proc.
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: master Commit: 303bdc2e4bd9f6b0b1056a3607abc236aa63bbf0 URL: https://gitlab.winehq.org/wine/wine/-/commit/303bdc2e4bd9f6b0b1056a3607abc2… Author: Shaun Ren <sren(a)codeweavers.com> Date: Wed Jul 19 13:28:21 2023 -0400 sapi: Implement ISpVoice::Speak speak_proc. --- dlls/sapi/tests/tts.c | 314 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/sapi/tts.c | 80 ++++++++++++- 2 files changed, 391 insertions(+), 3 deletions(-)

1 0