wine-commits October 2012

2 participants
960 discussions

André Hentschel : winex11: Avoid memory leaks ( coverity).

by Alexandre Julliard

Module: wine Branch: master Commit: 585a66a46320dc8bba7771ec147ef3d7a800310e URL: http://source.winehq.org/git/wine.git/?a=commit;h=585a66a46320dc8bba7771ec1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 30 20:07:22 2012 +0100 winex11: Avoid memory leaks (coverity). --- dlls/winex11.drv/clipboard.c | 1 + dlls/winex11.drv/xrender.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 37a115e..bd3ef7b 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2400,6 +2400,7 @@ static BOOL X11DRV_CLIPBOARD_ReadProperty(Display *display, Window w, Atom prop, if (!tmp) { HeapFree(GetProcessHeap(), 0, buf); + HeapFree(GetProcessHeap(), 0, prop_data); return FALSE; } diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index d7f0508..389f684 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1405,9 +1405,9 @@ static void UploadGlyph(struct xrender_physdev *physDev, int glyph, AA_Type form pXRenderAddGlyphs(gdi_display, formatEntry->glyphset, &gid, &gi, 1, buflen ? buf : zero, buflen ? buflen : sizeof(zero)); - HeapFree(GetProcessHeap(), 0, buf); } + HeapFree(GetProcessHeap(), 0, buf); formatEntry->gis[glyph] = gi; }

11 years, 6 months

André Hentschel : wineps: Avoid memory leaks (coverity ).

by Alexandre Julliard

Module: wine Branch: master Commit: 42f791ccd561f9188109dd000940536849919f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42f791ccd561f9188109dd000… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 30 20:07:15 2012 +0100 wineps: Avoid memory leaks (coverity). --- dlls/wineps.drv/download.c | 7 ++++--- dlls/wineps.drv/ps.c | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index 037ea34..f984225 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -313,9 +313,10 @@ BOOL PSDRV_WriteSetDownloadFont(PHYSDEV dev) UINT emsize; if (!get_bbox(dev->hdc, &bbox, &emsize)) { - HeapFree(GetProcessHeap(), 0, potm); - return FALSE; - } + HeapFree(GetProcessHeap(), 0, ps_name); + HeapFree(GetProcessHeap(), 0, potm); + return FALSE; + } if(!is_room_for_font(physDev)) PSDRV_EmptyDownloadList(dev, TRUE); diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index b6bbe7a..35a55f0 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -385,6 +385,7 @@ INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) strlen(escaped_title) + 30 ); if(!buf) { WARN("HeapAlloc failed\n"); + HeapFree(GetProcessHeap(), 0, escaped_title); return 0; }

11 years, 6 months

André Hentschel : usp10: Avoid memory leak in ScriptTextOut (coverity).

by Alexandre Julliard

Module: wine Branch: master Commit: 4ee73e69b5e7a01852967f6609a551b01c0311d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ee73e69b5e7a01852967f660… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 30 20:06:57 2012 +0100 usp10: Avoid memory leak in ScriptTextOut (coverity). --- dlls/usp10/usp10.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 9bd55b4..7f181d0 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3246,7 +3246,10 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN rtlGlyphs = heap_alloc(cGlyphs * sizeof(WORD)); if (!rtlGlyphs) + { + heap_free(lpDx); return E_OUTOFMEMORY; + } for (i = 0; i < cGlyphs; i++) rtlGlyphs[i] = pwGlyphs[cGlyphs-1-i];

11 years, 6 months

Francois Gouget : testbot: Cleanup uses of GetKeys(), GetItem(), GetKey() and CreateCollection().

by Alexandre Julliard

