September 2019 - Wine-devel

[PATCH] widl: Add the ARRAY_SIZE() macro
by Michael Stefaniuc 26 Sep '19

26 Sep '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/widl/typelib.c | 5 ++--- tools/widl/utils.c | 2 +- tools/widl/utils.h | 2 ++ tools/widl/widl.c | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 79e72e0472..cf027558d0 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -64,7 +64,6 @@ static const struct oatype { {"VARIANT", VT_VARIANT}, {"VARIANT_BOOL", VT_BOOL} }; -#define NTYPES (sizeof(oatypes)/sizeof(oatypes[0])) #define KWP(p) ((const struct oatype *)(p)) static int kw_cmp_func(const void *s1, const void *s2) @@ -79,11 +78,11 @@ static unsigned short builtin_vt(const type_t *t) const struct oatype *kwp; key.kw = kw; #ifdef KW_BSEARCH - kwp = bsearch(&key, oatypes, NTYPES, sizeof(oatypes[0]), kw_cmp_func); + kwp = bsearch(&key, oatypes, ARRAY_SIZE(oatypes), sizeof(oatypes[0]), kw_cmp_func); #else { unsigned int i; - for (kwp=NULL, i=0; i < NTYPES; i++) + for (kwp = NULL, i = 0; i < ARRAY_SIZE(oatypes); i++) if (!kw_cmp_func(&key, &oatypes[i])) { kwp = &oatypes[i]; break; diff --git a/tools/widl/utils.c b/tools/widl/utils.c index 90668873aa..20c63064c7 100644 --- a/tools/widl/utils.c +++ b/tools/widl/utils.c @@ -309,7 +309,7 @@ void add_output_to_resources( const char *type, const char *name ) size_t data_size = output_buffer_pos; size_t header_size = 5 * sizeof(unsigned int) + 2 * sizeof(unsigned short); - assert( nb_resources < sizeof(resources)/sizeof(resources[0]) ); + assert( nb_resources < ARRAY_SIZE( resources )); if (type[0] != '#') header_size += (strlen( type ) + 1) * sizeof(unsigned short); else header_size += 2 * sizeof(unsigned short); diff --git a/tools/widl/utils.h b/tools/widl/utils.h index ec02fc7c37..74dba11d3c 100644 --- a/tools/widl/utils.h +++ b/tools/widl/utils.h @@ -34,6 +34,8 @@ int strendswith(const char* str, const char* end); #define __attribute__(X) #endif +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) + void parser_error(const char *s) __attribute__((noreturn)); int parser_warning(const char *s, ...) __attribute__((format (printf, 1, 2))); void error_loc(const char *s, ...) __attribute__((format (printf, 1, 2))) __attribute__((noreturn)); diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 1620dfdb3a..f5fa20c884 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -302,7 +302,7 @@ static void set_target( const char *target ) if (!(p = strchr( spec, '-' ))) error( "Invalid target specification '%s'\n", target ); *p++ = 0; - for (i = 0; i < sizeof(cpu_names)/sizeof(cpu_names[0]); i++) + for (i = 0; i < ARRAY_SIZE( cpu_names ); i++) { if (!strcmp( cpu_names[i].name, spec )) { -- 2.20.1

1 0

[PATCH] msi: Fix a leak on error path (Coverity).
by Sven Baars 26 Sep '19

26 Sep '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/msi/dialog.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 6ccf46ec30..8a28e4d4af 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -4033,7 +4033,11 @@ static msi_dialog *dialog_create( MSIPACKAGE *package, const WCHAR *name, msi_di msiobj_release( &rec->hdr ); rec = MSI_CreateRecord(2); - if (!rec) return NULL; + if (!rec) + { + msi_dialog_destroy(dialog); + return NULL; + } MSI_RecordSetStringW(rec, 1, name); MSI_RecordSetStringW(rec, 2, szDialogCreated); MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONSTART, rec); -- 2.17.1

2 1

[PATCH 1/2] testbot/Submit: Preserve the old Submit page before replacing it.
by Francois Gouget 26 Sep '19

