- Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll/tests: Run dynamic unwind tests on ARM platforms.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: ec5e33cad6e30b9e6e3fd7b048c19c476f6c75ce URL: https://gitlab.winehq.org/wine/wine/-/commit/ec5e33cad6e30b9e6e3fd7b048c19c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 19 14:03:48 2024 +0100 ntdll/tests: Run dynamic unwind tests on ARM platforms. --- dlls/ntdll/tests/unwind.c | 89 +++++++++++++++++++++++++---------------------- 1 file changed, 48 insertions(+), 41 deletions(-)

1 0

Alexandre Julliard : ntdll/tests: Run RtlVirtualUnwind tests on ARM64EC.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: f0584966c252cfe2a84c5f0ca7858e9063bc034d URL: https://gitlab.winehq.org/wine/wine/-/commit/f0584966c252cfe2a84c5f0ca7858e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 19 17:16:30 2024 +0100 ntdll/tests: Run RtlVirtualUnwind tests on ARM64EC. --- dlls/ntdll/tests/unwind.c | 295 +++++++++++++++++++++++++++------------------- 1 file changed, 171 insertions(+), 124 deletions(-)

1 0

Eric Pouech : dbghelp: Don't expected a fixed number of substreams in DBI header (PDB).
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: 552bc893e17a0e046c2f598e0f18dc31850a8199 URL: https://gitlab.winehq.org/wine/wine/-/commit/552bc893e17a0e046c2f598e0f18dc… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Dec 12 08:34:10 2023 +0100 dbghelp: Don't expected a fixed number of substreams in DBI header (PDB). MSC no longer emits a fixed number of substreams (depending on version of PDB file), but can emit less. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/msc.c | 30 ++++++++++-------------------- dlls/dbghelp/tests/path.c | 6 +++--- include/wine/mscvpdb.h | 25 ------------------------- 3 files changed, 13 insertions(+), 48 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 26e921f7a0f..12ed93380b6 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -3823,7 +3823,8 @@ static BOOL pdb_process_internal(const struct process* pcs, struct codeview_type_parse ipi_ctp; BYTE* file; int header_size = 0; - PDB_STREAM_INDEXES* psi; + unsigned num_sub_streams; + const unsigned short* sub_streams; BOOL ipi_ok; pdb_convert_symbols_header(&symbols, &header_size, symbols_image); @@ -3839,25 +3840,14 @@ static BOOL pdb_process_internal(const struct process* pcs, symbols.version, symbols.version); } - switch (symbols.stream_index_size) - { - case 0: - case sizeof(PDB_STREAM_INDEXES_OLD): - /* no fpo ext stream in this case */ - break; - case sizeof(PDB_STREAM_INDEXES): - case sizeof(PDB_STREAM_INDEXES) + 2: - psi = (PDB_STREAM_INDEXES*)((const char*)symbols_image + sizeof(PDB_SYMBOLS) + - symbols.module_size + symbols.sectcontrib_size + - symbols.segmap_size + symbols.srcmodule_size + - symbols.pdbimport_size + symbols.unknown2_size); - pdb_file->fpoext_stream = psi->FPO_EXT; - break; - default: - FIXME("Unknown PDB_STREAM_INDEXES size (%u)\n", symbols.stream_index_size); - pdb_free(symbols_image); - return FALSE; - } + num_sub_streams = symbols.stream_index_size / sizeof(sub_streams[0]); + sub_streams = (const unsigned short*)((const char*)symbols_image + sizeof(PDB_SYMBOLS) + + symbols.module_size + symbols.sectcontrib_size + + symbols.segmap_size + symbols.srcmodule_size + + symbols.pdbimport_size + symbols.unknown2_size); + if (PDB_SIDX_FPO < num_sub_streams) + pdb_file->fpoext_stream = sub_streams[PDB_SIDX_FPO]; + files_image = pdb_read_strings(pdb_file); pdb_process_symbol_imports(pcs, msc_dbg, &symbols, symbols_image, image, diff --git a/dlls/dbghelp/tests/path.c b/dlls/dbghelp/tests/path.c index fb7c103d845..781df3dd771 100644 --- a/dlls/dbghelp/tests/path.c +++ b/dlls/dbghelp/tests/path.c @@ -587,7 +587,7 @@ static BOOL create_test_pdb_ds(const WCHAR* pdb_name, const GUID* guid, DWORD ag .hash_records_size = 0, .unknown = 0 }; - PDB_STREAM_INDEXES pddt = {0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, }; + unsigned short dbi_substream[] = {0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, }; char unknown[] = { 0xfe, 0xef, 0xfe, 0xef, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, @@ -650,7 +650,7 @@ static BOOL create_test_pdb_ds(const WCHAR* pdb_name, const GUID* guid, DWORD ag DBI.unknown2_size = stream->size - mark; mark = stream->size; - pdb_append_to_stream(stream, &pddt, sizeof(pddt)); + pdb_append_to_stream(stream, dbi_substream, sizeof(dbi_substream)); DBI.stream_index_size = stream->size - mark; stream = pdb_add_stream(&pdb, NULL, &IPI, sizeof(IPI)); /* always stream #4 */ @@ -658,7 +658,7 @@ static BOOL create_test_pdb_ds(const WCHAR* pdb_name, const GUID* guid, DWORD ag stream = pdb_add_stream(&pdb, &DBI.global_hash_stream, &GHASH, sizeof(GHASH)); stream = pdb_add_stream(&pdb, &DBI.gsym_stream, NULL, 0); - stream = pdb_add_stream(&pdb, &pddt.sections_stream, &ro_section, sizeof(ro_section)); + stream = pdb_add_stream(&pdb, &dbi_substream[PDB_SIDX_SECTIONS], &ro_section, sizeof(ro_section)); hfile = CreateFileW(pdb_name, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, 0); ok(hfile != INVALID_HANDLE_VALUE, "failed to create %ls err %lu\n", pdb_name, GetLastError()); diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index c0f9c70a4e1..08353f11811 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -2576,31 +2576,6 @@ enum PDB_STREAM_INDEX PDB_SIDX_FPOEXT = 9 }; -typedef struct -{ - unsigned short FPO; - unsigned short unk0; - unsigned short unk1; - unsigned short unk2; - unsigned short unk3; - unsigned short sections_stream; -} PDB_STREAM_INDEXES_OLD; - -typedef struct -{ - unsigned short FPO; - unsigned short unk0; - unsigned short unk1; - unsigned short unk2; - unsigned short unk3; - unsigned short sections_stream; - unsigned short unk4; - unsigned short unk5; - unsigned short unk6; - unsigned short FPO_EXT; - unsigned short unk7; -} PDB_STREAM_INDEXES; - typedef struct _PDB_FPO_DATA { unsigned int start;

