- Wine-Devel - list.winehq.org

[PATCH] wined3d: Trace the available Vulkan extensions.
by Henri Verbeet Jan. 25, 2021

Jan. 25, 2021

Like we do for OpenGL. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 9a226edc65a0..d2ac652ab629 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1853,6 +1853,12 @@ static BOOL enable_vulkan_instance_extensions(uint32_t *extension_count, goto done; } + TRACE("Vulkan instance extensions reported:\n"); + for (i = 0; i < count; ++i) + { + TRACE(" - %s.\n", debugstr_a(extensions[i].extensionName)); + } + for (i = 0; i < ARRAY_SIZE(vulkan_instance_extensions); ++i) { if (vulkan_instance_extensions[i].core_since_version <= vk_info->api_version) @@ -2207,6 +2213,12 @@ static bool wined3d_adapter_vk_init_device_extensions(struct wined3d_adapter_vk goto done; } + TRACE("Vulkan device extensions reported:\n"); + for (i = 0; i < count; ++i) + { + TRACE(" - %s.\n", debugstr_a(extensions[i].extensionName)); + } + for (i = 0, enable_count = 0; i < ARRAY_SIZE(info); ++i) { if (info[i].core_since_version <= vk_info->api_version) -- 2.20.1

1 0

[PATCH] mfmediaengine: Return current session time in GetCurrentTime().
by Nikolay Sivov Jan. 25, 2021

Jan. 25, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfmediaengine/main.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 55585b8b826..5981548c9f8 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -99,6 +99,7 @@ struct media_engine MF_MEDIA_ENGINE_READY ready_state; MF_MEDIA_ENGINE_PRELOAD preload; IMFMediaSession *session; + IMFClock *clock; IMFSourceResolver *resolver; BSTR current_source; struct video_frame video_frame; @@ -774,6 +775,8 @@ static void free_media_engine(struct media_engine *engine) { if (engine->callback) IMFMediaEngineNotify_Release(engine->callback); + if (engine->clock) + IMFClock_Release(engine->clock); if (engine->session) IMFMediaSession_Release(engine->session); if (engine->attributes) @@ -987,9 +990,22 @@ static BOOL WINAPI media_engine_IsSeeking(IMFMediaEngine *iface) static double WINAPI media_engine_GetCurrentTime(IMFMediaEngine *iface) { - FIXME("(%p): stub.\n", iface); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + LONGLONG clocktime; + double ret = 0.0; + MFTIME systime; - return 0.0; + TRACE("%p.\n", iface); + + EnterCriticalSection(&engine->cs); + if (SUCCEEDED(IMFClock_GetCorrelatedTime(engine->clock, 0, &clocktime, &systime))) + { + /* Assume 100ns clock. */ + ret = (double)clocktime / 10000000.0; + } + LeaveCriticalSection(&engine->cs); + + return ret; } static HRESULT WINAPI media_engine_SetCurrentTime(IMFMediaEngine *iface, double time) @@ -1644,6 +1660,9 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct if (FAILED(hr = MFCreateMediaSession(NULL, &engine->session))) return hr; + if (FAILED(hr = IMFMediaSession_GetClock(engine->session, &engine->clock))) + return hr; + if (FAILED(hr = IMFMediaSession_BeginGetEvent(engine->session, &engine->session_events, NULL))) return hr; -- 2.29.2

1 0

[PATCH] wined3d: Make adapter_gl_clear_uav() static.
by Zebediah Figura Jan. 25, 2021

Jan. 25, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/adapter_gl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index b6be5854714..d9f70049e6f 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5012,7 +5012,7 @@ static void adapter_gl_flush_context(struct wined3d_context *context) context_gl->gl_info->gl_ops.gl.p_glFlush(); } -void adapter_gl_clear_uav(struct wined3d_context *context, +static void adapter_gl_clear_uav(struct wined3d_context *context, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) { TRACE("context %p, view %p, clear_value %s.\n", context, view, debug_uvec4(clear_value)); -- 2.29.2

2 1

[tools] testbot/PatchUtils: Always track modified paths, if only for deletions.
by Francois Gouget Jan. 25, 2021

Jan. 25, 2021

We track all deleted and (re)added files. Global files and scripts should be no exception even if they are unlikely to be deleted / (re)added. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PatchUtils.pm | 30 +++++++++++++++++---------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 974ff8eb6..5588df204 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -138,9 +138,9 @@ sub _LoadWineFiles() # These paths are too generic to be proof that this is a Wine patch. my $AmbiguousPathsRe = join('|', 'Makefile\.in$', - # aclocal.m4 gets special treatment - # configure gets special treatment - # configure.ac gets special treatment + 'aclocal\.m4$', + 'configure$', + 'configure\.ac$', 'include/Makefile\.in$', 'include/config\.h\.in$', 'po/', @@ -313,42 +313,50 @@ sub GetPatchImpacts($) my ($Path, $Change); while (my $Line = <$fh>) { - if ($Line =~ m=^--- \w+/(?:aclocal\.m4|configure\.ac)$=) + if ($Line =~ m=^--- \w+/(aclocal\.m4|configure\.ac)$=) { + $Path = $1; $Impacts->{PatchedRoot} = $Impacts->{Autoconf} = 1; } - elsif ($Line =~ m=^--- \w+/tools/make_makefiles$=) + elsif ($Line =~ m=^--- \w+/(tools/make_makefiles)$=) { + $Path = $1; $Impacts->{PatchedRoot} = $Impacts->{MakeMakefiles} = 1; $Impacts->{IsWinePatch} = 1; } - elsif ($Line =~ m=^--- \w+/server/protocol\.def$=) + elsif ($Line =~ m=^--- \w+/(server/protocol\.def)$=) { + $Path = $1; $Impacts->{PatchedRoot} = $Impacts->{MakeRequests} = 1; $Impacts->{IsWinePatch} = 1; } - elsif ($Line =~ m=^--- \w+/dlls/dsound/make_fir$=) + elsif ($Line =~ m=^--- \w+/(dlls/dsound/make_fir)$=) { + $Path = $1; $Impacts->{MakeFir} = 1; $Impacts->{IsWinePatch} = 1; } - elsif ($Line =~ m=^--- \w+/(?:dlls/ntdll/make_errors|dlls/ntdll/error\.c|include/ntstatus\.h|include/winerror\.h)$=) + elsif ($Line =~ m=^--- \w+/(dlls/ntdll/make_errors|dlls/ntdll/error\.c|include/ntstatus\.h|include/winerror\.h)$=) { + $Path = $1; $Impacts->{MakeErrors} = 1; $Impacts->{IsWinePatch} = 1; } - elsif ($Line =~ m=^--- \w+/(?:dlls/opengl32/make_opengl|dlls/opengl32/winegl\.xml|include/wine/wgl_driver\.h)$=) + elsif ($Line =~ m=^--- \w+/(dlls/opengl32/make_opengl|dlls/opengl32/winegl\.xml|include/wine/wgl_driver\.h)$=) { + $Path = $1; $Impacts->{PatchedRoot} = $Impacts->{MakeOpenGL} = 1; $Impacts->{IsWinePatch} = 1; } - elsif ($Line =~ m=^--- \w+/dlls/winevulkan/make_vulkan$=) + elsif ($Line =~ m=^--- \w+/(dlls/winevulkan/make_vulkan)$=) { + $Path = $1; $Impacts->{PatchedRoot} = $Impacts->{MakeVulkan} = 1; $Impacts->{IsWinePatch} = 1; } - elsif ($Line =~ m=^--- \w+/tools/make_unicode$=) + elsif ($Line =~ m=^--- \w+/(tools/make_unicode)$=) { + $Path = $1; $Impacts->{PatchedRoot} = $Impacts->{MakeUnicode} = 1; $Impacts->{IsWinePatch} = 1; } -- 2.20.1

1 0

[tools] winetest/dissect: Minor tweaks to match the TestBot parser.
by Francois Gouget Jan. 25, 2021

Jan. 25, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/dissect | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 8f30ccde2..c62f9141b 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -591,7 +591,7 @@ sub close_test_unit($) $line =~ /^Test output:/ or mydie "no test header: $line"; while ($line = <IN>) { $unitsize += length($line); - next if ($line =~ /^\s*$/); + next if ($line =~ /^\s*$/); # empty lines have no impact chomp $line; $line =~ s/\r+$//; if ($line =~ m%^([_.a-z0-9-]+):([_a-z0-9]+) (start|skipped) (-|[/_.a-z0-9-]+) (-|[.0-9a-f]+)$%) @@ -697,8 +697,8 @@ while ($line = <IN>) { # There may be more than one summary line due to child processes $pids{$l_pid || 0} = 1; $s_total += $l_total; - $s_todo += $l_todo; $s_failures += $l_failures; + $s_todo += $l_todo; $s_skipped += $l_skipped; add_test_line($class, escapeHTML($line)); } -- 2.20.1

1 0

[PATCH 3/3] winebuild: Use lld-link for static libraries on msvc target.
by Jacek Caban Jan. 25, 2021

Jan. 25, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winebuild/import.c | 44 +++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 12 deletions(-)

1 0

[PATCH 1/3] winebuild: Make mingw a separated platform from msvc.
by Jacek Caban Jan. 25, 2021

Jan. 25, 2021

Based on winegcc. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winebuild/build.h | 6 ++++++ tools/winebuild/import.c | 6 +++--- tools/winebuild/main.c | 21 +++++++++++---------- tools/winebuild/relay.c | 2 +- tools/winebuild/res32.c | 2 +- tools/winebuild/spec32.c | 14 +++++++------- tools/winebuild/utils.c | 15 ++++++++++++--- 7 files changed, 41 insertions(+), 25 deletions(-)

1 0

[tools 1/4] testbot/LogUtils: Add support for arrays in .errors files.
by Francois Gouget Jan. 25, 2021

Jan. 25, 2021

Array lines allow providing multiple values for a given 'property' name. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 30 ++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 3488c7b28..79714358c 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -848,6 +848,10 @@ Property lines contain (name, value) pairs. Note that properties which can be calculated while reading the errors file are not saved (e.g. ErrCount and NewCount). +=item a <name> <value> +Array lines contain (name, value) pairs and can appear multiple times for a +given name, resulting in a corresponding list of values. + =item g <lineno> <groupname> Group lines contain the group name and the line number of the first line of the group in the log. Note that the first line would typically not be an @@ -897,6 +901,22 @@ sub LoadLogErrorsFromFh($$) return $Line; } } + elsif ($Type eq "a") + { + if (!defined $LogInfo->{$Property}) + { + $LogInfo->{$Property} = [ $Value ]; + } + elsif (ref($LogInfo->{$Property}) eq "ARRAY") + { + push @{$LogInfo->{$Property}}, $Value; + } + else + { + $LogInfo->{BadLog} = "$LogInfo->{LineNo}: $Property is not an array, its value is $LogInfo->{$Property}"; + return $Line; + } + } elsif ($Type eq "g") { $LogInfo->{CurGroup} = _AddLogGroup($LogInfo, $Value, $Property); @@ -1025,7 +1045,15 @@ sub _DumpErrors next; } - print STDERR "+ $Key $LogInfo->{$Key}\n"; + if (ref($LogInfo->{$Key}) eq "ARRAY") + { + print STDERR "+ $Key\n"; + map { print STDERR " | $_\n" } (@{$LogInfo->{$Key}}); + } + else + { + print STDERR "+ $Key $LogInfo->{$Key}\n"; + } } _WriteLogErrorsToFh(*STDERR, $LogInfo); map { _DumpErrors("$Label.$_", $LogInfo->{$_}) } (@SubKeys); -- 2.20.1

1 3

[PATCH] crypt32: Also import user/admin defined root certificates on macOS.
by Piotr Caban Jan. 25, 2021

Jan. 25, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/crypt32/unixlib.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-)

1 0

[PATCH 1/5] include: Add windows.media.speechsynthesis.idl draft.
by Rémi Bernon Jan. 25, 2021

Jan. 25, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This is the continuation of my WinRT support patches, tracked in [1]. I've left the DECLSPEC_SELECTANY runtimeclass string constants aside for now, and I'll add them to the generated headers in a separate patch. A previous version of whole series is already in Wine Staging, and it has been successfully used [2] by Steve Lhomme <robux4(a)ycbcr.xyz> for VLC, and who also contributed fixes that I've merged in the series. [1] https://bugs.winehq.org/show_bug.cgi?id=49998 [2] https://github.com/robUx4/mingw-w64/commits/vlc_winrt/12 This IDL is used by windows.media.speech.dll, which is itself required by Flight Simulator. It will here be used as an illustration and test case for WIDL WinRT features. include/Makefile.in | 1 + include/windows.media.speechsynthesis.idl | 47 +++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 include/windows.media.speechsynthesis.idl diff --git a/include/Makefile.in b/include/Makefile.in index 74a1d8e0c89..096fb4554e5 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -745,6 +745,7 @@ SOURCES = \ windef.h \ windns.h \ windows.foundation.idl \ + windows.media.speechsynthesis.idl \ windows.h \ windowscontracts.idl \ windowsx.h \ diff --git a/include/windows.media.speechsynthesis.idl b/include/windows.media.speechsynthesis.idl new file mode 100644 index 00000000000..7a1de5fcba6 --- /dev/null +++ b/include/windows.media.speechsynthesis.idl @@ -0,0 +1,47 @@ +/* + * Copyright 2020 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "windows.foundation.idl"; + +namespace Windows { + namespace Media { + namespace SpeechSynthesis { + typedef enum VoiceGender VoiceGender; + interface IInstalledVoicesStatic; + interface IVoiceInformation; + } + } +} + +namespace Windows { + namespace Media { + namespace SpeechSynthesis { + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + enum VoiceGender + { + Male = 0, + Female = 1 + }; + } + } +} -- 2.30.0

4 14