September 2019 - Wine-Commits

Francois Gouget : testbot/Engine: Increase VM::errors when a process dies and put it offline.
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: tools Branch: master Commit: f624b582e35d21eaa01bbcf8e5a72cda3ab3d07a URL: https://source.winehq.org/git/tools.git/?a=commit;h=f624b582e35d21eaa01bbcf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 26 13:35:46 2019 +0200 testbot/Engine: Increase VM::errors when a process dies and put it offline. A process dying is most likely to be a TestBot bug. But increase the VM's error count regardless and eventually put it offline. This will have two benefits: * If the crash is specific to that VM it will let other VMs runs. * It will notify the administrator that the VM was put offline and that something is wrong. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Engine/Scheduler.pm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 530a2ee..b6a8998 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -360,7 +360,18 @@ sub _CheckAndClassifyVMs() $FoundVMErrors = 1; $VM->ChildDeadline(undef); $VM->ChildPid(undef); - $VM->Status("dirty"); + my $Errors = ($VM->Errors || 0) + 1; + $VM->Errors($Errors); + if ($Errors >= $MaxVMErrors) + { + $VM->Status("offline"); + NotifyAdministrator("The TestBot and/or the ". $VM->Name ." VM needs fixing", + "The ". $VM->Name ." VM got $Errors consecutive errors, the last of which is a child process crash which indicates a TestBot bug. But something may also be wrong with the VM for it to have triggered the crash so it has been put offline.\n"); + } + else + { + $VM->Status("dirty"); + } $VM->Save(); $VM->RecordResult($Sched->{records}, "boterror process died"); $Sched->{lambvms}->{$VMKey} = 1;

1 0

Francois Gouget : testbot/LibvirtTool: Set up new live snapshots with the latest TestAgentd.
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: tools Branch: master Commit: dc42eb68bbf70d656fe81a5be890b0d86ec6b035 URL: https://source.winehq.org/git/tools.git/?a=commit;h=dc42eb68bbf70d656fe81a5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 26 13:36:23 2019 +0200 testbot/LibvirtTool: Set up new live snapshots with the latest TestAgentd. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 46 +++++++++++++++++++++++++++++++++++++++--- testbot/bin/WineRunReconfig.pl | 3 ++- testbot/lib/Build/Utils.pm | 7 +++++++ 3 files changed, 52 insertions(+), 4 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 936c386..37f95e9 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, $ResetStartCount) = @_; + my ($VM, $Booting, $UpgradeTestAgentd, $ResetStartCount) = @_; Debug(Elapsed($Start), " Setting up the $VMKey TestAgent server\n"); LogMsg "Setting up the $VMKey TestAgent server\n"; @@ -380,6 +380,46 @@ sub SetupTestAgentd($$$) FatalError("Could not connect to the $VMKey TestAgent: $ErrMessage\n"); } + # Upgrade TestAgentd + if ($UpgradeTestAgentd and ($VM->Type eq "win32" or $VM->Type eq "win64")) + { + Debug(Elapsed($Start), " Upgrading the $VMKey TestAgent server from $Version\n"); + LogMsg "Upgrading the $VMKey TestAgent server from $Version\n"; + if ($Version !~ / ([0-9]+)\.([0-9]+)$/) + { + FatalError("Unsupported TestAgent server version: $Version\n"); + } + # We want 'TestAgentd --detach --show-restarts' on Windows but this was + # not supported before this version and changing how the server is started + # is too complex. + $Version = sprintf("%02d.%02d", $1, $2); + if ($Version lt "01.07") + { + FatalError("The TestAgent server is too old to be upgraded: $Version\n"); + } + + if (!$TA->Upgrade("$DataDir/latest/TestAgentd.exe")) + { + my $ErrMessage = $TA->GetLastError(); + FatalError("Could not upgrade the $VMKey TestAgent: $ErrMessage\n"); + } + # Give the server enough time to restart, thus (maybe) avoiding a timeout + # on the first (re)connection attempt. + sleep(1); + $Version = $TA->GetVersion(); + if (!$Version) + { + my $ErrMessage = $TA->GetLastError(); + FatalError("Could not connect to the new $VMKey TestAgent: $ErrMessage\n"); + } + LogMsg "Upgraded the $VMKey TestAgent server to $Version\n"; + + # Note that the privileged TestAgent server (if any) is usually run with + # --set-time-only which means it cannot be upgraded since the restart RPC + # is blacklisted. But that also means it's unlikely to need upgrading. + # A side effect is that it will force TestAgentd.exe.old to stay around. + } + if ($ResetStartCount) { # If SetProperty() is not supported neither is --show-restarts. @@ -516,7 +556,7 @@ sub Revert() # 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); + SetupTestAgentd($VM, $Booting, ($CreateSnapshot or $SetLocale), $SetLocale); if ($CreateSnapshot) { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 0bf417b..0a5e606 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -464,7 +464,8 @@ FatalTAError(undef, $TAError) if (defined $TAError); if ($NewStatus eq "completed") { use File::Copy; - foreach my $FileName ("../src/TestLauncher/TestLauncher32.exe", + foreach my $FileName ("../src/testagentd/TestAgentd.exe", + "../src/TestLauncher/TestLauncher32.exe", "../src/TestLauncher/TestLauncher64.exe", "latest/winefiles.txt", "latest/wine-parentsrc.txt") diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 50d5735..9a45906 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -215,6 +215,9 @@ sub BuildNativeTestAgentd() sub BuildWindowsTestAgentd() { + my $WindowsTestAgentd = "$::RootDir/src/testagentd/TestAgentd.exe"; + my $Before = GetMTime($WindowsTestAgentd); + InfoMsg "\nRebuilding the Windows TestAgentd\n"; my $CPUCount = GetCPUCount(); system("cd '$::RootDir/src/testagentd' && set -x && ". @@ -225,6 +228,10 @@ sub BuildWindowsTestAgentd() return !1; } + if ($Before != GetMTime($WindowsTestAgentd)) + { + LogMsg "Updated TestAgentd.exe\n"; + } return 1; }