1 0

Eric Pouech : winedump: Don't expect a fixed number of substreams in DBI header (PDB).
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: dee3be21a3d4ad0ce12e5fae521f3d5370a84db6 URL: https://gitlab.winehq.org/wine/wine/-/commit/dee3be21a3d4ad0ce12e5fae521f3d… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Dec 12 08:14:20 2023 +0100 winedump: Don't expect a fixed number of substreams in DBI header (PDB). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- include/wine/mscvpdb.h | 8 ++++++ tools/winedump/pdb.c | 73 +++++++++++++++----------------------------------- 2 files changed, 29 insertions(+), 52 deletions(-) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 3502e0faed0..c0f9c70a4e1 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -2568,6 +2568,14 @@ typedef struct _PDB_SYMBOLS unsigned int resvd4; } PDB_SYMBOLS, *PPDB_SYMBOLS; +/* FIXME other entries are unknown */ +enum PDB_STREAM_INDEX +{ + PDB_SIDX_FPO, + PDB_SIDX_SECTIONS = 5, + PDB_SIDX_FPOEXT = 9 +}; + typedef struct { unsigned short FPO; diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index c028f2df2b6..dc59695a826 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -489,10 +489,8 @@ static void pdb_dump_symbols(struct pdb_reader* reader) unsigned char* modimage; const char* file; char tcver[32]; - PDB_STREAM_INDEXES sidx; - - sidx.FPO = sidx.unk0 = sidx.unk1 = sidx.unk2 = sidx.unk3 = sidx.sections_stream = - sidx.unk4 = sidx.unk5 = sidx.unk6 = sidx.FPO_EXT = sidx.unk7 = -1; + const unsigned short* sub_streams = NULL; + unsigned num_sub_streams = 0; symbols = reader->read_stream(reader, 3); if (!symbols) return; @@ -736,52 +734,20 @@ static void pdb_dump_symbols(struct pdb_reader* reader) } if (symbols->stream_index_size && globals_dump_sect("image")) { + const char* sub_stream_names[] = {"FPO", NULL, NULL, NULL, NULL, "Sections stream", NULL, NULL, NULL, "FPO-ext"}; + int i; + printf("\t------------stream indexes--------------\n"); - switch (symbols->stream_index_size) + num_sub_streams = symbols->stream_index_size / sizeof(sub_streams[0]); + sub_streams = (const unsigned short*)((const char*)symbols + sizeof(PDB_SYMBOLS) + symbols->module_size + + symbols->sectcontrib_size + symbols->segmap_size + symbols->srcmodule_size + + symbols->pdbimport_size + symbols->unknown2_size); + for (i = 0; i < num_sub_streams; i++) { - case sizeof(PDB_STREAM_INDEXES_OLD): - /* PDB_STREAM_INDEXES is a superset of PDB_STREAM_INDEX_OLD - * FIXME: to be confirmed when all fields are fully understood - */ - memcpy(&sidx, - (const char*)symbols + sizeof(PDB_SYMBOLS) + symbols->module_size + - symbols->sectcontrib_size + symbols->segmap_size + symbols->srcmodule_size + - symbols->pdbimport_size + symbols->unknown2_size, - sizeof(PDB_STREAM_INDEXES_OLD)); - printf("\tFPO: %04x\n" - "\t?: %04x\n" - "\t?: %04x\n" - "\t?: %04x\n" - "\t?: %04x\n" - "\tSections stream: %04x\n", - sidx.FPO, sidx.unk0, sidx.unk1, sidx.unk2, sidx.unk3, - sidx.sections_stream); - break; - case sizeof(PDB_STREAM_INDEXES): - case sizeof(PDB_STREAM_INDEXES) + 2: - memcpy(&sidx, - (const char*)symbols + sizeof(PDB_SYMBOLS) + symbols->module_size + - symbols->sectcontrib_size + symbols->segmap_size + symbols->srcmodule_size + - symbols->pdbimport_size + symbols->unknown2_size, - sizeof(sidx)); - printf("\tFPO: %04x\n" - "\t?: %04x\n" - "\t?: %04x\n" - "\t?: %04x\n" - "\t?: %04x\n" - "\tSection stream: %04x\n" - "\t?: %04x\n" - "\t?: %04x\n" - "\t?: %04x\n" - "\tFPO-ext: %04x\n" - "\t?: %04x\n", - sidx.FPO, sidx.unk0, sidx.unk1, sidx.unk2, sidx.unk3, - sidx.sections_stream, sidx.unk4, sidx.unk5, sidx.unk6, sidx.FPO_EXT, - sidx.unk7); - break; - default: - printf("unexpected size for stream index %d\n", symbols->stream_index_size); - break; + const char* name = "?"; + if (i < ARRAY_SIZE(sub_stream_names) && sub_stream_names[i]) + name = sub_stream_names[i]; + printf("\t%s:%.*s%04x\n", name, (int)(21 - strlen(name)), "", sub_streams[i]); } } @@ -835,11 +801,14 @@ static void pdb_dump_symbols(struct pdb_reader* reader) dump_global_symbol(reader, symbols->global_hash_stream); dump_public_symbol(reader, symbols->public_stream); - if (globals_dump_sect("image")) + if (sub_streams && globals_dump_sect("image")) { - pdb_dump_fpo(reader, sidx.FPO); - pdb_dump_fpo_ext(reader, sidx.FPO_EXT); - pdb_dump_sections(reader, sidx.sections_stream); + if (PDB_SIDX_FPO < num_sub_streams) + pdb_dump_fpo(reader, sub_streams[PDB_SIDX_FPO]); + if (PDB_SIDX_FPOEXT < num_sub_streams) + pdb_dump_fpo_ext(reader, sub_streams[PDB_SIDX_FPOEXT]); + if (PDB_SIDX_SECTIONS < num_sub_streams) + pdb_dump_sections(reader, sub_streams[PDB_SIDX_SECTIONS]); } free(symbols);

