October 2012 - Wine-commits

Francois Gouget : testbot/ddl: Add a 'USE winetestbot' statement to all the SQL update scripts.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: tools Branch: master Commit: 75eea6f9ae372e3a64e8bd609c7f85a105c70b96 URL: http://source.winehq.org/git/tools.git/?a=commit;h=75eea6f9ae372e3a64e8bd60… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 22 12:09:13 2012 +0200 testbot/ddl: Add a 'USE winetestbot' statement to all the SQL update scripts. This way they have all the instructions one needs to perform the updates. --- testbot/ddl/update1.sql | 2 ++ testbot/ddl/update10.sql | 2 ++ testbot/ddl/update11.sql | 2 ++ testbot/ddl/update12.sql | 2 ++ testbot/ddl/update14.sql | 2 ++ testbot/ddl/update2.sql | 2 ++ testbot/ddl/update3.sql | 2 ++ testbot/ddl/update4.sql | 2 ++ testbot/ddl/update5.sql | 2 ++ testbot/ddl/update6.sql | 2 ++ testbot/ddl/update7.sql | 2 ++ testbot/ddl/update8.sql | 2 ++ testbot/ddl/update9.sql | 2 ++ 13 files changed, 26 insertions(+), 0 deletions(-) diff --git a/testbot/ddl/update1.sql b/testbot/ddl/update1.sql index 89a5796..cf3039b 100644 --- a/testbot/ddl/update1.sql +++ b/testbot/ddl/update1.sql @@ -1,3 +1,5 @@ +USE winetestbot; + ALTER TABLE Steps ADD DebugLevel INT(2) NULL, ADD ReportSuccessfulTests ENUM('Y', 'N') NULL; diff --git a/testbot/ddl/update10.sql b/testbot/ddl/update10.sql index d58ed25..05a816d 100644 --- a/testbot/ddl/update10.sql +++ b/testbot/ddl/update10.sql @@ -1,3 +1,5 @@ +USE winetestbot; + ALTER TABLE Jobs ADD Archived ENUM('Y', 'N') NULL AFTER Id, diff --git a/testbot/ddl/update11.sql b/testbot/ddl/update11.sql index d3fa044..c8aed86 100644 --- a/testbot/ddl/update11.sql +++ b/testbot/ddl/update11.sql @@ -1,2 +1,4 @@ +USE winetestbot; + ALTER TABLE VMs MODIFY Type ENUM('base', 'extra', 'build', 'retired') NOT NULL; diff --git a/testbot/ddl/update12.sql b/testbot/ddl/update12.sql index 41024c4..d920a8e 100644 --- a/testbot/ddl/update12.sql +++ b/testbot/ddl/update12.sql @@ -1,3 +1,5 @@ +USE winetestbot; + ALTER TABLE Patches MODIFY Id INT(7) NOT NULL AUTO_INCREMENT, ADD WebPatchId INT(7) NULL diff --git a/testbot/ddl/update14.sql b/testbot/ddl/update14.sql index 9da8f58..55803f6 100644 --- a/testbot/ddl/update14.sql +++ b/testbot/ddl/update14.sql @@ -1,3 +1,5 @@ +USE winetestbot; + ALTER TABLE VMs DROP VmxHost, DROP VmxFilePath, diff --git a/testbot/ddl/update2.sql b/testbot/ddl/update2.sql index 219d0f5..11446b5 100644 --- a/testbot/ddl/update2.sql +++ b/testbot/ddl/update2.sql @@ -1,3 +1,5 @@ +USE winetestbot; + ALTER TABLE VMs ADD Type ENUM('base', 'extra', 'build') NULL AFTER BaseOS; diff --git a/testbot/ddl/update3.sql b/testbot/ddl/update3.sql index 4efd765..9b162c9 100644 --- a/testbot/ddl/update3.sql +++ b/testbot/ddl/update3.sql @@ -1,2 +1,4 @@ +USE winetestbot; + ALTER TABLE VMs ADD VmxHost VARCHAR(64) NULL AFTER Status; diff --git a/testbot/ddl/update4.sql b/testbot/ddl/update4.sql index 835a17c..6a09c5a 100644 --- a/testbot/ddl/update4.sql +++ b/testbot/ddl/update4.sql @@ -1,2 +1,4 @@ +USE winetestbot; + ALTER TABLE Steps MODIFY FileName VARCHAR(100) NOT NULL; diff --git a/testbot/ddl/update5.sql b/testbot/ddl/update5.sql index 7c0b4eb..45f9946 100644 --- a/testbot/ddl/update5.sql +++ b/testbot/ddl/update5.sql @@ -1,3 +1,5 @@ +USE winetestbot; + CREATE TABLE Patches ( Id INT(7) NOT NULL AUTO_INCREMENT, diff --git a/testbot/ddl/update6.sql b/testbot/ddl/update6.sql index 990fcd3..6242b74 100644 --- a/testbot/ddl/update6.sql +++ b/testbot/ddl/update6.sql @@ -1,3 +1,5 @@ +USE winetestbot; + ALTER TABLE Steps ADD FileType ENUM('exe32', 'exe64', 'patchdlls', 'patchprograms') NULL AFTER FileName; diff --git a/testbot/ddl/update7.sql b/testbot/ddl/update7.sql index aa2629c..0d1db30 100644 --- a/testbot/ddl/update7.sql +++ b/testbot/ddl/update7.sql @@ -1,2 +1,4 @@ +USE winetestbot; + ALTER TABLE Patches MODIFY Id INT(7) NOT NULL; diff --git a/testbot/ddl/update8.sql b/testbot/ddl/update8.sql index 18b3b92..caa5d1b 100644 --- a/testbot/ddl/update8.sql +++ b/testbot/ddl/update8.sql @@ -1,3 +1,5 @@ +USE winetestbot; + ALTER TABLE Roles ADD IsDefaultRole ENUM('Y', 'N') NULL AFTER Name; diff --git a/testbot/ddl/update9.sql b/testbot/ddl/update9.sql index 535621f..2ba3da2 100644 --- a/testbot/ddl/update9.sql +++ b/testbot/ddl/update9.sql @@ -1,3 +1,5 @@ +USE winetestbot; + ALTER TABLE Steps MODIFY FileType ENUM('exe32', 'exe64', 'patchdlls', 'patchprograms', 'dll32', 'dll64', 'zip') NOT NULL;