1 0

Francois Gouget : testbot/web: Document and slightly optimize PageBase::Redirect().
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: tools Branch: master Commit: 900e6913a2c2eefac07a0947fcc254aa62974410 URL: https://source.winehq.org/git/tools.git/?a=commit;h=900e6913a2c2eefac07a094… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 26 13:35:22 2019 +0200 testbot/web: Document and slightly optimize PageBase::Redirect(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index c1a8c8c..e3d2e04 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -395,18 +395,18 @@ sub Redirect($$$) $self->SetCookies(); if (substr($Location, 0, 4) ne "http") { - my $Protocol = "http"; - if (SecureConnection()) - { - $Protocol .= "s"; - } + # Use the same protocol as for the current page. To force switching to + # https the caller should use MakeSecureURL(). + my $Protocol = SecureConnection() ? "https://" : "http://"; if (substr($Location, 0, 1) ne "/") { + # Despite its name, Request->uri only contains the path portion of the + # URI, excluding the protocol, hostname and parameters! my $URI = $self->{Request}->uri; - $URI =~ s=^(.*)/[^/]*$=$1/=; - $Location = $URI . $Location; + $URI =~ s=^(.*)/[^/]*$=$1/$Location=; + $Location = $URI; } - $Location = $Protocol . "://" . $ENV{"HTTP_HOST"} . $Location; + $Location = $Protocol . $ENV{"HTTP_HOST"} . $Location; } $self->{Request}->headers_out->set("Location", $Location); $self->{Request}->status(Apache2::Const::REDIRECT);

1 0

Francois Gouget : testbot/WineRunReconfig: Use SpecialJobs to create the WineTest job.
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: tools Branch: master Commit: 03268afd2ba530ebb95c72f3795f397386dd7abe URL: https://source.winehq.org/git/tools.git/?a=commit;h=03268afd2ba530ebb95c72f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 26 13:35:15 2019 +0200 testbot/WineRunReconfig: Use SpecialJobs to create the WineTest job. Also notify the administrator if that job creation fails. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 2e62a2e..0bf417b 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -526,10 +526,24 @@ if ($NewStatus eq 'completed') FatalError("Could not recreate the $IdleSnapshot snapshot: $ErrMessage\n"); } - if ($VM->Type eq "wine" and - system("$BinDir/CheckForWinetestUpdate.pl", "--vm", $VM->Name, "--create", "winetest")) + if ($VM->Type eq "wine") { - Error("Could not create a job to run WineTest on the ". $VM->Name ." VM\n"); + require WineTestBot::SpecialJobs; + $ErrMessage = WineTestBot::SpecialJobs::AddWineTestJob([$VM], $VM->Name); + if (defined $ErrMessage) + { + Error("Could not create a WineTest job for ". $VM->Name .": $ErrMessage\n"); + NotifyAdministrator("Could not create a WineTest job for ". $VM->Name, + "Could not create a job to run WineTest on ". $VM->Name + ." after its update:\n\n". + "$ErrMessage\n\n". + "See the link below for more details:\n". + MakeSecureURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n"); + } + else + { + Debug(Elapsed($Start), " Added a WineTest job for ". $VM->Name ."\n"); + } } }