1 0

Shaun Ren : sapi: Implement ISpeechVoice::GetIDsOfNames.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: 9d044669f3a50fa154cbe4d1d804dee319dbbf09 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d044669f3a50fa154cbe4d1d804de… Author: Shaun Ren <shaun.ren(a)linux.com> Date: Fri Feb 16 20:04:41 2024 -0500 sapi: Implement ISpeechVoice::GetIDsOfNames. --- dlls/sapi/tests/tts.c | 7 +++++++ dlls/sapi/tts.c | 13 ++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c index 111d0a0bc6c..7566bd5c5cb 100644 --- a/dlls/sapi/tests/tts.c +++ b/dlls/sapi/tests/tts.c @@ -418,6 +418,7 @@ static void test_spvoice(void) { static const WCHAR test_token_id[] = L"HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Speech\\Voices\\Tokens\\WinetestVoice"; static const WCHAR test_text[] = L"Hello! This is a test sentence."; + static const WCHAR *get_voices = L"GetVoices"; ISpVoice *voice; IUnknown *dummy; @@ -438,6 +439,7 @@ static void test_spvoice(void) UINT info_count; ITypeInfo *typeinfo; TYPEATTR *typeattr; + DISPID dispid; HRESULT hr; if (waveOutGetNumDevs() == 0) { @@ -732,6 +734,11 @@ static void test_spvoice(void) ITypeInfo_ReleaseTypeAttr(typeinfo, typeattr); ITypeInfo_Release(typeinfo); + dispid = 0xdeadbeef; + hr = ISpeechVoice_GetIDsOfNames(speech_voice, &IID_NULL, (WCHAR **)&get_voices, 1, 0x409, &dispid); + ok(hr == S_OK, "got %#lx.\n", hr); + ok(dispid == DISPID_SVGetVoices, "got %#lx.\n", dispid); + ISpeechVoice_Release(speech_voice); done: diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index 8e597252b31..d08b0c5de22 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -195,11 +195,18 @@ static HRESULT WINAPI speech_voice_GetTypeInfo(ISpeechVoice *iface, UINT index, } static HRESULT WINAPI speech_voice_GetIDsOfNames(ISpeechVoice *iface, REFIID riid, LPOLESTR *names, - UINT count, LCID lcid, DISPID *dispid) + UINT count, LCID lcid, DISPID *dispids) { - FIXME("(%p, %s, %p, %u, %lu, %p): stub.\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + ITypeInfo *typeinfo; + HRESULT hr; - return E_NOTIMPL; + TRACE("(%p, %s, %p, %u, %#lx, %p).\n", iface, debugstr_guid(riid), names, count, lcid, dispids); + + if (FAILED(hr = get_typeinfo(ISpeechVoice_tid, &typeinfo))) + return hr; + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, dispids); + ITypeInfo_Release(typeinfo); + return hr; } static HRESULT WINAPI speech_voice_Invoke(ISpeechVoice *iface, DISPID dispid, REFIID riid, LCID lcid,

1 0

Shaun Ren : sapi: Implement ISpeechVoice::Invoke.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: c72f0ec0f06f19c5b1b443677702e867ee61f361 URL: https://gitlab.winehq.org/wine/wine/-/commit/c72f0ec0f06f19c5b1b443677702e8… Author: Shaun Ren <shaun.ren(a)linux.com> Date: Sat Feb 17 00:36:26 2024 -0500 sapi: Implement ISpeechVoice::Invoke. --- dlls/sapi/tests/tts.c | 25 +++++++++++++++++++++++++ dlls/sapi/tts.c | 11 +++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c index 7566bd5c5cb..4d565b35294 100644 --- a/dlls/sapi/tests/tts.c +++ b/dlls/sapi/tests/tts.c @@ -440,6 +440,8 @@ static void test_spvoice(void) ITypeInfo *typeinfo; TYPEATTR *typeattr; DISPID dispid; + DISPPARAMS params; + VARIANT args[2], ret; HRESULT hr; if (waveOutGetNumDevs() == 0) { @@ -739,6 +741,29 @@ static void test_spvoice(void) ok(hr == S_OK, "got %#lx.\n", hr); ok(dispid == DISPID_SVGetVoices, "got %#lx.\n", dispid); + memset(&params, 0, sizeof(params)); + params.cArgs = 2; + params.cNamedArgs = 0; + params.rgvarg = args; + VariantInit(&args[0]); + VariantInit(&args[1]); + V_VT(&args[0]) = VT_BSTR; + V_VT(&args[1]) = VT_BSTR; + V_BSTR(&args[0]) = opt; + V_BSTR(&args[1]) = req; + VariantInit(&ret); + hr = ISpeechVoice_Invoke(speech_voice, dispid, &IID_NULL, 0, DISPATCH_METHOD, &params, &ret, NULL, NULL); + ok(hr == S_OK, "got %#lx.\n", hr); + ok(V_VT(&ret) == VT_DISPATCH, "got %#x.\n", V_VT(&ret)); + hr = IDispatch_QueryInterface(V_DISPATCH(&ret), &IID_ISpeechObjectTokens, (void **)&speech_tokens); + ok(hr == S_OK, "got %#lx.\n", hr); + count = -1; + hr = ISpeechObjectTokens_get_Count(speech_tokens, &count); + ok(hr == S_OK, "got %#lx.\n", hr); + ok(count == 1, "got %ld.\n", count); + ISpeechObjectTokens_Release(speech_tokens); + VariantClear(&ret); + ISpeechVoice_Release(speech_voice); done: diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index d08b0c5de22..d22ffd7a0da 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -213,10 +213,17 @@ static HRESULT WINAPI speech_voice_Invoke(ISpeechVoice *iface, DISPID dispid, RE WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) { - FIXME("(%p, %ld, %s, %#lx, %#x, %p, %p, %p, %p): stub.\n", iface, dispid, debugstr_guid(riid), + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p, %ld, %s, %#lx, %#x, %p, %p, %p, %p).\n", iface, dispid, debugstr_guid(riid), lcid, flags, params, result, excepinfo, argerr); - return E_NOTIMPL; + if (FAILED(hr = get_typeinfo(ISpeechVoice_tid, &typeinfo))) + return hr; + hr = ITypeInfo_Invoke(typeinfo, iface, dispid, flags, params, result, excepinfo, argerr); + ITypeInfo_Release(typeinfo); + return hr; } static HRESULT WINAPI speech_voice_get_Status(ISpeechVoice *iface, ISpeechVoiceStatus **status)

1 0

Shaun Ren : sapi: Implement ISpeechVoice::GetTypeInfoCount.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: 58087358d1038365c168772eeea9628f72c56df2 URL: https://gitlab.winehq.org/wine/wine/-/commit/58087358d1038365c168772eeea962… Author: Shaun Ren <shaun.ren(a)linux.com> Date: Fri Feb 16 20:04:07 2024 -0500 sapi: Implement ISpeechVoice::GetTypeInfoCount. --- dlls/sapi/tests/tts.c | 6 ++++++ dlls/sapi/tts.c | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c index 8f88d74b9ef..8f18934fce3 100644 --- a/dlls/sapi/tests/tts.c +++ b/dlls/sapi/tests/tts.c @@ -435,6 +435,7 @@ static void test_spvoice(void) ISpeechObjectTokens *speech_tokens; LONG count; BSTR req = NULL, opt = NULL; + UINT info_count; HRESULT hr; if (waveOutGetNumDevs() == 0) { @@ -713,6 +714,11 @@ static void test_spvoice(void) hr = ISpeechVoice_Speak(speech_voice, NULL, SVSFPurgeBeforeSpeak, NULL); ok(hr == S_OK, "got %#lx.\n", hr); + info_count = 0xdeadbeef; + hr = ISpeechVoice_GetTypeInfoCount(speech_voice, &info_count); + ok(hr == S_OK, "got %#lx.\n", hr); + ok(info_count == 1, "got %u.\n", info_count); + ISpeechVoice_Release(speech_voice); done: diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index 6fe01373e56..2493a2804f2 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -179,11 +179,11 @@ static ULONG WINAPI speech_voice_Release(ISpeechVoice *iface) return ref; } -static HRESULT WINAPI speech_voice_GetTypeInfoCount(ISpeechVoice *iface, UINT *info) +static HRESULT WINAPI speech_voice_GetTypeInfoCount(ISpeechVoice *iface, UINT *count) { - FIXME("(%p, %p): stub.\n", iface, info); - - return E_NOTIMPL; + TRACE("(%p, %p).\n", iface, count); + *count = 1; + return S_OK; } static HRESULT WINAPI speech_voice_GetTypeInfo(ISpeechVoice *iface, UINT info, LCID lcid,

1 0

Shaun Ren : sapi: Implement ISpeechVoice::GetTypeInfo.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: dd083a6195df6b1b8a98940a76e6d2c7ae99b414 URL: https://gitlab.winehq.org/wine/wine/-/commit/dd083a6195df6b1b8a98940a76e6d2… Author: Shaun Ren <shaun.ren(a)linux.com> Date: Fri Feb 16 19:52:33 2024 -0500 sapi: Implement ISpeechVoice::GetTypeInfo. --- dlls/sapi/dispatch.c | 1 + dlls/sapi/sapi_private.h | 1 + dlls/sapi/tests/tts.c | 13 +++++++++++++ dlls/sapi/tts.c | 8 ++++---- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/sapi/dispatch.c b/dlls/sapi/dispatch.c index 731ae9ae48f..c1f0e842788 100644 --- a/dlls/sapi/dispatch.c +++ b/dlls/sapi/dispatch.c @@ -36,6 +36,7 @@ static REFIID tid_id[] = { &IID_ISpeechObjectToken, &IID_ISpeechObjectTokens, + &IID_ISpeechVoice, }; HRESULT get_typeinfo(enum type_id tid, ITypeInfo **ret) diff --git a/dlls/sapi/sapi_private.h b/dlls/sapi/sapi_private.h index 55e1460ad38..219436f88c1 100644 --- a/dlls/sapi/sapi_private.h +++ b/dlls/sapi/sapi_private.h @@ -57,6 +57,7 @@ enum type_id { ISpeechObjectToken_tid, ISpeechObjectTokens_tid, + ISpeechVoice_tid, last_tid }; diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c index 8f18934fce3..111d0a0bc6c 100644 --- a/dlls/sapi/tests/tts.c +++ b/dlls/sapi/tests/tts.c @@ -436,6 +436,8 @@ static void test_spvoice(void) LONG count; BSTR req = NULL, opt = NULL; UINT info_count; + ITypeInfo *typeinfo; + TYPEATTR *typeattr; HRESULT hr; if (waveOutGetNumDevs() == 0) { @@ -719,6 +721,17 @@ static void test_spvoice(void) ok(hr == S_OK, "got %#lx.\n", hr); ok(info_count == 1, "got %u.\n", info_count); + typeinfo = NULL; + typeattr = NULL; + hr = ISpeechVoice_GetTypeInfo(speech_voice, 0, 0, &typeinfo); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = ITypeInfo_GetTypeAttr(typeinfo, &typeattr); + ok(hr == S_OK, "got %#lx.\n", hr); + ok(typeattr->typekind == TKIND_DISPATCH, "got %u.\n", typeattr->typekind); + ok(IsEqualGUID(&typeattr->guid, &IID_ISpeechVoice), "got %s.\n", wine_dbgstr_guid(&typeattr->guid)); + ITypeInfo_ReleaseTypeAttr(typeinfo, typeattr); + ITypeInfo_Release(typeinfo); + ISpeechVoice_Release(speech_voice); done: diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index 2493a2804f2..8e597252b31 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -186,12 +186,12 @@ static HRESULT WINAPI speech_voice_GetTypeInfoCount(ISpeechVoice *iface, UINT *c return S_OK; } -static HRESULT WINAPI speech_voice_GetTypeInfo(ISpeechVoice *iface, UINT info, LCID lcid, +static HRESULT WINAPI speech_voice_GetTypeInfo(ISpeechVoice *iface, UINT index, LCID lcid, ITypeInfo **type_info) { - FIXME("(%p, %u, %lu, %p): stub.\n", iface, info, lcid, type_info); - - return E_NOTIMPL; + TRACE("(%p, %u, %#lx, %p).\n", iface, index, lcid, type_info); + if (index != 0) return DISP_E_BADINDEX; + return get_typeinfo(ISpeechVoice_tid, type_info); } static HRESULT WINAPI speech_voice_GetIDsOfNames(ISpeechVoice *iface, REFIID riid, LPOLESTR *names,

1 0

Shaun Ren : sapi: Implement ISpeechVoice::GetVoices.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: 62aec0318b958655a86d25a8baad8b37525fa564 URL: https://gitlab.winehq.org/wine/wine/-/commit/62aec0318b958655a86d25a8baad8b… Author: Shaun Ren <shaun.ren(a)linux.com> Date: Fri Feb 16 15:21:28 2024 -0500 sapi: Implement ISpeechVoice::GetVoices. --- dlls/sapi/tests/tts.c | 31 +++++++++++++++++++++++++++++-- dlls/sapi/tts.c | 21 +++++++++++++++++++-- 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c index 87711eac61a..8f88d74b9ef 100644 --- a/dlls/sapi/tests/tts.c +++ b/dlls/sapi/tests/tts.c @@ -416,7 +416,7 @@ static IClassFactory test_engine_cf = { &ClassFactoryVtbl }; static void test_spvoice(void) { - static const WCHAR test_token_id[] = L"HKEY_LOCAL_MACHINE\\Software\\Wine\\Winetest\\sapi\\tts\\TestEngine"; + static const WCHAR test_token_id[] = L"HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Speech\\Voices\\Tokens\\WinetestVoice"; static const WCHAR test_text[] = L"Hello! This is a test sentence."; ISpVoice *voice; @@ -432,6 +432,9 @@ static void test_spvoice(void) DWORD regid; DWORD start, duration; ISpeechVoice *speech_voice; + ISpeechObjectTokens *speech_tokens; + LONG count; + BSTR req = NULL, opt = NULL; HRESULT hr; if (waveOutGetNumDevs() == 0) { @@ -439,6 +442,8 @@ static void test_spvoice(void) return; } + RegDeleteTreeA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Speech\\Voices\\WinetestVoice"); + check_apttype(); ok(test_apt_data.type == APTTYPE_UNITIALIZED, "got apt type %d.\n", test_apt_data.type); @@ -588,6 +593,7 @@ static void test_spvoice(void) hr = ISpObjectToken_CreateKey(token, L"Attributes", &attrs_key); ok(hr == S_OK, "got %#lx.\n", hr); ISpDataKey_SetStringValue(attrs_key, L"Language", L"409"); + ISpDataKey_SetStringValue(attrs_key, L"Vendor", L"Winetest"); ISpDataKey_Release(attrs_key); hr = ISpVoice_SetVoice(voice, token); @@ -685,6 +691,25 @@ static void test_spvoice(void) hr = ISpVoice_QueryInterface(voice, &IID_ISpeechVoice, (void **)&speech_voice); ok(hr == S_OK, "got %#lx.\n", hr); + count = -1; + hr = ISpeechVoice_GetVoices(speech_voice, NULL, NULL, &speech_tokens); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = ISpeechObjectTokens_get_Count(speech_tokens, &count); + ok(hr == S_OK, "got %#lx.\n", hr); + ok(count > 0, "got %ld.\n", count); + ISpeechObjectTokens_Release(speech_tokens); + + req = SysAllocString(L"Vendor=Winetest"); + opt = SysAllocString(L"Language=409;Gender=Male"); + + count = 0xdeadbeef; + hr = ISpeechVoice_GetVoices(speech_voice, req, opt, &speech_tokens); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = ISpeechObjectTokens_get_Count(speech_tokens, &count); + ok(hr == S_OK, "got %#lx.\n", hr); + ok(count == 1, "got %ld.\n", count); + ISpeechObjectTokens_Release(speech_tokens); + hr = ISpeechVoice_Speak(speech_voice, NULL, SVSFPurgeBeforeSpeak, NULL); ok(hr == S_OK, "got %#lx.\n", hr); @@ -695,8 +720,10 @@ done: ISpVoice_Release(voice); ISpObjectToken_Release(token); ISpMMSysAudio_Release(audio_out); + SysFreeString(req); + SysFreeString(opt); - RegDeleteTreeA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Winetest\\sapi" ); + RegDeleteTreeA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Speech\\Voices\\WinetestVoice"); } START_TEST(tts) diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index 381558659b8..6fe01373e56 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -401,9 +401,26 @@ static HRESULT WINAPI speech_voice_Skip(ISpeechVoice *iface, const BSTR type, LO static HRESULT WINAPI speech_voice_GetVoices(ISpeechVoice *iface, BSTR required, BSTR optional, ISpeechObjectTokens **tokens) { - FIXME("(%p, %s, %s, %p): stub.\n", iface, debugstr_w(required), debugstr_w(optional), tokens); - return E_NOTIMPL; + ISpObjectTokenCategory *cat; + IEnumSpObjectTokens *token_enum; + HRESULT hr; + + TRACE("(%p, %s, %s, %p).\n", iface, debugstr_w(required), debugstr_w(optional), tokens); + + if (!tokens) return E_POINTER; + + if (FAILED(hr = create_token_category(SPCAT_VOICES, &cat))) + return hr; + + if (SUCCEEDED(hr = ISpObjectTokenCategory_EnumTokens(cat, required, optional, &token_enum))) + { + hr = IEnumSpObjectTokens_QueryInterface(token_enum, &IID_ISpeechObjectTokens, (void **)tokens); + IEnumSpObjectTokens_Release(token_enum); + } + + ISpObjectTokenCategory_Release(cat); + return hr; } static HRESULT WINAPI speech_voice_GetAudioOutputs(ISpeechVoice *iface, BSTR required, BSTR optional,

1 0

Shaun Ren : sapi: Handle zero-length attributes correctly in ISpObjectTokenCategory::EnumTokens.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: 4bbfd838983505ce4120ebfe94899049b071fbb8 URL: https://gitlab.winehq.org/wine/wine/-/commit/4bbfd838983505ce4120ebfe948990… Author: Shaun Ren <shaun.ren(a)linux.com> Date: Fri Feb 16 17:08:18 2024 -0500 sapi: Handle zero-length attributes correctly in ISpObjectTokenCategory::EnumTokens. --- dlls/sapi/tests/token.c | 10 ++++++++++ dlls/sapi/token.c | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 6d2c40ea154..c7067718c45 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -205,6 +205,16 @@ static void test_token_category(void) IEnumSpObjectTokens_Release( enum_tokens ); + hr = ISpObjectTokenCategory_EnumTokens( cat, L"", NULL, &enum_tokens ); + ok( hr == S_OK, "got %08lx\n", hr ); + + count = 0xdeadbeef; + hr = IEnumSpObjectTokens_GetCount( enum_tokens, &count ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( count == 5, "got %lu\n", count ); + + IEnumSpObjectTokens_Release( enum_tokens ); + hr = ISpObjectTokenCategory_EnumTokens( cat, L"Language=409", NULL, &enum_tokens ); ok( hr == S_OK, "got %08lx\n", hr ); diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index ad8163c9567..65d35dc96ff 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -947,7 +947,7 @@ static HRESULT score_attributes( ISpObjectToken *token, const WCHAR *attrs, unsigned int i, j; HRESULT hr; - if (!attrs) + if (!attrs || !*attrs) { *score = 1; return S_OK;

1 0