April 2021 - Wine-Devel - list.winehq.org

[PATCH] winevulkan: Don't hardcode performance frequency.
by Paul Gofman April 19, 2021

April 19, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- This only real problem that the hardcoded value currently causes is broken convert_monotonic_timestamp in Proton Experimental where performance frequency is currently different. While this is not an upstream issue and we may even want to change that in Proton it doesn't seem right for winevulkan to depend on this implementation detail. dlls/winevulkan/vulkan.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 1070ccec115..f793b907dad 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1355,7 +1355,6 @@ VkResult WINAPI unix_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevi /* From ntdll/unix/sync.c */ #define NANOSECONDS_IN_A_SECOND 1000000000 -#define TICKSPERSEC 10000000 static inline VkTimeDomainEXT get_performance_counter_time_domain(void) { @@ -1382,7 +1381,17 @@ static VkTimeDomainEXT map_to_host_time_domain(VkTimeDomainEXT domain) static inline uint64_t convert_monotonic_timestamp(uint64_t value) { - return value / (NANOSECONDS_IN_A_SECOND / TICKSPERSEC); + static LARGE_INTEGER freq; + + if (!freq.QuadPart) + { + LARGE_INTEGER temp; + + RtlQueryPerformanceFrequency(&temp); + InterlockedCompareExchange64(&freq.QuadPart, temp.QuadPart, 0); + } + + return value * freq.QuadPart / NANOSECONDS_IN_A_SECOND; } static inline uint64_t convert_timestamp(VkTimeDomainEXT host_domain, VkTimeDomainEXT target_domain, uint64_t value) -- 2.30.2

2 2

[tools] winetest/dissect: Make the load errors more explicit on the dll versions page.
by Francois Gouget April 19, 2021

April 19, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/dissect | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 45af4c3dc..2bc078a25 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -896,11 +896,16 @@ foreach my $dll (sort keys %dllinfo) # There should be no native dll in the Wine tests $box->{data} .= sprintf "<td>%s</td><td class=\"failed\">native</td></tr>\n", escapeHTML($dll); } - elsif ($dllinfo{$dll}->{version} =~ /^load error/) + elsif ($dllinfo{$dll}->{version} eq "load error 258") + { + $box->{data} .= sprintf "<td>%s</td><td class=\"failed\">timed out getting the test list</td></tr>\n", + escapeHTML($dll); + } + elsif ($dllinfo{$dll}->{version} =~ /^load error (\d+)$/) { # Flag unknown errors - $box->{data} .= sprintf "<td>%s</td><td class=\"failed\">%s</td></tr>\n", - escapeHTML($dll), escapeHTML($dllinfo{$dll}->{version}); + $box->{data} .= sprintf "<td>%s</td><td class=\"failed\">got error %s while getting the test list</td></tr>\n", + escapeHTML($dll), escapeHTML($1); } elsif (defined($dllinfo{$dll}->{first})) { -- 2.20.1

1 0

[tools] winetest/dissect: Allow linking to the dlls in the version page.
by Francois Gouget April 19, 2021