1 0

Francois Gouget : testbot/lib: Assume the $MaxXxx configuration settings are always set.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: tools Branch: master Commit: 4760b1819cf9df6446ea5f20e1af5e19accaaa19 URL: http://source.winehq.org/git/tools.git/?a=commit;h=4760b1819cf9df6446ea5f20… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 22 12:10:26 2012 +0200 testbot/lib: Assume the $MaxXxx configuration settings are always set. There is no reason to leave them undefined when insanely large values like 100 can be used instead. --- testbot/lib/WineTestBot/Jobs.pm | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 8ec9bb8..07a0685 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -464,7 +464,7 @@ sub ScheduleOnHost { my $VM = $HostVMs->GetItem($Task->VM->GetKey()); if ($VM->Status eq "idle" && - (! defined($MaxRunningVMs) || $RunningVMs < $MaxRunningVMs) && + $RunningVMs < $MaxRunningVMs && $RevertingVMs == 0) { $VM->Status("running"); @@ -507,11 +507,11 @@ sub ScheduleOnHost foreach $VMKey (@DirtyVMsByIndex) { my $VM = $HostVMs->GetItem($VMKey); - if (! defined($MaxRevertingVMs) || $RevertingVMs < $MaxRevertingVMs) + if ($RevertingVMs < $MaxRevertingVMs) { if ($VM->Type eq "extra" || $VM->Type eq "retired") { - if (! defined($MaxExtraPoweredOnVms) || $PoweredOnExtraVMs < $MaxExtraPoweredOnVms) + if ($PoweredOnExtraVMs < $MaxExtraPoweredOnVms) { $VM->RunRevert(); $PoweredOnExtraVMs++; @@ -529,7 +529,7 @@ sub ScheduleOnHost { my $VM = $HostVMs->GetItem($VMKey); if (! defined($DirtyVMsBlockingJobs{$VMKey}) && - (! defined($MaxRevertingVMs) || $RevertingVMs < $MaxRevertingVMs) && + $RevertingVMs < $MaxRevertingVMs && $VM->Status eq 'dirty' && $VM->Type ne "extra" && $VM->Type ne "retired") {

