June 2022 - Wine-commits - list.winehq.org

Francois Gouget : testbot/WineSendLog: Take into account the known failures.
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: tools Branch: master Commit: 2ea0ffd802cf42f073296baf5bd76fea778c74c2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2ea0ffd802cf42f073296ba… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 15 18:21:51 2022 +0200 testbot/WineSendLog: Take into account the known failures. Don't count known failures as new failures, in particular when updating the patches site. Add links to the WineHQ bugs for known failures found in the logs. And identify the bug each known failure line corresponds to. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48912 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 78 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 54 insertions(+), 24 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 3897ac03..a2f2369b 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -44,6 +44,7 @@ $Name0 =~ s+^.*/++; use Algorithm::Diff; use WineTestBot::Config; +use WineTestBot::Failures; use WineTestBot::Jobs; use WineTestBot::Log; use WineTestBot::LogUtils; @@ -177,10 +178,11 @@ sub SendLog($) # Collect and count the new and old failures, etc. # - my (@New, $JobInfo); - my ($NewCount, $OldCount, $BotCount, $NotRun) = (0, 0, 0, 0); + my ($JobInfo, @New, %BugDescriptions); + my ($NewCount, $FailCount, $OldCount, $BotCount, $NotRun) = (0, 0, 0, 0, 0); my $FileType = "test executable"; + my $Failures = CreateFailures($Job); my $StepsTasks = CreateStepsTasks(undef, $Job); my $SortedStepsTasks = $StepsTasks->GetSortedItems(); foreach my $StepTask (@$SortedStepsTasks) @@ -193,12 +195,13 @@ sub SendLog($) my $TaskDir = $StepTask->GetTaskDir(); my $LogNames = GetLogFileNames($TaskDir); - $JobInfo->{$StepTask->Id}->{LogNames} = $LogNames; - $JobInfo->{$StepTask->Id}->{NewCount} = 0; - $JobInfo->{$StepTask->Id}->{OldCount} = 0; + my $TaskInfo = $JobInfo->{$StepTask->Id} = {}; + $TaskInfo->{LogNames} = $LogNames; + $TaskInfo->{NewCount} = 0; + $TaskInfo->{OldCount} = 0; if ($StepTask->Status eq "boterror") { - $JobInfo->{$StepTask->Id}->{BotCount} = 1; + $TaskInfo->{BotCount} = 1; $BotCount++; } $FileType = "patch" if ($StepTask->FileType eq "patch"); @@ -207,7 +210,7 @@ sub SendLog($) { my $LogInfo = LoadLogErrors("$TaskDir/$LogName"); next if (!defined $LogInfo->{BadLog} and !$LogInfo->{ErrCount}); - $JobInfo->{$StepTask->Id}->{$LogName} = $LogInfo; + $TaskInfo->{$LogName} = $LogInfo; my $HasLogHeader; foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) @@ -216,7 +219,21 @@ sub SendLog($) my $Group = $LogInfo->{ErrGroups}->{$GroupName}; foreach my $ErrIndex (0..$#{$Group->{Errors}}) { - if ($Group->{IsNew}->[$ErrIndex]) + my $LineNo = $Group->{LineNos}->[$ErrIndex]; + my $LineFailureIds = $Group->{Failures}->{$ErrIndex}; + if ($LineFailureIds) + { + foreach my $FailureId (@$LineFailureIds) + { + my $Failure = $Failures->GetItem($FailureId); + next if (!$Failure); + $BugDescriptions{$Failure->BugId} = $Failure->BugDescription; + # Add bug information to $LogInfo + push @{$LogInfo->{Bugs}->{$LineNo}}, $Failure->BugId; + } + $TaskInfo->{OldCount}++; + } + elsif ($Group->{IsNew}->[$ErrIndex]) { if (!$HasLogHeader) { @@ -229,16 +246,16 @@ sub SendLog($) $HasGroupHeader = 1; } push @New, "$Group->{Errors}->[$ErrIndex]\n"; - $JobInfo->{$StepTask->Id}->{NewCount}++; + $TaskInfo->{NewCount}++; } else { - $JobInfo->{$StepTask->Id}->{OldCount}++; + $TaskInfo->{OldCount}++; } } } - $NewCount += $JobInfo->{$StepTask->Id}->{NewCount}; - $OldCount += $JobInfo->{$StepTask->Id}->{OldCount}; + $NewCount += $TaskInfo->{NewCount}; + $OldCount += $TaskInfo->{OldCount}; } } @@ -281,10 +298,9 @@ sub SendLog($) { print $Sendmail <<"EOF"; It looks like your $FileType introduces some new failures. Please -investigate and fix them if they are indeed new. Note that rare -failures and failures with always changing text (e.g. because of memory -addresses) can cause false positives. If this is what happened, then -fixing those would really help. +investigate and fix them if they are indeed new. If they are not new, +fixing them anyway would help a lot. Otherwise please ask for the known +failures list to be updated. EOF } @@ -309,10 +325,21 @@ EOF if ($OldCount) { print $Sendmail <<"EOF"; -Some preexisting failures (not caused by your $FileType) happened. +There are some preexisting failures (not caused by your $FileType). If you know how to fix them that would be helpful. - EOF + if (%BugDescriptions) + { + print $Sendmail <<"EOF"; +In particular some failures are tracked in the bug(s) below: +EOF + foreach my $BugId (sort { $a <=> $b } keys %BugDescriptions) + { + print $Sendmail "* $BugId - $BugDescriptions{$BugId}\n"; + print $Sendmail " $WineBugUrl$BugId\n"; + } + print $Sendmail "\n"; + } } print $Sendmail " Failures\n"; @@ -360,7 +387,7 @@ EOF my $TaskDir = $StepTask->GetTaskDir(); foreach my $LogName (@{$TaskInfo->{LogNames}}) { - my $LogInfo = LoadLogErrors("$TaskDir/$LogName"); + my $LogInfo = $TaskInfo->{$LogName}; next if (!defined $LogInfo->{BadLog} and !$LogInfo->{ErrCount}); print $Sendmail "\n=== ", GetTitle($StepTask, $LogName), " ===\n"; @@ -372,7 +399,11 @@ EOF my $Group = $LogInfo->{ErrGroups}->{$GroupName}; foreach my $ErrIndex (0..$#{$Group->{Errors}}) { - my $Prefix = $Group->{IsNew}->[$ErrIndex] ? "new" : "old"; + my $LineNo = $Group->{LineNos}->[$ErrIndex]; + my $Bugs = $LogInfo->{Bugs}->{$LineNo}; + my $Prefix = $Bugs ? join(" ", sort { $a <=> $b } @$Bugs) : + $Group->{IsNew}->[$ErrIndex] ? "new" : + "old"; print $Sendmail "[$Prefix] $Group->{Errors}->[$ErrIndex]\n"; } } @@ -433,10 +464,9 @@ EOF { print $Sendmail <<"EOF"; It looks like your $FileType introduced the new failures shown below. -Please investigate and fix them if they are indeed new. Note that rare -failures and failures with always changing text (e.g. because of memory -addresses) can cause false positives. If this is what happened, then -fixing those would really help. +Please investigate and fix them before resubmitting your $FileType. +If they are not new, fixing them anyway would help a lot. Otherwise +please ask for the known failures list to be updated. EOF }