26 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The new submit page works well for me (and I find it much better) but it's a significant rewrite. So should it not be usable for whatever reason, this one will provide an alternative path to submit jobs until the new page is fixed. testbot/lib/WineTestBot/CGI/PageBase.pm | 2 +- testbot/web/OldSubmit.pl | 1043 +++++++++++++++++++++++ 2 files changed, 1044 insertions(+), 1 deletion(-) create mode 100644 testbot/web/OldSubmit.pl diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index e3d2e04d5..0e6e25007 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -258,7 +258,7 @@ EOF if ($self->SessionActive()) { print " <li class='divider'> </li>\n"; - print " <li><p><a href='", MakeSecureURL("/Submit.pl"), + print " <li><p><a href='", MakeSecureURL("/OldSubmit.pl"), "'>Submit job</a></p></li>\n"; print " <li><p><a href='/Activity.pl'>Activity</a></p></li>\n"; print " <li><p><a href='/Stats.pl'>Statistics</a></p></li>\n"; diff --git a/testbot/web/OldSubmit.pl b/testbot/web/OldSubmit.pl new file mode 100644 index 000000000..e0ccda3a3 --- /dev/null +++ b/testbot/web/OldSubmit.pl @@ -0,0 +1,1043 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# WineTestBot job submit page +# +# Copyright 2009 Ge van Geldorp +# Copyright 2012-2014, 2017-2018 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 strict; + +package SubmitPage; + +use ObjectModel::CGI::FreeFormPage; +our @ISA = qw(ObjectModel::CGI::FreeFormPage); + +use CGI qw(:standard); +use Fcntl; # For O_XXX +use IO::Handle; +use POSIX qw(:fcntl_h); # For SEEK_XXX +use File::Basename; + +use ObjectModel::BasicPropertyDescriptor; +use WineTestBot::Branches; +use WineTestBot::Config; +use WineTestBot::Engine::Notify; +use WineTestBot::Jobs; +use WineTestBot::Missions; +use WineTestBot::PatchUtils; +use WineTestBot::Steps; +use WineTestBot::Utils; +use WineTestBot::VMs; + + +sub _initialize($$$) +{ + my ($self, $Request, $RequiredRole) = @_; + + $self->{Page} = $self->GetParam("Page") || 1; + # Page is a hidden parameter so fix it instead of issuing an error + $self->{Page} = 1 if ($self->{Page} !~ /^[1-4]$/); + $self->{LastPage} = $self->{Page}; + + my @PropertyDescriptors1 = ( + CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 128), + ); + $self->{PropertyDescriptors1} = \@PropertyDescriptors1; + + my @PropertyDescriptors3 = ( + CreateBasicPropertyDescriptor("TestExecutable", "Test executable", !1, 1, "A", 50), + 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), + ); + $self->{PropertyDescriptors3} = \@PropertyDescriptors3; + + if ($self->{Page} == 2) + { + $self->{ShowAll} = defined($self->GetParam("ShowAll")); + } + + $self->SUPER::_initialize($Request, $RequiredRole, undef); +} + +sub GetTitle($) +{ + #my ($self) = @_; + return "Submit a job"; +} + +sub GetHeaderText($) +{ + my ($self) = @_; + + if ($self->{Page} == 1) + { + return "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) + { + my $HeaderText = "Select the VMs on which you want to run your test."; + my $VMs = CreateVMs(); + $VMs->AddFilter("Status", ["offline", "maintenance"]); + if (!$VMs->IsEmpty()) + { + $HeaderText .= "<br>NOTE: Offline VMs and those undergoing maintenance will not be able to run your tests right away."; + } + return $HeaderText; + } + elsif ($self->{Page} == 4) + { + 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."; + } + + return ""; +} + +sub GetPropertyDescriptors($) +{ + my ($self) = @_; + + if ($self->{Page} == 1) + { + return $self->{PropertyDescriptors1}; + } + elsif ($self->{Page} == 3) + { + my $IsPatch = ($self->GetParam("FileType") eq "patch"); + $self->{PropertyDescriptors3}[0]->{IsRequired} = $IsPatch; + return $self->{PropertyDescriptors3}; + } + + return $self->SUPER::GetPropertyDescriptors(); +} + +sub GenerateFields($) +{ + my ($self) = @_; + + print "<div><input type='hidden' name='Page' value='$self->{Page}'></div>\n"; + if ($self->{Page} == 1) + { + print "<div class='ItemProperty'><label>File</label>", + "<div class='ItemValue'>", + "<input type='file' name='File' size='64' maxlength='64' />", + " <span class='Required'>*</span></div></div>\n"; + my $Branches = CreateBranches(); + my $SelectedBranchKey = $self->GetParam("Branch"); + if (! defined($SelectedBranchKey)) + { + $SelectedBranchKey = $Branches->GetDefaultBranch()->GetKey(); + } + if (! $Branches->MultipleBranchesPresent()) + { + print "<div><input type='hidden' name='Branch' value='", + $self->CGI->escapeHTML($SelectedBranchKey), + "'></div>\n"; + } + else + { + print "<div class='ItemProperty'><label>Branch</label>", + "<div class='ItemValue'>", + "<select name='Branch' size='1'>"; + my @SortedKeys = sort { $a cmp $b } @{$Branches->GetKeys()}; + foreach my $Key (@SortedKeys) + { + my $Branch = $Branches->GetItem($Key); + print "<option value='", $self->CGI->escapeHTML($Key), "'"; + if ($Key eq $SelectedBranchKey) + { + print " selected"; + } + print ">", $self->CGI->escapeHTML($Branch->Name), "</option>"; + } + print "</select>", + " <span class='Required'>*</span></div></div>\n"; + } + + $self->{HasRequired} = 1; + } + else + { + if (! defined($self->{FileName})) + { + $self->{FileName} = $self->GetParam("FileName"); + } + if (! defined($self->{FileType})) + { + $self->{FileType} = $self->GetParam("FileType"); + } + if (! defined($self->{TestExecutable})) + { + $self->{TestExecutable} = $self->GetParam("TestExecutable"); + } + if (! defined($self->{CmdLineArg})) + { + $self->{CmdLineArg} = $self->GetParam("CmdLineArg"); + } + print "<div><input type='hidden' name='Remarks' value='", + $self->CGI->escapeHTML($self->GetParam("Remarks")), "'></div>\n"; + print "<div><input type='hidden' name='FileName' value='", + $self->CGI->escapeHTML($self->{FileName}), "'></div>\n"; + print "<div><input type='hidden' name='FileType' value='", + $self->CGI->escapeHTML($self->{FileType}), "'></div>\n"; + print "<div><input type='hidden' name='Branch' value='", + $self->CGI->escapeHTML($self->GetParam("Branch")), "'></div>\n"; + if ($self->{Page} != 3) + { + if (defined($self->{TestExecutable})) + { + print "<div><input type='hidden' name='TestExecutable' value='", + $self->CGI->escapeHTML($self->{TestExecutable}), "'></div>\n"; + } + if (defined($self->{CmdLineArg})) + { + print "<div><input type='hidden' name='CmdLineArg' value='", + $self->CGI->escapeHTML($self->{CmdLineArg}), "'></div>\n"; + } + } + if ($self->{Page} == 2) + { + if ($self->{LastPage} == 3) + { + my $VMs = CreateVMs(); + # VMs that are only visible with ShowAll + $VMs->AddFilter("Role", ["winetest", "extra"]); + foreach my $VMKey (@{$VMs->GetKeys()}) + { + my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); + if (defined $self->GetParam($FieldName)) + { + $self->{ShowAll} = 1; + last; + } + } + } + if ($self->{ShowAll}) + { + print "<div><input type='hidden' name='ShowAll' value='1'></div>\n"; + } + print "<div class='CollectionBlock'><table>\n"; + print "<thead><tr><th class='Record'></th>\n"; + print "<th class='Record'>VM Name</th>\n"; + print "<th class='Record'>Description</th>\n"; + print "</thead><tbody>\n"; + + my $VMs = CreateVMs(); + if ($self->{FileType} eq "exe64") + { + $VMs->AddFilter("Type", ["win64", "wine"]); + } + else + { + $VMs->AddFilter("Type", ["win32", "win64", "wine"]); + } + if ($self->{ShowAll}) + { + # All but the retired and deleted ones + $VMs->AddFilter("Role", ["base", "winetest", "extra"]); + } + else + { + $VMs->AddFilter("Role", ["base"]); + } + my $Even = 1; + my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); + foreach my $VMKey (@$SortedKeys) + { + my $VM = $VMs->GetItem($VMKey); + my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); + print "<tr class='", ($Even ? "even" : "odd"), + "'><td><input name='$FieldName' type='checkbox'"; + $Even = !$Even; + my ($Checked, $Status) = (1, ""); + if ($VM->Status =~ /^(offline|maintenance)$/) + { + $Status = " [". $VM->Status ."]"; + $Checked = undef; + } + if ($Checked and + ($self->{LastPage} == 1 || $self->GetParam($FieldName))) + { + print " checked='checked'"; + } + print "/></td>\n"; + + print "<td>", $self->CGI->escapeHTML($VM->Name), "</td>\n"; + print "<td><details><summary>", + $self->CGI->escapeHTML($VM->Description || $VM->Name), + "$Status</summary>", + $self->CGI->escapeHTML($VM->Details || "No details!"), + "</details></td>"; + print "</tr>\n"; + } + print "</tbody></table>\n"; + print "</div>\n"; + } + else + { + if (defined($self->{NoCmdLineArgWarn})) + { + print "<div><input type='hidden' name='NoCmdLineArgWarn' value='on'>", + "</div>\n"; + } + my $VMs = CreateVMs(); + foreach my $VMKey (@{$VMs->GetKeys()}) + { + my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); + if ($self->GetParam($FieldName)) + { + print "<div><input type='hidden' name='$FieldName' value='on'>", + "</div>\n"; + } + } + } + } + if ($self->{Page} == 4) + { + if ($self->GetParam("JobKey")) + { + $self->{JobKey} = $self->GetParam("JobKey"); + } + print "<div><input type='hidden' name='JobKey' value='", $self->{JobKey}, + "'></div>\n"; + } + + $self->SUPER::GenerateFields(); +} + +sub GenerateActions($) +{ + my ($self) = @_; + + if ($self->{Page} == 2) + { + print <<EOF; +<script type='text/javascript'> + +</script> +EOF + + print "<div class='ItemActions'>\n"; + print "<input type='submit' name='Action' value='", + $self->{ShowAll} ? "Show base VMs" : "Show all VMs", "'/>\n"; + print "</div>\n"; + } + + $self->SUPER::GenerateActions(); +} + +sub GetActions($) +{ + my ($self) = @_; + + my $Actions = $self->SUPER::GetActions(); + if ($self->{Page} == 1) + { + push @$Actions, "Next >"; + } + elsif ($self->{Page} == 2) + { + push @$Actions, "< Prev", "Next >"; + } + elsif ($self->{Page} == 3) + { + push @$Actions, "< Prev", "Submit"; + } + elsif ($self->{Page} == 4) + { + push @$Actions, "OK"; + } + + return $Actions; +} + +sub DisplayProperty($$) +{ + my ($self, $PropertyDescriptor) = @_; + + if ($self->{Page} == 3) + { + my $PropertyName = $PropertyDescriptor->GetName(); + if ($self->GetParam("FileType") eq "patch") + { + if ($PropertyName eq "Run64") + { + my $Show64 = !1; + my $VMs = CreateVMs(); + $VMs->AddFilter("Type", ["win64"]); + foreach my $VMKey (@{$VMs->GetKeys()}) + { + my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); + if ($self->GetParam($FieldName)) + { + $Show64 = 1; + last; + } + } + if (! $Show64) + { + return ""; + } + } + } + else + { + if ($PropertyName eq "TestExecutable" || $PropertyName eq "Run64") + { + return ""; + } + } + } + + return $self->SUPER::DisplayProperty($PropertyDescriptor); +} + +sub GetPropertyValue($$) +{ + my ($self, $PropertyDescriptor) = @_; + + if ($self->{Page} == 3) + { + my $PropertyName = $PropertyDescriptor->GetName(); + if ($PropertyName eq "DebugLevel") + { + return 1; + } + if ($PropertyName eq "Run64") + { + return 1; + } + } + + return $self->SUPER::GetPropertyValue($PropertyDescriptor); +} + +sub GetTmpStagingFullPath($$) +{ + my ($self, $FileName) = @_; + + return undef if (!$FileName); + return "$DataDir/staging/" . $self->GetCurrentSession()->Id . "-websubmit_$FileName"; +} + +sub Validate($) +{ + my ($self) = @_; + + if ($self->{Page} == 2) + { + my $VMSelected = !1; + my $VMs = CreateVMs(); + foreach my $VMKey (@{$VMs->GetKeys()}) + { + my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); + if ($self->GetParam($FieldName)) + { + $VMSelected = 1; + last; + } + } + + if (! $VMSelected) + { + $self->{ErrMessage} = "Select at least one VM"; + return !1; + } + } + elsif ($self->{Page} == 3) + { + if (($self->GetParam("FileType") eq "patch" && + $self->GetParam("TestExecutable") !~ m/^[\w_.]+_test\.exe$/) || + !IsValidFileName($self->GetParam("TestExecutable"))) + { + $self->{ErrField} = "TestExecutable"; + $self->{ErrMessage} = "Invalid test executable filename"; + return !1; + } + + if ($self->GetParam("NoCmdLineArgWarn")) + { + $self->{NoCmdLineArgWarn} = 1; + } + elsif (! $self->GetParam("CmdLineArg")) + { + $self->{ErrMessage} = "You didn't specify a command line argument. " . + "This is most likely not correct, so please " . + "fix this. If you're sure that you really don't " . + 'want a command line argument, press "Submit" ' . + "again."; + $self->{ErrField} = "CmdLineArg"; + $self->{NoCmdLineArgWarn} = 1; + return !1; + } + } + + return $self->SUPER::Validate(); +} + +sub ValidateAndGetFileName($$) +{ + my ($self, $FieldName) = @_; + + my $FileName = $self->GetParam($FieldName); + if (!$FileName) + { + $self->{ErrField} = $FieldName; + $self->{ErrMessage} = "You must provide a file to test"; + return undef; + } + if (!IsValidFileName($FileName)) + { + $self->{ErrField} = $FieldName; + $self->{ErrMessage} = "The filename contains invalid characters"; + return undef; + } + my $PropertyDescriptor = CreateSteps()->GetPropertyDescriptorByName("FileName"); + if ($PropertyDescriptor->GetMaxLength() - 32 - 1 < length($FileName)) + { + $self->{ErrField} = $FieldName; + $self->{ErrMessage} = "The filename is too long"; + return undef; + } + return $FileName; +} + +sub DetermineFileType($$) +{ + my ($self, $FileName) = @_; + + if (! sysopen(FH, $FileName, O_RDONLY)) + { + return ("Unable to open $FileName", "unknown", undef, undef); + } + + my $FileType = "unknown"; + my $Buffer; + if (sysread(FH, $Buffer, 0x40)) + { + # Unpack IMAGE_DOS_HEADER + my @Fields = unpack "S30I", $Buffer; + if ($Fields[0] == 0x5a4d) + { + seek FH, $Fields[30], SEEK_SET; + if (sysread(FH, $Buffer, 0x18)) + { + @Fields = unpack "IS2I3S2", $Buffer; + if ($Fields[0] == 0x00004550) + { + if (($Fields[7] & 0x2000) == 0) + { + $FileType = "exe"; + } + else + { + $FileType = "dll"; + } + if ($Fields[1] == 0x014c) + { + $FileType .= "32"; + } + elsif ($Fields[1] == 0x8664) + { + $FileType .= "64"; + } + else + { + $FileType = "unknown"; + } + } + } + } + # zip files start with PK, 0x03, 0x04 + elsif ($Fields[0] == 0x4b50 && $Fields[1] == 0x0403) + { + $FileType = "zip"; + } + } + + close FH; + + my ($ErrMessage, $ExeBase, $TestUnit); + if ($FileType eq "unknown") + { + my $Impacts = GetPatchImpacts($FileName); + if ($Impacts->{TestUnitCount} == 0) + { + $ErrMessage = "Patch doesn't affect tests"; + } + elsif ($Impacts->{TestUnitCount} > 1) + { + $ErrMessage = "Patch contains changes to multiple tests"; + } + else + { + foreach my $TestInfo (values %{$Impacts->{Tests}}) + { + if ($TestInfo->{UnitCount}) + { + $FileType = "patch"; + $ExeBase = $TestInfo->{ExeBase}; + $TestUnit = (keys %{$TestInfo->{PatchedUnits}})[0]; + last; + } + } + } + } + elsif ($FileType eq "dll32" || $FileType eq "dll64" || $FileType eq "zip") + { + # We know what these are but not what to do with them. So reject them early. + $FileType = "unknown"; + } + + return ($ErrMessage, $FileType, $ExeBase, $TestUnit); +} + +sub OnPage1Next($) +{ + my ($self) = @_; + + my $BaseName = $self->ValidateAndGetFileName("File"); + return !1 if (!$BaseName); + + my $Fh = $self->CGI->upload("File"); + if (defined($Fh)) + { + my $StagingFile = $self->GetTmpStagingFullPath($BaseName); + my $OldUMask = umask(002); + if (! open (OUTFILE,">$StagingFile")) + { + umask($OldUMask); + $self->{ErrField} = "File"; + $self->{ErrMessage} = "Unable to process uploaded file"; + return !1; + } + umask($OldUMask); + my $Buffer; + while (sysread($Fh, $Buffer, 4096)) + { + print OUTFILE $Buffer; + } + close OUTFILE; + + my ($ErrMessage, $FileType, $ExeBase, $TestUnit) = $self->DetermineFileType($StagingFile); + if (defined($ErrMessage)) + { + $self->{ErrField} = "File"; + $self->{ErrMessage} = $ErrMessage; + return !1; + } + if ($FileType !~ /^(?:exe32|exe64|patch)$/) + { + $self->{ErrField} = "File"; + $self->{ErrMessage} = "Unrecognized file type"; + return !1; + } + + $self->{FileName} = $BaseName; + $self->{FileType} = $FileType; + if (defined $ExeBase) + { + $self->{TestExecutable} = "$ExeBase.exe"; + } + if (defined($TestUnit)) + { + $self->{CmdLineArg} = $TestUnit; + } + } + else + { + $self->{ErrField} = "File"; + $self->{ErrMessage} = "File upload failed"; + return !1; + } + + if (! $self->Validate) + { + return !1; + } + + $self->{Page} = 2; + + return 1; +} + +sub OnPage2Next($) +{ + my ($self) = @_; + + if (! $self->Validate) + { + return !1; + } + + $self->{Page} = 3; + + return 1; +} + +sub OnPage2Prev($) +{ + my ($self) = @_; + + my $FileName = $self->GetParam("FileName"); + if ($FileName) + { + my $StagingFileName = $self->GetTmpStagingFullPath(basename($FileName)); + unlink($StagingFileName) if ($StagingFileName); + } + + $self->{Page} = 1; + + return 1; +} + +sub OnPage3Prev($) +{ + my ($self) = @_; + + $self->{Page} = 2; + + return 1; +} + + +sub SubmitJob($$$) +{ + my ($self, $BaseName, $Staging) = @_; + + # See also Patches::Submit() in lib/WineTestBot/Patches.pm + + # First create a new job + my $Jobs = CreateJobs(); + my $NewJob = $Jobs->Add(); + $NewJob->User($self->GetCurrentSession()->User); + $NewJob->Priority(5); + if ($self->GetParam("Remarks")) + { + $NewJob->Remarks($self->GetParam("Remarks")); + } + else + { + $NewJob->Remarks($self->GetParam("CmdLineArg")); + } + my $Branch = CreateBranches()->GetItem($self->GetParam("Branch")); + if (defined($Branch)) + { + $NewJob->Branch($Branch); + } + my $Steps = $NewJob->Steps; + + # Add steps and tasks for the 32 and 64-bit tests + my $FileType = $self->GetParam("FileType"); + my $Impacts; + $Impacts = GetPatchImpacts($Staging) if ($FileType eq "patch"); + + my $BuildStep; + foreach my $Bits ("32", "64") + { + next if ($Bits eq "32" && $FileType eq "exe64"); + next if ($Bits eq "64" && $FileType eq "exe32"); + next if ($Bits eq "64" && $FileType eq "patch" && !defined($self->GetParam("Run64"))); + + my $Tasks; + my $VMs = CreateVMs(); + $VMs->AddFilter("Type", $Bits eq "32" ? ["win32", "win64"] : ["win64"]); + my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); + foreach my $VMKey (@$SortedKeys) + { + my $VM = $VMs->GetItem($VMKey); + my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); + next if (!$self->GetParam($FieldName)); # skip unselected VMs + + if (!$Tasks) + { + if (!$BuildStep and $FileType eq "patch") + { + # This is a patch so add a build step... + $BuildStep = $Steps->Add(); + $BuildStep->FileName($BaseName); + $BuildStep->FileType($FileType); + $BuildStep->Type("build"); + $BuildStep->DebugLevel(0); + + # ...with a build task + my $VMs = CreateVMs(); + $VMs->AddFilter("Type", ["build"]); + $VMs->AddFilter("Role", ["base"]); + my $BuildVM = ${$VMs->GetItems()}[0]; + my $Task = $BuildStep->Tasks->Add(); + $Task->VM($BuildVM); + + my $MissionStatement = "exe32"; + $MissionStatement .= ":exe64" if (defined $self->GetParam("Run64")); + my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); + if (!defined $ErrMessage) + { + $Task->Timeout(GetBuildTimeout($Impacts, $Missions->[0])); + $Task->Missions($MissionStatement); + + # Save the build step so the others can reference it + (my $ErrKey, my $ErrProperty, $ErrMessage) = $Jobs->Save(); + } + if (defined $ErrMessage) + { + $self->{ErrMessage} = $ErrMessage; + return !1; + } + } + + # Then create the test step + my $TestStep = $Steps->Add(); + if ($FileType eq "patch") + { + $TestStep->PreviousNo($BuildStep->No); + my $TestExe = basename($self->GetParam("TestExecutable")); + $TestExe =~ s/_test\.exe$/_test64.exe/ if ($Bits eq "64"); + $TestStep->FileName($TestExe); + } + else + { + $TestStep->FileName($BaseName); + } + $TestStep->FileType("exe$Bits"); + $TestStep->Type("single"); + $TestStep->DebugLevel($self->GetParam("DebugLevel")); + $TestStep->ReportSuccessfulTests(defined($self->GetParam("ReportSuccessfulTests"))); + $Tasks = $TestStep->Tasks; + } + + # Then add a task for this VM + my $Task = $Tasks->Add(); + $Task->VM($VM); + $Task->Timeout($SingleTimeout); + $Task->Missions("exe$Bits"); + $Task->CmdLineArg($self->GetParam("CmdLineArg")); + } + } + + my ($Tasks, $MissionStatement, $Timeout); + my $VMs = CreateVMs(); + $VMs->AddFilter("Type", ["wine"]); + my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); + foreach my $VMKey (@$SortedKeys) + { + my $VM = $VMs->GetItem($VMKey); + my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); + next if (!$self->GetParam($FieldName)); # skip unselected VMs + + if (!$Tasks) + { + # First create the Wine test step + my $WineStep = $Steps->Add(); + $WineStep->FileName($BaseName); + $WineStep->FileType($FileType); + $WineStep->Type("single"); + $WineStep->DebugLevel($self->GetParam("DebugLevel")); + $WineStep->ReportSuccessfulTests(defined($self->GetParam("ReportSuccessfulTests"))); + $Tasks = $WineStep->Tasks; + + $MissionStatement = ($FileType =~ /^(?:exe32|patch)$/) ? "win32" : ""; + if ($FileType eq "exe64" or + ($FileType eq "patch" and defined $self->GetParam("Run64"))) + { + $MissionStatement .= ":wow64"; + } + $MissionStatement =~ s/^://; + + my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); + if (defined $ErrMessage) + { + $self->{ErrMessage} = $ErrMessage; + return !1; + } + $Missions = $Missions->[0]; + $Timeout = $FileType ne "patch" ? + $SingleTimeout : + GetBuildTimeout($Impacts, $Missions) + + GetTestTimeout($Impacts, $Missions); + } + + # Then add a task for this VM + my $Task = $Tasks->Add(); + $Task->VM($VM); + $Task->Timeout($Timeout); + $Task->Missions($MissionStatement); + $Task->CmdLineArg($self->GetParam("CmdLineArg")) if ($FileType ne "patch"); + } + + # Now save it all (or whatever's left to save) + my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + if (defined($ErrMessage)) + { + $self->{ErrMessage} = $ErrMessage; + return !1; + } + + # Stage the test patch/executable so the job can pick it up + if (!rename($Staging, "$DataDir/staging/job". $NewJob->Id ."_$BaseName")) + { + $self->{ErrMessage} = "Could not stage '$BaseName': $!\n"; + return !1; + } + + # Switch Status to staging to indicate we are done setting up the job + $NewJob->Status("staging"); + ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + if (defined($ErrMessage)) + { + $self->{ErrMessage} = $ErrMessage; + return !1; + } + + # Notify engine + my $ErrMessage = RescheduleJobs(); + if (defined $ErrMessage) + { + $self->{ErrMessage} = $ErrMessage; + $self->{Page} = 4; + $self->{JobKey} = $NewJob->GetKey(); + return !1; + } + + $self->Redirect("/JobDetails.pl?Key=". $NewJob->GetKey()); # does not return + exit; +} + +sub OnSubmit($) +{ + my ($self) = @_; + + return !1 if (!$self->Validate()); + my $BaseName = $self->ValidateAndGetFileName("FileName"); + return !1 if (!$BaseName); + + # Rename the staging file to avoid race conditions if the user clicks on + # Submit multiple times + my $OldStaging = $self->GetTmpStagingFullPath($BaseName); + my $Staging = CreateNewLink($OldStaging, "$DataDir/staging", $BaseName); + if (!defined $Staging) + { + $self->{ErrMessage} = "Could not rename '$BaseName': $!"; + return !1; + } + if (!unlink $OldStaging) + { + unlink $Staging; + $self->{ErrMessage} = $!{ENOENT} ? + "$BaseName has already been submitted or has expired" : + "Could not remove the staging '$BaseName' file: $!"; + return !1; + } + + if (!$self->SubmitJob($BaseName, $Staging)) + { + # Restore the file for the next attempt + rename($Staging, $OldStaging); + return !1; + } + return 1; +} + +sub OnShowAllVMs($) +{ + my ($self) = @_; + + $self->{ShowAll} = 1; + + return !1; +} + +sub OnShowBaseVMs($) +{ + my ($self) = @_; + + $self->{ShowAll} = !1; + + return !1; +} + +sub OnOK($) +{ + my ($self) = @_; + + if (defined($self->GetParam("JobKey"))) + { + $self->Redirect("/JobDetails.pl?Key=" . $self->GetParam("JobKey")); # does not return + } + else + { + $self->Redirect("/index.pl"); # does not return + } +} + +sub OnAction($$) +{ + my ($self, $Action) = @_; + + if ($Action eq "Next >") + { + return $self->{Page} == 2 ? $self->OnPage2Next() : $self->OnPage1Next(); + } + elsif ($Action eq "< Prev") + { + return $self->{Page} == 3 ? $self->OnPage3Prev() : $self->OnPage2Prev(); + } + elsif ($Action eq "Submit") + { + return $self->OnSubmit(); + } + elsif ($Action eq "Show base VMs") + { + return $self->OnShowBaseVMs(); + } + elsif ($Action eq "Show all VMs") + { + return $self->OnShowAllVMs(); + } + elsif ($Action eq "OK") + { + return $self->OnOK(); + } + + return $self->SUPER::OnAction($Action); +} + + +package main; + +my $Request = shift; + +my $SubmitPage = SubmitPage->new($Request, "wine-devel"); +$SubmitPage->GeneratePage(); -- 2.20.1

1 1

[PATCH] vkd3d: Implement ID3D12Resource::WriteToSubresource().
by Rémi Bernon 26 Sep '19

26 Sep '19

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- A dumb copy-paste adapted from ID3D12Resource::ReadFromSubresource() that would maybe benefit from factorization. It fixes rendering issues for SOTTR on Intel GPU and the main menu now renders correctly (although it crashes later on). libs/vkd3d/resource.c | 107 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 103 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index aebe1fa..f11125a 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1285,10 +1285,109 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_WriteToSubresource(ID3D12Resourc UINT dst_sub_resource, const D3D12_BOX *dst_box, const void *src_data, UINT src_row_pitch, UINT src_slice_pitch) { - FIXME("iface %p, dst_sub_resource %u, dst_box %p, src_data %p, " - "src_row_pitch %u, src_slice_pitch %u stub!\n", - iface, dst_sub_resource, dst_box, - src_data, src_row_pitch, src_slice_pitch); + struct d3d12_resource *resource = impl_from_ID3D12Resource(iface); + const struct vkd3d_vk_device_procs *vk_procs; + VkImageSubresource vk_sub_resource; + const struct vkd3d_format *format; + VkSubresourceLayout vk_layout; + struct d3d12_device *device; + BYTE *dst_data, *dst; + BYTE const *src; + unsigned int y, z; + D3D12_BOX box; + size_t size; + HRESULT hr; + + TRACE("iface %p, src_data %p, src_row_pitch %u, src_slice_pitch %u, " + "dst_sub_resource %u, dst_box %s.\n", + iface, src_data, src_row_pitch, src_slice_pitch, dst_sub_resource, debug_d3d12_box(dst_box)); + + if (d3d12_resource_is_buffer(resource)) + { + WARN("Buffers are not supported.\n"); + return E_INVALIDARG; + } + + device = resource->device; + vk_procs = &device->vk_procs; + + if (!(format = vkd3d_format_from_d3d12_resource_desc(device, &resource->desc, 0))) + { + ERR("Invalid DXGI format %#x.\n", resource->desc.Format); + return E_INVALIDARG; + } + if (format->vk_aspect_mask != VK_IMAGE_ASPECT_COLOR_BIT) + { + FIXME("Not supported for format %#x.\n", format->dxgi_format); + return E_NOTIMPL; + } + + vk_sub_resource.arrayLayer = dst_sub_resource / resource->desc.MipLevels; + vk_sub_resource.mipLevel = dst_sub_resource % resource->desc.MipLevels; + vk_sub_resource.aspectMask = format->vk_aspect_mask; + + if (dst_box) + { + if (!d3d12_resource_validate_box(resource, dst_sub_resource, dst_box)) + { + WARN("Invalid box %s.\n", debug_d3d12_box(dst_box)); + return E_INVALIDARG; + } + + box = *dst_box; + } + else + { + box.left = 0; + box.top = 0; + box.front = 0; + box.right = d3d12_resource_desc_get_width(&resource->desc, vk_sub_resource.mipLevel); + box.bottom = d3d12_resource_desc_get_height(&resource->desc, vk_sub_resource.mipLevel); + box.back = d3d12_resource_desc_get_depth(&resource->desc, vk_sub_resource.mipLevel); + } + if (box.right <= box.left || box.bottom <= box.top || box.back <= box.front) + { + WARN("Empty box %s.\n", debug_d3d12_box(dst_box)); + return S_OK; + } + + if (!d3d12_resource_is_cpu_accessible(resource)) + { + FIXME_ONCE("Not implemented for this resource type.\n"); + return E_NOTIMPL; + } + if (!(resource->flags & VKD3D_RESOURCE_LINEAR_TILING)) + { + FIXME_ONCE("Not implemented for image tiling other than VK_IMAGE_TILING_LINEAR.\n"); + return E_NOTIMPL; + } + + VK_CALL(vkGetImageSubresourceLayout(device->vk_device, resource->u.vk_image, &vk_sub_resource, &vk_layout)); + TRACE("Offset %#"PRIx64", size %#"PRIx64", row pitch %#"PRIx64", depth pitch %#"PRIx64".\n", + vk_layout.offset, vk_layout.size, vk_layout.rowPitch, vk_layout.depthPitch); + + if (FAILED(hr = d3d12_heap_map(resource->heap, resource->heap_offset, resource, (void **)&dst_data))) + { + WARN("Failed to map resource %p, hr %#x.\n", resource, hr); + return hr; + } + + dst_data += vk_layout.offset; + dst_data += box.left / format->block_width * format->byte_count * format->block_byte_count; + size = (box.right - box.left) / format->block_width * format->byte_count * format->block_byte_count; + for (z = box.front; z < box.back; ++z) + { + src = src_data + (z - box.front) * src_slice_pitch; + dst = dst_data + z * vk_layout.depthPitch + box.top / format->block_height * vk_layout.rowPitch; + for (y = box.top; y < box.bottom; y += format->block_height) + { + memcpy(dst, src, size); + src += src_row_pitch; + dst += vk_layout.rowPitch; + } + } + + d3d12_heap_unmap(resource->heap, resource); return E_NOTIMPL; } -- 2.23.0

1 1

[PATCH] httpapi: Fix a memory leak (Valgrind).
by Sven Baars 26 Sep '19

26 Sep '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/httpapi/httpapi_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 0d6895b998..03511d6c9f 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -230,6 +230,7 @@ static ULONG add_url(HANDLE queue, const WCHAR *urlW, HTTP_URL_CONTEXT context) offsetof(struct http_add_url_params, url[len]), NULL, 0, NULL, &ovl)) ret = GetLastError(); CloseHandle(ovl.hEvent); + heap_free(params); return ret; } -- 2.17.1

2 3

[PATCH] wined3d: Add GPU information for Intel UHD Graphics 620.
by Rémi Bernon 26 Sep '19

26 Sep '19

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- The reported name is "Intel(R) HD Graphics (Whiskey Lake 3x8 GT2)." on my linux laptop, but internet says this product id is UHD Graphics 620. The vram minimum amount is a wild guess, if anyone has a better value. dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 313e522f4a5..8a2e10323d1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -464,6 +464,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_IPP580_2, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_HD620, "Intel(R) HD Graphics 620", DRIVER_INTEL_HD4000, 3072}, {HW_VENDOR_INTEL, CARD_INTEL_HD630, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, + {HW_VENDOR_INTEL, CARD_INTEL_UHD620, "Intel(R) UHD Graphics 620", DRIVER_INTEL_HD4000, 3072}, }; static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 22c19abd008..9e8985f76f1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2578,6 +2578,7 @@ enum wined3d_pci_device CARD_INTEL_IP580_2 = 0x193b, CARD_INTEL_IPP580_1 = 0x193a, CARD_INTEL_IPP580_2 = 0x193d, + CARD_INTEL_UHD620 = 0x3ea0, CARD_INTEL_HD620 = 0x5916, CARD_INTEL_HD630 = 0x5912, }; -- 2.23.0