1 0

Francois Gouget : testbot: Remove the dll32, dll64 and zip file types as they are actually unsupported.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: tools Branch: master Commit: f762576897ee4deb6dbe8b9524fbd5e49d38b7c2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f762576897ee4deb6dbe8b95… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 22 12:13:43 2012 +0200 testbot: Remove the dll32, dll64 and zip file types as they are actually unsupported. --- testbot/ddl/update15.sql | 4 ++++ testbot/ddl/winetestbot.sql | 2 +- testbot/lib/WineTestBot/Steps.pm | 2 +- testbot/web/Submit.pl | 28 ++++++++++------------------ 4 files changed, 16 insertions(+), 20 deletions(-) diff --git a/testbot/ddl/update15.sql b/testbot/ddl/update15.sql new file mode 100644 index 0000000..73ddeb0 --- /dev/null +++ b/testbot/ddl/update15.sql @@ -0,0 +1,4 @@ +USE winetestbot; + +ALTER TABLE Steps + MODIFY FileType ENUM('exe32', 'exe64', 'patchdlls', 'patchprograms') NOT NULL; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index f588810..c5d9e61 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -130,7 +130,7 @@ CREATE TABLE Steps Type ENUM('suite', 'single', 'build', 'reconfig') NOT NULL, Status ENUM('queued', 'running', 'completed', 'failed', 'skipped') NOT NULL, FileName VARCHAR(100) NOT NULL, - FileType ENUM('exe32', 'exe64', 'patchdlls', 'patchprograms', 'dll32', 'dll64', 'zip') NOT NULL, + FileType ENUM('exe32', 'exe64', 'patchdlls', 'patchprograms') NOT NULL, InStaging ENUM('Y', 'N') NOT NULL, DebugLevel INT(2) NOT NULL, ReportSuccessfulTests ENUM('Y', 'N') NOT NULL, diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index ccfac79..609fb43 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -118,7 +118,7 @@ BEGIN CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['queued', 'running', 'completed', 'failed', 'skipped']), CreateEnumPropertyDescriptor("Type", "Step type", !1, 1, ['suite', 'single', 'build', 'reconfig']), CreateBasicPropertyDescriptor("FileName", "File name", !1, 1, "A", 100), - CreateEnumPropertyDescriptor("FileType", "File type", !1, 1, ['exe32', 'exe64', 'patchdlls', 'patchprograms', 'dll32', 'dll64', 'zip']), + CreateEnumPropertyDescriptor("FileType", "File type", !1, 1, ['exe32', 'exe64', 'patchdlls', 'patchprograms']), CreateBasicPropertyDescriptor("InStaging", "File is in staging area", !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), diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 72687aa..9481629 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -243,10 +243,8 @@ sub GenerateFields { my $VM = $VMs->GetItem($VMKey); if ($VM->Bits == 64 || $self->{FileType} eq "exe32" || - $self->{FileType} eq "dll32" || $self->{FileType} eq "patchdlls" || - $self->{FileType} eq "patchprograms" || - $self->{FileType} eq "zip") + $self->{FileType} eq "patchprograms") { my $FieldName = "vm_" . $self->CGI->escapeHTML($VM->GetKey()); print "<div class='ItemProperty'><label>", @@ -473,9 +471,7 @@ sub Validate { $self->{NoCmdLineArgWarn} = 1; } - elsif (! $self->GetParam("CmdLineArg") && - $self->GetParam("FileType") ne "dll32" && - $self->GetParam("FileType") ne "dll64") + elsif (! $self->GetParam("CmdLineArg")) { $self->{ErrMessage} = "You didn't specify a command line argument. " . "This is most likely not correct, so please " . @@ -624,6 +620,11 @@ sub DetermineFileType } } } + 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, $DllBaseName, $TestSet); } @@ -678,8 +679,7 @@ sub OnPage1Next return !1; } if ($FileType ne "patchdlls" && $FileType ne "patchprograms" && - $FileType ne "exe32" && $FileType ne "exe64" && $FileType ne "dll32" && - $FileType ne "zip") + $FileType ne "exe32" && $FileType ne "exe64") { $self->{ErrField} = "File"; $self->{ErrMessage} = "Unrecognized file type"; @@ -846,14 +846,7 @@ sub OnSubmit $NewStep->InStaging(!1); } - if ($FileType eq "dll32" && ! $self->GetParam("CmdLineArg")) - { - $NewStep->Type("suite"); - } - else - { - $NewStep->Type("single"); - } + $NewStep->Type("single"); $NewStep->DebugLevel($self->GetParam("DebugLevel")); $NewStep->ReportSuccessfulTests(defined($self->GetParam("ReportSuccessfulTests"))); @@ -869,8 +862,7 @@ sub OnSubmit { my $Task = $Tasks->Add(); $Task->VM($VM); - $Task->Timeout($NewStep->Type eq "suite" ? - $SuiteTimeout : $SingleTimeout); + $Task->Timeout($SingleTimeout); $Task->CmdLineArg($self->GetParam("CmdLineArg")); } }

