wine-commits April 2022

wine-commits@winehq.org

2 participants
1024 discussions

Zebediah Figura : demos: Load libvulkan dynamically.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: vkd3d Branch: master Commit: f9c7b123d87aedbff2815f75eb9c3dd6946eb71d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f9c7b123d87aedbff2815f7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 22 15:17:59 2022 -0500 demos: Load libvulkan dynamically. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 +- demos/demo_xcb.h | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index e760a66b..3e113dc7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -322,7 +322,7 @@ endif EXTRA_DIST += $(vkd3d_shader_tests) if BUILD_DEMOS -DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @DEMO_LIBS@ @VULKAN_LIBS@ +DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @DL_LIBS@ @DEMO_LIBS@ DEMOS_CFLAGS = $(AM_CFLAGS) @DEMO_CFLAGS@ bin_PROGRAMS += $(vkd3d_demos) diff --git a/demos/demo_xcb.h b/demos/demo_xcb.h index d8be00f0..bb43d8a4 100644 --- a/demos/demo_xcb.h +++ b/demos/demo_xcb.h @@ -17,18 +17,65 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define VK_NO_PROTOTYPES #define VK_USE_PLATFORM_XCB_KHR #define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_3 +#include "config.h" #include <vkd3d.h> #include <vkd3d_utils.h> #include <xcb/xcb_event.h> #include <xcb/xcb_icccm.h> #include <xcb/xcb_keysyms.h> #include <sys/stat.h> +#include <dlfcn.h> #include <limits.h> #include <unistd.h> #include <fcntl.h> #include <stdbool.h> +#include <stdio.h> + +#define DECLARE_VK_PFN(name) PFN_##name name; +DECLARE_VK_PFN(vkAcquireNextImageKHR) +DECLARE_VK_PFN(vkCreateFence) +DECLARE_VK_PFN(vkCreateSwapchainKHR) +DECLARE_VK_PFN(vkCreateXcbSurfaceKHR) +DECLARE_VK_PFN(vkDestroyFence) +DECLARE_VK_PFN(vkDestroySurfaceKHR) +DECLARE_VK_PFN(vkDestroySwapchainKHR) +DECLARE_VK_PFN(vkGetPhysicalDeviceSurfaceCapabilitiesKHR) +DECLARE_VK_PFN(vkGetPhysicalDeviceSurfaceFormatsKHR) +DECLARE_VK_PFN(vkGetPhysicalDeviceSurfaceSupportKHR) +DECLARE_VK_PFN(vkGetSwapchainImagesKHR) +DECLARE_VK_PFN(vkQueuePresentKHR) +DECLARE_VK_PFN(vkResetFences) +DECLARE_VK_PFN(vkWaitForFences) + +static void load_vulkan_procs(void) +{ + void *libvulkan; + + if (!(libvulkan = dlopen(SONAME_LIBVULKAN, RTLD_NOW))) + { + fprintf(stderr, "Failed to load %s: %s.\n", SONAME_LIBVULKAN, dlerror()); + exit(1); + } + +#define LOAD_VK_PFN(name) name = (void *)dlsym(libvulkan, #name); + LOAD_VK_PFN(vkAcquireNextImageKHR) + LOAD_VK_PFN(vkCreateFence) + LOAD_VK_PFN(vkCreateSwapchainKHR) + LOAD_VK_PFN(vkCreateXcbSurfaceKHR) + LOAD_VK_PFN(vkDestroyFence) + LOAD_VK_PFN(vkDestroySurfaceKHR) + LOAD_VK_PFN(vkDestroySwapchainKHR) + LOAD_VK_PFN(vkGetPhysicalDeviceSurfaceCapabilitiesKHR) + LOAD_VK_PFN(vkGetPhysicalDeviceSurfaceFormatsKHR) + LOAD_VK_PFN(vkGetPhysicalDeviceSurfaceSupportKHR) + LOAD_VK_PFN(vkGetSwapchainImagesKHR) + LOAD_VK_PFN(vkQueuePresentKHR) + LOAD_VK_PFN(vkResetFences) + LOAD_VK_PFN(vkWaitForFences) +} struct demo { @@ -330,6 +377,8 @@ static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *c VkImage *vk_images; VkFormat format; + load_vulkan_procs(); + if ((format = vkd3d_get_vk_format(desc->format)) == VK_FORMAT_UNDEFINED) return NULL;