2 1

[PATCH] wined3d: Fail SRV creation for resources without corresponding bind flag.
by Nikolay Sivov 26 Sep '19

26 Sep '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- As far as I can tell, d3d9 always sets BIND_SHADER_RESOURCE for all texture types. dlls/d3d10_1/tests/d3d10_1.c | 3 --- dlls/d3d10core/tests/d3d10core.c | 3 --- dlls/d3d11/tests/d3d11.c | 3 --- dlls/wined3d/view.c | 2 ++ 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index 9c468c13a2..51da614d9d 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -410,10 +410,7 @@ static void test_create_shader_resource_view(void) ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x\n", hr); hr = ID3D10Device1_CreateShaderResourceView1(device, (ID3D10Resource *)buffer, &srv_desc, &srview); -todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ID3D10ShaderResourceView1_Release(srview); ID3D10Buffer_Release(buffer); diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index cc6b39ccd1..d291c881e3 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -3582,10 +3582,7 @@ static void test_create_shader_resource_view(void) buffer = create_buffer(device, 0, 1024, NULL); hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)buffer, &srv_desc, &srview); -todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ID3D10ShaderResourceView_Release(srview); ID3D10Buffer_Release(buffer); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 97ab9b4487..d58319df58 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4260,10 +4260,7 @@ static void test_create_shader_resource_view(void) buffer = create_buffer(device, 0, 1024, NULL); hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)buffer, &srv_desc, &srview); -todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ID3D11ShaderResourceView_Release(srview); ID3D11Buffer_Release(buffer); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index f7bb18934f..f1c99a3b6a 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -767,6 +767,8 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ view->parent = parent; view->parent_ops = parent_ops; + if (!(resource->bind_flags & WINED3D_BIND_SHADER_RESOURCE)) + return E_INVALIDARG; if (!(view->format = validate_resource_view(desc, resource, FALSE, FALSE))) return E_INVALIDARG; view->desc = *desc; -- 2.23.0