Module: tools Branch: master Commit: 403fbbff4d62226b0c27eae84c348d51b2560594 URL: http://source.winehq.org/git/tools.git/?a=commit;h=403fbbff4d62226b0c27eae8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 31 04:47:17 2012 +0100 testbot: Cleanup uses of GetKeys(), GetItem(), GetKey() and CreateCollection(). Specifically: - Use GetItems() instead of GetKeys() where appropriate. This way the code is simpler and we avoid one call to GetItem() for each iteration. - Don't call GetKey() when we already have the object's key in a variable. - Don't store the result of CreateCollection() in a variable if we are only going to use it once. --- testbot/bin/CheckForWinetestUpdate.pl | 11 +++----- testbot/bin/Engine.pl | 17 ++++-------- testbot/bin/Janitor.pl | 38 ++++++++------------------ testbot/bin/RevertVM.pl | 3 +- testbot/bin/WineRunBuild.pl | 10 ++----- testbot/bin/WineRunReconfig.pl | 4 +-- testbot/bin/WineRunTask.pl | 4 +-- testbot/bin/WineSendLog.pl | 3 +- testbot/lib/WineTestBot/Branches.pm | 8 +---- testbot/lib/WineTestBot/CGI/Sessions.pm | 6 +--- testbot/lib/WineTestBot/Jobs.pm | 35 +++++++----------------- testbot/lib/WineTestBot/Patches.pm | 12 +++----- testbot/lib/WineTestBot/PendingPatchSets.pm | 3 +- testbot/lib/WineTestBot/StepsTasks.pm | 8 +---- testbot/lib/WineTestBot/Tasks.pm | 4 +-- testbot/lib/WineTestBot/Users.pm | 6 +--- testbot/lib/WineTestBot/VMs.pm | 9 ++---- testbot/web/JobDetails.pl | 5 +-- testbot/web/Submit.pl | 24 ++++++---------- 19 files changed, 67 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=403fbbff4d62226b0c27…

11 years, 6 months

Francois Gouget : testbot/WineRunTask: Just die when killed.

by Alexandre Julliard

Module: tools Branch: master Commit: 1f15aa170d4dc112db076c082c19d39472d86ecd URL: http://source.winehq.org/git/tools.git/?a=commit;h=1f15aa170d4dc112db076c08… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 31 04:47:05 2012 +0100 testbot/WineRunTask: Just die when killed. This script had a SIGTERM handler that tried to retrieve the task's log file. However this caused a deadlock because testagentd is single-client and WineRunTask still had another connection to it. Anyway, this last ditch attempt to retrieve the log was questionable to begin with. --- testbot/bin/WineRunTask.pl | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index edcfd81..aedfed1 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -228,16 +228,7 @@ my $FullLogFileName = "$TaskDir/log"; my $FullErrFileName = "$TaskDir/err"; my $FullScreenshotFileName = "$TaskDir/screenshot.png"; -sub TermHandler -{ - RetrieveLogFile $Job, $Step, $Task, "C:\\winetest\\$RptFileName", - $FullLogFileName; - TakeScreenshot $VM, $FullScreenshotFileName; - FatalError "Cancelled\n", $FullErrFileName, $Job, $Step, $Task; -} - $VM->Status('running'); -$SIG{TERM} = \&TermHandler; my ($ErrProperty, $ErrMessage) = $VM->Save(); if (defined($ErrMessage)) {

11 years, 6 months

Francois Gouget : testbot/bin: Remove unneeded StepsTasks imports.

by Alexandre Julliard

Module: tools Branch: master Commit: 360d290b8a50a6a09f36b7f5eebf8d25256f85f1 URL: http://source.winehq.org/git/tools.git/?a=commit;h=360d290b8a50a6a09f36b7f5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 31 04:46:59 2012 +0100 testbot/bin: Remove unneeded StepsTasks imports. --- testbot/bin/WineRunBuild.pl | 1 - testbot/bin/WineRunReconfig.pl | 1 - testbot/bin/WineRunTask.pl | 1 - 3 files changed, 0 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index e886801..65da630 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -33,7 +33,6 @@ sub BEGIN use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::Log; -use WineTestBot::StepsTasks; use WineTestBot::Engine::Notify; sub FatalError diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index c4d5c49..ba03fbd 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -33,7 +33,6 @@ sub BEGIN use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::Log; -use WineTestBot::StepsTasks; use WineTestBot::Engine::Notify; sub FatalError diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 9ec499f..edcfd81 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -33,7 +33,6 @@ use POSIX qw(:fcntl_h); use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::Log; -use WineTestBot::StepsTasks; use WineTestBot::Engine::Notify; sub FatalError

11 years, 6 months

Francois Gouget : testbot/web: Remove the shebang line and add a copyright notice.

by Alexandre Julliard

