October 2019 - Wine-commits

Francois Gouget : testbot/Submit: Add a single page mode.
by Alexandre Julliard 02 Oct '19

02 Oct '19

Module: tools Branch: master Commit: 0ad777fa1db816a0f74663c94d9fa969218ac859 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0ad777fa1db816a0f74663c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 2 06:56:23 2019 +0200 testbot/Submit: Add a single page mode. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 131 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 95 insertions(+), 36 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index b672375..dc3fdca 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -325,6 +325,22 @@ sub _ValidateTestExecutable($;$) return 1; } +sub _ValidateUpload($) +{ + my ($self) = @_; + + if (defined $self->{FileName}) + { + return undef if (!$self->_ValidateFileName()); + } + else + { + $self->{FileName} = $self->GetParam("Upload"); + return undef if (!$self->_ValidateFileName() or !$self->_Upload()); + } + return 1; +} + sub Validate($) { my ($self) = @_; @@ -410,7 +426,7 @@ sub _initialize($$$) $self->{Page} = $self->GetParam("Page"); # Page is a hidden parameter so fix it instead of issuing an error - $self->{Page} = 1 if (!defined $self->{Page} or $self->{Page} !~ /^[0-3]$/); + $self->{Page} = 1 if (!defined $self->{Page} or $self->{Page} !~ /^[0-4]$/); $self->{LastPage} = $self->{Page}; # Load the Page 1 parameters @@ -468,6 +484,9 @@ sub _GenerateStateFields($) $self->_GenerateStateField("Page"); + # There are no parameters to preserve when there is a single page + return if ($self->{Page} == 4); + if ($self->{Page} != 1) { $self->_GenerateStateField("Branch"); @@ -514,22 +533,24 @@ sub GetHeaderText($) { my ($self) = @_; + my @Headers; if ($self->{Page} == 0) { - return "Your job was successfully queued, but the job engine that takes " . - "care of actually running it seems to be unavailable (perhaps it " . - "crashed). Your job will remain queued until the engine is " . - "restarted."; + push @Headers, + "Your job was successfully queued, but the job engine that takes " . + "care of actually running it seems to be unavailable (perhaps it " . + "crashed). Your job will remain queued until the engine is " . + "restarted."; } - elsif ($self->{Page} == 1) + if ($self->{Page} == 1 or $self->{Page} == 4) { - return defined $self->{FileName} ? "" : + push @Headers, defined $self->{FileName} ? "" : "Specify the patch file that you want to upload and submit " . "for testing.<br>\n" . "You can also specify a Windows .exe file, this would normally be " . "a Wine test executable that you cross-compiled." } - elsif ($self->{Page} == 2) + if ($self->{Page} == 2 or $self->{Page} == 4) { my $HeaderText = "Select the VMs on which you want to run your test."; my $VMs = CreateVMs(); @@ -538,9 +559,9 @@ sub GetHeaderText($) { $HeaderText .= "<br>NOTE: Offline VMs and those undergoing maintenance will not be able to run your tests right away."; } - return $HeaderText; + push @Headers, $HeaderText; } - elsif ($self->{Page} == 3 and $self->{Impacts}) + if (($self->{Page} == 3 or $self->{Page} == 0) and $self->{Impacts}) { my @TestExecutables; $self->_GetTestExecutables(); @@ -562,10 +583,10 @@ sub GetHeaderText($) } push @TestExecutables, "$Module: ". join(" ", @TestUnits) if (@TestUnits); } - return join("<br>\n", "Here is a list of the test executables impacted by the patch (patched test units, if any, are in italics).", @TestExecutables); + push @Headers, join("<br>\n", "Here is a list of the test executables impacted by the patch (patched test units, if any, are in italics).", @TestExecutables); } - return ""; + return join("<br>\n", @Headers); } sub GetPropertyDescriptors($) @@ -581,21 +602,33 @@ sub GetPropertyDescriptors($) CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 128), ]; } - elsif ($self->{Page} == 3) + elsif (($self->{Page} == 3 or $self->{Page} == 4) and + !$self->{PropertyDescriptors}) { - if (!$self->{PropertyDescriptors}) + if ($self->{Page} == 4) + { + $self->{PropertyDescriptors} = [ + CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 128), + # Let the user type in the TestExecutable since we won't be able to + # figure it out in advance + CreateBasicPropertyDescriptor("TestExecutable", "Test executable", !1, 1, "A", 50), + ]; + } + else { $self->_GetTestExecutables(); my @TestExecutables = sort keys %{$self->{TestExecutables}}; $self->{PropertyDescriptors} = [ CreateEnumPropertyDescriptor("TestExecutable", "Test executable", !1, 1, \@TestExecutables), - CreateBasicPropertyDescriptor("CmdLineArg", "Command line arguments", !1, !1, "A", 50), - CreateBasicPropertyDescriptor("Run64", "Run 64-bit tests in addition to 32-bit tests", !1, 1, "B", 1), - CreateBasicPropertyDescriptor("DebugLevel", "Debug level (WINETEST_DEBUG)", !1, 1, "N", 2), - CreateBasicPropertyDescriptor("ReportSuccessfulTests", "Report successful tests (WINETEST_REPORT_SUCCESS)", !1, 1, "B", 1), ]; } + push @{$self->{PropertyDescriptors}}, + CreateBasicPropertyDescriptor("CmdLineArg", "Command line arguments", !1, !1, "A", 50), + CreateBasicPropertyDescriptor("Run64", "Run 64-bit tests in addition to 32-bit tests", !1, 1, "B", 1), + CreateBasicPropertyDescriptor("DebugLevel", "Debug level (WINETEST_DEBUG)", !1, 1, "N", 2), + CreateBasicPropertyDescriptor("ReportSuccessfulTests", "Report successful tests (WINETEST_REPORT_SUCCESS)", !1, 1, "B", 1); } + return $self->SUPER::GetPropertyDescriptors(); } @@ -611,7 +644,7 @@ sub GenerateFields($) $self->_GenerateStateField("JobKey"); } - elsif ($self->{Page} == 1) + if ($self->{Page} == 1 or $self->{Page} == 4) { print "<div class='ItemProperty'><label>File</label>", "<div class='ItemValue'>"; @@ -657,9 +690,11 @@ sub GenerateFields($) } # The other fields are taken care of by FreeFormPage. $self->{HasRequired} = 1; + + print "<br>\n" if ($self->{Page} == 4); } - elsif ($self->{Page} == 2) + if ($self->{Page} == 2 or $self->{Page} == 4) { $self->_GenerateStateField("ShowAll"); print "<div class='CollectionBlock'><table>\n"; @@ -742,15 +777,23 @@ EOF print "<input type='submit' name='Action' value='", $self->{ShowAll} ? "Show base VMs" : "Show all VMs", "'/>\n"; print "</div>\n"; + + print "<br>\n" if ($self->{Page} == 4); } - elsif ($self->{Page} == 3) + if ($self->{Page} == 3 or $self->{Page} == 4) { $self->_GenerateStateField("NoCmdLineArgWarn"); # Preserve these fields if they are not shown - $self->_GenerateStateField("Run64") if (!$self->{ShowRun64} or $self->{FileType} ne "patch"); - $self->_GenerateStateField("TestExecutable") if ($self->{FileType} ne "patch"); + if (!$self->{ShowRun64} or $self->{FileType} ne "patch") + { + $self->_GenerateStateField("Run64"); + } + if ($self->{FileType} ne "patch" and $self->{Page} != 4) + { + $self->_GenerateStateField("TestExecutable"); + } # The other fields are taken care of by FreeFormPage. } @@ -769,7 +812,7 @@ sub GetActions($) } elsif ($self->{Page} == 1) { - push @$Actions, "Next >"; + push @$Actions, "Single Page", "Next >"; } elsif ($self->{Page} == 2) { @@ -779,6 +822,10 @@ sub GetActions($) { push @$Actions, "< Prev", "Submit"; } + elsif ($self->{Page} == 4) + { + push @$Actions, "Submit"; + } return $Actions; } @@ -848,16 +895,8 @@ sub OnPage1Next($) { my ($self) = @_; - if (defined $self->{FileName}) - { - return undef if (!$self->_ValidateFileName()); - } - else - { - $self->{FileName} = $self->GetParam("Upload"); - return undef if (!$self->_ValidateFileName() or !$self->_Upload()); - } - if (!$self->Validate() or !$self->_ValidateVMSelection("deselect") or + if (!$self->_ValidateUpload() or !$self->Validate() or + !$self->_ValidateVMSelection("deselect") or !$self->_ValidateTestExecutable("reset")) { return undef; @@ -874,6 +913,22 @@ sub OnPage1Next($) return 1; } +sub OnSinglePage($) +{ + my ($self) = @_; + + # The checks and defaults are the same as for Page1Next() + if (!$self->OnPage1Next()) + { + # But ignore all errors. The user can change everything anyway. + delete $self->{ErrField}; + delete $self->{ErrMessage}; + } + + $self->_SetPage(4); + return 1; +} + sub OnPage2Next($) { my ($self) = @_; @@ -1101,7 +1156,7 @@ sub OnSubmit($) { my ($self) = @_; - return undef if (!$self->Validate()); + return undef if (!$self->_ValidateUpload() or !$self->Validate()); # Rename the staging file to avoid race conditions if the user clicks on # Submit multiple times @@ -1165,7 +1220,11 @@ sub OnAction($$) { my ($self, $Action) = @_; - if ($Action eq "Next >") + if ($Action eq "Single Page") + { + return $self->OnSinglePage(); + } + elsif ($Action eq "Next >") { return $self->{Page} == 2 ? $self->OnPage2Next() : $self->OnPage1Next(); }

1 0

Francois Gouget : testbot/LibvirtTool: Check the X session for Wine VMs after booting.
by Alexandre Julliard 02 Oct '19

02 Oct '19

Module: tools Branch: master Commit: ae2ecce33aad2f1cefecf5e8fa7ca65cfa6be587 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ae2ecce33aad2f1cefecf5e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 2 07:00:28 2019 +0200 testbot/LibvirtTool: Check the X session for Wine VMs after booting. We need to wait for the X session whenever a Wine VM is booted, even when not creating a snapshot. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index f6e2d4f..5438f29 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -420,6 +420,25 @@ sub SetupTestAgentd($$$$) # A side effect is that it will force TestAgentd.exe.old to stay around. } + if ($Booting and $VM->Type eq "wine") + { + # Make sure the X session has had time to start + Debug(Elapsed($Start), " Waiting for the X session\n"); + LogMsg "Waiting for the $VMKey X session\n"; + my $Pid = $TA->Run(["sh", "-c", "while ! xset -display :0.0 q >/dev/null; do sleep 1; done"], 0); + FatalError("Could not check for the X session on $VMKey\n") if (!$Pid); + + if (!defined $TA->Wait($Pid, $SleepAfterBoot)) + { + my $ErrMessage = $TA->GetLastError(); + if ($ErrMessage =~ /timed out waiting for the child process/) + { + FatalError("Timed out waiting for the X session\n"); + } + FatalError("An error occurred while waiting for the X session: $ErrMessage\n"); + } + } + if ($ResetStartCount) { # If SetProperty() is not supported neither is --show-restarts. @@ -443,29 +462,6 @@ sub CreateSnapshot($$) { my ($Domain, $SnapshotName) = @_; - if ($VM->Type eq "wine") - { - # Make sure an X session has started before taking the snapshot - Debug(Elapsed($Start), " Waiting for the X session\n"); - LogMsg "Waiting for the $VMKey X session\n"; - my $TA = $VM->GetAgent(); - my $Pid = $TA->Run(["sh", "-c", "while ! xset -display :0.0 q >/dev/null; do sleep 1; done"], 0); - if (!$Pid) - { - FatalError("Could not check for the X session on the $VMKey VM\n"); - } - if (!defined $TA->Wait($Pid, $SleepAfterBoot)) - { - my $ErrMessage = $TA->GetLastError(); - if ($ErrMessage =~ /timed out waiting for the child process/) - { - FatalError("Timed out waiting for the X session\n"); - } - FatalError("An error occurred while waiting for the X session: $ErrMessage\n"); - } - $TA->Disconnect(); - } - if ($SleepAfterBoot != 0) { Debug(Elapsed($Start), " Sleeping for the $SnapshotName snapshot\n");

1 0

Francois Gouget : testbot/web: Allow downloading the raw task reports and logs.
by Alexandre Julliard 02 Oct '19

02 Oct '19

Module: tools Branch: master Commit: f730e3fbb4ef500be232ad3893dcf6629c8d9729 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f730e3fbb4ef500be232ad3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 2 07:02:08 2019 +0200 testbot/web: Allow downloading the raw task reports and logs. This can make analysis easier or allow processing through scripts to derive statistics. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/GetTaskFile.pl | 79 ++++++++++++++++++++++++++++++++++++++++++++++ testbot/web/JobDetails.pl | 14 ++++++-- 2 files changed, 90 insertions(+), 3 deletions(-) diff --git a/testbot/web/GetTaskFile.pl b/testbot/web/GetTaskFile.pl new file mode 100644 index 0000000..83e723e --- /dev/null +++ b/testbot/web/GetTaskFile.pl @@ -0,0 +1,79 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Sends a Task's report or log file +# +# Copyright 2019 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use warnings; +use strict; + +use Apache2::Const -compile => qw(REDIRECT); +use CGI; +use Fcntl; # for O_READONLY +use WineTestBot::Config; + + +sub SendTaskFile($$$$$) +{ + my ($Request, $JobId, $StepNo, $TaskNo, $File) = @_; + + # Validate and untaint + return undef if ($JobId !~ m/^(\d+)$/); + $JobId = $1; + return undef if ($StepNo !~ m/^(\d+)$/); + $StepNo = $1; + return undef if ($TaskNo !~ m/^(\d+)$/); + $TaskNo = $1; + return undef if ($File !~ m/^(log|[a-zA-Z0-9_-]+\.report)$/); + $File = $1; + + my $FileName = "$DataDir/jobs/$JobId/$StepNo/$TaskNo/$File"; + if (sysopen(my $fh, $FileName, O_RDONLY)) + { + my ($FileSize, $MTime, $BlkSize) = (stat($fh))[7, 9, 11]; + + $Request->headers_out->add("Last-Modified", scalar(gmtime($MTime)) ." GMT"); + $Request->content_type("text/plain"); + $Request->headers_out->add("Content-length", $FileSize); + $Request->headers_out->add("Content-Disposition", + "attachment; filename='$File'"); + + $BlkSize ||= 16384; + print $_ while (sysread($fh, $_, $BlkSize)); + close($fh); + + return 1; + } + + return undef; +} + + +my $Request = shift; + +my $CGIObj = CGI->new($Request); +my $JobId = $CGIObj->param("Job") || ""; +my $StepNo = $CGIObj->param("Step") || ""; +my $TaskNo = $CGIObj->param("Task") || ""; +my $File = $CGIObj->param("File") || ""; + +if (!SendTaskFile($Request, $JobId, $StepNo, $TaskNo, $File)) +{ + $Request->headers_out->set("Location", "/"); + $Request->status(Apache2::Const::REDIRECT); +} + +exit; diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 8d87880..fc98e14 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -321,14 +321,22 @@ sub GetMoreInfoLink($$$$;$) return ($Action, $Url); } -sub GenerateMoreInfoLink($$$$;$) +sub GenerateMoreInfoLink($$$$;$$) { - my ($self, $LinkKey, $Label, $Set, $Value) = @_; + my ($self, $LinkKey, $Label, $Set, $Value, $StepTask) = @_; my ($Action, $Url) = $self->GetMoreInfoLink($LinkKey, $Label, $Set, $Value); my $Title = ($Value =~ /^(.*)\.report$/) ? " title='$1'" : ""; my $Html = "<a href='". $self->CGI->escapeHTML($Url) ."'$Title>$Action $Label</a>"; + if (defined $Value) + { + $Url = "/GetTaskFile.pl?Job=". uri_escape($self->{JobId}) + ."&Step=". uri_escape($StepTask->StepNo) + ."&Task=". uri_escape($StepTask->TaskNo) + ."&File=". uri_escape($Value); + $Html = "<a href='$Url'>↓</a> $Html"; + } if ($Action eq "Hide") { $Html = "<span class='TaskMoreInfoSelected'>$Html</span>"; @@ -442,7 +450,7 @@ EOF my $ReportCount; foreach my $LogName (@{$MoreInfo->{Logs}}) { - $self->GenerateMoreInfoLink($Key, GetLogLabel($LogName), "Full", $LogName); + $self->GenerateMoreInfoLink($Key, GetLogLabel($LogName), "Full", $LogName, $StepTask); $ReportCount++ if ($LogName !~ /^old_/ and $LogName =~ /\.report$/); } print "</div>\n";

1 0

Francois Gouget : testbot/LibvirtTool: Only create locale snapshots for Windows VMs.
by Alexandre Julliard 02 Oct '19

02 Oct '19

Module: tools Branch: master Commit: 980fc8a758b729f1181c0a22b270b1e67ff31935 URL: https://source.winehq.org/git/tools.git/?a=commit;h=980fc8a758b729f1181c0a2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 2 07:02:15 2019 +0200 testbot/LibvirtTool: Only create locale snapshots for Windows VMs. This is the only supported and needed case. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 5438f29..415cdc5 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -491,7 +491,8 @@ sub Revert() my ($SetLocale, $CreateSnapshot); my $Domain = $VM->GetDomain(); - if (!$Domain->HasSnapshot($DomainSnapshot) and + if (($VM->Type eq "win32" or $VM->Type eq "win64") and + !$Domain->HasSnapshot($DomainSnapshot) and $DomainSnapshot =~ s/-([a-z]{2})[_-]([A-Z]{2})$//) { # Add some extra time to set up the VM locale and reboot it

1 0

Francois Gouget : testbot/LibvirtTool: Only allow dashes in the locale snapshot names.
by Alexandre Julliard 02 Oct '19

02 Oct '19

Module: tools Branch: master Commit: ade2cc55a64580bc20ca60ff3ec841c2b0cd1945 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ade2cc55a64580bc20ca60f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 2 07:02:22 2019 +0200 testbot/LibvirtTool: Only allow dashes in the locale snapshot names. Matching the Windows locale syntax makes it easier to interface with SetWinLocale. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 415cdc5..d590191 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -493,7 +493,7 @@ sub Revert() my $Domain = $VM->GetDomain(); if (($VM->Type eq "win32" or $VM->Type eq "win64") and !$Domain->HasSnapshot($DomainSnapshot) and - $DomainSnapshot =~ s/-([a-z]{2})[_-]([A-Z]{2})$//) + $DomainSnapshot =~ s/-([a-z]{2})-([A-Z]{2})$//) { # Add some extra time to set up the VM locale and reboot it $ExtraTimeout += $VMToolTimeout;

1 0

Zebediah Figura : d3d9: Handle stateblocks in d3d9_device_SetVertexShader().
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: 12439d3d00b1b2118bd8f459cd3d39c6a41a872b URL: https://source.winehq.org/git/wine.git/?a=commit;h=12439d3d00b1b2118bd8f459… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 30 20:28:31 2019 -0500 d3d9: Handle stateblocks in d3d9_device_SetVertexShader(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index faf4cb7ea6..6917ad577c 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3422,8 +3422,11 @@ static HRESULT WINAPI d3d9_device_SetVertexShader(IDirect3DDevice9Ex *iface, IDi TRACE("iface %p, shader %p.\n", iface, shader); wined3d_mutex_lock(); - wined3d_device_set_vertex_shader(device->wined3d_device, + wined3d_stateblock_set_vertex_shader(device->update_state, shader_obj ? shader_obj->wined3d_shader : NULL); + if (!device->recording) + wined3d_device_set_vertex_shader(device->wined3d_device, + shader_obj ? shader_obj->wined3d_shader : NULL); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_vertex_declaration().
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: d7eecf7f204ede4f1d9684bff15b92bda4e0aa56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7eecf7f204ede4f1d9684bf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 30 20:28:32 2019 -0500 wined3d: Introduce wined3d_stateblock_set_vertex_declaration(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 13 +++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 16 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 83001253d3..4268d085a7 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1340,6 +1340,19 @@ HRESULT CDECL wined3d_stateblock_set_vs_consts_b(struct wined3d_stateblock *stat return WINED3D_OK; } +void CDECL wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *stateblock, + struct wined3d_vertex_declaration *declaration) +{ + TRACE("stateblock %p, declaration %p.\n", stateblock, declaration); + + if (declaration) + wined3d_vertex_declaration_incref(declaration); + if (stateblock->stateblock_state.vertex_declaration) + wined3d_vertex_declaration_decref(stateblock->stateblock_state.vertex_declaration); + stateblock->stateblock_state.vertex_declaration = declaration; + stateblock->changed.vertexDecl = TRUE; +} + static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { union diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 1f75721792..975de561d0 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -258,6 +258,7 @@ @ cdecl wined3d_stateblock_create(ptr long ptr) @ cdecl wined3d_stateblock_decref(ptr) @ cdecl wined3d_stateblock_incref(ptr) +@ cdecl wined3d_stateblock_set_vertex_declaration(ptr ptr) @ cdecl wined3d_stateblock_set_vertex_shader(ptr ptr) @ cdecl wined3d_stateblock_set_vs_consts_b(ptr long long ptr) @ cdecl wined3d_stateblock_set_vs_consts_f(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 5bc33f8232..1bf103c8a4 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2660,6 +2660,8 @@ HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, enum wined3d_stateblock_type type, struct wined3d_stateblock **stateblock); ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); +void __cdecl wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *stateblock, + struct wined3d_vertex_declaration *declaration); void __cdecl wined3d_stateblock_set_vertex_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader); HRESULT __cdecl wined3d_stateblock_set_vs_consts_b(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const BOOL *constants);