1 0

Francois Gouget : testbot/bin: A few small spelling fixes.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: tools Branch: master Commit: 4dcf0a099e760a29bfbb4a2d36a657b8ac861e7d URL: http://source.winehq.org/git/tools.git/?a=commit;h=4dcf0a099e760a29bfbb4a2d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 22 12:13:55 2012 +0200 testbot/bin: A few small spelling fixes. --- testbot/bin/Engine.pl | 4 ++-- testbot/bin/WineRunTask.pl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 8723c9e..b97402b 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -64,7 +64,7 @@ sub HandleJobSubmit my $Job = $Jobs->GetItem($JobKey); if (! $Job) { - LogMsg "Engine: JobSubmit for non-existing job $JobKey\n"; + LogMsg "Engine: JobSubmit for nonexistent job $JobKey\n"; return "0Job $JobKey not found"; } # We've already determined that JobKey is valid, untaint it @@ -141,7 +141,7 @@ sub HandleJobCancel my $Job = CreateJobs()->GetItem($JobKey); if (! $Job) { - LogMsg "Engine: JobCancel for non-existing job $JobKey\n"; + LogMsg "Engine: JobCancel for nonexistent job $JobKey\n"; return "0Job $JobKey not found"; } # We've already determined that JobKey is valid, untaint it diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 430c842..94cb265 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -250,7 +250,7 @@ if (defined($ErrMessage)) my $FileType = $Step->FileType; if ($FileType ne "exe32" && $FileType ne "exe64") { - FatalError "Unexpectd file type $FileType found\n", + FatalError "Unexpected file type $FileType found\n", $FullErrFileName, $Job, $Step, $Task; } my $FileName = $Step->FileName;

1 0