1 0

Francois Gouget : winetest: Move the win2004 results in the Win1909+ category.
by Alexandre Julliard 25 Apr '22

25 Apr '22

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 : testbot/cgi: Fix ItemPage's iteration over the master columns.
by Alexandre Julliard 25 Apr '22

25 Apr '22

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

Francois Gouget : winetest: Add support for Windows 21H2.
by Alexandre Julliard 25 Apr '22

25 Apr '22

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

Alexandre Julliard : gitlab: Import the gitlab-to-mail tool.
by Alexandre Julliard 25 Apr '22

25 Apr '22

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 : packaging: Add Fedora 36.
by Alexandre Julliard 25 Apr '22

25 Apr '22

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 : Wine release 7.7
by Alexandre Julliard 22 Apr '22

22 Apr '22

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

Tag wine-7.7 : Alexandre Julliard : Release 7.7
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: refs/tags/wine-7.7 Tag: 72a1d76aa2aec5b410eca5abba0c405bfa3d1426 URL: https://source.winehq.org/git/wine.git/?a=tag;h=72a1d76aa2aec5b410eca5abba0… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 22 21:44:11 2022 +0200 Release 7.7

1 0

Alexandre Julliard : Release 7.7.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: master Commit: f4fdafbb5597bde5d2d3433d5c64f5a74dfac859 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4fdafbb5597bde5d2d3433d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 22 21:44:11 2022 +0200 Release 7.7. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 853 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 459 insertions(+), 415 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f4fdafbb5597bde5d2d3…

1 0