1 0

Francois Gouget : testbot/LibvirtTool: Create a reconfig job for new live Build/Wine VM snapshots.
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: tools Branch: master Commit: 489a36c8f60b146d5be6dc29f1b6e627d98e6de1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=489a36c8f60b146d5be6dc2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 26 13:36:44 2019 +0200 testbot/LibvirtTool: Create a reconfig job for new live Build/Wine VM snapshots. Only the live snapshots are kept up to date by the TestBot. So Wine will always be out of date in powered off snapshots making any live snapshot created from them unusable. The fix is to create a high priority reconfig job so they are brought up to date before being used for any other task. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 37f95e9..f6e2d4f 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -562,6 +562,24 @@ sub Revert() { $DomainSnapshot .= "-live"; CreateSnapshot($Domain, $DomainSnapshot); + + if ($VM->Type eq "build" or $VM->Type eq "wine") + { + require WineTestBot::SpecialJobs; + $ErrMessage = WineTestBot::SpecialJobs::AddReconfigJob([$VM], $VM->Name, $VM->Type); + if (defined $ErrMessage) + { + Error("Could not create a job to update and rebuild Wine on the $VMKey VM: $ErrMessage\n"); + NotifyAdministrator("Could not create a job to update $VMKey", + "A live snapshot was created for $VMKey but no job could be\n". + "created to update and rebuild Wine on it:\n\n". + "$ErrMessage\n"); + } + else + { + Debug(Elapsed($Start), " Added a job to update and rebuild Wine on $VMKey\n"); + } + } } # Set up the VM locale

1 0

Francois Gouget : testbot/SpecialJobs: Tweak GetWindowsTestVMs() to work the same for 32 and 64 bit.
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: tools Branch: master Commit: 9cf225863b45409d1a0f3c016d80131a09295d65 URL: https://source.winehq.org/git/tools.git/?a=commit;h=9cf225863b45409d1a0f3c0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 26 13:34:47 2019 +0200 testbot/SpecialJobs: Tweak GetWindowsTestVMs() to work the same for 32 and 64 bit. Also make it possible to retrieve all the enabled VMs, regardless of their role like is possible with the other GetXxxVMs() functions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/SpecialJobs.pm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/testbot/lib/WineTestBot/SpecialJobs.pm b/testbot/lib/WineTestBot/SpecialJobs.pm index b0cb148..d709e48 100644 --- a/testbot/lib/WineTestBot/SpecialJobs.pm +++ b/testbot/lib/WineTestBot/SpecialJobs.pm @@ -113,21 +113,21 @@ sub GetWindowsTestVMs($$$) my ($VMKey, $Build, $BaseJob) = @_; my $VMs = CreateVMs(); - $VMs->AddFilter("Name", [$VMKey]) if (defined $VMKey); - if ($Build eq "exe64") + $VMs->AddFilter("Type", $Build eq "exe32" ? ["win32", "win64"] : ["win64"]); + if (defined $VMKey) { - $VMs->AddFilter("Type", ["win64"]); - $VMs->AddFilter("Role", ["base", "winetest"]) if (!defined $VMKey); + $VMs->AddFilter("Name", [$VMKey]); + $VMs->FilterEnabledRole(); } - elsif ($BaseJob eq "base") + elsif ($BaseJob) { - $VMs->AddFilter("Type", ["win32", "win64"]); - $VMs->AddFilter("Role", ["base"]) if (!defined $VMKey); + $VMs->AddFilter("Role", $BaseJob eq "base" ? ["base"] : + $BaseJob eq "other" ? ["winetest"] : + ["base", "winetest"]); } else { - $VMs->AddFilter("Type", ["win32", "win64"]); - $VMs->AddFilter("Role", ["winetest"]) if (!defined $VMKey); + $VMs->FilterEnabledRole(); } my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys());