1 0

Zebediah Figura : d3d9: Handle stateblocks in d3d9_device_SetVertexDeclaration().
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: 3b7967cdd6eb437c47f15354eecdeb95da871842 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b7967cdd6eb437c47f15354… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 30 20:28:33 2019 -0500 d3d9: Handle stateblocks in d3d9_device_SetVertexDeclaration(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 6917ad577c..7d24703795 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3232,8 +3232,11 @@ static HRESULT WINAPI d3d9_device_SetVertexDeclaration(IDirect3DDevice9Ex *iface TRACE("iface %p, declaration %p.\n", iface, declaration); wined3d_mutex_lock(); - wined3d_device_set_vertex_declaration(device->wined3d_device, + wined3d_stateblock_set_vertex_declaration(device->update_state, decl_impl ? decl_impl->wined3d_declaration : NULL); + if (!device->recording) + wined3d_device_set_vertex_declaration(device->wined3d_device, + decl_impl ? decl_impl->wined3d_declaration : NULL); device->has_vertex_declaration = !!decl_impl; wined3d_mutex_unlock();

1 0

Zebediah Figura : d3d9: Handle stateblocks in d3d9_device_SetFVF().
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: 157aac1b2302786c2e4368bfdee7ea90292a3ded URL: https://source.winehq.org/git/wine.git/?a=commit;h=157aac1b2302786c2e4368bf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 30 20:28:34 2019 -0500 d3d9: Handle stateblocks in d3d9_device_SetFVF(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 7d24703795..26b1b982f8 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3359,7 +3359,9 @@ static HRESULT WINAPI d3d9_device_SetFVF(IDirect3DDevice9Ex *iface, DWORD fvf) return D3DERR_DRIVERINTERNALERROR; } - wined3d_device_set_vertex_declaration(device->wined3d_device, decl); + wined3d_stateblock_set_vertex_declaration(device->update_state, decl); + if (!device->recording) + wined3d_device_set_vertex_declaration(device->wined3d_device, decl); device->has_vertex_declaration = TRUE; wined3d_mutex_unlock();

1 0

Zebediah Figura : d3d8: Handle stateblocks in d3d8_device_SetVertexShader().
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: 41f0096d5e9ed2adcacbeea46d79b082949042c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41f0096d5e9ed2adcacbeea4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 30 20:28:35 2019 -0500 d3d8: Handle stateblocks in d3d8_device_SetVertexShader(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index be43314d3c..eabefd8043 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2814,9 +2814,15 @@ static HRESULT WINAPI d3d8_device_SetVertexShader(IDirect3DDevice8 *iface, DWORD TRACE("Setting FVF, %#x\n", shader); wined3d_mutex_lock(); - wined3d_device_set_vertex_declaration(device->wined3d_device, + wined3d_stateblock_set_vertex_declaration(device->update_state, d3d8_device_get_fvf_declaration(device, shader)->wined3d_vertex_declaration); - wined3d_device_set_vertex_shader(device->wined3d_device, NULL); + wined3d_stateblock_set_vertex_shader(device->update_state, NULL); + if (!device->recording) + { + wined3d_device_set_vertex_declaration(device->wined3d_device, + d3d8_device_get_fvf_declaration(device, shader)->wined3d_vertex_declaration); + wined3d_device_set_vertex_shader(device->wined3d_device, NULL); + } wined3d_mutex_unlock(); return D3D_OK; @@ -2833,9 +2839,15 @@ static HRESULT WINAPI d3d8_device_SetVertexShader(IDirect3DDevice8 *iface, DWORD return D3DERR_INVALIDCALL; } - wined3d_device_set_vertex_declaration(device->wined3d_device, + wined3d_stateblock_set_vertex_declaration(device->update_state, shader_impl->vertex_declaration->wined3d_vertex_declaration); - wined3d_device_set_vertex_shader(device->wined3d_device, shader_impl->wined3d_shader); + wined3d_stateblock_set_vertex_shader(device->update_state, shader_impl->wined3d_shader); + if (!device->recording) + { + wined3d_device_set_vertex_declaration(device->wined3d_device, + shader_impl->vertex_declaration->wined3d_vertex_declaration); + wined3d_device_set_vertex_shader(device->wined3d_device, shader_impl->wined3d_shader); + } wined3d_mutex_unlock(); return D3D_OK;

1 0