3 2

[PATCH v2 1/6] wined3d: Return a wined3d_stateblock from wined3d_device_begin_stateblock().
by Zebediah Figura 26 Sep '19

26 Sep '19

And hold it locally in d3d[789]. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: Fix refcounting in wined3d_device_{begin,end}_stateblock() [thanks Henri]. dlls/d3d8/d3d8_private.h | 5 +++-- dlls/d3d8/device.c | 17 ++++++++++++----- dlls/d3d9/d3d9_private.h | 5 +++-- dlls/d3d9/device.c | 24 ++++++++++++++++-------- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 13 +++++++++---- dlls/ddraw/surface.c | 7 +++++++ dlls/wined3d/device.c | 32 ++++++++++++++++++-------------- dlls/wined3d/wined3d.spec | 4 ++-- include/wine/wined3d.h | 4 ++-- 10 files changed, 73 insertions(+), 40 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 1669ff74315..0d4d4faf898 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -126,12 +126,13 @@ struct d3d8_device DWORD sysmem_vb : 16; /* D3D8_MAX_STREAMS */ DWORD sysmem_ib : 1; DWORD in_destruction : 1; - DWORD recording : 1; - DWORD padding : 13; + DWORD padding : 14; /* The d3d8 API supports only one implicit swapchain (no D3DCREATE_ADAPTERGROUP_DEVICE, * no GetSwapchain, GetBackBuffer doesn't accept a swapchain number). */ struct wined3d_swapchain *implicit_swapchain; + + struct wined3d_stateblock *recording; }; HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wined3d *wined3d, UINT adapter, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index b5436241a9e..741218c9515 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -593,6 +593,9 @@ static ULONG WINAPI d3d8_device_Release(IDirect3DDevice8 *iface) if (device->index_buffer) wined3d_buffer_decref(device->index_buffer); + if (device->recording) + wined3d_stateblock_decref(device->recording); + wined3d_swapchain_decref(device->implicit_swapchain); wined3d_device_release_focus_window(device->wined3d_device); wined3d_device_decref(device->wined3d_device); @@ -908,7 +911,9 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, NULL, reset_enum_callback, TRUE))) { - device->recording = FALSE; + if (device->recording) + wined3d_stateblock_decref(device->recording); + device->recording = NULL; present_parameters->BackBufferCount = swapchain_desc.backbuffer_count; implicit_swapchain = wined3d_swapchain_get_parent(device->implicit_swapchain); implicit_swapchain->swap_interval @@ -1859,13 +1864,14 @@ static HRESULT WINAPI d3d8_device_GetRenderState(IDirect3DDevice8 *iface, static HRESULT WINAPI d3d8_device_BeginStateBlock(IDirect3DDevice8 *iface) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); + struct wined3d_stateblock *stateblock; HRESULT hr; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - if (SUCCEEDED(hr = wined3d_device_begin_stateblock(device->wined3d_device))) - device->recording = TRUE; + if (SUCCEEDED(hr = wined3d_device_begin_stateblock(device->wined3d_device, &stateblock))) + device->recording = stateblock; wined3d_mutex_unlock(); return hr; @@ -1883,14 +1889,15 @@ static HRESULT WINAPI d3d8_device_EndStateBlock(IDirect3DDevice8 *iface, DWORD * * of memory later and cause locking problems) */ wined3d_mutex_lock(); - hr = wined3d_device_end_stateblock(device->wined3d_device, &stateblock); + hr = wined3d_device_end_stateblock(device->wined3d_device); if (FAILED(hr)) { WARN("Failed to end the state block, %#x.\n", hr); wined3d_mutex_unlock(); return hr; } - device->recording = FALSE; + stateblock = device->recording; + device->recording = NULL; *token = d3d8_allocate_handle(&device->handle_table, stateblock, D3D8_HANDLE_SB); wined3d_mutex_unlock(); diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index a56bdb270b2..7c3d77c8a25 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -107,8 +107,7 @@ struct d3d9_device DWORD in_destruction : 1; DWORD in_scene : 1; DWORD has_vertex_declaration : 1; - DWORD recording : 1; - DWORD padding : 11; + DWORD padding : 12; DWORD auto_mipmaps; /* D3D9_MAX_TEXTURE_UNITS */ @@ -116,6 +115,8 @@ struct d3d9_device UINT implicit_swapchain_count; struct wined3d_swapchain **implicit_swapchains; + + struct wined3d_stateblock *recording; }; HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wined3d *wined3d, diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index dc3363bab8c..953bf4c5419 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -603,6 +603,9 @@ static ULONG WINAPI DECLSPEC_HOTPATCH d3d9_device_Release(IDirect3DDevice9Ex *if } heap_free(device->implicit_swapchains); + if (device->recording) + wined3d_stateblock_decref(device->recording); + wined3d_device_release_focus_window(device->wined3d_device); wined3d_device_decref(device->wined3d_device); wined3d_mutex_unlock(); @@ -993,7 +996,9 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, if (!extended) { - device->recording = FALSE; + if (device->recording) + wined3d_stateblock_decref(device->recording); + device->recording = NULL; device->auto_mipmaps = 0; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); @@ -2348,13 +2353,14 @@ static HRESULT WINAPI d3d9_device_CreateStateBlock(IDirect3DDevice9Ex *iface, static HRESULT WINAPI d3d9_device_BeginStateBlock(IDirect3DDevice9Ex *iface) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + struct wined3d_stateblock *stateblock; HRESULT hr; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - if (SUCCEEDED(hr = wined3d_device_begin_stateblock(device->wined3d_device))) - device->recording = TRUE; + if (SUCCEEDED(hr = wined3d_device_begin_stateblock(device->wined3d_device, &stateblock))) + device->recording = stateblock; wined3d_mutex_unlock(); return hr; @@ -2370,14 +2376,16 @@ static HRESULT WINAPI d3d9_device_EndStateBlock(IDirect3DDevice9Ex *iface, IDire TRACE("iface %p, stateblock %p.\n", iface, stateblock); wined3d_mutex_lock(); - hr = wined3d_device_end_stateblock(device->wined3d_device, &wined3d_stateblock); - wined3d_mutex_unlock(); + hr = wined3d_device_end_stateblock(device->wined3d_device); if (FAILED(hr)) { - WARN("Failed to end the state block, hr %#x.\n", hr); - return hr; + wined3d_mutex_unlock(); + WARN("Failed to end the stateblock, hr %#x.\n", hr); + return hr; } - device->recording = FALSE; + wined3d_stateblock = device->recording; + device->recording = NULL; + wined3d_mutex_unlock(); if (!(object = heap_alloc_zero(sizeof(*object)))) { diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 11861f2a129..771b2a44d17 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -351,7 +351,7 @@ struct d3d_device struct wined3d_vec4 user_clip_planes[D3DMAXUSERCLIPPLANES]; - BOOL recording; + struct wined3d_stateblock *recording; }; HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface, diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 690332dbdca..43e5d0aa920 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -245,6 +245,9 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface) wined3d_device_set_rendertarget_view(This->wined3d_device, 0, NULL, FALSE); + if (This->recording) + wined3d_stateblock_decref(This->recording); + /* Release the wined3d device. This won't destroy it. */ if (!wined3d_device_decref(This->wined3d_device)) ERR("The wined3d device (%p) was destroyed unexpectedly.\n", This->wined3d_device); @@ -5604,6 +5607,7 @@ static HRESULT WINAPI d3d_device7_GetLight_FPUPreserve(IDirect3DDevice7 *iface, static HRESULT d3d_device7_BeginStateBlock(IDirect3DDevice7 *iface) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); + struct wined3d_stateblock *stateblock; HRESULT hr; TRACE("iface %p.\n", iface); @@ -5615,8 +5619,8 @@ static HRESULT d3d_device7_BeginStateBlock(IDirect3DDevice7 *iface) WARN("Trying to begin a stateblock while recording, returning D3DERR_INBEGINSTATEBLOCK.\n"); return D3DERR_INBEGINSTATEBLOCK; } - if (SUCCEEDED(hr = wined3d_device_begin_stateblock(device->wined3d_device))) - device->recording = TRUE; + if (SUCCEEDED(hr = wined3d_device_begin_stateblock(device->wined3d_device, &stateblock))) + device->recording = stateblock; wined3d_mutex_unlock(); return hr_ddraw_from_wined3d(hr); @@ -5674,7 +5678,7 @@ static HRESULT d3d_device7_EndStateBlock(IDirect3DDevice7 *iface, DWORD *statebl WARN("Trying to end a stateblock, but no stateblock is being recorded.\n"); return D3DERR_NOTINBEGINSTATEBLOCK; } - hr = wined3d_device_end_stateblock(device->wined3d_device, &wined3d_sb); + hr = wined3d_device_end_stateblock(device->wined3d_device); if (FAILED(hr)) { WARN("Failed to end stateblock, hr %#x.\n", hr); @@ -5682,7 +5686,8 @@ static HRESULT d3d_device7_EndStateBlock(IDirect3DDevice7 *iface, DWORD *statebl *stateblock = 0; return hr_ddraw_from_wined3d(hr); } - device->recording = FALSE; + wined3d_sb = device->recording; + device->recording = NULL; h = ddraw_allocate_handle(&device->handle_table, wined3d_sb, DDRAW_HANDLE_STATEBLOCK); if (h == DDRAW_INVALID_HANDLE) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 59af556560b..6c27d8c26c6 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6076,6 +6076,13 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return hr_ddraw_from_wined3d(hr); } + if (ddraw->d3ddevice) + { + if (ddraw->d3ddevice->recording) + wined3d_stateblock_decref(ddraw->d3ddevice->recording); + ddraw->d3ddevice->recording = NULL; + } + wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 62341290ffa..9b1b6300140 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4070,49 +4070,53 @@ HRESULT CDECL wined3d_device_get_display_mode(const struct wined3d_device *devic return wined3d_swapchain_get_display_mode(swapchain, mode, rotation); } -HRESULT CDECL wined3d_device_begin_stateblock(struct wined3d_device *device) +HRESULT CDECL wined3d_device_begin_stateblock(struct wined3d_device *device, + struct wined3d_stateblock **stateblock) { - struct wined3d_stateblock *stateblock; + struct wined3d_stateblock *object; HRESULT hr; TRACE("device %p.\n", device); if (device->recording) + { + *stateblock = NULL; return WINED3DERR_INVALIDCALL; + } - hr = wined3d_stateblock_create(device, WINED3D_SBT_RECORDED, &stateblock); + hr = wined3d_stateblock_create(device, WINED3D_SBT_RECORDED, &object); if (FAILED(hr)) return hr; - device->recording = stateblock; - device->update_stateblock_state = &stateblock->stateblock_state; + device->recording = object; + device->update_stateblock_state = &object->stateblock_state; + wined3d_stateblock_incref(object); + *stateblock = object; - TRACE("Recording stateblock %p.\n", stateblock); + TRACE("Recording stateblock %p.\n", *stateblock); return WINED3D_OK; } -HRESULT CDECL wined3d_device_end_stateblock(struct wined3d_device *device, - struct wined3d_stateblock **stateblock) +HRESULT CDECL wined3d_device_end_stateblock(struct wined3d_device *device) { - struct wined3d_stateblock *object = device->recording; + struct wined3d_stateblock *stateblock = device->recording; - TRACE("device %p, stateblock %p.\n", device, stateblock); + TRACE("device %p.\n", device); if (!device->recording) { WARN("Not recording.\n"); - *stateblock = NULL; return WINED3DERR_INVALIDCALL; } - stateblock_init_contained_states(object); + stateblock_init_contained_states(stateblock); - *stateblock = object; + wined3d_stateblock_decref(device->recording); device->recording = NULL; device->update_stateblock_state = &device->stateblock_state; - TRACE("Returning stateblock %p.\n", *stateblock); + TRACE("Ending stateblock %p.\n", stateblock); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index edd4a70d979..947bff7cb0d 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -37,7 +37,7 @@ @ cdecl wined3d_device_acquire_focus_window(ptr ptr) @ cdecl wined3d_device_begin_scene(ptr) -@ cdecl wined3d_device_begin_stateblock(ptr) +@ cdecl wined3d_device_begin_stateblock(ptr ptr) @ cdecl wined3d_device_clear(ptr long ptr long ptr float long) @ cdecl wined3d_device_clear_rendertarget_view(ptr ptr ptr long ptr float long) @ cdecl wined3d_device_clear_unordered_access_view_uint(ptr ptr ptr) @@ -55,7 +55,7 @@ @ cdecl wined3d_device_draw_primitive_instanced(ptr long long long long) @ cdecl wined3d_device_draw_primitive_instanced_indirect(ptr ptr long) @ cdecl wined3d_device_end_scene(ptr) -@ cdecl wined3d_device_end_stateblock(ptr ptr) +@ cdecl wined3d_device_end_stateblock(ptr) @ cdecl wined3d_device_evict_managed_resources(ptr) @ cdecl wined3d_device_get_available_texture_mem(ptr) @ cdecl wined3d_device_get_base_vertex_index(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3e46c23c145..ee28ab1bb94 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2228,7 +2228,7 @@ ULONG __cdecl wined3d_buffer_incref(struct wined3d_buffer *buffer); HRESULT __cdecl wined3d_device_acquire_focus_window(struct wined3d_device *device, HWND window); HRESULT __cdecl wined3d_device_begin_scene(struct wined3d_device *device); -HRESULT __cdecl wined3d_device_begin_stateblock(struct wined3d_device *device); +HRESULT __cdecl wined3d_device_begin_stateblock(struct wined3d_device *device, struct wined3d_stateblock **stateblock); HRESULT __cdecl wined3d_device_clear(struct wined3d_device *device, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float z, DWORD stencil); HRESULT __cdecl wined3d_device_clear_rendertarget_view(struct wined3d_device *device, @@ -2264,7 +2264,7 @@ void __cdecl wined3d_device_draw_primitive_instanced(struct wined3d_device *devi void __cdecl wined3d_device_draw_primitive_instanced_indirect(struct wined3d_device *device, struct wined3d_buffer *buffer, unsigned int offset); HRESULT __cdecl wined3d_device_end_scene(struct wined3d_device *device); -HRESULT __cdecl wined3d_device_end_stateblock(struct wined3d_device *device, struct wined3d_stateblock **stateblock); +HRESULT __cdecl wined3d_device_end_stateblock(struct wined3d_device *device); void __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *device); UINT __cdecl wined3d_device_get_available_texture_mem(const struct wined3d_device *device); INT __cdecl wined3d_device_get_base_vertex_index(const struct wined3d_device *device); -- 2.23.0

3 17

[PATCH 3/3] scrobj: Improve debug traces.
by Jacek Caban 26 Sep '19

26 Sep '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/scrobj/scrobj.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[PATCH 2/3] scrobj: Ignore processing instructions in scriptlet files.
by Jacek Caban 26 Sep '19

26 Sep '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/scrobj/scrobj.c | 14 ++++++++++++-- dlls/scrobj/tests/scrobj.wsc | 4 +++- 2 files changed, 15 insertions(+), 3 deletions(-)

1 0