Francois Gouget : testbot/lib: Fix an incorrect string equality test.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: tools Branch: master Commit: d67806173d8f929a837c7166d67a088954e3e0a1 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d67806173d8f929a837c7166… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 22 12:14:12 2012 +0200 testbot/lib: Fix an incorrect string equality test. --- testbot/lib/ObjectModel/CGI/FormPage.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 4595e44..eb859a0 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -243,7 +243,7 @@ sub GenerateField my ($PropertyDescriptor, $Display) = @_; my $Value = $self->GetDisplayValue($PropertyDescriptor); - if ($Display == "rw") + if ($Display eq "rw") { my $InputType = $self->GetInputType($PropertyDescriptor); print "<div class='ItemValue'>";

1 0

Francois Gouget : testbot/web: VMs have no MemSize property.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: tools Branch: master Commit: 0911ce5a1574c208381ef977275a24d2b104ac4e URL: http://source.winehq.org/git/tools.git/?a=commit;h=0911ce5a1574c208381ef977… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 22 12:14:44 2012 +0200 testbot/web: VMs have no MemSize property. --- testbot/web/admin/VMsList.pl | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/testbot/web/admin/VMsList.pl b/testbot/web/admin/VMsList.pl index 7c94882..05a89e2 100644 --- a/testbot/web/admin/VMsList.pl +++ b/testbot/web/admin/VMsList.pl @@ -41,8 +41,7 @@ sub DisplayProperty my $PropertyName = $PropertyDescriptor->GetName(); return $PropertyName eq "Name" || $PropertyName eq "Bits" || - $PropertyName eq "MemSize" || $PropertyName eq "Status" || - $PropertyName eq "Description"; + $PropertyName eq "Status" || $PropertyName eq "Description"; } sub SortKeys

1 0

Lucas Zawacki : Portuguese translation for release 1.5.15
by Jeremy Newman 19 Oct '12

19 Oct '12

Module: website Branch: master Commit: f62825551b52553dc46aa63cc99d060808cb1365 URL: http://source.winehq.org/git/website.git/?a=commit;h=f62825551b52553dc46aa6… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Thu Oct 18 16:53:43 2012 -0300 Portuguese translation for release 1.5.15 --- news/pt/2012101201.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/pt/2012101201.xml b/news/pt/2012101201.xml new file mode 100644 index 0000000..02a18c3 --- /dev/null +++ b/news/pt/2012101201.xml @@ -0,0 +1,18 @@ +<news> +<date>12 de Outubro de 2012</date> +<title>Wine 1.5.15 lançado</title> +<body> +<p> A versão de desenvolvimento 1.5.15 já está disponível.</p> +<p> <a href="{$root}/announce/1.5.15">Novidades</a> nesta versão: +<ul> + <li>Suporte completo a janelas em camadas.</li> + <li>Nova versão da engine Gecko baseada no Firefox 16.</li> + <li>Suporte a sockets broadcast usados por jogos em rede.</li> + <li>Add-ons baixados agora são armazenados em cache.</li> + <li>Suporte a Internet cookies persistentes.</li> + <li>Otimizações nas strings do JavaScript.</li> + <li>Várias correções de bugs.</li> +</ul></p> +<p><p>O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.15.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e em breve estarão em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</p></body></news>

1 0

Francois Gouget : testbot/bin: Always retrieve the task log file before taking a screenshot.
by Alexandre Julliard 19 Oct '12

19 Oct '12

Module: tools Branch: master Commit: 4e611a7ed3c87eb9a243007c5b02d8a7c67a4572 URL: http://source.winehq.org/git/tools.git/?a=commit;h=4e611a7ed3c87eb9a243007c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 19 12:13:55 2012 +0200 testbot/bin: Always retrieve the task log file before taking a screenshot. This is in fact a workaround for a libvirt bug that causes the screen capture to fail randomly. We can do without a screenshot but not without the result log. This also reduces code duplication a little bit. --- testbot/bin/WineRunTask.pl | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 00e0c35..430c842 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -318,21 +318,18 @@ elsif ($Step->Type eq "suite") $Script .= "cls\r\n"; $ErrMessage = $VM->RunScriptInGuestTimeout($Script, $Task->Timeout + 15); +my $LogErrMessage = RetrieveLogFile $Job, $Step, $Task, + "C:\\winetest\\$RptFileName", + $FullLogFileName; +TakeScreenshot $VM, $FullScreenshotFileName; if (defined($ErrMessage)) { - RetrieveLogFile $Job, $Step, $Task, "C:\\winetest\\$RptFileName", - $FullLogFileName; - TakeScreenshot $VM, $FullScreenshotFileName; FatalError "Failure running script in VM: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } -TakeScreenshot $VM, $FullScreenshotFileName; - -$ErrMessage = RetrieveLogFile $Job, $Step, $Task, "C:\\winetest\\$RptFileName", - $FullLogFileName; -if (defined($ErrMessage)) +if (defined($LogErrMessage)) { - FatalError "Can't copy log from VM: $ErrMessage\n", $FullErrFileName, + FatalError "Can't copy log from VM: $LogErrMessage\n", $FullErrFileName, $Job, $Step, $Task; }

1 0

Francois Gouget : testbot/VMs: Interface with libvirt instead of VMware/VIX .
by Alexandre Julliard 19 Oct '12

19 Oct '12

Module: tools Branch: master Commit: 7bff5106294fe0a48eb349be6ee495d2b6ff8476 URL: http://source.winehq.org/git/tools.git/?a=commit;h=7bff5106294fe0a48eb349be… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 19 12:14:31 2012 +0200 testbot/VMs: Interface with libvirt instead of VMware/VIX. --- testbot/ddl/update14.sql | 7 + testbot/ddl/winetestbot.sql | 4 +- testbot/doc/INSTALL.txt | 7 +- testbot/doc/winetestbot-schema.dia | 8 +- testbot/lib/WineTestBot/Config.pm | 19 +- testbot/lib/WineTestBot/ConfigLocalTemplate.pl | 27 +-- testbot/lib/WineTestBot/Jobs.pm | 64 +++- testbot/lib/WineTestBot/VMs.pm | 491 ++++++++++++------------ 8 files changed, 335 insertions(+), 292 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=7bff5106294fe0a48eb3…

1 0

Jacek Caban : mshtml: Properly handle OOM errors in htmlnode.c (coverity).
by Alexandre Julliard 19 Oct '12

19 Oct '12

Module: wine Branch: master Commit: 23c87ba829b44c68574b6aeee5abcadac3410de3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23c87ba829b44c68574b6aeee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 19 11:58:34 2012 +0200 mshtml: Properly handle OOM errors in htmlnode.c (coverity). --- dlls/mshtml/htmlnode.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 91ffe6d..b1f1b80 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -282,6 +282,9 @@ static IHTMLDOMChildrenCollection *create_child_collection(HTMLDocumentNode *doc HTMLDOMChildrenCollection *ret; ret = heap_alloc_zero(sizeof(*ret)); + if(!ret) + return NULL; + ret->IHTMLDOMChildrenCollection_iface.lpVtbl = &HTMLDOMChildrenCollectionVtbl; ret->ref = 1; @@ -468,7 +471,7 @@ static HRESULT WINAPI HTMLDOMNode_get_childNodes(IHTMLDOMNode *iface, IDispatch *p = (IDispatch*)create_child_collection(This->doc, nslist); nsIDOMNodeList_Release(nslist); - return S_OK; + return *p ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI HTMLDOMNode_get_attributes(IHTMLDOMNode *iface, IDispatch **p) @@ -1072,8 +1075,7 @@ void HTMLDOMNode_Init(HTMLDocumentNode *doc, HTMLDOMNode *node, nsIDOMNode *nsno htmldoc_addref(&doc->basedoc); node->doc = doc; - if(nsnode) - nsIDOMNode_AddRef(nsnode); + nsIDOMNode_AddRef(nsnode); node->nsnode = nsnode; nsres = nsIDOMNode_SetMshtmlNode(nsnode, (nsISupports*)&node->IHTMLDOMNode_iface);

1 0