wine-commits September 2019

wine-commits@winehq.org

2 participants
629 discussions

Francois Gouget : testbot/LibvirtTool: Create the locale snapshots as needed.
by Alexandre Julliard 25 Sep '19

25 Sep '19

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

Francois Gouget : testbot/WineRunReconfig: Tweak formatting of a notification email.
by Alexandre Julliard 25 Sep '19

25 Sep '19

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

Matteo Bruni : d3dx9/tests: Add a test with a larger DXT5 texture.
by Alexandre Julliard 24 Sep '19

24 Sep '19

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 24 Sep '19

24 Sep '19

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/tests: Add a test for loading surfaces not divisible by the block size.
by Alexandre Julliard 24 Sep '19

24 Sep '19

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: Relax a block alignment check.
by Alexandre Julliard 24 Sep '19

24 Sep '19

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

Matteo Bruni : d3dx9: Simplify unsupported format check.
by Alexandre Julliard 24 Sep '19

24 Sep '19

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

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

24 Sep '19

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

Kevin Puetz : atlbase.h: Add AtlComModuleRevokeClassObjects declaration.
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: wine Branch: master Commit: 4e896e3ee110492285aa621ea0ce32b348fdf650 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e896e3ee110492285aa621e… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Tue Sep 24 17:56:26 2019 +0200 atlbase.h: Add AtlComModuleRevokeClassObjects declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/atlbase.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/atlbase.h b/include/atlbase.h index 1e0d76082f..b8c4f65651 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -286,6 +286,7 @@ HRESULT WINAPI AtlRegisterTypeLib(HINSTANCE,LPCOLESTR); HRESULT WINAPI AtlRegisterClassCategoriesHelper(REFCLSID,const struct _ATL_CATMAP_ENTRY*,BOOL); HRESULT WINAPI AtlComModuleGetClassObject(_ATL_COM_MODULE*,REFCLSID,REFIID,void**); HRESULT WINAPI AtlComModuleRegisterClassObjects(_ATL_COM_MODULE*,DWORD,DWORD); +HRESULT WINAPI AtlComModuleRevokeClassObjects(_ATL_COM_MODULE*); HRESULT WINAPI AtlComModuleUnregisterServer(_ATL_COM_MODULE*,BOOL,const CLSID*); BOOL WINAPI AtlWaitWithMessageLoop(HANDLE); HRESULT WINAPI AtlGetObjectSourceInterface(IUnknown*,GUID*,IID*,unsigned short*,unsigned short*);

1 0

Kevin Puetz : winbase.h: Add GetFinalPathNameByHandle declaration.
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: wine Branch: master Commit: aad9dca8eea949202ac08ff2877ede4082414a41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aad9dca8eea949202ac08ff2… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Tue Sep 24 17:56:20 2019 +0200 winbase.h: Add GetFinalPathNameByHandle declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/winbase.h b/include/winbase.h index 31d45aa0cb..aa8b144230 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2172,6 +2172,9 @@ WINBASEAPI BOOL WINAPI GetFileAttributesExW(LPCWSTR,GET_FILEEX_INFO_LEVEL #define GetFileAttributesEx WINELIB_NAME_AW(GetFileAttributesEx) WINBASEAPI BOOL WINAPI GetFileInformationByHandle(HANDLE,BY_HANDLE_FILE_INFORMATION*); WINBASEAPI BOOL WINAPI GetFileInformationByHandleEx(HANDLE,FILE_INFO_BY_HANDLE_CLASS,LPVOID,DWORD); +WINBASEAPI DWORD WINAPI GetFinalPathNameByHandleA(HANDLE,LPSTR,DWORD,DWORD); +WINBASEAPI DWORD WINAPI GetFinalPathNameByHandleW(HANDLE,LPWSTR,DWORD,DWORD); +#define GetFinalPathNameByHandle WINELIB_NAME_AW(GetFinalPathNameByHandle) WINADVAPI BOOL WINAPI GetFileSecurityA(LPCSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD,LPDWORD); WINADVAPI BOOL WINAPI GetFileSecurityW(LPCWSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD,LPDWORD); #define GetFileSecurity WINELIB_NAME_AW(GetFileSecurity)

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2019