Module: tools Branch: master Commit: 69cb138b894d48156f9a7b1033270feee3fb5a54 URL: http://source.winehq.org/git/tools.git/?a=commit;h=69cb138b894d48156f9a7b10… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 31 04:46:45 2012 +0100 testbot/web: Remove the shebang line and add a copyright notice. The shebang line is useless for web pages and only causes Apache to generate a warning. --- testbot/web/GetFile.pl | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/testbot/web/GetFile.pl b/testbot/web/GetFile.pl index 1590902..697bbbd 100644 --- a/testbot/web/GetFile.pl +++ b/testbot/web/GetFile.pl @@ -1,4 +1,20 @@ -#!/usr/bin/perl -Tw +# Returns the specified Step/Task file. +# +# Copyright 2009 Ge van Geldorp +# +# 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;

11 years, 6 months

Francois Gouget : testbot/bin: Fix the fatal error handling in WineRun{Build, Reconfig}.

by Alexandre Julliard

Module: tools Branch: master Commit: 0b786aab5fd2e3962da71c6182dd1b446699f20a URL: http://source.winehq.org/git/tools.git/?a=commit;h=0b786aab5fd2e3962da71c61… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 31 04:46:36 2012 +0100 testbot/bin: Fix the fatal error handling in WineRun{Build,Reconfig}. Don't call TaskComplete() if we don't have a valid task to start with. A failed task should have an error report file so create it first. --- testbot/bin/WineRunBuild.pl | 21 ++++++++++----------- testbot/bin/WineRunReconfig.pl | 21 ++++++++++----------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index cc0746f..e886801 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -45,6 +45,15 @@ sub FatalError my $TaskKey = defined($Task) ? $Task->GetKey() : "0"; LogMsg "$JobKey/$StepKey/$TaskKey $ErrMessage"; + if ($RptFileName) + { + my $RPTFILE; + if (open RPTFILE, ">>$RptFileName") + { + print RPTFILE $ErrMessage; + close RPTFILE; + } + } if ($Task) { @@ -55,20 +64,10 @@ sub FatalError $Task->VM->Status('dirty'); $Task->VM->Save(); - } - if ($RptFileName) - { - my $RPTFILE; - if (open RPTFILE, ">>$RptFileName") - { - print RPTFILE $ErrMessage; - close RPTFILE; - } + TaskComplete($JobKey, $StepKey, $TaskKey); } - TaskComplete($JobKey, $StepKey, $TaskKey); - exit 1; } diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 9cc1e5e..c4d5c49 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -45,6 +45,15 @@ sub FatalError my $TaskKey = defined($Task) ? $Task->GetKey() : "0"; LogMsg "$JobKey/$StepKey/$TaskKey $ErrMessage"; + if ($RptFileName) + { + my $RPTFILE; + if (open RPTFILE, ">>$RptFileName") + { + print RPTFILE $ErrMessage; + close RPTFILE; + } + } if ($Task) { @@ -55,20 +64,10 @@ sub FatalError $Task->VM->Status('dirty'); $Task->VM->Save(); - } - if ($RptFileName) - { - my $RPTFILE; - if (open RPTFILE, ">>$RptFileName") - { - print RPTFILE $ErrMessage; - close RPTFILE; - } + TaskComplete($JobKey, $StepKey, $TaskKey); } - TaskComplete($JobKey, $StepKey, $TaskKey); - exit 1; }

11 years, 6 months

Francois Gouget : testbot/VMs: Add a function for filtering out offline VMs .

by Alexandre Julliard

Module: tools Branch: master Commit: a29506610abcef2d5c6eab0dac1cf3a993b10e4c URL: http://source.winehq.org/git/tools.git/?a=commit;h=a29506610abcef2d5c6eab0d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 31 04:46:21 2012 +0100 testbot/VMs: Add a function for filtering out offline VMs. --- testbot/bin/CheckForWinetestUpdate.pl | 3 +-- testbot/bin/Engine.pl | 11 ++++------- testbot/lib/WineTestBot/Patches.pm | 3 +-- testbot/lib/WineTestBot/VMs.pm | 7 +++++++ testbot/web/Submit.pl | 4 ++-- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 5ca5aa9..f8a9128 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -86,8 +86,7 @@ sub AddJob $VMs->AddFilter("Type", ["win32", "win64"]); $VMs->AddFilter("Role", ["winetest"]); } - # Don't schedule the 'offline' ones - $VMs->AddFilter("Status", ["reverting", "sleeping", "idle", "running", "dirty"]); + $VMs->FilterNotOffline(); foreach my $VMKey (@{$VMs->SortKeysBySortOrder($VMs->GetKeys())}) { my $VM = $VMs->GetItem($VMKey); diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index b3cfbee..f188212 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -490,14 +490,11 @@ sub InitVMs() # On startup we don't know what state the VMs are in. So consider them all # to be dirty. my $VMs = CreateVMs(); - foreach my $VMKey (@{$VMs->GetKeys()}) + $VMs->FilterNotOffline(); + foreach my $VM (@{$VMs->GetItems()}) { - my $VM = $VMs->GetItem($VMKey); - if ($VM->Status ne "offline") - { - $VM->Status("dirty"); - $VM->Save(); - } + $VM->Status('dirty'); + $VM->Save(); } } diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index c9e0145..d7dca4e 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -238,8 +238,7 @@ sub Submit $VMs = CreateVMs(); $VMs->AddFilter("Type", $Bits eq "32" ? ["win32", "win64"] : ["win64"]); $VMs->AddFilter("Role", ["base"]); - # Don't schedule the 'offline' ones - $VMs->AddFilter("Status", ["reverting", "sleeping", "idle", "running", "dirty"]); + $VMs->FilterNotOffline(); if (@{$VMs->GetKeys()}) { # Create the corresponding Step diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index c616b09..ad6d1b0 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -618,6 +618,13 @@ sub SortKeysBySortOrder return \@SortedKeys; } +sub FilterNotOffline($) +{ + my ($self) = @_; + # All but the offline ones + $self->AddFilter("Status", ["dirty", "reverting", "sleeping", "idle", "running"]); +} + sub FilterHypervisor { my $self = shift; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index d8b222d..233583c 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -238,8 +238,8 @@ sub GenerateFields { $VMs->AddFilter("Type", ["win32", "win64"]); } - # Don't even show the 'offline' ones - $VMs->AddFilter("Status", ["reverting", "sleeping", "idle", "running", "dirty"]); + # Scheduling jobs on offline VMs is not allowed + $VMs->FilterNotOffline(); if ($self->{ShowAll}) { # All but the retired and deleted ones

11 years, 6 months

Francois Gouget : testbot/Janitor: Remove unneeded package qualifiers for the configuration settings.

by Alexandre Julliard

Module: tools Branch: master Commit: 4da7fea6937a8d32cbf132e152af20ea750cabe4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=4da7fea6937a8d32cbf132e1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 31 04:46:11 2012 +0100 testbot/Janitor: Remove unneeded package qualifiers for the configuration settings. --- testbot/bin/Janitor.pl | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 6c398d7..e978aa3 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -42,9 +42,9 @@ $ENV{PATH} = "/usr/bin:/bin"; delete $ENV{ENV}; # Delete obsolete Jobs -if ($WineTestBot::Config::JobPurgeDays != 0) +if ($JobPurgeDays != 0) { - my $DeleteBefore = time() - $WineTestBot::Config::JobPurgeDays * 86400; + my $DeleteBefore = time() - $JobPurgeDays * 86400; my $Jobs = CreateJobs(); foreach my $JobKey (@{$Jobs->GetKeys()}) { @@ -91,9 +91,9 @@ foreach my $SetKey (@{$Sets->GetKeys()}) } # Delete obsolete Patches now that no Job references them -if ($WineTestBot::Config::JobPurgeDays != 0) +if ($JobPurgeDays != 0) { - $DeleteBefore = time() - $WineTestBot::Config::JobPurgeDays * 86400; + $DeleteBefore = time() - $JobPurgeDays * 86400; my $Patches = CreatePatches(); foreach my $PatchKey (@{$Patches->GetKeys()}) { @@ -118,9 +118,9 @@ if ($WineTestBot::Config::JobPurgeDays != 0) } # Archive old Jobs, that is remove all their associated files -if ($WineTestBot::Config::JobArchiveDays != 0) +if ($JobArchiveDays != 0) { - my $ArchiveBefore = time() - $WineTestBot::Config::JobArchiveDays * 86400; + my $ArchiveBefore = time() - $JobArchiveDays * 86400; my $Jobs = CreateJobs(); $Jobs->FilterNotArchived(); foreach my $JobKey (@{$Jobs->GetKeys()})

11 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2012