wine-devel

wine-devel@winehq.org

3 participants
84481 discussions

[PATCH] windows.media.speech: Add ISpeechSynthesizer2 stub
by Andrew Eikum 23 Mar '22

23 Mar '22

A recent update for Microsoft Flight Simulator requires this. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/windows.media.speech/synthesizer.c | 33 +++++++++++++++++++++++ dlls/windows.media.speech/tests/speech.c | 12 +++++++++ include/windows.media.speechsynthesis.idl | 32 ++++++++++++++++++++++ 3 files changed, 77 insertions(+) diff --git a/dlls/windows.media.speech/synthesizer.c b/dlls/windows.media.speech/synthesizer.c index 3863e468d36..179229b4bb4 100644 --- a/dlls/windows.media.speech/synthesizer.c +++ b/dlls/windows.media.speech/synthesizer.c @@ -151,6 +151,7 @@ static struct voice_information_vector all_voices = struct speech_synthesizer { ISpeechSynthesizer ISpeechSynthesizer_iface; + ISpeechSynthesizer2 ISpeechSynthesizer2_iface; IClosable IClosable_iface; LONG ref; }; @@ -181,6 +182,13 @@ static HRESULT STDMETHODCALLTYPE speech_synthesizer_QueryInterface( return S_OK; } + if (IsEqualGUID(iid, &IID_ISpeechSynthesizer2)) + { + IUnknown_AddRef(iface); + *out = &impl->ISpeechSynthesizer2_iface; + return S_OK; + } + if (IsEqualGUID(iid, &IID_IClosable)) { IUnknown_AddRef(iface); @@ -289,6 +297,30 @@ static const struct ISpeechSynthesizerVtbl speech_synthesizer_vtbl = speech_synthesizer_get_Voice, }; + +DEFINE_IINSPECTABLE(speech_synthesizer2, ISpeechSynthesizer2, struct speech_synthesizer, ISpeechSynthesizer_iface) + +static HRESULT STDMETHODCALLTYPE speech_synthesizer2_get_Options(ISpeechSynthesizer2 *iface, ISpeechSynthesizerOptions **value) +{ + FIXME("iface %p, value %p stub.\n", iface, value); + + return E_NOTIMPL; +} + +static const struct ISpeechSynthesizer2Vtbl speech_synthesizer2_vtbl = +{ + /* IUnknown methods */ + speech_synthesizer2_QueryInterface, + speech_synthesizer2_AddRef, + speech_synthesizer2_Release, + /* IInspectable methods */ + speech_synthesizer2_GetIids, + speech_synthesizer2_GetRuntimeClassName, + speech_synthesizer2_GetTrustLevel, + /* ISpeechSynthesizer2 methods */ + speech_synthesizer2_get_Options, +}; + static HRESULT STDMETHODCALLTYPE closable_QueryInterface( IClosable *iface, REFIID iid, void **out) { @@ -467,6 +499,7 @@ static HRESULT STDMETHODCALLTYPE factory_ActivateInstance( } obj->ISpeechSynthesizer_iface.lpVtbl = &speech_synthesizer_vtbl; + obj->ISpeechSynthesizer2_iface.lpVtbl = &speech_synthesizer2_vtbl; obj->IClosable_iface.lpVtbl = &closable_vtbl; obj->ref = 1; *instance = (IInspectable *)&obj->ISpeechSynthesizer_iface; diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index fc0a8d762c1..e88cfc25d54 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -557,6 +557,7 @@ static void test_SpeechSynthesizer(void) IInspectable *inspectable = NULL, *tmp_inspectable = NULL; IAgileObject *agile_object = NULL, *tmp_agile_object = NULL; ISpeechSynthesizer *synthesizer; + ISpeechSynthesizer2 *synthesizer2; IClosable *closable; HMODULE hdll; HSTRING str, str2; @@ -673,6 +674,17 @@ static void test_SpeechSynthesizer(void) hr = IInspectable_QueryInterface(inspectable, &IID_IClosable, (void **)&closable); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = IInspectable_QueryInterface(inspectable, &IID_ISpeechSynthesizer2, (void **)&synthesizer2); + ok(hr == S_OK || + broken(hr == E_NOINTERFACE), /* requires newer Windows */ + "Got unexpected hr %#lx.\n", hr); + + if (hr == S_OK) + { + ref = ISpeechSynthesizer2_Release(synthesizer2); + ok(ref == 3, "Got unexpected ref %lu.\n", ref); + } + ref = IClosable_Release(closable); ok(ref == 2, "Got unexpected ref %lu.\n", ref); diff --git a/include/windows.media.speechsynthesis.idl b/include/windows.media.speechsynthesis.idl index 29dca510dee..b2c86f37137 100644 --- a/include/windows.media.speechsynthesis.idl +++ b/include/windows.media.speechsynthesis.idl @@ -39,6 +39,7 @@ namespace Windows { interface ISpeechSynthesisStream; runtimeclass SpeechSynthesizer; runtimeclass VoiceInformation; + runtimeclass SpeechSynthesizerOptions; runtimeclass SpeechSynthesisStream; } } @@ -112,6 +113,16 @@ namespace Windows { [propget] HRESULT Voice([out] [retval] VoiceInformation **value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesizer), + uuid(a7c5ecb2-4339-4d6a-bbf8-c7a4f1544c2e) + ] + interface ISpeechSynthesizer2 : IInspectable + { + [propget] HRESULT Options([out, retval] SpeechSynthesizerOptions **value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Media.SpeechSynthesis.VoiceInformation), @@ -126,6 +137,19 @@ namespace Windows { [propget] HRESULT Gender([out] [retval] VoiceGender* value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesizerOptions), + uuid(a0e23871-cc3d-43c9-91b1-ee185324d83d) + ] + interface ISpeechSynthesizerOptions : IInspectable + { + [propget] HRESULT IncludeWordBoundaryMetadata([out, retval] boolean *value); + [propput] HRESULT IncludeWordBoundaryMetadata([in] boolean value); + [propget] HRESULT IncludeSentenceBoundaryMetadata([out, retval] boolean *value); + [propput] HRESULT IncludeSentenceBoundaryMetadata([in] boolean value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesizer), @@ -146,6 +170,14 @@ namespace Windows { [default] interface Windows.Media.SpeechSynthesis.IVoiceInformation; } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass SpeechSynthesizerOptions + { + [default] interface Windows.Media.SpeechSynthesis.ISpeechSynthesizerOptions; + } [contract(Windows.Foundation.UniversalApiContract, 1.0)] [marshaling_behavior(agile)] -- 2.35.1

1 0

[PATCH] po: Update Dutch Translation.
by Floris Renaud 23 Mar '22

23 Mar '22

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- po/nl.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/nl.po b/po/nl.po index 40692ed0bb3..21e4f45a65a 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-03-08 13:40+0100\n" +"PO-Revision-Date: 2022-03-23 17:00+0100\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -3987,13 +3987,11 @@ msgstr "" #: dlls/jscript/jscript.rc:74 msgid "Cyclic __proto__ value" -msgstr "" +msgstr "Cyclische __proto__ waarde" #: dlls/jscript/jscript.rc:75 -#, fuzzy -#| msgid "Cannot define property '|': object is not extensible" msgid "Cannot create property for a non-extensible object" -msgstr "Kan de eigenschap '|' niet definiëren: object is niet uitbreidbaar" +msgstr "Kan geen eigenschap maken voor een niet-uitbreidbaar object" #: dlls/jscript/jscript.rc:76 msgid "Cannot define property '|': object is not extensible" -- 2.35.1

1 0

[PATCH] ntdll: Return the UI language id in uppercase.
by Francois Gouget 23 Mar '22

23 Mar '22

This fixes a failure in kernel32:locale. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- https://test.winehq.org/data/patterns.html#kernel32:locale The test was introduced in commit 68dc3d411674. At the time this lead to tweaking the nls ILANGUAGE values: https://www.winehq.org/pipermail/wine-devel/2021-December/202660.html --- dlls/ntdll/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 158f068b03d..e24b4d8188f 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -605,7 +605,7 @@ static NTSTATUS get_dummy_preferred_ui_language( DWORD flags, LANGID lang, ULONG FIXME("(0x%x %p %p %p) returning a dummy value (current locale)\n", flags, count, buffer, size); - if (flags & MUI_LANGUAGE_ID) swprintf( name, ARRAY_SIZE(name), L"%04lx", lang ); + if (flags & MUI_LANGUAGE_ID) swprintf( name, ARRAY_SIZE(name), L"%04lX", lang ); else { UNICODE_STRING str; -- 2.30.2

1 0

[PATCH v2 2/8] user32: Use dispatch_win_proc_params in CallWindowProc.
by Jacek Caban 23 Mar '22

23 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Fixed a typo in commit message dlls/user32/winproc.c | 70 ++++++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 30 deletions(-)

2 1

[PATCH 8/8] win32u: Move ScreenToClient implementation from user32.
by Jacek Caban 23 Mar '22

23 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/winpos.c | 16 ++-------------- dlls/win32u/window.c | 20 ++++++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 23 insertions(+), 14 deletions(-)

3 2

[PATCH 7/8] user32: Merge WINPROC_call_window into call_window_proc.
by Jacek Caban 23 Mar '22

23 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 62 ++++++++++++++++++++++++++++++++------ dlls/user32/user_private.h | 3 +- dlls/user32/winproc.c | 55 ++++----------------------------- 3 files changed, 59 insertions(+), 61 deletions(-)

3 2

[PATCH 6/8] user32: Use User32CallWinEventHook in peek_message.
by Jacek Caban 23 Mar '22

23 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/hook.c | 6 +++--- dlls/user32/message.c | 43 ++++++++++++++++--------------------------- dlls/win32u/hook.c | 2 ++ include/ntuser.h | 2 ++ 4 files changed, 23 insertions(+), 30 deletions(-)

3 2

[PATCH 5/8] win32u: Implement NtUserDispatchMessage.
by Jacek Caban 23 Mar '22

23 Mar '22

3 2

[PATCH 4/8] win32u: Move init_win_proc_params implementation from user32.
by Jacek Caban 23 Mar '22

23 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/winproc.c | 46 +++++++----------------------------- dlls/win32u/class.c | 21 +++++++++++++++- dlls/win32u/message.c | 22 +++++++++++++++++ dlls/win32u/ntuser_private.h | 1 + include/ntuser.h | 1 + 5 files changed, 52 insertions(+), 39 deletions(-)

3 2

[PATCH 3/8] user32: Move more code out of call_window_proc.
by Jacek Caban 23 Mar '22

23 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/winproc.c | 20 ++++++++++++-------- include/ntuser.h | 1 + 2 files changed, 13 insertions(+), 8 deletions(-)

3 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel