April 2022 - Wine-Commits - list.winehq.org

Giovanni Mascellani : tests: Test matrix copying with a non-square matrix.
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: vkd3d Branch: master Commit: 3bbb90a3cb6537babd8e5edf12a5c42b3cdad1f6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3bbb90a3cb6537babd8e5ed… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Apr 22 12:25:02 2022 +0200 tests: Test matrix copying with a non-square matrix. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/hlsl-matrix-indexing.shader_test | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/hlsl-matrix-indexing.shader_test b/tests/hlsl-matrix-indexing.shader_test index e2103fe2..8057179e 100644 --- a/tests/hlsl-matrix-indexing.shader_test +++ b/tests/hlsl-matrix-indexing.shader_test @@ -47,18 +47,16 @@ todo draw quad probe all rgba (1.0, 5.0, 7.0, 12.0) [pixel shader] -uniform float4x4 m; +uniform float3x2 m; float4 main() : SV_TARGET { - float4x4 m2 = m; - return float4(m2[0][0], m2[1][0], m2[1][2], m2[2][3]); + float3x2 m2 = m; + return float4(m2[0][0], m2[2][0], m2[1][1], m2[2][1]); } [test] -uniform 0 float4 1.0 2.0 3.0 4.0 -uniform 4 float4 5.0 6.0 7.0 8.0 -uniform 8 float4 9.0 10.0 11.0 12.0 -uniform 12 float4 13.0 14.0 15.0 16.0 +uniform 0 float4 1.0 2.0 3.0 0.0 +uniform 4 float4 5.0 6.0 7.0 0.0 todo draw quad -probe all rgba (1.0, 2.0, 10.0, 15.0) +probe all rgba (1.0, 3.0, 6.0, 7.0)

1 0

Francois Gouget : winetest: Move the win2004 results in the Win1909+ category.
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: tools Branch: master Commit: fd6c06576400f717ceb569a0dffb91c8f2e7522a URL: https://source.winehq.org/git/tools.git/?a=commit;h=fd6c06576400f717ceb569a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 25 19:15:59 2022 +0200 winetest: Move the win2004 results in the Win1909+ category. They used to be used for the locale tests which is why they were in the Win10L category. But the locale tests have been running on win21H1 for a long time now. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/winetest.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/winetest/winetest.conf b/winetest/winetest.conf index 3623a8d..411382b 100644 --- a/winetest/winetest.conf +++ b/winetest/winetest.conf @@ -47,9 +47,9 @@ $fixed_threshold = 0.99; { name => "Win8", ids => [ "win8", "win81" ] }, { name => "Win1507+", ids => [ "win1507", "win1511", "win1607", "win1703" ] }, { name => "Win1709+", ids => [ "win1709", "win1803", "win1809", "win1903" ] }, - { name => "Win1909+", ids => [ "win1909" ] }, + { name => "Win1909+", ids => [ "win1909", "win2004" ] }, { name => "Win10", ids => [ "win2009", "win21H2", "win10" ] }, # win10 for backward compatibility - { name => "Win10L", ids => [ "win2004", "win21H1" ] }, + { name => "Win10L", ids => [ "win21H1" ] }, { name => "Other", ids => [ "unknown" ] }, { name => "Linux", ids => [ "linux" ] }, { name => "Mac", ids => [ "mac" ] },

1 0

Francois Gouget : winetest: Add support for Windows 21H2.
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: tools Branch: master Commit: 3151dda4a838678881dd79a118ff106b7c158349 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3151dda4a838678881dd79a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 25 18:46:26 2022 +0200 winetest: Add support for Windows 21H2. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 1 + winetest/dissect | 1 + winetest/winetest.conf | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index d1d5261..49b08e3 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -428,6 +428,7 @@ my %platform_order = ( win1809 => 1809, win1903 => 1903, win1909 => 1909, win2004 => 2004, win2009 => 2009, win21H1 => 2101, + win21H2 => 2107, win10 => 2100, # for backward compatibility wine => 3000, linux => 3001, mac => 3001, bsd => 3002, solaris => 3003 diff --git a/winetest/dissect b/winetest/dissect index fe88cb9..c66293d 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -394,6 +394,7 @@ my @idmatch = ( [ "win2004", 2, 10, 0, 19041, 1, 0 ], [ "win2009", 2, 10, 0, 19042, 1, 0 ], [ "win21H1", 2, 10, 0, 19043, 1, 0 ], + [ "win21H2", 2, 10, 0, 19044, 1, 0 ], # [ "ce", 3, undef, undef, undef, undef, 0 ], [ "unknown", 2, undef, undef, undef, undef, 0 ], [ "unknown", undef, undef, undef, undef, undef, 1 ], diff --git a/winetest/winetest.conf b/winetest/winetest.conf index 0b8fd63..3623a8d 100644 --- a/winetest/winetest.conf +++ b/winetest/winetest.conf @@ -48,7 +48,7 @@ $fixed_threshold = 0.99; { name => "Win1507+", ids => [ "win1507", "win1511", "win1607", "win1703" ] }, { name => "Win1709+", ids => [ "win1709", "win1803", "win1809", "win1903" ] }, { name => "Win1909+", ids => [ "win1909" ] }, - { name => "Win10", ids => [ "win2009", "win10" ] }, # win10 for backward compatibility + { name => "Win10", ids => [ "win2009", "win21H2", "win10" ] }, # win10 for backward compatibility { name => "Win10L", ids => [ "win2004", "win21H1" ] }, { name => "Other", ids => [ "unknown" ] }, { name => "Linux", ids => [ "linux" ] },

1 0

Francois Gouget : testbot/cgi: Fix ItemPage's iteration over the master columns.
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: tools Branch: master Commit: e244074494de8a06fcdb09ce9b3f720bceac8b07 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e244074494de8a06fcdb09c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 25 18:49:21 2022 +0200 testbot/cgi: Fix ItemPage's iteration over the master columns. GenerateFormStart() went one iteration too far which is okay only because our pages never have master columns in the first place. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/ItemPage.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index b88e273..1b77eea 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -109,7 +109,7 @@ sub GenerateFormStart($) my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); if (defined($MasterColNames)) { - foreach my $ColIndex (0 .. @$MasterColNames) + foreach my $ColIndex (0..$#{$MasterColNames}) { print "<div><input type='hidden' name='", $MasterColNames->[$ColIndex], "' value='", $self->escapeHTML($MasterColValues->[$ColIndex]), @@ -146,7 +146,7 @@ sub RedirectToList($) my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); if (defined($MasterColNames)) { - foreach my $ColIndex (0 .. @$MasterColNames - 1) + foreach my $ColIndex (0..$#{$MasterColNames}) { $Target .= ($ColIndex == 0 ? "?" : "&") . $MasterColNames->[$ColIndex] . "=" . url_escape($MasterColValues->[$ColIndex]);

1 0

Alexandre Julliard : packaging: Add Fedora 36.
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: tools Branch: master Commit: 616a64ae176f77db01ae5ca48f64c1b86d65864d URL: https://source.winehq.org/git/tools.git/?a=commit;h=616a64ae176f77db01ae5ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 23 11:28:42 2022 +0200 packaging: Add Fedora 36. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/obs-sync | 2 +- packaging/obs/rsync-filter | 1 + packaging/obs/yum.conf | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 0b81755..831c2b1 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -199,7 +199,7 @@ publish_files () cd $basedir -distros="34 35 buster bullseye bookworm bionic focal impish jammy" +distros="34 35 36 buster bullseye bookworm bionic focal impish jammy" dry_run= build=1 diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index 4d818b3..220e0fd 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -1,6 +1,7 @@ + /fedora + /fedora/34 + /fedora/35 ++ /fedora/36 - /fedora/* + /debian diff --git a/packaging/obs/yum.conf b/packaging/obs/yum.conf index 6d5a731..4ad17e2 100644 --- a/packaging/obs/yum.conf +++ b/packaging/obs/yum.conf @@ -11,3 +11,7 @@ baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/… [fedora-35] name = Fedora 35 baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/… + +[fedora-36] +name = Fedora 36 +baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/Fedora_36

1 0

Alexandre Julliard : gitlab: Import the gitlab-to-mail tool.
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: tools Branch: master Commit: 212ab0a40cfd329d4ab3b9a0bf1db6fe546297d3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=212ab0a40cfd329d4ab3b9a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 25 16:27:47 2022 +0200 gitlab: Import the gitlab-to-mail tool. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/LICENSE | 18 + gitlab/gitlab-to-mail/Makefile | 19 + gitlab/gitlab-to-mail/README.md | 21 + gitlab/gitlab-to-mail/db.py | 111 +++++ gitlab/gitlab-to-mail/gitlabtomail.py | 632 +++++++++++++++++++++++++++++ gitlab/gitlab-to-mail/gitlabtomail.service | 13 + gitlab/gitlab-to-mail/mailtogitlab.py | 160 ++++++++ gitlab/gitlab-to-mail/runner.py | 46 +++ gitlab/gitlab-to-mail/settings_example.py | 31 ++ gitlab/gitlab-to-mail/util.py | 15 + 10 files changed, 1066 insertions(+) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=212ab0a40cfd329d4ab…

1 0

Alexandre Julliard : Wine release 7.7
by Alexandre Julliard April 22, 2022

April 22, 2022

Module: website Branch: master Commit: 90dfaa04c04b5b1a868211cd0eaa19b4cfce29c2 URL: https://source.winehq.org/git/website.git/?a=commit;h=90dfaa04c04b5b1a86821… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 22 21:46:37 2022 +0200 Wine release 7.7 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022042201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2022042201.xml b/news/en/2022042201.xml new file mode 100644 index 00000000..da50903c --- /dev/null +++ b/news/en/2022042201.xml @@ -0,0 +1,16 @@ +<news> +<date>April 22, 2022</date> +<title>Wine 7.7 Released</title> +<body> +<p> The Wine development release 7.7 is now available.</p> +<p> <a href="{$root}/announce/7.7">What's new</a> in this release: +<ul> + <li>More progress on the PE conversion of the X11 and OSS drivers.</li> + <li>Support for UTF-8 as default Ansi codepage.</li> + <li>Theming support for control panel applets.</li> + <li>Various bug fixes.</li> +</ul> +</p> +<p>The source is <a href="//dl.winehq.org/wine/source/7.x/wine-7.7.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>

1 0

Bernhard Kölbl : windows.media.speech/tests: Remove an unnecessary variable.
by Alexandre Julliard April 22, 2022

April 22, 2022

Module: wine Branch: master Commit: 5839f1da7fcc15eec77e22cb7faa1c76270c4ef0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5839f1da7fcc15eec77e22cb… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Fri Apr 22 14:48:03 2022 +0200 windows.media.speech/tests: Remove an unnecessary variable. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/tests/speech.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 4f1f92ded5f..12ac407b751 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -834,7 +834,6 @@ static void test_SpeechRecognizer(void) struct completed_event_handler completed_handler; struct recognition_result_handler result_handler; struct compilation_handler compilation_handler; - struct compilation_handler compilation_handler2; SpeechRecognitionResultStatus result_status; EventRegistrationToken token = { .value = 0 }; AsyncStatus async_status; @@ -1034,11 +1033,11 @@ static void test_SpeechRecognizer(void) IAsyncOperation_SpeechRecognitionCompilationResult_Release(operation); /* Test if AsyncOperation is started immediately. */ - compilation_handler_create_static(&compilation_handler2); - compilation_handler2.event_finished = CreateEventW(NULL, FALSE, FALSE, NULL); - compilation_handler2.thread_id = GetCurrentThreadId(); + compilation_handler_create_static(&compilation_handler); + compilation_handler.event_finished = CreateEventW(NULL, FALSE, FALSE, NULL); + compilation_handler.thread_id = GetCurrentThreadId(); - ok(compilation_handler2.event_finished != NULL, "Finished event wasn't created.\n"); + ok(compilation_handler.event_finished != NULL, "Finished event wasn't created.\n"); hr = ISpeechRecognizer_CompileConstraintsAsync(recognizer, &operation); todo_wine ok(hr == S_OK, "ISpeechRecognizer_CompileConstraintsAsync failed, hr %#lx.\n", hr); @@ -1052,11 +1051,11 @@ static void test_SpeechRecognizer(void) todo_wine ok(hr == S_OK, "IAsyncInfo_get_Status failed, hr %#lx.\n", hr); todo_wine ok(async_status != AsyncStatus_Closed, "Status was %#x.\n", async_status); - hr = IAsyncOperation_SpeechRecognitionCompilationResult_put_Completed(operation, &compilation_handler2.IAsyncHandler_Compilation_iface); + hr = IAsyncOperation_SpeechRecognitionCompilationResult_put_Completed(operation, &compilation_handler.IAsyncHandler_Compilation_iface); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(!WaitForSingleObject(compilation_handler2.event_finished, 1000), "Wait for event_finished failed.\n"); - CloseHandle(compilation_handler2.event_finished); + todo_wine ok(!WaitForSingleObject(compilation_handler.event_finished, 1000), "Wait for event_finished failed.\n"); + CloseHandle(compilation_handler.event_finished); async_status = 0xdeadbeef; hr = IAsyncInfo_get_Status(info, &async_status);

1 0

Bernhard Kölbl : windows.media.speech: Partially implement IAsyncOperation.
by Alexandre Julliard April 22, 2022

April 22, 2022

Module: wine Branch: master Commit: caf138f59044baece62ed5201a78822c8f011bd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=caf138f59044baece62ed520… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Fri Apr 22 14:48:05 2022 +0200 windows.media.speech: Partially implement IAsyncOperation. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/async.c | 138 +++++++++++++++++++++++++++---- dlls/windows.media.speech/tests/speech.c | 105 ++++++++++++----------- 2 files changed, 177 insertions(+), 66 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=caf138f59044baece62e…

1 0

Bernhard Kölbl : windows.media.speech/tests: Add tests to check if IAsyncInfo_Close is non blocking.
by Alexandre Julliard April 22, 2022

April 22, 2022

Module: wine Branch: master Commit: 9d67ca493a43d0effa49992553c1ebf195fab5eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d67ca493a43d0effa499925… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Fri Apr 22 14:48:04 2022 +0200 windows.media.speech/tests: Add tests to check if IAsyncInfo_Close is non blocking. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/tests/speech.c | 96 +++++++++++++++++++++++++++----- 1 file changed, 82 insertions(+), 14 deletions(-) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 12ac407b751..3df687d1148 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -239,8 +239,8 @@ struct compilation_handler IAsyncHandler_Compilation IAsyncHandler_Compilation_iface; LONG ref; + HANDLE event_block; HANDLE event_finished; - BOOLEAN sleeping; DWORD thread_id; }; @@ -290,8 +290,10 @@ HRESULT WINAPI compilation_handler_Invoke( IAsyncHandler_Compilation *iface, trace("Iface %p, info %p, status %d.\n", iface, info, status); trace("Caller thread id %lu callback thread id %lu.\n", impl->thread_id, id); - ok(status != Started, "Got unexpected status %#x.\n", status); + /* Signal finishing of the handler. */ if (impl->event_finished) SetEvent(impl->event_finished); + /* Block handler until event is set. */ + if (impl->event_block) WaitForSingleObject(impl->event_block, INFINITE); return S_OK; } @@ -813,6 +815,23 @@ static void test_VoiceInformation(void) RoUninitialize(); } +struct async_operation_block_param +{ + IAsyncOperationCompletedHandler_SpeechRecognitionCompilationResult *handler; + IAsyncOperation_SpeechRecognitionCompilationResult *operation; +}; + +static DWORD WINAPI async_operation_block_thread(void *arg) +{ + struct async_operation_block_param *param = arg; + HRESULT hr; + + hr = IAsyncOperation_SpeechRecognitionCompilationResult_put_Completed(param->operation, param->handler); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + return 0; +} + static void test_SpeechRecognizer(void) { static const WCHAR *speech_recognition_name = L"Windows.Media.SpeechRecognition.SpeechRecognizer"; @@ -828,16 +847,17 @@ static void test_SpeechRecognizer(void) ISpeechRecognizer2 *recognizer2 = NULL; IActivationFactory *factory = NULL; IInspectable *inspectable = NULL; - IClosable *closable = NULL; ILanguage *language = NULL; IAsyncInfo *info = NULL; struct completed_event_handler completed_handler; struct recognition_result_handler result_handler; + struct async_operation_block_param block_param; struct compilation_handler compilation_handler; SpeechRecognitionResultStatus result_status; EventRegistrationToken token = { .value = 0 }; AsyncStatus async_status; HSTRING hstr, hstr_lang; + HANDLE blocked_thread; HRESULT hr; UINT32 id; LONG ref; @@ -909,11 +929,16 @@ static void test_SpeechRecognizer(void) hr = IInspectable_QueryInterface(inspectable, &IID_ISpeechRecognizer2, (void **)&recognizer2); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + check_interface(inspectable, &IID_IClosable, TRUE); + hr = ISpeechRecognizer2_get_ContinuousRecognitionSession(recognizer2, &session); ok(hr == S_OK, "ISpeechRecognizer2_get_ContinuousRecognitionSession failed, hr %#lx.\n", hr); check_refcount(session, 2); check_refcount(inspectable, 3); + ref = ISpeechRecognizer2_Release(recognizer2); + ok(ref == 2, "Got unexpected ref %lu.\n", ref); + hr = ISpeechContinuousRecognitionSession_add_Completed(session, NULL, &token); ok(hr == E_INVALIDARG, "ISpeechContinuousRecognitionSession_add_ResultGenerated failed, hr %#lx.\n", hr); @@ -938,6 +963,9 @@ static void test_SpeechRecognizer(void) hr = ISpeechContinuousRecognitionSession_remove_ResultGenerated(session, token); ok(hr == S_OK, "ISpeechContinuousRecognitionSession_remove_ResultGenerated failed, hr %#lx.\n", hr); + ref = ISpeechContinuousRecognitionSession_Release(session); + ok(ref == 1, "Got unexpected ref %lu.\n", ref); + hr = ISpeechRecognizer_get_Constraints(recognizer, &constraints); ok(hr == S_OK, "ISpeechContinuousRecognitionSession_get_Constraints failed, hr %#lx.\n", hr); @@ -1064,22 +1092,62 @@ static void test_SpeechRecognizer(void) ref = IAsyncInfo_Release(info); todo_wine ok(ref == 1, "Got unexpected ref %lu.\n", ref); - -skip_operation: ref = IAsyncOperation_SpeechRecognitionCompilationResult_Release(operation); - ok(!ref, "Got unexpected ref %lu.\n", ref); + todo_wine ok(!ref, "Got unexpected ref %lu.\n", ref); - ref = ISpeechContinuousRecognitionSession_Release(session); - ok(ref == 1, "Got unexpected ref %lu.\n", ref); + ref = ISpeechRecognizer_Release(recognizer); + todo_wine ok(ref == 1, "Got unexpected ref %lu.\n", ref); - hr = IInspectable_QueryInterface(inspectable, &IID_IClosable, (void **)&closable); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ref = IInspectable_Release(inspectable); + todo_wine ok(!ref, "Got unexpected ref %lu.\n", ref); - ref = IClosable_Release(closable); - ok(ref == 3, "Got unexpected ref %lu.\n", ref); + /* Test if AsyncInfo_Close waits for the handler to finish. */ + hr = RoActivateInstance(hstr, &inspectable); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - ref = ISpeechRecognizer2_Release(recognizer2); - ok(ref == 2, "Got unexpected ref %lu.\n", ref); + hr = IInspectable_QueryInterface(inspectable, &IID_ISpeechRecognizer, (void **)&recognizer); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + compilation_handler_create_static(&compilation_handler); + compilation_handler.event_block = CreateEventW(NULL, FALSE, FALSE, NULL); + compilation_handler.event_finished = CreateEventW(NULL, FALSE, FALSE, NULL); + compilation_handler.thread_id = GetCurrentThreadId(); + + todo_wine ok(compilation_handler.event_finished != NULL, "Finished event wasn't created.\n"); + + hr = ISpeechRecognizer_CompileConstraintsAsync(recognizer, &operation); + todo_wine ok(hr == S_OK, "ISpeechRecognizer_CompileConstraintsAsync failed, hr %#lx.\n", hr); + + block_param.handler = &compilation_handler.IAsyncHandler_Compilation_iface; + block_param.operation = operation; + blocked_thread = CreateThread(NULL, 0, async_operation_block_thread, &block_param, 0, NULL); + + todo_wine ok(!WaitForSingleObject(compilation_handler.event_finished, 5000), "Wait for event_finished failed.\n"); + + todo_wine ok(WaitForSingleObject(blocked_thread, 100) == WAIT_TIMEOUT, "Wait for block_thread didn't time out.\n"); + + todo_wine ok(compilation_handler.ref == 3, "Got unexpected ref %lu.\n", compilation_handler.ref); + todo_wine check_refcount(operation, 3); + + hr = IAsyncOperation_SpeechRecognitionCompilationResult_QueryInterface(operation, &IID_IAsyncInfo, (void **)&info); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = IAsyncInfo_Close(info); /* If IAsyncInfo_Close would wait for the handler to finish, the test would get stuck here. */ + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + SetEvent(compilation_handler.event_block); + todo_wine ok(!WaitForSingleObject(blocked_thread, 1000), "Wait for block_thread failed.\n"); + + CloseHandle(blocked_thread); + CloseHandle(compilation_handler.event_block); + CloseHandle(compilation_handler.event_finished); + + ref = IAsyncInfo_Release(info); + todo_wine ok(ref == 1, "Got unexpected ref %lu.\n", ref); + +skip_operation: + ref = IAsyncOperation_SpeechRecognitionCompilationResult_Release(operation); + ok(!ref, "Got unexpected ref %lu.\n", ref); ref = ISpeechRecognizer_Release(recognizer); ok(ref == 1, "Got unexpected ref %lu.\n", ref);

1 0