1 0

Connor McAdams : uiautomationcore/tests: Release interfaces returned from get_HostRawElementProvider.
by Alexandre Julliard 14 Jun '22

14 Jun '22

Module: wine Branch: master Commit: ce9ea0260e7a590efde16edceb473a5a12315867 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce9ea0260e7a590efde16edc… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Jun 13 17:06:39 2022 -0400 uiautomationcore/tests: Release interfaces returned from get_HostRawElementProvider. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 885e520bfd3..10d91d04d81 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -2092,12 +2092,14 @@ static void test_UiaProviderFromIAccessible(void) CHECK_CALLED(Accessible2_get_accName); todo_wine CHECK_CALLED(Accessible2_QI_IAccIdentity); todo_wine CHECK_CALLED(Accessible2_get_accParent); + IRawElementProviderSimple_Release(elprov2); elprov2 = (void *)0xdeadbeef; acc_client = NULL; hr = IRawElementProviderSimple_get_HostRawElementProvider(elprov, &elprov2); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!!elprov2, "elprov == NULL, elprov %p\n", elprov2); + IRawElementProviderSimple_Release(elprov2); IRawElementProviderSimple_Release(elprov); ok(Accessible.ref == 1, "Unexpected refcnt %ld\n", Accessible.ref);

1 0

Connor McAdams : uiautomationcore: Implement NavigateDirection_{First/Last}Child for MSAA Providers.
by Alexandre Julliard 14 Jun '22

14 Jun '22

Module: wine Branch: master Commit: 66b6786e8dd5fc28481e6201361a2f3094d395fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=66b6786e8dd5fc28481e6201… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue May 24 16:05:10 2022 -0400 uiautomationcore: Implement NavigateDirection_{First/Last}Child for MSAA Providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 155 ++++++++++++++--------------- dlls/uiautomationcore/uia_provider.c | 109 +++++++++++++++++++- 2 files changed, 182 insertions(+), 82 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=66b6786e8dd5fc28481e…

1 0

Connor McAdams : uiautomationcore: Implement NavigateDirection_{Previous/Next}Sibling for MSAA providers.
by Alexandre Julliard 14 Jun '22

14 Jun '22

Module: wine Branch: master Commit: 163e9c5b453b3a4255deb4fd1d8da73866a3c0a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=163e9c5b453b3a4255deb4fd… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed May 25 12:21:40 2022 -0400 uiautomationcore: Implement NavigateDirection_{Previous/Next}Sibling for MSAA providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 132 +++++++++++++-------------- dlls/uiautomationcore/uia_provider.c | 139 +++++++++++++++++++++++++++-- 2 files changed, 194 insertions(+), 77 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=163e9c5b453b3a4255de…

1 0

Bernhard Kölbl : include/windows.media.idl: Update file to newer formatting.
by Alexandre Julliard 14 Jun '22

14 Jun '22

Module: wine Branch: master Commit: aab9ec78d6c1546aadbc9f10b6ddea552f3c1ac5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aab9ec78d6c1546aadbc9f10… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Fri Jun 10 17:05:01 2022 +0200 include/windows.media.idl: Update file to newer formatting. I.e. get rid of nested namespaces and forward declares, separate attributes with commas and right align pointer declarations. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- include/windows.media.idl | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/include/windows.media.idl b/include/windows.media.idl index fe81c768361..1c0b3e82c1d 100644 --- a/include/windows.media.idl +++ b/include/windows.media.idl @@ -23,21 +23,19 @@ import "inspectable.idl"; import "windows.foundation.idl"; -namespace Windows { - namespace Media { - interface IMediaControl; - } -} +namespace Windows.Media +{ + interface IMediaControl; -namespace Windows { - namespace Media { - [contract(Windows.Foundation.UniversalApiContract, 1.0)] - [uuid(1803def8-dca5-4b6f-9c20-e3d3c0643625)] - interface IMediaMarker : IInspectable - { - [propget] HRESULT Time([out] [retval] Windows.Foundation.TimeSpan* value); - [propget] HRESULT MediaMarkerType([out] [retval] HSTRING* value); - [propget] HRESULT Text([out] [retval] HSTRING* value); - } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + uuid(1803def8-dca5-4b6f-9c20-e3d3c0643625) + ] + interface IMediaMarker : IInspectable + { + [propget] HRESULT Time([out, retval] Windows.Foundation.TimeSpan *value); + [propget] HRESULT MediaMarkerType([out, retval] HSTRING *value); + [propget] HRESULT Text([out, retval] HSTRING *value); } + }

1 0

Bernhard Kölbl : include/windows.media.idl: Move IMediaMarker collections from speechsynthesis.
by Alexandre Julliard 14 Jun '22

14 Jun '22

Module: wine Branch: master Commit: 6e26dc6b59da93f6ba951430f32a7203459515a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e26dc6b59da93f6ba951430… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Fri Jun 10 17:19:29 2022 +0200 include/windows.media.idl: Move IMediaMarker collections from speechsynthesis. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- include/windows.media.idl | 9 +++++++++ include/windows.media.speechsynthesis.idl | 7 ------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/include/windows.media.idl b/include/windows.media.idl index 1c0b3e82c1d..2c80e49a92b 100644 --- a/include/windows.media.idl +++ b/include/windows.media.idl @@ -26,6 +26,15 @@ import "windows.foundation.idl"; namespace Windows.Media { interface IMediaControl; + interface IMediaMarker; + + declare + { + interface Windows.Foundation.Collections.IIterable<Windows.Media.IMediaMarker*>; + interface Windows.Foundation.Collections.IIterator<Windows.Media.IMediaMarker*>; + interface Windows.Foundation.Collections.IVectorView<Windows.Media.IMediaMarker*>; + interface Windows.Foundation.Collections.IVector<Windows.Media.IMediaMarker*>; + } [ contract(Windows.Foundation.UniversalApiContract, 1.0), diff --git a/include/windows.media.speechsynthesis.idl b/include/windows.media.speechsynthesis.idl index b2c86f37137..10fd2f5c897 100644 --- a/include/windows.media.speechsynthesis.idl +++ b/include/windows.media.speechsynthesis.idl @@ -54,12 +54,6 @@ namespace Windows { } } -namespace Windows { - namespace Media { - interface IMediaMarker; - } -} - namespace Windows { namespace Media { namespace SpeechSynthesis { @@ -67,7 +61,6 @@ namespace Windows { interface Windows.Foundation.Collections.IIterator<Windows.Media.SpeechSynthesis.VoiceInformation*>; interface Windows.Foundation.Collections.IIterable<Windows.Media.SpeechSynthesis.VoiceInformation*>; interface Windows.Foundation.Collections.IVectorView<Windows.Media.SpeechSynthesis.VoiceInformation*>; - interface Windows.Foundation.Collections.IVectorView<Windows.Media.IMediaMarker*>; interface Windows.Foundation.IAsyncOperation<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*>; interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*>; }

1 0

Bernhard Kölbl : include/windows.media.speechsynthesis.idl: Update file to newer formatting.
by Alexandre Julliard 14 Jun '22

14 Jun '22

Module: wine Branch: master Commit: faf8ed367cb6199845fbb5a4336094e5da4748ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=faf8ed367cb6199845fbb5a4… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Sun Jun 12 17:36:43 2022 +0200 include/windows.media.speechsynthesis.idl: Update file to newer formatting. I.e. get rid of nested namespaces and forward declares, separate attributes with commas and right align pointer declarations. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- include/windows.media.speechsynthesis.idl | 305 ++++++++++++++---------------- 1 file changed, 143 insertions(+), 162 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=faf8ed367cb6199845fb…

1 0

Bernhard Kölbl : windows.media.speech/tests: Remove a useless thread id trace.
by Alexandre Julliard 14 Jun '22

14 Jun '22

Module: wine Branch: master Commit: d95681aaf5b540c7a24c916d72de69cb84e17808 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d95681aaf5b540c7a24c916d… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Thu Jun 9 17:13:40 2022 +0200 windows.media.speech/tests: Remove a useless thread id trace. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/tests/speech.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 5e74b90bf9a..421819fd10a 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -331,7 +331,6 @@ struct async_inspectable_handler HANDLE event_block; HANDLE event_finished; - DWORD thread_id; }; static inline struct async_inspectable_handler *impl_from_IAsyncOperationCompletedHandler_IInspectable( IAsyncOperationCompletedHandler_IInspectable *iface ) @@ -378,9 +377,8 @@ HRESULT WINAPI async_inspectable_handler_Invoke( IAsyncOperationCompletedHandler AsyncStatus status ) { struct async_inspectable_handler *impl = impl_from_IAsyncOperationCompletedHandler_IInspectable(iface); - DWORD id = GetCurrentThreadId(); + trace("Iface %p, sender %p, status %d.\n", iface, sender, status); - trace("Caller thread id %lu callback thread id %lu.\n", impl->thread_id, id); /* Signal finishing of the handler. */ if (impl->event_finished) SetEvent(impl->event_finished); @@ -1217,7 +1215,6 @@ static void test_SpeechRecognizer(void) async_inspectable_handler_create_static(&compilation_handler, &IID_IAsyncOperationCompletedHandler_SpeechRecognitionCompilationResult); compilation_handler.event_block = CreateEventW(NULL, FALSE, FALSE, NULL); compilation_handler.event_finished = CreateEventW(NULL, FALSE, FALSE, NULL); - compilation_handler.thread_id = GetCurrentThreadId(); ok(!!compilation_handler.event_block, "event_block wasn't created.\n"); ok(!!compilation_handler.event_finished, "event_finished wasn't created.\n");

1 0

Bernhard Kölbl : windows.media.speech/tests: Handle a possible race condition.
by Alexandre Julliard 14 Jun '22

14 Jun '22

Module: wine Branch: master Commit: 22aa88a17e8e4c1a55f6860b9f115d450fba0d34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22aa88a17e8e4c1a55f6860b… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Thu Jun 9 18:25:04 2022 +0200 windows.media.speech/tests: Handle a possible race condition. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/tests/speech.c | 33 +++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 421819fd10a..9e65f52181b 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -1122,26 +1122,33 @@ static void test_SpeechRecognizer(void) compilation_result = (void*)0xdeadbeef; hr = IAsyncOperation_SpeechRecognitionCompilationResult_GetResults(operation, &compilation_result); - ok(hr == E_ILLEGAL_METHOD_CALL, "Got unexpected hr %#lx.\n", hr); - ok(compilation_result == (void*)0xdeadbeef, "Compilation result had value %p.\n", compilation_result); + ok(hr == E_ILLEGAL_METHOD_CALL || hr == S_OK, "Got unexpected hr %#lx.\n", hr); - await_async_inspectable((IAsyncOperation_IInspectable *)operation, - &compilation_handler, - &IID_IAsyncOperationCompletedHandler_SpeechRecognitionCompilationResult); - check_async_info((IInspectable *)operation, 1, Completed, S_OK); + if (hr == E_ILLEGAL_METHOD_CALL) /* Sometimes the operation could have already finished here, */ + /* if so skip waiting and getting the results a second time. */ + { + ok(compilation_result == (void*)0xdeadbeef, "Compilation result had value %p.\n", compilation_result); - hr = IAsyncOperation_SpeechRecognitionCompilationResult_put_Completed(operation, NULL); - ok(hr == E_ILLEGAL_DELEGATE_ASSIGNMENT, "Got unexpected hr %#lx.\n", hr); + await_async_inspectable((IAsyncOperation_IInspectable *)operation, + &compilation_handler, + &IID_IAsyncOperationCompletedHandler_SpeechRecognitionCompilationResult); - hr = IAsyncOperation_SpeechRecognitionCompilationResult_get_Completed(operation, &handler); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = IAsyncOperation_SpeechRecognitionCompilationResult_put_Completed(operation, NULL); + ok(hr == E_ILLEGAL_DELEGATE_ASSIGNMENT, "Got unexpected hr %#lx.\n", hr); - compilation_result = (void*)0xdeadbeef; - hr = IAsyncOperation_SpeechRecognitionCompilationResult_GetResults(operation, &compilation_result); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = IAsyncOperation_SpeechRecognitionCompilationResult_get_Completed(operation, &handler); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + compilation_result = (void*)0xdeadbeef; + hr = IAsyncOperation_SpeechRecognitionCompilationResult_GetResults(operation, &compilation_result); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + } + + ok(compilation_result != (void*)0xdeadbeef, "Compilation result had value %p.\n", compilation_result); check_interface(compilation_result, &IID_IAgileObject, TRUE); + check_async_info((IInspectable *)operation, 1, Completed, S_OK); + hr = ISpeechRecognitionCompilationResult_get_Status(compilation_result, &result_status); ok(hr == S_OK, "ISpeechRecognitionCompilationResult_get_Status failed, hr %#lx.\n", hr); ok(result_status == SpeechRecognitionResultStatus_Success, "Got unexpected status %#x.\n", result_status);

1 0

Bernhard Kölbl : windows.media.speech/tests: Add basic tests for ssml/text to stream functions.
by Alexandre Julliard 14 Jun '22

14 Jun '22

Module: wine Branch: master Commit: 20f990a3094a4bd032a15749f0239dfc10fd2fe0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20f990a3094a4bd032a15749… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Jun 7 22:01:11 2022 +0200 windows.media.speech/tests: Add basic tests for ssml/text to stream functions. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/tests/speech.c | 129 +++++++++++++++++++++++++++++-- 1 file changed, 123 insertions(+), 6 deletions(-) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 9e65f52181b..e6f8a32bb80 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -41,6 +41,7 @@ #define AsyncStatus_Closed 4 #define SPERR_WINRT_INTERNAL_ERROR 0x800455a0 +#define SPERR_WINRT_INCORRECT_FORMAT 0x80131537 #define IHandler_RecognitionResult ITypedEventHandler_SpeechContinuousRecognitionSession_SpeechContinuousRecognitionResultGeneratedEventArgs #define IHandler_RecognitionResultVtbl ITypedEventHandler_SpeechContinuousRecognitionSession_SpeechContinuousRecognitionResultGeneratedEventArgsVtbl @@ -779,18 +780,27 @@ static void test_ActivationFactory(void) static void test_SpeechSynthesizer(void) { + static const WCHAR *simple_ssml = + L"<speak version='1.0' xmlns='http://www.w3.org/2001/10/synthesis' xml:lang='en-US'>" + "Hello, how are you doing today?" + "</speak>"; + static const WCHAR *simple_synth_text = L"Hello, how are you doing today?"; static const WCHAR *speech_synthesizer_name = L"Windows.Media.SpeechSynthesis.SpeechSynthesizer"; static const WCHAR *speech_synthesizer_name2 = L"windows.media.speechsynthesis.speechsynthesizer"; static const WCHAR *unknown_class_name = L"Unknown.Class"; IActivationFactory *factory = NULL, *factory2 = NULL; + IAsyncOperation_SpeechSynthesisStream *operation_ss_stream = NULL; + IVectorView_IMediaMarker *media_markers = NULL; IVectorView_VoiceInformation *voices = NULL; IInstalledVoicesStatic *voices_static = NULL; + ISpeechSynthesisStream *ss_stream = NULL; IVoiceInformation *voice; IInspectable *inspectable = NULL, *tmp_inspectable = NULL; IAgileObject *agile_object = NULL, *tmp_agile_object = NULL; ISpeechSynthesizer *synthesizer; ISpeechSynthesizer2 *synthesizer2; IClosable *closable; + struct async_inspectable_handler async_inspectable_handler; HMODULE hdll; HSTRING str, str2; HRESULT hr; @@ -843,6 +853,7 @@ static void test_SpeechSynthesizer(void) FreeLibrary(hdll); } + /* Test static Synth ifaces: IActivationFactory, IInstalledVoicesStatic, etc. */ hr = IActivationFactory_QueryInterface(factory, &IID_IInspectable, (void **)&inspectable); ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInspectable failed, hr %#lx\n", hr); @@ -889,27 +900,135 @@ static void test_SpeechSynthesizer(void) IVectorView_VoiceInformation_Release(voices); - IInstalledVoicesStatic_Release(voices_static); + hr = IInstalledVoicesStatic_get_DefaultVoice(voices_static, &voice); + todo_wine ok(hr == S_OK, "IInstalledVoicesStatic_get_DefaultVoice failed, hr %#lx\n", hr); + + if (hr == S_OK) + { + IVoiceInformation_get_Description(voice, &str2); + trace("SpeechSynthesizer default voice %s.\n", debugstr_hstring(str2)); + + WindowsDeleteString(str2); + ref = IVoiceInformation_Release(voice); + ok(ref == 0, "Got unexpected ref %lu.\n", ref); + } + IInstalledVoicesStatic_Release(voices_static); IAgileObject_Release(agile_object); IInspectable_Release(inspectable); + /* Test Synthesizer */ hr = IActivationFactory_QueryInterface(factory, &IID_ISpeechSynthesizer, (void **)&synthesizer); ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); hr = RoActivateInstance(str, &inspectable); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + WindowsDeleteString(str); hr = IInspectable_QueryInterface(inspectable, &IID_ISpeechSynthesizer, (void **)&synthesizer); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + /* Test SynthesizeTextToStreamAsync */ + hr = WindowsCreateString(simple_synth_text, wcslen(simple_synth_text), &str); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr); + + hr = ISpeechSynthesizer_SynthesizeTextToStreamAsync(synthesizer, NULL, &operation_ss_stream); + todo_wine ok(hr == S_OK, "ISpeechSynthesizer_SynthesizeTextToStreamAsync failed, hr %#lx\n", hr); + if(FAILED(hr)) goto skip_ss_stream; + + IAsyncOperation_SpeechSynthesisStream_Release(operation_ss_stream); + + hr = ISpeechSynthesizer_SynthesizeTextToStreamAsync(synthesizer, str, &operation_ss_stream); + todo_wine ok(hr == S_OK, "ISpeechSynthesizer_SynthesizeTextToStreamAsync failed, hr %#lx\n", hr); + + await_async_inspectable((IAsyncOperation_IInspectable *)operation_ss_stream, + &async_inspectable_handler, + &IID_IAsyncOperationCompletedHandler_SpeechSynthesisStream); + check_async_info((IInspectable *)operation_ss_stream, 2, Completed, S_OK); + check_interface(operation_ss_stream, &IID_IAsyncOperation_SpeechSynthesisStream, TRUE); + check_interface(operation_ss_stream, &IID_IAgileObject, TRUE); + + hr = IAsyncOperation_SpeechSynthesisStream_GetResults(operation_ss_stream, &ss_stream); + todo_wine ok(hr == S_OK, "IAsyncOperation_SpeechSynthesisStream_GetResults failed, hr %#lx\n", hr); + + if (hr == S_OK) + { + hr = ISpeechSynthesisStream_get_Markers(ss_stream, &media_markers); + todo_wine ok(hr == S_OK, "ISpeechSynthesisStream_get_Markers failed, hr %#lx\n", hr); + check_interface(media_markers, &IID_IVectorView_IMediaMarker, TRUE); + check_interface(media_markers, &IID_IIterable_IMediaMarker, TRUE); + check_interface(media_markers, &IID_IAgileObject, TRUE); + + ref = IVectorView_IMediaMarker_Release(media_markers); + todo_wine ok(ref == 0, "Got unexpected ref %lu.\n", ref); + + ref = ISpeechSynthesisStream_Release(ss_stream); + todo_wine ok(ref == 0, "Got unexpected ref %lu.\n", ref); + } + + IAsyncOperation_SpeechSynthesisStream_Release(operation_ss_stream); + + /* Test SynthesizeSsmlToStreamAsync */ + hr = WindowsCreateString(simple_ssml, wcslen(simple_ssml), &str2); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr); + + hr = ISpeechSynthesizer_SynthesizeSsmlToStreamAsync(synthesizer, str2, &operation_ss_stream); + todo_wine ok(hr == S_OK, "ISpeechSynthesizer_SynthesizeSsmlToStreamAsync failed, hr %#lx\n", hr); + await_async_inspectable((IAsyncOperation_IInspectable *)operation_ss_stream, + &async_inspectable_handler, + &IID_IAsyncOperationCompletedHandler_SpeechSynthesisStream); + check_async_info((IInspectable *)operation_ss_stream, 3, Completed, S_OK); + check_interface(operation_ss_stream, &IID_IAsyncOperation_SpeechSynthesisStream, TRUE); + check_interface(operation_ss_stream, &IID_IAgileObject, TRUE); + + hr = IAsyncOperation_SpeechSynthesisStream_GetResults(operation_ss_stream, &ss_stream); + todo_wine ok(hr == S_OK, "IAsyncOperation_SpeechSynthesisStream_GetResults failed, hr %#lx\n", hr); + + if (hr == S_OK) + { + check_interface(ss_stream, &IID_ISpeechSynthesisStream, TRUE); + check_interface(ss_stream, &IID_IAgileObject, TRUE); + + ref = ISpeechSynthesisStream_Release(ss_stream); + ok(ref == 0, "Got unexpected ref %lu.\n", ref); + } + + IAsyncOperation_SpeechSynthesisStream_Release(operation_ss_stream); + + operation_ss_stream = (void *)0xdeadbeef; + hr = ISpeechSynthesizer_SynthesizeSsmlToStreamAsync(synthesizer, NULL, &operation_ss_stream); + /* Broken on Win 8 + 8.1 */ + todo_wine ok(hr == S_OK || broken(hr == E_INVALIDARG), "ISpeechSynthesizer_SynthesizeSsmlToStreamAsync failed, hr %#lx\n", hr); + + if (hr == S_OK) + { + todo_wine ok(!!operation_ss_stream, "operation_ss_stream had value %p.\n", operation_ss_stream); + IAsyncOperation_SpeechSynthesisStream_Release(operation_ss_stream); + } + else todo_wine ok(operation_ss_stream == NULL, "operation_ss_stream had value %p.\n", operation_ss_stream); + + operation_ss_stream = (void *)0xdeadbeef; + hr = ISpeechSynthesizer_SynthesizeSsmlToStreamAsync(synthesizer, str, &operation_ss_stream); + /* Broken on Win 8 + 8.1 */ + todo_wine ok(hr == S_OK || broken(hr == SPERR_WINRT_INCORRECT_FORMAT), "ISpeechSynthesizer_SynthesizeSsmlToStreamAsync failed, hr %#lx\n", hr); + + if (hr == S_OK) + { + todo_wine ok(!!operation_ss_stream, "operation_ss_stream had value %p.\n", operation_ss_stream); + IAsyncOperation_SpeechSynthesisStream_Release(operation_ss_stream); + } + else todo_wine ok(operation_ss_stream == NULL, "operation_ss_stream had value %p.\n", operation_ss_stream); + + WindowsDeleteString(str2); + +skip_ss_stream: + WindowsDeleteString(str); + 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); + ok(hr == S_OK || broken(hr == E_NOINTERFACE), "Got unexpected hr %#lx.\n", hr); /* Requires Win10 >= 1703 */ if (hr == S_OK) { @@ -927,8 +1046,6 @@ static void test_SpeechSynthesizer(void) ok(!ref, "Got unexpected ref %lu.\n", ref); IActivationFactory_Release(factory); - WindowsDeleteString(str); - RoUninitialize(); }

1 0