Bernhard Kölbl : windows.media.speech: Add ISpeechRecognitionCompilationResult.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: master Commit: 5c27a1ccc2aba5f986ab62581399aff051fad947 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c27a1ccc2aba5f986ab6258… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Fri Apr 22 14:48:07 2022 +0200 windows.media.speech: Add ISpeechRecognitionCompilationResult. 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/recognizer.c | 124 ++++++++++++++++++++++++++++++- dlls/windows.media.speech/tests/speech.c | 17 ++--- 2 files changed, 130 insertions(+), 11 deletions(-) diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c index 9802a4ae5da..39813ef5607 100644 --- a/dlls/windows.media.speech/recognizer.c +++ b/dlls/windows.media.speech/recognizer.c @@ -23,6 +23,128 @@ WINE_DEFAULT_DEBUG_CHANNEL(speech); +/* + * + * ISpeechRecognitionCompilationResult + * + */ + +struct compilation_result +{ + ISpeechRecognitionCompilationResult ISpeechRecognitionCompilationResult_iface; + LONG ref; + + SpeechRecognitionResultStatus status; +}; + +static inline struct compilation_result *impl_from_ISpeechRecognitionCompilationResult( ISpeechRecognitionCompilationResult *iface ) +{ + return CONTAINING_RECORD(iface, struct compilation_result, ISpeechRecognitionCompilationResult_iface); +} + +static HRESULT WINAPI compilation_result_QueryInterface( ISpeechRecognitionCompilationResult *iface, REFIID iid, void **out ) +{ + struct compilation_result *impl = impl_from_ISpeechRecognitionCompilationResult(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IAgileObject) || + IsEqualGUID(iid, &IID_ISpeechRecognitionCompilationResult)) + { + IInspectable_AddRef((*out = &impl->ISpeechRecognitionCompilationResult_iface)); + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI compilation_result_AddRef( ISpeechRecognitionCompilationResult *iface ) +{ + struct compilation_result *impl = impl_from_ISpeechRecognitionCompilationResult(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p, ref %lu.\n", iface, ref); + return ref; +} + +static ULONG WINAPI compilation_result_Release( ISpeechRecognitionCompilationResult *iface ) +{ + struct compilation_result *impl = impl_from_ISpeechRecognitionCompilationResult(iface); + + ULONG ref = InterlockedDecrement(&impl->ref); + TRACE("iface %p, ref %lu.\n", iface, ref); + + if (!ref) + free(impl); + + return ref; +} + +static HRESULT WINAPI compilation_result_GetIids( ISpeechRecognitionCompilationResult *iface, ULONG *iid_count, IID **iids ) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +static HRESULT WINAPI compilation_result_GetRuntimeClassName( ISpeechRecognitionCompilationResult *iface, HSTRING *class_name ) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT WINAPI compilation_result_GetTrustLevel( ISpeechRecognitionCompilationResult *iface, TrustLevel *trust_level ) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT WINAPI compilation_result_get_Status( ISpeechRecognitionCompilationResult *iface, SpeechRecognitionResultStatus *value ) +{ + struct compilation_result *impl = impl_from_ISpeechRecognitionCompilationResult(iface); + TRACE("iface %p, value %p.\n", iface, value); + *value = impl->status; + return S_OK; +} + +static const struct ISpeechRecognitionCompilationResultVtbl compilation_result_vtbl = +{ + /* IUnknown methods */ + compilation_result_QueryInterface, + compilation_result_AddRef, + compilation_result_Release, + /* IInspectable methods */ + compilation_result_GetIids, + compilation_result_GetRuntimeClassName, + compilation_result_GetTrustLevel, + /* ISpeechRecognitionCompilationResult methods */ + compilation_result_get_Status +}; + + +static HRESULT WINAPI compilation_result_create( SpeechRecognitionResultStatus status, ISpeechRecognitionCompilationResult **out ) +{ + struct compilation_result *impl; + + TRACE("out %p.\n", out); + + if (!(impl = calloc(1, sizeof(*impl)))) + { + *out = NULL; + return E_OUTOFMEMORY; + } + + impl->ISpeechRecognitionCompilationResult_iface.lpVtbl = &compilation_result_vtbl; + impl->ref = 1; + impl->status = status; + + *out = &impl->ISpeechRecognitionCompilationResult_iface; + TRACE("created %p\n", *out); + return S_OK; +} + /* * * SpeechContinuousRecognitionSession @@ -350,7 +472,7 @@ static HRESULT WINAPI recognizer_get_UIOptions( ISpeechRecognizer *iface, ISpeec static HRESULT WINAPI compile_callback( IInspectable *invoker, IInspectable **result ) { - return S_OK; + return compilation_result_create(SpeechRecognitionResultStatus_Success, (ISpeechRecognitionCompilationResult **) result); } static HRESULT WINAPI recognizer_CompileConstraintsAsync( ISpeechRecognizer *iface, diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index e04198c93d9..051b38ce0f9 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -1005,19 +1005,16 @@ static void test_SpeechRecognizer(void) compilation_result = (void*)0xdeadbeef; hr = IAsyncOperation_SpeechRecognitionCompilationResult_GetResults(operation, &compilation_result); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - if (compilation_result != (void*)0xdeadbeef) - { - todo_wine check_interface(compilation_result, &IID_IAgileObject, TRUE); + check_interface(compilation_result, &IID_IAgileObject, TRUE); - hr = ISpeechRecognitionCompilationResult_get_Status(compilation_result, &result_status); - todo_wine ok(hr == S_OK, "ISpeechRecognitionCompilationResult_get_Status failed, hr %#lx.\n", hr); - todo_wine ok(result_status == SpeechRecognitionResultStatus_Success, "Got unexpected status %#x.\n", result_status); + 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); - ref = ISpeechRecognitionCompilationResult_Release(compilation_result); - todo_wine ok(!ref , "Got unexpected ref %lu.\n", ref); - } + ref = ISpeechRecognitionCompilationResult_Release(compilation_result); + ok(!ref , "Got unexpected ref %lu.\n", ref); hr = IAsyncOperation_SpeechRecognitionCompilationResult_GetResults(operation, &compilation_result); ok(hr == E_UNEXPECTED, "Got unexpected hr %#lx.\n", hr);

1 0

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-commits April 2022