April 19, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This will allow the patterns page to link to it. --- winetest/dissect | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 4b09cbb86..45af4c3dc 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -876,39 +876,40 @@ mydie "report reached file size limit (runaway test?)" if -s $report >= $maxfile $box->{data} .= "<table class=\"output\">\n"; foreach my $dll (sort keys %dllinfo) { + $box->{data} .= sprintf "<tr id=\"%s\">", escapeHTML($dll); if ($dllinfo{$dll}->{version} =~ /^dll is missing/) { my $reason = $dllinfo{$dll}->{version}; $reason =~ s/dll is //; - $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">%s</td></tr>\n", escapeHTML($dll), escapeHTML($reason); + $box->{data} .= sprintf "<td>%s</td><td class=\"skipped\">%s</td></tr>\n", escapeHTML($dll), escapeHTML($reason); } elsif ($dllinfo{$dll}->{version} eq "skipped") { - $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">skipped by user request</td></tr>\n", escapeHTML($dll); + $box->{data} .= sprintf "<td>%s</td><td class=\"skipped\">skipped by user request</td></tr>\n", escapeHTML($dll); } elsif ($dllinfo{$dll}->{version} eq "dll is a stub") { - $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">stub</td></tr>\n", escapeHTML($dll); + $box->{data} .= sprintf "<td>%s</td><td class=\"skipped\">stub</td></tr>\n", escapeHTML($dll); } elsif ($dllinfo{$dll}->{version} eq "dll is native") { # There should be no native dll in the Wine tests - $box->{data} .= sprintf "<tr><td>%s</td><td class=\"failed\">native</td></tr>\n", escapeHTML($dll); + $box->{data} .= sprintf "<td>%s</td><td class=\"failed\">native</td></tr>\n", escapeHTML($dll); } elsif ($dllinfo{$dll}->{version} =~ /^load error/) { # Flag unknown errors - $box->{data} .= sprintf "<tr><td>%s</td><td class=\"failed\">%s</td></tr>\n", + $box->{data} .= sprintf "<td>%s</td><td class=\"failed\">%s</td></tr>\n", escapeHTML($dll), escapeHTML($dllinfo{$dll}->{version}); } elsif (defined($dllinfo{$dll}->{first})) { - $box->{data} .= sprintf "<tr><td><a href=\"report.html#%s\">%s</a></td><td>%s</td></tr>\n", + $box->{data} .= sprintf "<td><a href=\"report.html#%s\">%s</a></td><td>%s</td></tr>\n", escapeHTML($dllinfo{$dll}->{first}), escapeHTML($dll), escapeHTML($dllinfo{$dll}->{version}); } else { - $box->{data} .= sprintf "<tr><td>%s</td><td>%s</td></tr>\n", escapeHTML($dll), escapeHTML($dllinfo{$dll}->{version}); + $box->{data} .= sprintf "<td>%s</td><td>%s</td></tr>\n", escapeHTML($dll), escapeHTML($dllinfo{$dll}->{version}); } } $box->{data} .= "</table>"; -- 2.20.1

1 0

[PATCH 1/4] evr/presenter: Set MF_MT_MINIMUM_DISPLAY_APERTURE when configuring mixer output.
by Nikolay Sivov April 19, 2021

April 19, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/presenter.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 868a265e3ee..29317fb87b4 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -309,12 +309,25 @@ static HRESULT video_presenter_set_media_type(struct video_presenter *presenter, return hr; } +static HRESULT video_presenter_configure_output_type(struct video_presenter *presenter, const MFVideoArea *aperture, + IMFMediaType *media_type) +{ + HRESULT hr; + + hr = IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, (UINT64)aperture->Area.cx << 32 | aperture->Area.cy); + if (SUCCEEDED(hr)) + hr = IMFMediaType_SetBlob(media_type, &MF_MT_GEOMETRIC_APERTURE, (UINT8 *)aperture, sizeof(*aperture)); + if (SUCCEEDED(hr)) + hr = IMFMediaType_SetBlob(media_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, (UINT8 *)aperture, sizeof(*aperture)); + + return hr; +} + static HRESULT video_presenter_invalidate_media_type(struct video_presenter *presenter) { IMFMediaType *media_type, *candidate_type; + MFVideoArea aperture = { 0 }; unsigned int idx = 0; - UINT64 frame_size; - MFVideoArea aperture; RECT rect; HRESULT hr; @@ -332,11 +345,6 @@ static HRESULT video_presenter_invalidate_media_type(struct video_presenter *pre aperture.Area.cx = rect.right - rect.left; aperture.Area.cy = rect.bottom - rect.top; - aperture.OffsetX.value = 0; - aperture.OffsetX.fract = 0; - aperture.OffsetY.value = 0; - aperture.OffsetY.fract = 0; - frame_size = (UINT64)aperture.Area.cx << 32 | aperture.Area.cy; while (SUCCEEDED(hr = IMFTransform_GetOutputAvailableType(presenter->mixer, 0, idx++, &candidate_type))) { @@ -346,10 +354,10 @@ static HRESULT video_presenter_invalidate_media_type(struct video_presenter *pre WARN("Failed to clone a media type, hr %#x.\n", hr); IMFMediaType_Release(candidate_type); - IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, frame_size); - IMFMediaType_SetBlob(media_type, &MF_MT_GEOMETRIC_APERTURE, (UINT8 *)&aperture, sizeof(aperture)); + hr = video_presenter_configure_output_type(presenter, &aperture, media_type); - hr = IMFTransform_SetOutputType(presenter->mixer, 0, media_type, MFT_SET_TYPE_TEST_ONLY); + if (SUCCEEDED(hr)) + hr = IMFTransform_SetOutputType(presenter->mixer, 0, media_type, MFT_SET_TYPE_TEST_ONLY); if (SUCCEEDED(hr)) hr = video_presenter_set_media_type(presenter, media_type); -- 2.30.2

1 3

[PATCH] mf/evr: Set initial output window size for the presenter.
by Nikolay Sivov April 19, 2021

April 19, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/Makefile.in | 2 +- dlls/mf/evr.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in index f60e337b386..e56d4c04a84 100644 --- a/dlls/mf/Makefile.in +++ b/dlls/mf/Makefile.in @@ -1,7 +1,7 @@ MODULE = mf.dll IMPORTLIB = mf IMPORTS = advapi32 mfplat ole32 uuid mfuuid strmiids -DELAYIMPORTS = evr +DELAYIMPORTS = evr user32 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 9cb6763da4e..79e2f57f9c5 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -1611,11 +1611,15 @@ static HRESULT video_renderer_configure_mixer(struct video_renderer *renderer) static HRESULT video_renderer_configure_presenter(struct video_renderer *renderer) { IMFVideoDisplayControl *control; + RECT rect = { 0 }; HRESULT hr; if (SUCCEEDED(IMFVideoPresenter_QueryInterface(renderer->presenter, &IID_IMFVideoDisplayControl, (void **)&control))) { - IMFVideoDisplayControl_SetVideoWindow(control, renderer->window); + GetClientRect(renderer->window, &rect); + + if (SUCCEEDED(hr = IMFVideoDisplayControl_SetVideoWindow(control, renderer->window))) + hr = IMFVideoDisplayControl_SetVideoPosition(control, NULL, &rect); IMFVideoDisplayControl_Release(control); } -- 2.30.2

1 0

[PATCH 4/4] winevulkan: Use wide string literals.
by Jacek Caban April 19, 2021

April 19, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/loader.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)

1 0

[PATCH 3/4] winevulkan: Build with msvcrt.
by Jacek Caban April 19, 2021

April 19, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/Makefile.in | 2 ++ 1 file changed, 2 insertions(+)

1 0

[PATCH 2/4] winevulkan: Don't use vulkan_private.h in loader.c.
by Jacek Caban April 19, 2021

April 19, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/loader.c | 4 ++-- dlls/winevulkan/vulkan.c | 4 ++-- dlls/winevulkan/vulkan_loader.h | 26 ++++++++++++++++++++++++++ dlls/winevulkan/vulkan_private.h | 24 +----------------------- 4 files changed, 31 insertions(+), 27 deletions(-)

1 0

[PATCH 1/4] winevulkan: Don't use vulkan_private.h in loader_thunks.c.
by Jacek Caban April 19, 2021

April 19, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/loader_thunks.c | 2 +- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_loader.h | 43 ++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_private.h | 19 +------------- 4 files changed, 46 insertions(+), 20 deletions(-) create mode 100644 dlls/winevulkan/vulkan_loader.h

1 0

[PATCH 0/1] msvcrt: Add __stdio_common_vfprintf_p and __stdio_common_vfwprintf_p
by Michele Dionisio April 19, 2021

April 19, 2021

this patch implement required function usefull to close issue 50960. Michele Dionisio (1): msvcrt: Add __stdio_common_vfprintf_p and __stdio_common_vfwprintf_p .../api-ms-win-crt-private-l1-1-0.spec | 4 +-- .../api-ms-win-crt-stdio-l1-1-0.spec | 4 +-- dlls/msvcrt/file.c | 28 +++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 8 +++--- 4 files changed, 36 insertions(+), 8 deletions(-) -- 2.30.2

2 2