1 0

Francois Gouget : testbot/CheckForWinetestUpdate: Use WineTestBot::Utils so we get GetMTime().
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: tools Branch: master Commit: 07c25b805729f9cb294c5c1aae040f2fbc8aa071 URL: https://source.winehq.org/git/tools.git/?a=commit;h=07c25b805729f9cb294c5c1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 26 03:48:02 2019 +0200 testbot/CheckForWinetestUpdate: Use WineTestBot::Utils so we get GetMTime(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/CheckForWinetestUpdate.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 3f69731..c3ec3a4 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -53,6 +53,7 @@ use WineTestBot::Config; use WineTestBot::Engine::Notify; use WineTestBot::Log; use WineTestBot::SpecialJobs; +use WineTestBot::Utils; use WineTestBot::VMs;

1 0

Paul Gofman : wined3d: Allow loading buffers mapped through system memory.
by Alexandre Julliard Sept. 25, 2019

Sept. 25, 2019

Module: wine Branch: master Commit: df509be8c6d581b2e68ea79c282289dd8840b11a URL: https://source.winehq.org/git/wine.git/?a=commit;h=df509be8c6d581b2e68ea79c… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Sep 23 17:00:30 2019 +0300 wined3d: Allow loading buffers mapped through system memory. Fixes rendering dirt on the wind shield and GL_INVALID_OPERATION errors in "Need For Speed Shift 2". The test succeeds on Windows with retail Direct3D 9, but fails with debug Direct3D 9 if selected in DirectX SDK control panel: error code is returned from _DrawIndexedPrimitive() and the triangle is not rendered. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/buffer.c | 8 ++- 2 files changed, 146 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 121b50f42a..e7076aeed6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26125,6 +26125,145 @@ done: DestroyWindow(window); } +static void test_draw_mapped_buffer(void) +{ + IDirect3DVertexBuffer9 *vb; + IDirect3DIndexBuffer9 *ib; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + unsigned int i; + D3DCOLOR color; + ULONG refcount; + BOOL test_pass; + HWND window; + HRESULT hr; + void *data; + + static const short indices[] = {0, 1, 2}; + static const struct + { + struct vec3 position; + DWORD diffuse; + } + quad[] = + { + {{-1.0f, -1.0f, 0.1f}, 0xffff0000}, + {{-1.0f, 1.0f, 0.1f}, 0xffff0000}, + {{ 1.0f, 1.0f, 0.1f}, 0xffff0000}, + }; + static const struct + { + D3DPOOL pool; + DWORD usage; + BOOL ignore_wine_result; + } + tests[] = + { + {D3DPOOL_DEFAULT, D3DUSAGE_DYNAMIC, TRUE}, + {D3DPOOL_MANAGED, 0}, + {D3DPOOL_SYSTEMMEM, 0}, + }; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateIndexBuffer(device, sizeof(indices), 0, + D3DFMT_INDEX16, D3DPOOL_DEFAULT, &ib, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DIndexBuffer9_Lock(ib, 0, sizeof(indices), &data, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memcpy(data, indices, sizeof(indices)); + + hr = IDirect3DDevice9_SetIndices(device, ib); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice9_CreateVertexBuffer(device, sizeof(quad), tests[i].usage, + D3DFVF_XYZ | D3DFVF_DIFFUSE, tests[i].pool, &vb, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(quad), &data, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memcpy(data, quad, sizeof(quad)); + + hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 0, sizeof(quad[0])); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, 0, 0, ARRAY_SIZE(quad), 0, 1); + ok(hr == D3D_OK, "Got unexpected hr %#x, test %u.\n", hr, i); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + color = getPixelColor(device, 160, 120); + ok(color_match(color, 0x00ff0000, 1), "Got unexpected color 0x%08x, test %u.\n", color, i); + color = getPixelColor(device, 480, 360); + ok(color_match(color, 0x000000ff, 1), "Got unexpected color 0x%08x, test %u.\n", color, i); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer9_Unlock(vb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + /* One more time now when buffer object in wined3d is already created. */ + hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(quad), &data, D3DLOCK_DISCARD); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memcpy(data, quad, sizeof(quad)); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, 0, 0, ARRAY_SIZE(quad), 0, 1); + ok(hr == D3D_OK, "Got unexpected hr %#x, test %u.\n", hr, i); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + color = getPixelColor(device, 160, 120); + + test_pass = color_match(color, 0x00ff0000, 1); + todo_wine_if(tests[i].ignore_wine_result && !test_pass) + ok(test_pass, "Got unexpected color 0x%08x, test %u.\n", color, i); + + color = getPixelColor(device, 480, 360); + ok(color_match(color, 0x000000ff, 1), "Got unexpected color 0x%08x, test %u.\n", color, i); + + hr = IDirect3DVertexBuffer9_Unlock(vb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + IDirect3DVertexBuffer9_Release(vb); + } + + hr = IDirect3DIndexBuffer9_Unlock(ib); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + IDirect3DIndexBuffer9_Release(ib); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -26269,4 +26408,5 @@ START_TEST(visual) test_nrm_instruction(); test_desktop_window(); test_mismatched_sample_types(); + test_draw_mapped_buffer(); } diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 18a0d72117..95fcdff7ef 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -857,11 +857,15 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * TRACE("buffer %p.\n", buffer); - if (buffer->resource.map_count) + if (buffer->resource.map_count && buffer->map_ptr) { - WARN("Buffer is mapped, skipping preload.\n"); + FIXME("Buffer is mapped through buffer object, not loading.\n"); return; } + else if (buffer->resource.map_count) + { + WARN("Loading mapped buffer.\n"); + } buffer_mark_used(buffer);

