September 2019 - Wine-Commits

Francois Gouget : testbot/WineRunReconfig: Tweak formatting of a notification email.
by Alexandre Julliard Sept. 25, 2019

Sept. 25, 2019

Module: tools Branch: master Commit: 358f63b80f3eeff4ce35b212263b12e962878719 URL: https://source.winehq.org/git/tools.git/?a=commit;h=358f63b80f3eeff4ce35b21… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 25 08:51:22 2019 +0200 testbot/WineRunReconfig: Tweak formatting of a notification email. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index bfbc5ab..1103120 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -299,8 +299,8 @@ sub FatalTAError($$) # since neither the VM nor the task are at fault. Error("$ErrMessage\n"); NotifyAdministrator("Putting the ". $VM->Name ." VM offline", - "A TestAgent operation to the ". $VM->Name ." VM failed:\n". - "\n$ErrMessage\n". + "A TestAgent operation to the ". $VM->Name ." VM failed:\n\n". + "$ErrMessage\n\n". "So the VM has been put offline and the TestBot will try to regain access to it."); WrapUpAndExit('queued'); }

1 0

Francois Gouget : testbot/LibvirtTool: Create the locale snapshots as needed.
by Alexandre Julliard Sept. 25, 2019

Sept. 25, 2019

Module: tools Branch: master Commit: d19b0f740497ffce9a1780ccd75cc9eff417e537 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d19b0f740497ffce9a1780c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 25 08:51:57 2019 +0200 testbot/LibvirtTool: Create the locale snapshots as needed. A VM may have a lot of locale live snapshots. This removes the need for manually creating them (or recreating them after restoring the VM from backup or after a QEmu upgrade). Sadly the locales must still be manually installed beforehand. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 73 ++++++++++++++++++++++++++++---- testbot/{scripts => bin}/SetWinLocale | 0 testbot/bin/WineRunReconfig.pl | 2 +- testbot/lib/WineTestBot/LibvirtDomain.pm | 5 +-- 4 files changed, 67 insertions(+), 13 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index d1402bc..936c386 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -365,9 +365,9 @@ sub CheckOff() return ChangeStatus("dirty", "off", "done"); } -sub SetupTestAgentd($$) +sub SetupTestAgentd($$$) { - my ($VM, $Booting) = @_; + my ($VM, $Booting, $ResetStartCount) = @_; Debug(Elapsed($Start), " Setting up the $VMKey TestAgent server\n"); LogMsg "Setting up the $VMKey TestAgent server\n"; @@ -379,6 +379,23 @@ sub SetupTestAgentd($$) my $ErrMessage = $TA->GetLastError(); FatalError("Could not connect to the $VMKey TestAgent: $ErrMessage\n"); } + + if ($ResetStartCount) + { + # If SetProperty() is not supported neither is --show-restarts. + # So it all works out. + $TA->SetProperty("start.count", 0); + } + else + { + # Check that TestAgentd is not displaying the "Has Windows rebooted?" + # warning. + my $Count = $TA->GetProperties("start.count"); + if (defined $Count and $Count > 1) + { + FatalError("Cannot take a live snapshot because start.count=$Count > 1"); + } + } $TA->Disconnect(); } @@ -435,9 +452,17 @@ sub Revert() $CurrentStatus = "reverting"; my $DomainSnapshot = $VM->IdleSnapshot; my $ExtraTimeout = 0; - my $CreateSnapshot; + my ($SetLocale, $CreateSnapshot); my $Domain = $VM->GetDomain(); + if (!$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"; + 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 @@ -484,19 +509,49 @@ 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) + if (!$CreateSnapshot and !$SetLocale) { return 1 if (ChangeStatus("reverting", "sleeping")); } - # Set up the TestAgent server - SetupTestAgentd($VM, $Booting); + # Set up the TestAgent server. Note that setting the locale will require a + # reboot so reset start.count in that case. + SetupTestAgentd($VM, $Booting, $SetLocale); if ($CreateSnapshot) { - CreateSnapshot($Domain, $VM->IdleSnapshot); + $DomainSnapshot .= "-live"; + CreateSnapshot($Domain, $DomainSnapshot); } - else + + # Set up the VM locale + if ($SetLocale) + { + Debug(Elapsed($Start), " Setting up the $SetLocale locale on $VMKey\n"); + if (system("$BinDir/SetWinLocale", "--vm", $VMKey, "--default", $SetLocale)) + { + FatalError("Could not set the $VMKey locale to $SetLocale\n"); + } + + Debug(Elapsed($Start), " Wait for the $VMKey locale-setting reboot to complete\n"); + LogMsg "Wait for the $VMKey locale-setting reboot to complete\n"; + while (1) + { + my $TA = $VM->GetAgent(); + my $Count = $TA->GetProperties("start.count"); + $TA->Disconnect(); + + # SetupTestAgentd() has reset start.count to zero. + # It will only change after the reboot. + last if (defined $Count and $Count != 0); + + sleep(1); + } + + $DomainSnapshot .= "-$SetLocale"; + CreateSnapshot($Domain, $DomainSnapshot); + } + elsif (!$CreateSnapshot) { my $Sleep = ($Booting and $SleepAfterBoot > $SleepAfterRevert) ? $SleepAfterBoot : $SleepAfterRevert; @@ -505,7 +560,7 @@ sub Revert() sleep($Sleep); } - if ($CreateSnapshot) + if ($CreateSnapshot or $SetLocale) { # The activity monitor does not like it when VMs skip the sleeping step return 1 if (ChangeStatus("reverting", "sleeping")); diff --git a/testbot/scripts/SetWinLocale b/testbot/bin/SetWinLocale similarity index 100% rename from testbot/scripts/SetWinLocale rename to testbot/bin/SetWinLocale diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 1103120..2e62a2e 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -512,7 +512,7 @@ if ($NewStatus eq 'completed') } Debug(Elapsed($Start), " Recreating the $IdleSnapshot snapshot\n"); - $ErrMessage = $Domain->CreateSnapshot(); + $ErrMessage = $Domain->CreateSnapshot($IdleSnapshot); if (defined $ErrMessage) { # Without the snapshot the VM is not usable anymore but FatalError() will diff --git a/testbot/lib/WineTestBot/LibvirtDomain.pm b/testbot/lib/WineTestBot/LibvirtDomain.pm index 14bf71d..9613e83 100644 --- a/testbot/lib/WineTestBot/LibvirtDomain.pm +++ b/testbot/lib/WineTestBot/LibvirtDomain.pm @@ -328,14 +328,13 @@ sub RevertToSnapshot($$) return (undef, $Reason != Sys::Virt::Domain::STATE_RUNNING_FROM_SNAPSHOT); } -sub CreateSnapshot($) +sub CreateSnapshot($$) { - my ($self) = @_; + my ($self, $SnapshotName) = @_; my ($ErrMessage, $Domain) = $self->_GetDomain(); return $ErrMessage if (defined $ErrMessage); - my $SnapshotName = $self->{VM}->IdleSnapshot; # FIXME: XML escaping my $Xml = "<domainsnapshot><name>$SnapshotName</name></domainsnapshot>"; eval { $Domain->create_snapshot($Xml, 0) };

1 0

Matteo Bruni : d3dx9/tests: Add a test for loading surfaces not divisible by the block size.
by Alexandre Julliard Sept. 24, 2019

Sept. 24, 2019

Module: wine Branch: master Commit: 7f39c726fc91d84d4b26241c3a031381ad9e59cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f39c726fc91d84d4b26241c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 24 19:46:27 2019 +0200 d3dx9/tests: Add a test for loading surfaces not divisible by the block size. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/surface.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 4a10492a08..2f8149fd01 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -167,6 +167,20 @@ static const unsigned char dds_volume_map[] = { 0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x84,0xef,0x7b,0xaa,0xab,0xab,0xab }; +/* 4x2 dxt5 */ +static const BYTE dds_dxt5[] = +{ + 0x44,0x44,0x53,0x20,0x7c,0x00,0x00,0x00,0x07,0x10,0x08,0x00,0x02,0x00,0x00,0x00, + 0x04,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00, + 0x04,0x00,0x00,0x00,0x44,0x58,0x54,0x35,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x10,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50, +}; + static HRESULT create_file(const char *filename, const unsigned char *data, const unsigned int size) { DWORD received; @@ -1269,6 +1283,26 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr); hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0); todo_wine ok(SUCCEEDED(hr), "Failed to convert pixels to DXT5 format.\n"); + + SetRect(&rect, 0, 0, 4, 2); + hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, &rect, surf, NULL, &rect, D3DX_FILTER_NONE, 0); + todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = D3DXLoadSurfaceFromMemory(newsurf, NULL, &rect, &dds_dxt5[128], + D3DFMT_DXT5, 16, NULL, &rect, D3DX_FILTER_NONE, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + check_release((IUnknown *)newsurf, 1); + check_release((IUnknown *)tex, 0); + + /* Test a rect larger than but not an integer multiple of the block size. */ + hr = IDirect3DDevice9_CreateTexture(device, 4, 8, 1, 0, D3DFMT_DXT5, D3DPOOL_SYSTEMMEM, &tex, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + SetRect(&rect, 0, 0, 4, 6); + hr = D3DXLoadSurfaceFromMemory(newsurf, NULL, &rect, &dds_dxt5[112], + D3DFMT_DXT5, 16, NULL, &rect, D3DX_FILTER_POINT, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + check_release((IUnknown*)newsurf, 1); check_release((IUnknown*)tex, 0); }

1 0

Matteo Bruni : d3dx9/tests: Add a test with a larger DXT5 texture.
by Alexandre Julliard Sept. 24, 2019

Sept. 24, 2019

Module: wine Branch: master Commit: b7656110e6e83866a33418bc6b48984632010e00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7656110e6e83866a33418bc… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 24 19:46:29 2019 +0200 d3dx9/tests: Add a test with a larger DXT5 texture. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/texture.c | 66 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 5c641913ce..68bbd37f8a 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -101,6 +101,22 @@ static const BYTE dds_dxt5[] = 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50, }; +static const BYTE dds_dxt5_8_8[] = +{ + 0x44,0x44,0x53,0x20,0x7c,0x00,0x00,0x00,0x07,0x10,0x08,0x00,0x08,0x00,0x00,0x00, + 0x08,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00, + 0x04,0x00,0x00,0x00,0x44,0x58,0x54,0x35,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x10,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0x00,0xe0,0x07,0x05,0x05,0x50,0x50, + 0x3f,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0x07,0x05,0x05,0x50,0x50, + 0x7f,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0xf8,0xe0,0xff,0x05,0x05,0x50,0x50, + 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x00,0x00,0x05,0x05,0x50,0x50, +}; + static const unsigned char png_grayscale[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, @@ -1556,6 +1572,17 @@ static void test_D3DXCreateTextureFromFileInMemory(IDirect3DDevice9 *device) 0xff7b207b, 0xff7b207b, 0xff84df7b, 0xff84df7b, 0xff7b207b, 0xff7b207b, 0xff84df7b, 0xff84df7b, }; + static const DWORD dds_dxt5_8_8_expected[] = + { + 0x0000ff00, 0x0000ff00, 0x000000ff, 0x000000ff, 0x3f00ffff, 0x3f00ffff, 0x3fff0000, 0x3fff0000, + 0x0000ff00, 0x0000ff00, 0x000000ff, 0x000000ff, 0x3f00ffff, 0x3f00ffff, 0x3fff0000, 0x3fff0000, + 0x000000ff, 0x000000ff, 0x0000ff00, 0x0000ff00, 0x3fff0000, 0x3fff0000, 0x3f00ffff, 0x3f00ffff, + 0x000000ff, 0x000000ff, 0x0000ff00, 0x0000ff00, 0x3fff0000, 0x3fff0000, 0x3f00ffff, 0x3f00ffff, + 0x7fffff00, 0x7fffff00, 0x7fff00ff, 0x7fff00ff, 0xff000000, 0xff000000, 0xffffffff, 0xffffffff, + 0x7fffff00, 0x7fffff00, 0x7fff00ff, 0x7fff00ff, 0xff000000, 0xff000000, 0xffffffff, 0xffffffff, + 0x7fff00ff, 0x7fff00ff, 0x7fffff00, 0x7fffff00, 0xffffffff, 0xffffffff, 0xff000000, 0xff000000, + 0x7fff00ff, 0x7fff00ff, 0x7fffff00, 0x7fffff00, 0xffffffff, 0xffffffff, 0xff000000, 0xff000000, + }; IDirect3DSurface9 *surface, *uncompressed_surface; IDirect3DTexture9 *texture; D3DLOCKED_RECT lock_rect; @@ -1644,6 +1671,45 @@ static void test_D3DXCreateTextureFromFileInMemory(IDirect3DDevice9 *device) if (SUCCEEDED(hr)) IDirect3DTexture9_Release(texture); + /* Test with a larger DXT5 texture. */ + hr = D3DXCreateTextureFromFileInMemory(device, dds_dxt5_8_8, sizeof(dds_dxt5_8_8), &texture); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + type = IDirect3DTexture9_GetType(texture); + ok(type == D3DRTYPE_TEXTURE, "Got unexpected type %u.\n", type); + hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(desc.Width == 8, "Got unexpected width %u.\n", desc.Width); + ok(desc.Height == 8, "Got unexpected height %u.\n", desc.Height); + IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); + + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 8, 8, D3DFMT_A8R8G8B8, + D3DPOOL_DEFAULT, &uncompressed_surface, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = D3DXLoadSurfaceFromSurface(uncompressed_surface, NULL, NULL, surface, NULL, NULL, D3DX_FILTER_NONE, 0); + todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + hr = IDirect3DSurface9_LockRect(uncompressed_surface, &lock_rect, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (y = 0; y < 8; ++y) + { + for (x = 0; x < 8; ++x) + { + ok(compare_color(((DWORD *)lock_rect.pBits)[lock_rect.Pitch / 4 * y + x], + dds_dxt5_8_8_expected[y * 8 + x], 0), + "Color at position %u, %u is 0x%08x, expected 0x%08x.\n", + x, y, ((DWORD *)lock_rect.pBits)[lock_rect.Pitch / 4 * y + x], + dds_dxt5_8_8_expected[y * 8 + x]); + } + } + hr = IDirect3DSurface9_UnlockRect(uncompressed_surface); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + + IDirect3DSurface9_Release(uncompressed_surface); + IDirect3DSurface9_Release(surface); + IDirect3DTexture9_Release(texture); + /* Volume textures work too. */ hr = D3DXCreateTextureFromFileInMemory(device, dds_volume_map, sizeof(dds_volume_map), &texture); todo_wine_if (!has_2d_dxt3)

1 0

Matteo Bruni : d3dx9/tests: Add a test for loading a texture smaller than the block size.
by Alexandre Julliard Sept. 24, 2019

Sept. 24, 2019

Module: wine Branch: master Commit: 426d6776cff537e36bdb7c0fb7963a74e4a3251e URL: https://source.winehq.org/git/wine.git/?a=commit;h=426d6776cff537e36bdb7c0f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 24 19:46:28 2019 +0200 d3dx9/tests: Add a test for loading a texture smaller than the block size. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/texture.c | 79 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 76 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 6c25a15811..5c641913ce 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -87,6 +87,20 @@ static const unsigned char dds_volume_map[] = { 0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x84,0xef,0x7b,0xaa,0xab,0xab,0xab }; +/* 4x2 dxt5 */ +static const BYTE dds_dxt5[] = +{ + 0x44,0x44,0x53,0x20,0x7c,0x00,0x00,0x00,0x07,0x10,0x08,0x00,0x02,0x00,0x00,0x00, + 0x04,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00, + 0x04,0x00,0x00,0x00,0x44,0x58,0x54,0x35,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x10,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50, +}; + static const unsigned char png_grayscale[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, @@ -400,6 +414,15 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) ok(height == 4, "Returned height %d, expected %d\n", height, 4); ok(mipmaps == 1, "Returned mipmaps %d, expected %d\n", mipmaps, 1); ok(format == D3DFMT_DXT5, "Returned format %u, expected %u\n", format, D3DFMT_DXT5); + + width = 4; + height = 2; + hr = D3DXCheckTextureRequirements(device, &width, &height, &mipmaps, 0, &format, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(width == 4, "Got unexpected width %u.\n", width); + ok(height == 4, "Got unexpected height %u.\n", height); + ok(mipmaps == 1, "Got unexpected mipmap level count %u.\n", mipmaps); + ok(format == D3DFMT_DXT5, "Got unexpected format %u.\n", format); } else { @@ -1526,13 +1549,21 @@ static void test_D3DXFillVolumeTexture(IDirect3DDevice9 *device) static void test_D3DXCreateTextureFromFileInMemory(IDirect3DDevice9 *device) { - HRESULT hr; + static const DWORD dds_dxt5_expected[] = + { + 0xff7b207b, 0xff7b207b, 0xff84df7b, 0xff84df7b, + 0xff7b207b, 0xff7b207b, 0xff84df7b, 0xff84df7b, + 0xff7b207b, 0xff7b207b, 0xff84df7b, 0xff84df7b, + 0xff7b207b, 0xff7b207b, 0xff84df7b, 0xff84df7b, + }; + IDirect3DSurface9 *surface, *uncompressed_surface; IDirect3DTexture9 *texture; + D3DLOCKED_RECT lock_rect; D3DRESOURCETYPE type; D3DSURFACE_DESC desc; - D3DLOCKED_RECT lock_rect; - int i; + unsigned int i, x, y; DWORD level_count; + HRESULT hr; hr = D3DXCreateTextureFromFileInMemory(device, dds_16bit, sizeof(dds_16bit), &texture); ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); @@ -1568,8 +1599,50 @@ static void test_D3DXCreateTextureFromFileInMemory(IDirect3DDevice9 *device) IDirect3DTexture9_UnlockRect(texture, 0); } IDirect3DTexture9_Release(texture); + } + /* Test with a DXT5 texture smaller than the block size. */ + hr = D3DXCreateTextureFromFileInMemory(device, dds_dxt5, sizeof(dds_dxt5), &texture); + todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr) && has_2d_dxt5) + { + type = IDirect3DTexture9_GetType(texture); + ok(type == D3DRTYPE_TEXTURE, "Got unexpected type %u.\n", type); + hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(desc.Width == 4, "Got unexpected width %u.\n", desc.Width); + ok(desc.Height == 4, "Got unexpected height %u.\n", desc.Height); + + IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 4, 4, D3DFMT_A8R8G8B8, + D3DPOOL_DEFAULT, &uncompressed_surface, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = D3DXLoadSurfaceFromSurface(uncompressed_surface, NULL, NULL, surface, NULL, NULL, D3DX_FILTER_NONE, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DSurface9_LockRect(uncompressed_surface, &lock_rect, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (y = 0; y < 4; ++y) + { + for (x = 0; x < 4; ++x) + { + /* Use a large tolerance, decompression + stretching + + * compression + decompression again introduce quite a bit of + * precision loss. */ + ok(compare_color(((DWORD *)lock_rect.pBits)[lock_rect.Pitch / 4 * y + x], + dds_dxt5_expected[y * 4 + x], 32), + "Color at position %u, %u is 0x%08x, expected 0x%08x.\n", + x, y, ((DWORD *)lock_rect.pBits)[lock_rect.Pitch / 4 * y + x], + dds_dxt5_expected[y * 4 + x]); + } + } + hr = IDirect3DSurface9_UnlockRect(uncompressed_surface); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + IDirect3DSurface9_Release(uncompressed_surface); + IDirect3DSurface9_Release(surface); } + if (SUCCEEDED(hr)) + IDirect3DTexture9_Release(texture); /* Volume textures work too. */ hr = D3DXCreateTextureFromFileInMemory(device, dds_volume_map, sizeof(dds_volume_map), &texture);

1 0

Matteo Bruni : d3dx9: Relax a block alignment check.
by Alexandre Julliard Sept. 24, 2019

Sept. 24, 2019

Module: wine Branch: master Commit: e371085aaf4424e6ef9b5b76ebf3107121d22f50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e371085aaf4424e6ef9b5b76… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 24 19:46:26 2019 +0200 d3dx9: Relax a block alignment check. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/surface.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 00a7694ab0..39dfbf16ac 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1905,11 +1905,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, && color_key == 0) /* Simple copy. */ { if (src_rect->left & (srcformatdesc->block_width - 1) - || src_rect->top & (srcformatdesc->block_height - 1) - || (src_rect->right & (srcformatdesc->block_width - 1) - && src_size.width != surfdesc.Width) - || (src_rect->bottom & (srcformatdesc->block_height - 1) - && src_size.height != surfdesc.Height)) + || src_rect->top & (srcformatdesc->block_height - 1)) { WARN("Source rect %s is misaligned.\n", wine_dbgstr_rect(src_rect)); unlock_surface(dst_surface, dst_rect, surface, FALSE);

1 0

Henri Verbeet : wined3d: Make the adapter responsible for clearing UAVs.
by Alexandre Julliard Sept. 24, 2019

Sept. 24, 2019

Module: wine Branch: master Commit: f2c668e7797078799deecd7ed1e074402d52a2ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2c668e7797078799deecd7e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 24 18:08:42 2019 +0330 wined3d: Make the adapter responsible for clearing UAVs. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 10 ++++++++++ dlls/wined3d/adapter_vk.c | 7 +++++++ dlls/wined3d/cs.c | 2 +- dlls/wined3d/directx.c | 7 +++++++ dlls/wined3d/view.c | 15 +++++++-------- dlls/wined3d/wined3d_private.h | 6 ++++-- 6 files changed, 36 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 03799b6aa8..e161f7261b 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5073,6 +5073,15 @@ 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, + 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)); + + wined3d_unordered_access_view_gl_clear_uint(wined3d_unordered_access_view_gl(view), + clear_value, wined3d_context_gl(context)); +} + static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = { adapter_gl_destroy, @@ -5103,6 +5112,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = adapter_gl_create_query, adapter_gl_destroy_query, adapter_gl_flush_context, + adapter_gl_clear_uav, }; static void wined3d_adapter_gl_init_d3d_info(struct wined3d_adapter_gl *adapter_gl, uint32_t wined3d_creation_flags) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 91a81b47e6..0d83cf7582 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -802,6 +802,12 @@ static void adapter_vk_flush_context(struct wined3d_context *context) TRACE("context %p.\n", context); } +void adapter_vk_clear_uav(struct wined3d_context *context, + struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) +{ + FIXME("context %p, view %p, clear_value %s.\n", context, view, debug_uvec4(clear_value)); +} + static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = { adapter_vk_destroy, @@ -832,6 +838,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = adapter_vk_create_query, adapter_vk_destroy_query, adapter_vk_flush_context, + adapter_vk_clear_uav, }; static unsigned int wined3d_get_wine_vk_version(void) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 044d586b29..ec17b59d71 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2424,7 +2424,7 @@ static void wined3d_cs_exec_clear_unordered_access_view(struct wined3d_cs *cs, c struct wined3d_context *context; context = context_acquire(cs->device, NULL, 0); - wined3d_unordered_access_view_clear_uint(view, &op->clear_value, context); + cs->device->adapter->adapter_ops->adapter_clear_uav(context, view, &op->clear_value); context_release(context); wined3d_resource_release(view->resource); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2c3d2787bc..24fab8491a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2607,6 +2607,12 @@ static void adapter_no3d_flush_context(struct wined3d_context *context) TRACE("context %p.\n", context); } +void adapter_no3d_clear_uav(struct wined3d_context *context, + struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) +{ + ERR("context %p, view %p, clear_value %s.\n", context, view, debug_uvec4(clear_value)); +} + static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = { adapter_no3d_destroy, @@ -2637,6 +2643,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = adapter_no3d_create_query, adapter_no3d_destroy_query, adapter_no3d_flush_context, + adapter_no3d_clear_uav, }; static void wined3d_adapter_no3d_init_d3d_info(struct wined3d_adapter *adapter, unsigned int wined3d_creation_flags) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 0b4c296f17..f7bb18934f 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -995,17 +995,16 @@ void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_ wined3d_view_invalidate_location(view->resource, &view->desc, location); } -void wined3d_unordered_access_view_clear_uint(struct wined3d_unordered_access_view *view, - const struct wined3d_uvec4 *clear_value, struct wined3d_context *context) +void wined3d_unordered_access_view_gl_clear_uint(struct wined3d_unordered_access_view_gl *view_gl, + const struct wined3d_uvec4 *clear_value, struct wined3d_context_gl *context_gl) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context_gl->gl_info; const struct wined3d_format_gl *format; struct wined3d_buffer_gl *buffer_gl; struct wined3d_resource *resource; unsigned int offset, size; - resource = view->resource; + resource = view_gl->v.resource; if (resource->type != WINED3D_RTYPE_BUFFER) { FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(resource->type)); @@ -1018,7 +1017,7 @@ void wined3d_unordered_access_view_clear_uint(struct wined3d_unordered_access_vi return; } - format = wined3d_format_gl(view->format); + format = wined3d_format_gl(view_gl->v.format); if (format->f.id != WINED3DFMT_R32_UINT && format->f.id != WINED3DFMT_R32_SINT && format->f.id != WINED3DFMT_R32G32B32A32_UINT && format->f.id != WINED3DFMT_R32G32B32A32_SINT) @@ -1028,10 +1027,10 @@ void wined3d_unordered_access_view_clear_uint(struct wined3d_unordered_access_vi } buffer_gl = wined3d_buffer_gl(buffer_from_resource(resource)); - wined3d_buffer_load_location(&buffer_gl->b, context, WINED3D_LOCATION_BUFFER); - wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_BUFFER); + wined3d_buffer_load_location(&buffer_gl->b, &context_gl->c, WINED3D_LOCATION_BUFFER); + wined3d_unordered_access_view_invalidate_location(&view_gl->v, ~WINED3D_LOCATION_BUFFER); - get_buffer_view_range(&buffer_gl->b, &view->desc, &format->f, &offset, &size); + get_buffer_view_range(&buffer_gl->b, &view_gl->v.desc, &format->f, &offset, &size); wined3d_context_gl_bind_bo(context_gl, buffer_gl->buffer_type_hint, buffer_gl->b.buffer_object); GL_EXTCALL(glClearBufferSubData(buffer_gl->buffer_type_hint, format->internal, offset, size, format->format, format->type, clear_value)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 15a272db17..648e3f0dee 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2851,6 +2851,8 @@ struct wined3d_adapter_ops void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query); void (*adapter_destroy_query)(struct wined3d_query *query); void (*adapter_flush_context)(struct wined3d_context *context); + void (*adapter_clear_uav)(struct wined3d_context *context, + struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value); }; /* The adapter structure */ @@ -4377,8 +4379,6 @@ struct wined3d_unordered_access_view }; void wined3d_unordered_access_view_cleanup(struct wined3d_unordered_access_view *view) DECLSPEC_HIDDEN; -void wined3d_unordered_access_view_clear_uint(struct wined3d_unordered_access_view *view, - const struct wined3d_uvec4 *clear_value, struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_view *view, struct wined3d_buffer *buffer, unsigned int offset, struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_access_view *view, @@ -4399,6 +4399,8 @@ static inline struct wined3d_unordered_access_view_gl *wined3d_unordered_access_ return CONTAINING_RECORD(view, struct wined3d_unordered_access_view_gl, v); } +void wined3d_unordered_access_view_gl_clear_uint(struct wined3d_unordered_access_view_gl *view_gl, + const struct wined3d_uvec4 *clear_value, struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; HRESULT wined3d_unordered_access_view_gl_init(struct wined3d_unordered_access_view_gl *view_gl, const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Make the adapter responsible for copying between buffer objects.
by Alexandre Julliard Sept. 24, 2019

Sept. 24, 2019

Module: wine Branch: master Commit: 422fa49668a0b151a830cf673706e5c628bd7c69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=422fa49668a0b151a830cf67… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 24 18:08:43 2019 +0330 wined3d: Make the adapter responsible for copying between buffer objects. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 15 +++++++++++++++ dlls/wined3d/adapter_vk.c | 19 +++++++++++++++++++ dlls/wined3d/buffer.c | 5 ++--- dlls/wined3d/directx.c | 14 ++++++++++++++ dlls/wined3d/wined3d_private.h | 11 +++++++++++ 5 files changed, 61 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index e161f7261b..ed1022030b 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4611,6 +4611,20 @@ static void adapter_gl_unmap_bo_address(struct wined3d_context *context, const s wined3d_context_gl_unmap_bo_address(context_gl, data, binding, range_count, ranges); } +static void adapter_gl_copy_bo_address(struct wined3d_context *context, + const struct wined3d_bo_address *dst, uint32_t dst_bind_flags, + const struct wined3d_bo_address *src, uint32_t src_bind_flags, size_t size) +{ + struct wined3d_context_gl *context_gl; + GLenum dst_binding, src_binding; + + context_gl = wined3d_context_gl(context); + dst_binding = wined3d_buffer_gl_binding_from_bind_flags(context_gl->gl_info, dst_bind_flags); + src_binding = wined3d_buffer_gl_binding_from_bind_flags(context_gl->gl_info, src_bind_flags); + + wined3d_context_gl_copy_bo_address(context_gl, dst, dst_binding, src, src_binding, size); +} + static HRESULT adapter_gl_create_swapchain(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain) { @@ -5095,6 +5109,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = adapter_gl_uninit_3d, adapter_gl_map_bo_address, adapter_gl_unmap_bo_address, + adapter_gl_copy_bo_address, adapter_gl_create_swapchain, adapter_gl_destroy_swapchain, adapter_gl_create_buffer, diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 0d83cf7582..21163a2094 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -490,6 +490,24 @@ static void adapter_vk_unmap_bo_address(struct wined3d_context *context, const s ERR("Unsupported buffer object %#lx.\n", data->buffer_object); } +static void adapter_vk_copy_bo_address(struct wined3d_context *context, + const struct wined3d_bo_address *dst, uint32_t dst_bind_flags, + const struct wined3d_bo_address *src, uint32_t src_bind_flags, size_t size) +{ + struct wined3d_map_range range; + void *dst_ptr, *src_ptr; + + src_ptr = adapter_vk_map_bo_address(context, src, size, src_bind_flags, WINED3D_MAP_READ); + dst_ptr = adapter_vk_map_bo_address(context, dst, size, dst_bind_flags, WINED3D_MAP_WRITE); + + memcpy(dst_ptr, src_ptr, size); + + range.offset = 0; + range.size = size; + adapter_vk_unmap_bo_address(context, dst, dst_bind_flags, 1, &range); + adapter_vk_unmap_bo_address(context, src, src_bind_flags, 0, NULL); +} + static HRESULT adapter_vk_create_swapchain(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain) { @@ -821,6 +839,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = adapter_vk_uninit_3d, adapter_vk_map_bo_address, adapter_vk_unmap_bo_address, + adapter_vk_copy_bo_address, adapter_vk_create_swapchain, adapter_vk_destroy_swapchain, adapter_vk_create_buffer, diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b8f985e8e4..18a0d72117 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1188,9 +1188,8 @@ void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_off src.addr += src_offset; context = context_acquire(dst_buffer->resource.device, NULL, 0); - wined3d_context_gl_copy_bo_address(wined3d_context_gl(context), - &dst, wined3d_buffer_gl(dst_buffer)->buffer_type_hint, - &src, wined3d_buffer_gl(src_buffer)->buffer_type_hint, size); + wined3d_context_copy_bo_address(context, &dst, dst_buffer->resource.bind_flags, + &src, src_buffer->resource.bind_flags, size); context_release(context); wined3d_buffer_invalidate_range(dst_buffer, ~dst_location, dst_offset, size); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 24fab8491a..92d4766bc5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2372,6 +2372,19 @@ static void adapter_no3d_unmap_bo_address(struct wined3d_context *context, const ERR("Unsupported buffer object %#lx.\n", data->buffer_object); } +static void adapter_no3d_copy_bo_address(struct wined3d_context *context, + const struct wined3d_bo_address *dst, uint32_t dst_bind_flags, + const struct wined3d_bo_address *src, uint32_t src_bind_flags, size_t size) +{ + if (dst->buffer_object) + ERR("Unsupported dst buffer object %#lx.\n", dst->buffer_object); + if (src->buffer_object) + ERR("Unsupported src buffer object %#lx.\n", src->buffer_object); + if (dst->buffer_object || src->buffer_object) + return; + memcpy(dst->addr, src->addr, size); +} + static HRESULT adapter_no3d_create_swapchain(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain) { @@ -2626,6 +2639,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = adapter_no3d_uninit_3d, adapter_no3d_map_bo_address, adapter_no3d_unmap_bo_address, + adapter_no3d_copy_bo_address, adapter_no3d_create_swapchain, adapter_no3d_destroy_swapchain, adapter_no3d_create_buffer, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 648e3f0dee..5ce23f85f6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2821,6 +2821,9 @@ struct wined3d_adapter_ops const struct wined3d_bo_address *data, size_t size, uint32_t bind_flags, uint32_t map_flags); void (*adapter_unmap_bo_address)(struct wined3d_context *context, const struct wined3d_bo_address *data, uint32_t bind_flags, unsigned int range_count, const struct wined3d_map_range *ranges); + void (*adapter_copy_bo_address)(struct wined3d_context *context, + const struct wined3d_bo_address *dst, uint32_t dst_bind_flags, + const struct wined3d_bo_address *src, uint32_t src_bind_flags, size_t size); HRESULT (*adapter_create_swapchain)(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain); void (*adapter_destroy_swapchain)(struct wined3d_swapchain *swapchain); @@ -5267,6 +5270,14 @@ static inline void wined3d_context_unmap_bo_address(struct wined3d_context *cont context->device->adapter->adapter_ops->adapter_unmap_bo_address(context, data, bind_flags, range_count, ranges); } +static inline void wined3d_context_copy_bo_address(struct wined3d_context *context, + const struct wined3d_bo_address *dst, uint32_t dst_bind_flags, + const struct wined3d_bo_address *src, uint32_t src_bind_flags, size_t size) +{ + context->device->adapter->adapter_ops->adapter_copy_bo_address(context, + dst, dst_bind_flags, src, src_bind_flags, size); +} + /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */ #define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL"

1 0

Kevin Puetz : winegcc: Correctly pass the '-' file name (stdin) to the compiler.
by Alexandre Julliard Sept. 24, 2019

Sept. 24, 2019

Module: wine Branch: master Commit: d5e175e32b64cd734c142cfc583f17bccb03ec5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5e175e32b64cd734c142cfc… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Tue Sep 24 18:35:03 2019 +0200 winegcc: Correctly pass the '-' file name (stdin) to the compiler. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38300 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index bdcbe45c4b..f1798a8978 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -795,7 +795,7 @@ no_compat_defines: /* last, but not least, the files */ for ( j = 0; j < opts->files->size; j++ ) { - if (opts->files->base[j][0] != '-') + if (opts->files->base[j][0] != '-' || !opts->files->base[j][1]) /* not an option or bare '-' (i.e. stdin) */ strarray_add(comp_args, opts->files->base[j]); } @@ -1472,7 +1472,7 @@ int main(int argc, char **argv) /* parse options */ for ( i = 1 ; i < argc ; i++ ) { - if (argv[i][0] == '-') /* option */ + if (argv[i][0] == '-' && argv[i][1]) /* option, except '-' alone is stdin, which is a file */ { /* determine if this switch is followed by a separate argument */ next_is_arg = 0;

1 0

Matteo Bruni : d3dx9: Simplify unsupported format check.
by Alexandre Julliard Sept. 24, 2019

Sept. 24, 2019

Module: wine Branch: master Commit: b744a309ace15a8c5494cf7134294c5869d2dade URL: https://source.winehq.org/git/wine.git/?a=commit;h=b744a309ace15a8c5494cf71… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 24 19:46:25 2019 +0200 d3dx9: Simplify unsupported format check. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 8e9b834d88..00a7694ab0 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1890,9 +1890,9 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, srcformatdesc = get_format_info(src_format); destformatdesc = get_format_info(surfdesc.Format); - if (srcformatdesc->type == FORMAT_UNKNOWN || destformatdesc->type == FORMAT_UNKNOWN) + if (srcformatdesc->type == FORMAT_UNKNOWN) { - FIXME("Unsupported pixel format conversion %#x -> %#x\n", src_format, surfdesc.Format); + FIXME("Unsupported format %#x.\n", src_format); return E_NOTIMPL; }

1 0