February 2022 - Wine-Commits

Zebediah Figura : kernelbase: Also return E_FAIL when trying to parse username, password, or port for non-Internet URLs.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: ef64aea701376bf19a4969756cf5a42b6b68ecbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef64aea701376bf19a496975… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 14 20:37:06 2022 -0600 kernelbase: Also return E_FAIL when trying to parse username, password, or port for non-Internet URLs. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 34 ++++++++++++++++++---------------- dlls/shlwapi/tests/url.c | 6 +++--- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index b753ce3dd2e..28717c25f79 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4329,6 +4329,24 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p hr = parse_url(url, &pl); + switch (scheme) + { + case URL_SCHEME_FILE: + case URL_SCHEME_FTP: + case URL_SCHEME_GOPHER: + case URL_SCHEME_HTTP: + case URL_SCHEME_HTTPS: + case URL_SCHEME_TELNET: + case URL_SCHEME_NEWS: + case URL_SCHEME_NNTP: + case URL_SCHEME_SNEWS: + break; + + default: + if (part != URL_PART_SCHEME && part != URL_PART_QUERY) + return E_FAIL; + } + switch (part) { case URL_PART_SCHEME: @@ -4344,22 +4362,6 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p break; case URL_PART_HOSTNAME: - switch (scheme) - { - case URL_SCHEME_FILE: - case URL_SCHEME_FTP: - case URL_SCHEME_GOPHER: - case URL_SCHEME_HTTP: - case URL_SCHEME_HTTPS: - case URL_SCHEME_TELNET: - case URL_SCHEME_NEWS: - case URL_SCHEME_NNTP: - case URL_SCHEME_SNEWS: - break; - default: - return E_FAIL; - } - if (scheme == URL_SCHEME_FILE && (!pl.hostname_len || (pl.hostname_len == 1 && *(pl.hostname + 1) == ':'))) { *out = '\0'; diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 729b069a772..904d3e7bb5b 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -601,10 +601,10 @@ static void test_UrlGetPart(void) tests[] = { {"hi", URL_PART_SCHEME, 0, S_FALSE, ""}, - {"hi", URL_PART_USERNAME, 0, E_FAIL, .todo_hr = TRUE}, - {"hi", URL_PART_PASSWORD, 0, E_FAIL, .todo_hr = TRUE}, + {"hi", URL_PART_USERNAME, 0, E_FAIL}, + {"hi", URL_PART_PASSWORD, 0, E_FAIL}, {"hi", URL_PART_HOSTNAME, 0, E_FAIL}, - {"hi", URL_PART_PORT, 0, E_FAIL, .todo_hr = TRUE}, + {"hi", URL_PART_PORT, 0, E_FAIL}, {"hi", URL_PART_QUERY, 0, S_FALSE, ""}, {"http://foo:bar(a)localhost:21/internal.php?query=x&return=y", URL_PART_SCHEME, 0, S_OK, "http"},

1 0

Francois Gouget : testbot/LibvirtTool: Skip creating the intermediate -live snapshot.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: tools Branch: master Commit: 93052eced61615df6d9acf5b4d4ef455c284b119 URL: https://source.winehq.org/git/tools.git/?a=commit;h=93052eced61615df6d9acf5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 15 05:03:19 2022 +0100 testbot/LibvirtTool: Skip creating the intermediate -live snapshot. Basing the localized snapshots on the plain -live snapshot is not very useful and skipping this intermediate step makes the code simpler. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 43 +++++++++++++++++++------------------------ 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index fad0727..3b2794f 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -603,6 +603,7 @@ sub Revert() # Add some extra time to set up the VM locale and reboot it $ExtraTimeout += $VMToolTimeout; $SetLocale = "$1-$2"; + $CreateSnapshot = 1; Debug(Elapsed($Start), " $VMKey does not yet have a $DomainSnapshot-$SetLocale snapshot\n"); } if (!$Domain->HasSnapshot($DomainSnapshot) and $DomainSnapshot =~ s/-live$//) @@ -655,7 +656,7 @@ sub Revert() # Mark the VM as sleeping which allows the scheduler to abort the revert in # favor of higher priority tasks. But don't allow interruptions in the # middle of snapshot creation! - if (!$CreateSnapshot and !$SetLocale) + if (!$CreateSnapshot) { return 1 if (ChangeStatus("reverting", "sleeping")); } @@ -664,10 +665,22 @@ sub Revert() # reboot so reset start.count in that case. SetupTestAgentd($Booting, ($CreateSnapshot or $SetLocale), $SetLocale); + # Set up the VM locale + if ($SetLocale) + { + Debug(Elapsed($Start), " Setting up the $SetLocale locale on $VMKey\n"); + my @Cmd = ("$BinDir/SetWinLocale", $VM->Hostname, "--default", $SetLocale); + push @Cmd, "--debug" if ($Debug); + if (system(@Cmd)) + { + FatalError("Could not set the $VMKey locale to $SetLocale\n"); + } + $Booting = 1; + } + if ($CreateSnapshot) { - $DomainSnapshot .= "-live"; - CreateSnapshot($Domain, $DomainSnapshot); + CreateSnapshot($Domain, $VM->IdleSnapshot); if ($VM->Type eq "build" or $VM->Type eq "wine") { @@ -686,23 +699,11 @@ sub Revert() Debug(Elapsed($Start), " Added a job to update and rebuild Wine on $VMKey\n"); } } - } - # Set up the VM locale - if ($SetLocale) - { - Debug(Elapsed($Start), " Setting up the $SetLocale locale on $VMKey\n"); - my @Cmd = ("$BinDir/SetWinLocale", $VM->Hostname, "--default", $SetLocale); - push @Cmd, "--debug" if ($Debug); - if (system(@Cmd)) - { - FatalError("Could not set the $VMKey locale to $SetLocale\n"); - } - - $DomainSnapshot .= "-$SetLocale"; - CreateSnapshot($Domain, $DomainSnapshot); + # The activity monitor does not like it when VMs skip the sleeping step + return 1 if (ChangeStatus("reverting", "sleeping")); } - elsif (!$CreateSnapshot) + else { my $Sleep = ($Booting and $SleepAfterBoot > $SleepAfterRevert) ? $SleepAfterBoot : $SleepAfterRevert; @@ -711,12 +712,6 @@ sub Revert() sleep($Sleep); } - if ($CreateSnapshot or $SetLocale) - { - # The activity monitor does not like it when VMs skip the sleeping step - return 1 if (ChangeStatus("reverting", "sleeping")); - } - return ChangeStatus($CurrentStatus, "idle", "done"); }

1 0

Francois Gouget : testbot/LibvirtTool: Wait a bit between shutting down and reverting a VM.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: tools Branch: master Commit: d5be151028e0dab3e1d323e4e6a0fc9be2061118 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d5be151028e0dab3e1d323e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 15 05:03:17 2022 +0100 testbot/LibvirtTool: Wait a bit between shutting down and reverting a VM. Also rename ShutDown() to the more descriptive ShutDownIfOffSnapshot() and document it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index a4ae7df..fad0727 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -279,7 +279,20 @@ sub GetPrivilegedTA($) return $TA->SetTime() ? $TA : $VM->GetAgent(1); } -sub ShutDown() +=pod +=over 12 + +=item C<ShutDownIfOffSnapshot()> + +Attempt a clean shutdown of the VM if it is running a snapshot that requests +them (snapshot name containing '-off'). + +Returns 0 if the shutdown failed, 2 if it was successful and 1 if the VM was +already powered off or a shutdown was not needed. +=back +=cut + +sub ShutDownIfOffSnapshot() { my $Domain = $VM->GetDomain(); my $CurrentSnapshot = $Domain->GetSnapshotName(); @@ -310,7 +323,7 @@ sub ShutDown() { Debug(Elapsed($Start), " Successfully shut down $VMKey\n"); LogMsg "Successfully shut down $VMKey\n"; - return 1; + return 2; } sleep(1); } @@ -364,7 +377,7 @@ sub Monitor() if ($IsReady and $VM->GetDomain()->IsPoweredOn()) { # Try to perform a clean shutdown if requested - ShutDown(); + ShutDownIfOffSnapshot(); my $ErrMessage = $VM->GetDomain()->PowerOff(); if (defined $ErrMessage) @@ -390,7 +403,7 @@ sub Monitor() sub PowerOff() { # Try to perform a clean shutdown if requested - ShutDown(); + ShutDownIfOffSnapshot(); # Power off the VM no matter what its initial status is $CurrentStatus = $VM->Status; @@ -430,7 +443,7 @@ sub CheckOff() if ($SnapshotName eq $VM->IdleSnapshot) { # Try to perform a clean shutdown if requested - ShutDown(); + ShutDownIfOffSnapshot(); my $ErrMessage = $VM->GetDomain()->PowerOff(); FatalError("$ErrMessage\n") if (defined $ErrMessage); @@ -611,8 +624,10 @@ sub Revert() $VM->Save(); } - # Before reverting, try to perform a clean shutdown if requested - ShutDown(); + # Before reverting, try to perform a clean shutdown if requested. + # After a shutdown a small wait is also sometimes required, at least when + # switching from a PCI-passthrough configuration to a regular one. + sleep(1) if (ShutDownIfOffSnapshot() == 2); # Revert the VM (and power it on if necessary) Debug(Elapsed($Start), " Reverting $VMKey to $DomainSnapshot\n");

1 0

Francois Gouget : testbot/LibvirtTool: Clean up the snapshot name parsing.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: tools Branch: master Commit: c960a95f6025538a9979b56cca652dc7a612615f URL: https://source.winehq.org/git/tools.git/?a=commit;h=c960a95f6025538a9979b56… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 15 05:03:22 2022 +0100 testbot/LibvirtTool: Clean up the snapshot name parsing. This also makes it easier to extend it and pass all the configuration around. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 95 +++++++++++++++++++++++++++------------------- 1 file changed, 56 insertions(+), 39 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 3b2794f..d51699f 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -6,7 +6,7 @@ # network trouble, and thus are best performed in a separate process. # # Copyright 2009 Ge van Geldorp -# Copyright 2012-2019 Francois Gouget +# Copyright 2012-2021 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -564,6 +564,27 @@ sub SetupTestAgentd($$$) $TA->Disconnect(); } +sub GetSnapshotConfig($) +{ + my ($Config) = @_; + + while (1) + { + if ($Config->{base} =~ s/-([a-z]{2}-[A-Z]{2})$//) + { + $Config->{locale} = $1; + } + elsif ($Config->{base} =~ s/-(live)$//) + { + $Config->{$1} = 1; + } + else + { + last; + } + } +} + sub CreateSnapshot($$) { my ($Domain, $SnapshotName) = @_; @@ -591,35 +612,32 @@ sub Revert() return 1; } $CurrentStatus = "reverting"; - my $DomainSnapshot = $VM->IdleSnapshot; - my $ExtraTimeout = 0; - my ($SetLocale, $CreateSnapshot); + my $Config = { base => $VM->IdleSnapshot }; my $Domain = $VM->GetDomain(); - if (($VM->Type eq "win32" or $VM->Type eq "win64") and - !$Domain->HasSnapshot($DomainSnapshot) and - $DomainSnapshot =~ s/-([a-z]{2})-([A-Z]{2})$//) - { - # Add some extra time to set up the VM locale and reboot it - $ExtraTimeout += $VMToolTimeout; - $SetLocale = "$1-$2"; - $CreateSnapshot = 1; - Debug(Elapsed($Start), " $VMKey does not yet have a $DomainSnapshot-$SetLocale snapshot\n"); - } - if (!$Domain->HasSnapshot($DomainSnapshot) and $DomainSnapshot =~ s/-live$//) - { - # Add some extra time to boot the VM and create the live snapshot - $ExtraTimeout += $WaitForBoot + $VMToolTimeout / 2; - $CreateSnapshot = 1; - Debug(Elapsed($Start), " $VMKey does not yet have a $DomainSnapshot-live snapshot\n"); - } - if (!$Domain->HasSnapshot($DomainSnapshot)) - { - FatalError("Could not find $VMKey\'s $DomainSnapshot snapshot\n"); - } - if ($ExtraTimeout) + if (!$Domain->HasSnapshot($Config->{base})) { + $Config->{create} = 1; + GetSnapshotConfig($Config); + if ($Config->{locale} and $VM->Type !~ /^win(?:32|64)$/) + { + FatalError("Creating locale snapshots ($Config->{locale}) is not supported for ". $VM->Type ." VMs ($VMKey)\n"); + } + if (!$Config->{live}) + { + FatalError("Only live snapshots can be created ($VMKey)\n"); + } + if (!$Domain->HasSnapshot($Config->{base})) + { + FatalError("Could not find $VMKey\'s $Config->{base} snapshot\n"); + } + + # Extend the deadline to have time to set up the VM and (re)boot it. + # Add $WaitForBoot even if no reboot is needed in the end. + my $ExtraTimeout = $WaitForBoot + $VMToolTimeout; Debug(Elapsed($Start), " Extending the $VMKey revert deadline by ${ExtraTimeout}s\n"); + # ChildDeadline is undefined if the VM (or another sharing the same + # hypervisor domain) is in maintenance mode. my $Deadline = $VM->ChildDeadline || (time() + $VMToolTimeout); $VM->ChildDeadline($Deadline + $ExtraTimeout); $VM->Save(); @@ -631,8 +649,8 @@ sub Revert() sleep(1) if (ShutDownIfOffSnapshot() == 2); # Revert the VM (and power it on if necessary) - Debug(Elapsed($Start), " Reverting $VMKey to $DomainSnapshot\n"); - my ($ErrMessage, $Booting) = $Domain->RevertToSnapshot($DomainSnapshot); + Debug(Elapsed($Start), " Reverting $VMKey to $Config->{base}\n"); + my ($ErrMessage, $Booting) = $Domain->RevertToSnapshot($Config->{base}); if (defined $ErrMessage) { # Libvirt/QEmu is buggy and cannot revert a running VM from one hardware @@ -645,40 +663,39 @@ sub Revert() FatalError("Could not power off $VMKey: $ErrMessage\n"); } - Debug(Elapsed($Start), " Reverting $VMKey to $DomainSnapshot... again\n"); - ($ErrMessage, $Booting) = $Domain->RevertToSnapshot($DomainSnapshot); + Debug(Elapsed($Start), " Reverting $VMKey to $Config->{base}... again\n"); + ($ErrMessage, $Booting) = $Domain->RevertToSnapshot($Config->{base}); } if (defined $ErrMessage) { - FatalError("Could not revert $VMKey to $DomainSnapshot: $ErrMessage\n"); + FatalError("Could not revert $VMKey to $Config->{base}: $ErrMessage\n"); } # Mark the VM as sleeping which allows the scheduler to abort the revert in # favor of higher priority tasks. But don't allow interruptions in the # middle of snapshot creation! - if (!$CreateSnapshot) + if (!$Config->{create}) { return 1 if (ChangeStatus("reverting", "sleeping")); } # Set up the TestAgent server. Note that setting the locale will require a # reboot so reset start.count in that case. - SetupTestAgentd($Booting, ($CreateSnapshot or $SetLocale), $SetLocale); + SetupTestAgentd($Booting, $Config->{create}, $Config->{locale}); # Set up the VM locale - if ($SetLocale) + if ($Config->{locale}) { - Debug(Elapsed($Start), " Setting up the $SetLocale locale on $VMKey\n"); - my @Cmd = ("$BinDir/SetWinLocale", $VM->Hostname, "--default", $SetLocale); + Debug(Elapsed($Start), " Setting up the $Config->{locale} locale on $VMKey\n"); + my @Cmd = ("$BinDir/SetWinLocale", $VM->Hostname, "--default", $Config->{locale}); push @Cmd, "--debug" if ($Debug); if (system(@Cmd)) { - FatalError("Could not set the $VMKey locale to $SetLocale\n"); + FatalError("Could not set the $VMKey locale to $Config->{locale}\n"); } - $Booting = 1; } - if ($CreateSnapshot) + if ($Config->{create}) { CreateSnapshot($Domain, $VM->IdleSnapshot);

1 0

Henri Verbeet : wined3d: Use the chunk allocator for GL vertex buffers.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: a13fc3bb7e055562b8b9deae985c64c5c7861424 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a13fc3bb7e055562b8b9deae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 11 19:42:02 2022 -0600 wined3d: Use the chunk allocator for GL vertex buffers. 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> --- dlls/wined3d/context_gl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 2a37834b706..c6816d97c63 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3139,6 +3139,7 @@ static bool use_buffer_chunk_suballocation(const struct wined3d_gl_info *gl_info { switch (binding) { + case GL_ARRAY_BUFFER: case GL_ATOMIC_COUNTER_BUFFER: case GL_DRAW_INDIRECT_BUFFER: case GL_PIXEL_UNPACK_BUFFER:

1 0

Nikolay Sivov : mfplat/tests: Add a separate test function for MFGetPlaneSize().
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: ee8ddf37c9af60db6c15f6f7d99c9de593a2e120 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee8ddf37c9af60db6c15f6f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 14 21:46:24 2022 +0300 mfplat/tests: Add a separate test function for MFGetPlaneSize(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 206 +++++++++++++++++++++++++-------------------- 1 file changed, 114 insertions(+), 92 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index cabcc1b06b0..50f4e059205 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -4117,104 +4117,102 @@ static void test_stream_descriptor(void) IMFStreamDescriptor_Release(stream_desc); } -static void test_MFCalculateImageSize(void) +static const struct image_size_test { - static const struct image_size_test - { - const GUID *subtype; - UINT32 width; - UINT32 height; - UINT32 size; - UINT32 plane_size; /* Matches image size when 0. */ - } - image_size_tests[] = - { - { &MFVideoFormat_RGB8, 3, 5, 20 }, - { &MFVideoFormat_RGB8, 1, 1, 4 }, - { &MFVideoFormat_RGB555, 3, 5, 40 }, - { &MFVideoFormat_RGB555, 1, 1, 4 }, - { &MFVideoFormat_RGB565, 3, 5, 40 }, - { &MFVideoFormat_RGB565, 1, 1, 4 }, - { &MFVideoFormat_RGB24, 3, 5, 60 }, - { &MFVideoFormat_RGB24, 1, 1, 4 }, - { &MFVideoFormat_RGB32, 3, 5, 60 }, - { &MFVideoFormat_RGB32, 1, 1, 4 }, - { &MFVideoFormat_ARGB32, 3, 5, 60 }, - { &MFVideoFormat_ARGB32, 1, 1, 4 }, - { &MFVideoFormat_A2R10G10B10, 3, 5, 60 }, - { &MFVideoFormat_A2R10G10B10, 1, 1, 4 }, - { &MFVideoFormat_A16B16G16R16F, 3, 5, 120 }, - { &MFVideoFormat_A16B16G16R16F, 1, 1, 8 }, + const GUID *subtype; + UINT32 width; + UINT32 height; + UINT32 size; + UINT32 plane_size; /* Matches image size when 0. */ +} +image_size_tests[] = +{ + { &MFVideoFormat_RGB8, 3, 5, 20 }, + { &MFVideoFormat_RGB8, 1, 1, 4 }, + { &MFVideoFormat_RGB555, 3, 5, 40 }, + { &MFVideoFormat_RGB555, 1, 1, 4 }, + { &MFVideoFormat_RGB565, 3, 5, 40 }, + { &MFVideoFormat_RGB565, 1, 1, 4 }, + { &MFVideoFormat_RGB24, 3, 5, 60 }, + { &MFVideoFormat_RGB24, 1, 1, 4 }, + { &MFVideoFormat_RGB32, 3, 5, 60 }, + { &MFVideoFormat_RGB32, 1, 1, 4 }, + { &MFVideoFormat_ARGB32, 3, 5, 60 }, + { &MFVideoFormat_ARGB32, 1, 1, 4 }, + { &MFVideoFormat_A2R10G10B10, 3, 5, 60 }, + { &MFVideoFormat_A2R10G10B10, 1, 1, 4 }, + { &MFVideoFormat_A16B16G16R16F, 3, 5, 120 }, + { &MFVideoFormat_A16B16G16R16F, 1, 1, 8 }, + + /* YUV */ + { &MFVideoFormat_NV12, 1, 3, 9, 4 }, + { &MFVideoFormat_NV12, 1, 2, 6, 3 }, + { &MFVideoFormat_NV12, 2, 2, 6, 6 }, + { &MFVideoFormat_NV12, 3, 2, 12, 9 }, + { &MFVideoFormat_NV12, 4, 2, 12 }, + { &MFVideoFormat_NV12, 320, 240, 115200 }, + { &MFVideoFormat_AYUV, 1, 1, 4 }, + { &MFVideoFormat_AYUV, 2, 1, 8 }, + { &MFVideoFormat_AYUV, 1, 2, 8 }, + { &MFVideoFormat_AYUV, 4, 3, 48 }, + { &MFVideoFormat_AYUV, 320, 240, 307200 }, + { &MFVideoFormat_IMC1, 1, 1, 4 }, + { &MFVideoFormat_IMC1, 2, 1, 4 }, + { &MFVideoFormat_IMC1, 1, 2, 8 }, + { &MFVideoFormat_IMC1, 4, 3, 24 }, + { &MFVideoFormat_IMC1, 320, 240, 153600 }, + { &MFVideoFormat_IMC3, 1, 1, 4 }, + { &MFVideoFormat_IMC3, 2, 1, 4 }, + { &MFVideoFormat_IMC3, 1, 2, 8 }, + { &MFVideoFormat_IMC3, 4, 3, 24 }, + { &MFVideoFormat_IMC3, 320, 240, 153600 }, + { &MFVideoFormat_IMC2, 1, 3, 9, 4 }, + { &MFVideoFormat_IMC2, 1, 2, 6, 3 }, + { &MFVideoFormat_IMC2, 2, 2, 6, 6 }, + { &MFVideoFormat_IMC2, 3, 2, 12, 9 }, + { &MFVideoFormat_IMC2, 4, 2, 12 }, + { &MFVideoFormat_IMC2, 320, 240, 115200 }, + { &MFVideoFormat_IMC4, 1, 3, 9, 4 }, + { &MFVideoFormat_IMC4, 1, 2, 6, 3 }, + { &MFVideoFormat_IMC4, 2, 2, 6, 6 }, + { &MFVideoFormat_IMC4, 3, 2, 12, 9 }, + { &MFVideoFormat_IMC4, 4, 2, 12 }, + { &MFVideoFormat_IMC4, 320, 240, 115200 }, + { &MFVideoFormat_YV12, 1, 1, 3, 1 }, + { &MFVideoFormat_YV12, 2, 1, 3 }, + { &MFVideoFormat_YV12, 1, 2, 6, 3 }, + { &MFVideoFormat_YV12, 4, 3, 18 }, + { &MFVideoFormat_YV12, 320, 240, 115200 }, + + { &MFVideoFormat_I420, 1, 1, 3, 1 }, + { &MFVideoFormat_I420, 2, 1, 3 }, + { &MFVideoFormat_I420, 1, 2, 6, 3 }, + { &MFVideoFormat_I420, 4, 3, 18 }, + { &MFVideoFormat_I420, 320, 240, 115200 }, + + { &MFVideoFormat_IYUV, 1, 1, 3, 1 }, + { &MFVideoFormat_IYUV, 2, 1, 3 }, + { &MFVideoFormat_IYUV, 1, 2, 6, 3 }, + { &MFVideoFormat_IYUV, 4, 3, 18 }, + { &MFVideoFormat_IYUV, 320, 240, 115200 }, + + { &MFVideoFormat_YUY2, 2, 1, 4 }, + { &MFVideoFormat_YUY2, 4, 3, 24 }, + { &MFVideoFormat_YUY2, 128, 128, 32768 }, + { &MFVideoFormat_YUY2, 320, 240, 153600 }, + + { &MFVideoFormat_UYVY, 2, 1, 4 }, + { &MFVideoFormat_UYVY, 4, 3, 24 }, + { &MFVideoFormat_UYVY, 128, 128, 32768 }, + { &MFVideoFormat_UYVY, 320, 240, 153600 }, +}; - /* YUV */ - { &MFVideoFormat_NV12, 1, 3, 9, 4 }, - { &MFVideoFormat_NV12, 1, 2, 6, 3 }, - { &MFVideoFormat_NV12, 2, 2, 6, 6 }, - { &MFVideoFormat_NV12, 3, 2, 12, 9 }, - { &MFVideoFormat_NV12, 4, 2, 12 }, - { &MFVideoFormat_NV12, 320, 240, 115200 }, - { &MFVideoFormat_AYUV, 1, 1, 4 }, - { &MFVideoFormat_AYUV, 2, 1, 8 }, - { &MFVideoFormat_AYUV, 1, 2, 8 }, - { &MFVideoFormat_AYUV, 4, 3, 48 }, - { &MFVideoFormat_AYUV, 320, 240, 307200 }, - { &MFVideoFormat_IMC1, 1, 1, 4 }, - { &MFVideoFormat_IMC1, 2, 1, 4 }, - { &MFVideoFormat_IMC1, 1, 2, 8 }, - { &MFVideoFormat_IMC1, 4, 3, 24 }, - { &MFVideoFormat_IMC1, 320, 240, 153600 }, - { &MFVideoFormat_IMC3, 1, 1, 4 }, - { &MFVideoFormat_IMC3, 2, 1, 4 }, - { &MFVideoFormat_IMC3, 1, 2, 8 }, - { &MFVideoFormat_IMC3, 4, 3, 24 }, - { &MFVideoFormat_IMC3, 320, 240, 153600 }, - { &MFVideoFormat_IMC2, 1, 3, 9, 4 }, - { &MFVideoFormat_IMC2, 1, 2, 6, 3 }, - { &MFVideoFormat_IMC2, 2, 2, 6, 6 }, - { &MFVideoFormat_IMC2, 3, 2, 12, 9 }, - { &MFVideoFormat_IMC2, 4, 2, 12 }, - { &MFVideoFormat_IMC2, 320, 240, 115200 }, - { &MFVideoFormat_IMC4, 1, 3, 9, 4 }, - { &MFVideoFormat_IMC4, 1, 2, 6, 3 }, - { &MFVideoFormat_IMC4, 2, 2, 6, 6 }, - { &MFVideoFormat_IMC4, 3, 2, 12, 9 }, - { &MFVideoFormat_IMC4, 4, 2, 12 }, - { &MFVideoFormat_IMC4, 320, 240, 115200 }, - { &MFVideoFormat_YV12, 1, 1, 3, 1 }, - { &MFVideoFormat_YV12, 2, 1, 3 }, - { &MFVideoFormat_YV12, 1, 2, 6, 3 }, - { &MFVideoFormat_YV12, 4, 3, 18 }, - { &MFVideoFormat_YV12, 320, 240, 115200 }, - - { &MFVideoFormat_I420, 1, 1, 3, 1 }, - { &MFVideoFormat_I420, 2, 1, 3 }, - { &MFVideoFormat_I420, 1, 2, 6, 3 }, - { &MFVideoFormat_I420, 4, 3, 18 }, - { &MFVideoFormat_I420, 320, 240, 115200 }, - - { &MFVideoFormat_IYUV, 1, 1, 3, 1 }, - { &MFVideoFormat_IYUV, 2, 1, 3 }, - { &MFVideoFormat_IYUV, 1, 2, 6, 3 }, - { &MFVideoFormat_IYUV, 4, 3, 18 }, - { &MFVideoFormat_IYUV, 320, 240, 115200 }, - - { &MFVideoFormat_YUY2, 2, 1, 4 }, - { &MFVideoFormat_YUY2, 4, 3, 24 }, - { &MFVideoFormat_YUY2, 128, 128, 32768 }, - { &MFVideoFormat_YUY2, 320, 240, 153600 }, - - { &MFVideoFormat_UYVY, 2, 1, 4 }, - { &MFVideoFormat_UYVY, 4, 3, 24 }, - { &MFVideoFormat_UYVY, 128, 128, 32768 }, - { &MFVideoFormat_UYVY, 320, 240, 153600 }, - }; +static void test_MFCalculateImageSize(void) +{ unsigned int i; UINT32 size; HRESULT hr; - if (!pMFGetPlaneSize) - win_skip("MFGetPlaneSize() is not available.\n"); - size = 1; hr = MFCalculateImageSize(&IID_IUnknown, 1, 1, &size); ok(hr == E_INVALIDARG || broken(hr == S_OK) /* Vista */, "Unexpected hr %#x.\n", hr); @@ -4244,6 +4242,29 @@ static void test_MFCalculateImageSize(void) } } +static void test_MFGetPlaneSize(void) +{ + unsigned int i; + UINT32 size; + HRESULT hr; + + if (!pMFGetPlaneSize) + { + win_skip("MFGetPlaneSize() is not available.\n"); + return; + } + + for (i = 0; i < ARRAY_SIZE(image_size_tests); ++i) + { + const struct image_size_test *ptr = &image_size_tests[i]; + unsigned int plane_size = ptr->plane_size ? ptr->plane_size : ptr->size; + + hr = pMFGetPlaneSize(ptr->subtype->Data1, ptr->width, ptr->height, &size); + ok(hr == S_OK, "%u: failed to get plane size, hr %#x.\n", i, hr); + ok(size == plane_size, "%u: unexpected plane size %u, expected %u.\n", i, size, plane_size); + } +} + static void test_MFCompareFullToPartialMediaType(void) { IMFMediaType *full_type, *partial_type; @@ -7940,6 +7961,7 @@ START_TEST(mfplat) test_MFInvokeCallback(); test_stream_descriptor(); test_MFCalculateImageSize(); + test_MFGetPlaneSize(); test_MFCompareFullToPartialMediaType(); test_attributes_serialization(); test_wrapped_media_type();

1 0

Zebediah Figura : wined3d: Allow NOOVERWRITE maps to be accelerated on 32-bit architectures.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: 30d670a7b9cd937eba6cb4d07ef4118dba57d3b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30d670a7b9cd937eba6cb4d0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 11 19:42:04 2022 -0600 wined3d: Allow NOOVERWRITE maps to be accelerated on 32-bit architectures. 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> --- dlls/wined3d/buffer.c | 3 +-- dlls/wined3d/cs.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 50e3e9fe2b4..902ab720396 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1002,8 +1002,7 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc * but it's safe because the client thread will wait for the * map to return, thus completely serializing this call with * other client code. */ - if (wined3d_map_persistent()) - buffer->resource.client.addr = addr; + buffer->resource.client.addr = addr; if (((DWORD_PTR)buffer->map_ptr) & (RESOURCE_ALIGNMENT - 1)) { diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ed8a41c778b..63d8628cea7 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3088,8 +3088,7 @@ static bool wined3d_cs_map_upload_bo(struct wined3d_device_context *context, str if (!device->adapter->adapter_ops->adapter_alloc_bo(device, resource, sub_resource_idx, &addr)) return false; - if (wined3d_map_persistent()) - client->addr = addr; + client->addr = addr; } else {

1 0

Giovanni Mascellani : mfplat: Fix MFGetPlaneSize() behavior for invalid formats.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: 3a0eb8bde9014b5ba46a01c77f9219abb52ef614 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a0eb8bde9014b5ba46a01c7… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Feb 14 21:46:25 2022 +0300 mfplat: Fix MFGetPlaneSize() behavior for invalid formats. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 8 ++++---- dlls/mfplat/tests/mfplat.c | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index b77db17189f..9330e420036 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -2755,10 +2755,10 @@ HRESULT WINAPI MFGetPlaneSize(DWORD fourcc, DWORD width, DWORD height, DWORD *si memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); subtype.Data1 = fourcc; - if (!(format = mf_get_video_format(&subtype))) - return MF_E_INVALIDMEDIATYPE; - - stride = mf_get_stride_for_format(format, width); + if ((format = mf_get_video_format(&subtype))) + stride = mf_get_stride_for_format(format, width); + else + stride = 0; switch (fourcc) { diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 50f4e059205..c013b7b5c23 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -4254,6 +4254,11 @@ static void test_MFGetPlaneSize(void) return; } + size = 1; + hr = pMFGetPlaneSize(0xdeadbeef, 64, 64, &size); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(size == 0, "Unexpected size %u.\n", size); + for (i = 0; i < ARRAY_SIZE(image_size_tests); ++i) { const struct image_size_test *ptr = &image_size_tests[i];

1 0

Paul Gofman : wined3d: Clear GL backbuffer in wined3d_context_gl_init().
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: b36e4cfe2d7ceef6f6b672811d9481d6c23c0ac9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b36e4cfe2d7ceef6f6b67281… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Feb 11 18:42:28 2022 +0300 wined3d: Clear GL backbuffer in wined3d_context_gl_init(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 9153b7fd95f..f8a96c8a10a 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -1897,7 +1897,7 @@ HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, } static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context_gl, - struct wined3d_swapchain_gl *swapchain_gl) + struct wined3d_swapchain_gl *swapchain_gl, BOOL *new_drawable) { enum wined3d_swap_effect swap_effect = swapchain_gl->s.state.desc.swap_effect; const struct wined3d_format *colour_format, *ds_format; @@ -1920,6 +1920,8 @@ static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context swap_effect_copy = swap_effect == WINED3D_SWAP_EFFECT_COPY || swap_effect == WINED3D_SWAP_EFFECT_COPY_VSYNC; + *new_drawable = !GetPixelFormat(context_gl->dc); + if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) { static const enum wined3d_format_id ds_formats[] = @@ -2018,7 +2020,7 @@ static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context } context_gl->dc_is_private = TRUE; - return wined3d_context_gl_create_wgl_ctx(context_gl, swapchain_gl); + return wined3d_context_gl_create_wgl_ctx(context_gl, swapchain_gl, new_drawable); } share_ctx = device->context_count ? wined3d_context_gl(device->contexts[0])->gl_ctx : NULL; @@ -2064,6 +2066,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi const struct wined3d_d3d_info *d3d_info; const struct wined3d_gl_info *gl_info; struct wined3d_device *device; + BOOL new_drawable; unsigned int i; TRACE("context_gl %p, swapchain %p.\n", context_gl, swapchain_gl); @@ -2142,7 +2145,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi sizeof(*context_gl->texture_type)))) goto fail; - if (!wined3d_context_gl_create_wgl_ctx(context_gl, swapchain_gl)) + if (!wined3d_context_gl_create_wgl_ctx(context_gl, swapchain_gl, &new_drawable)) goto fail; /* Set up the context defaults. */ @@ -2299,6 +2302,14 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi gl_info->gl_ops.gl.p_glScissor(0, 0, 0, 0); checkGLcall("glScissor"); + if (new_drawable) + { + gl_info->gl_ops.gl.p_glClearColor(0.0f, 0.0f, 0.0f, 0.0f); + gl_info->gl_ops.gl.p_glClearDepth(1.0f); + gl_info->gl_ops.gl.p_glClearStencil(0); + gl_info->gl_ops.gl.p_glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); + checkGLcall("glClear"); + } return WINED3D_OK; fail:

1 0

Zebediah Figura : wined3d: Allow up to 128 MiB of persistently mapped memory on 32-bit architectures.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: eb90d5db4f9bf92059d379d4fe0ea4a516db5e5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb90d5db4f9bf92059d379d4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 11 19:42:01 2022 -0600 wined3d: Allow up to 128 MiB of persistently mapped memory on 32-bit architectures. 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> --- dlls/wined3d/adapter_vk.c | 24 ++++++++++++----- dlls/wined3d/context_gl.c | 61 +++++++++++++++++++++++++----------------- dlls/wined3d/context_vk.c | 20 ++++++++++---- dlls/wined3d/directx.c | 9 +++++++ dlls/wined3d/wined3d_private.h | 9 +++++++ 5 files changed, 87 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eb90d5db4f9bf92059d3…

1 0