1 0

Alex Henrie : include: Add Tag field to SYSTEM_BATTERY_STATE.
by Alexandre Julliard Sept. 25, 2019

Sept. 25, 2019

Module: wine Branch: master Commit: 4407fb7ada185b301532def526d3411ee026ac18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4407fb7ada185b301532def5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 25 00:45:54 2019 -0600 include: Add Tag field to SYSTEM_BATTERY_STATE. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index 5e9057199e..3f59bd9f30 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5607,7 +5607,8 @@ typedef struct { BOOLEAN BatteryPresent; BOOLEAN Charging; BOOLEAN Discharging; - BOOLEAN Spare1[4]; + BOOLEAN Spare1[3]; + BYTE Tag; ULONG MaxCapacity; ULONG RemainingCapacity; ULONG Rate;

1 0

Brendan Shanks : d2d1: Only create shader resource views for drawable bitmaps.
by Alexandre Julliard Sept. 25, 2019

Sept. 25, 2019

Module: wine Branch: master Commit: 940c3b4896a75b65351d4c7d610f1071d0c9d0be URL: https://source.winehq.org/git/wine.git/?a=commit;h=940c3b4896a75b65351d4c7d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Sep 25 22:53:57 2019 +0330 d2d1: Only create shader resource views for drawable bitmaps. The underlying resource for bitmaps created with D2D1_BITMAP_OPTIONS_CANNOT_DRAW doesn't necessarily have D3D10_BIND_SHADER_RESOURCE in its bind flags. Original patch by Robin Kertels <robin.kertels(a)gmail.com> Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap.c | 65 ++++++++++++++++---------------------------- dlls/d2d1/brush.c | 2 +- dlls/d2d1/d2d1_private.h | 3 +- dlls/d2d1/dc_render_target.c | 5 +--- 4 files changed, 27 insertions(+), 48 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 39e81192f7..dc5ed9e6ad 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -66,11 +66,13 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_Release(ID2D1Bitmap1 *iface) if (!refcount) { - ID3D10ShaderResourceView_Release(bitmap->view); + if (bitmap->srv) + ID3D10ShaderResourceView_Release(bitmap->srv); if (bitmap->rtv) ID3D10RenderTargetView_Release(bitmap->rtv); if (bitmap->surface) IDXGISurface_Release(bitmap->surface); + ID3D10Resource_Release(bitmap->resource); ID2D1Factory_Release(bitmap->factory); heap_free(bitmap); } @@ -149,7 +151,6 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromMemory(ID2D1Bitmap1 *iface, { struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap1(iface); ID3D10Device *device; - ID3D10Resource *dst; D3D10_BOX box; TRACE("iface %p, dst_rect %p, src_data %p, pitch %u.\n", iface, dst_rect, src_data, pitch); @@ -164,11 +165,9 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromMemory(ID2D1Bitmap1 *iface, box.back = 1; } - ID3D10ShaderResourceView_GetResource(bitmap->view, &dst); - ID3D10ShaderResourceView_GetDevice(bitmap->view, &device); - ID3D10Device_UpdateSubresource(device, dst, 0, dst_rect ? &box : NULL, src_data, pitch, 0); + ID3D10Resource_GetDevice(bitmap->resource, &device); + ID3D10Device_UpdateSubresource(device, bitmap->resource, 0, dst_rect ? &box : NULL, src_data, pitch, 0); ID3D10Device_Release(device); - ID3D10Resource_Release(dst); return S_OK; } @@ -271,36 +270,37 @@ static BOOL format_supported(const D2D1_PIXEL_FORMAT *format) } static void d2d_bitmap_init(struct d2d_bitmap *bitmap, struct d2d_device_context *context, - ID3D10ShaderResourceView *view, D2D1_SIZE_U size, const D2D1_BITMAP_PROPERTIES1 *desc) + ID3D10Resource *resource, D2D1_SIZE_U size, const D2D1_BITMAP_PROPERTIES1 *desc) { - ID3D10Resource *resource; ID3D10Device *d3d_device; HRESULT hr; bitmap->ID2D1Bitmap1_iface.lpVtbl = &d2d_bitmap_vtbl; bitmap->refcount = 1; ID2D1Factory_AddRef(bitmap->factory = context->factory); - ID3D10ShaderResourceView_AddRef(bitmap->view = view); + ID3D10Resource_AddRef(bitmap->resource = resource); bitmap->pixel_size = size; bitmap->format = desc->pixelFormat; bitmap->dpi_x = desc->dpiX; bitmap->dpi_y = desc->dpiY; bitmap->options = desc->bitmapOptions; - ID3D10ShaderResourceView_GetResource(bitmap->view, &resource); - if (d2d_device_context_is_dxgi_target(context)) ID3D10Resource_QueryInterface(resource, &IID_IDXGISurface, (void **)&bitmap->surface); + ID3D10Resource_GetDevice(resource, &d3d_device); if (bitmap->options & D2D1_BITMAP_OPTIONS_TARGET) { - ID3D10Resource_GetDevice(resource, &d3d_device); if (FAILED(hr = ID3D10Device_CreateRenderTargetView(d3d_device, resource, NULL, &bitmap->rtv))) - WARN("Failed to create rtv, hr %#x.\n", hr); - ID3D10Device_Release(d3d_device); + WARN("Failed to create RTV, hr %#x.\n", hr); } - ID3D10Resource_Release(resource); + if (!(bitmap->options & D2D1_BITMAP_OPTIONS_CANNOT_DRAW)) + { + if (FAILED(hr = ID3D10Device_CreateShaderResourceView(d3d_device, resource, NULL, &bitmap->srv))) + WARN("Failed to create SRV, hr %#x.\n", hr); + } + ID3D10Device_Release(d3d_device); if (bitmap->dpi_x == 0.0f && bitmap->dpi_y == 0.0f) { @@ -314,7 +314,6 @@ HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size, { D3D10_SUBRESOURCE_DATA resource_data; D3D10_TEXTURE2D_DESC texture_desc; - ID3D10ShaderResourceView *view; ID3D10Texture2D *texture; HRESULT hr; @@ -355,21 +354,12 @@ HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size, return hr; } - hr = ID3D10Device_CreateShaderResourceView(context->d3d_device, (ID3D10Resource *)texture, NULL, &view); - ID3D10Texture2D_Release(texture); - if (FAILED(hr)) - { - ERR("Failed to create view, hr %#x.\n", hr); - return hr; - } - if ((*bitmap = heap_alloc_zero(sizeof(**bitmap)))) { - d2d_bitmap_init(*bitmap, context, view, size, desc); + d2d_bitmap_init(*bitmap, context, (ID3D10Resource *)texture, size, desc); TRACE("Created bitmap %p.\n", *bitmap); } - - ID3D10ShaderResourceView_Release(view); + ID3D10Texture2D_Release(texture); return *bitmap ? S_OK : E_OUTOFMEMORY; } @@ -391,7 +381,7 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, goto failed; } - ID3D10ShaderResourceView_GetDevice(src_impl->view, &device); + ID3D10Resource_GetDevice(src_impl->resource, &device); ID3D10Device_Release(device); if (device != context->d3d_device) { @@ -423,7 +413,7 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, goto failed; } - d2d_bitmap_init(*bitmap, context, src_impl->view, src_impl->pixel_size, desc); + d2d_bitmap_init(*bitmap, context, src_impl->resource, src_impl->pixel_size, desc); TRACE("Created bitmap %p.\n", *bitmap); failed: @@ -432,7 +422,6 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, if (IsEqualGUID(iid, &IID_IDXGISurface) || IsEqualGUID(iid, &IID_IDXGISurface1)) { - ID3D10ShaderResourceView *view; DXGI_SURFACE_DESC surface_desc; IDXGISurface *surface = data; ID3D10Resource *resource; @@ -454,17 +443,9 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, return D2DERR_UNSUPPORTED_OPERATION; } - hr = ID3D10Device_CreateShaderResourceView(context->d3d_device, resource, NULL, &view); - ID3D10Resource_Release(resource); - if (FAILED(hr)) - { - WARN("Failed to create shader resource view, hr %#x.\n", hr); - return hr; - } - if (!(*bitmap = heap_alloc_zero(sizeof(**bitmap)))) { - ID3D10ShaderResourceView_Release(view); + ID3D10Resource_Release(resource); return E_OUTOFMEMORY; } @@ -472,7 +453,7 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, if (FAILED(hr = IDXGISurface_GetDesc(surface, &surface_desc))) { WARN("Failed to get surface desc, hr %#x.\n", hr); - ID3D10ShaderResourceView_Release(view); + ID3D10Resource_Release(resource); return hr; } @@ -499,8 +480,8 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, pixel_size.width = surface_desc.Width; pixel_size.height = surface_desc.Height; - d2d_bitmap_init(*bitmap, context, view, pixel_size, &d); - ID3D10ShaderResourceView_Release(view); + d2d_bitmap_init(*bitmap, context, resource, pixel_size, &d); + ID3D10Resource_Release(resource); TRACE("Created bitmap %p.\n", *bitmap); return S_OK; diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 21abf1456a..80fc0f5331 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -1295,7 +1295,7 @@ static void d2d_brush_bind_bitmap(struct d2d_brush *brush, ID3D10Device *device, { HRESULT hr; - ID3D10Device_PSSetShaderResources(device, brush_idx, 1, &brush->u.bitmap.bitmap->view); + ID3D10Device_PSSetShaderResources(device, brush_idx, 1, &brush->u.bitmap.bitmap->srv); if (!brush->u.bitmap.sampler_state) { D3D10_SAMPLER_DESC sampler_desc; diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index b07893ae18..2e42d6d550 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -346,9 +346,10 @@ struct d2d_bitmap LONG refcount; ID2D1Factory *factory; - ID3D10ShaderResourceView *view; + ID3D10ShaderResourceView *srv; ID3D10RenderTargetView *rtv; IDXGISurface *surface; + ID3D10Resource *resource; D2D1_SIZE_U pixel_size; D2D1_PIXEL_FORMAT format; float dpi_x; diff --git a/dlls/d2d1/dc_render_target.c b/dlls/d2d1/dc_render_target.c index 310c541296..47aa99697d 100644 --- a/dlls/d2d1/dc_render_target.c +++ b/dlls/d2d1/dc_render_target.c @@ -687,7 +687,6 @@ static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_BindDC(ID2D1DCRenderTarget struct d2d_bitmap *bitmap_impl; IDXGISurface1 *dxgi_surface; ID2D1DeviceContext *context; - ID3D10Resource *resource; D2D1_SIZE_U bitmap_size; ID2D1Bitmap *bitmap; HRESULT hr; @@ -716,9 +715,7 @@ static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_BindDC(ID2D1DCRenderTarget } bitmap_impl = unsafe_impl_from_ID2D1Bitmap(bitmap); - ID3D10ShaderResourceView_GetResource(bitmap_impl->view, &resource); - ID3D10Resource_QueryInterface(resource, &IID_IDXGISurface1, (void **)&dxgi_surface); - ID3D10Resource_Release(resource); + ID3D10Resource_QueryInterface(bitmap_impl->resource, &IID_IDXGISurface1, (void **)&dxgi_surface); ID2D1DeviceContext_SetTarget(context, (ID2D1Image *)bitmap); ID2D1Bitmap_Release(bitmap);

1 0