wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

Francois Gouget : testbot/doc: Update the installation instructions for WineHQ.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: tools Branch: master Commit: 8eb5441f28f368ad4b485898ff9f854023dfca7a URL: http://source.winehq.org/git/tools.git/?a=commit;h=8eb5441f28f368ad4b485898… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 4 15:03:22 2012 +0200 testbot/doc: Update the installation instructions for WineHQ. --- testbot/doc/INSTALL.txt | 80 +++++++++++++++++------------------ testbot/doc/vhost_winetestbot.conf | 12 +++--- testbot/lib/WineTestBot/Config.pm | 6 +- testbot/lib/startup.pl | 2 +- 4 files changed, 49 insertions(+), 51 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index f6ef966..7113c9a 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -28,29 +28,28 @@ Apache setup: perl.load symbolic link in /etc/apache2/mods-enabled. General setup for the web site: -- Create a new system group 'winetest' and a system user 'winetest', - make sure to make user winetest a member of group winetest. -- Unpack the WineTestBot source to /usr/lib/winetestbot (so this - document should be available as /usr/lib/winetestbot/doc/INSTALL.txt). -- Create directory /var/lib/winetestbot, create subdirs 'jobs', - 'latest', 'socket' and 'staging' within this dir. Set owner/group to - winetest/winetest for jobs, latest, socket, but set owner/group to - wwwrun/winetest for staging (where 'wwwrun' is the account your apache - server runs under). Run: - mkdir /var/lib/winetestbot - cd /var/lib/winetestbot +- Create a new system group 'winehq' and a system user 'winehq', + make sure to make user winehq a member of group winehq. +- Clone Wine's tools repository to $HOME/tools (so this document + should be available as $HOME/tools/testbot/doc/INSTALL.txt). +- Create directory $HOME/tools/testbot/var, create subdirs + 'jobs', 'latest', 'socket' and 'staging' and a file called log within this + directory. Set owner/group to wwwrun/winehq for staging (where 'wwwrun' is + the account your apache server runs under). Run: + cd $HOME/tools/testbot + mkdir var + cd var + touch log mkdir jobs latest patches socket staging - chown winetest:winetest jobs latest socket - chown WWWRUN:winetest staging + sudo chown WWWRUN:winehq staging chmod g+w * -- Create an empty logfile /var/log/winetestbot/log and make it writable - to group winetest. - mkdir /var/log/winetestbot - touch /var/log/winetestbot/log - chgrp winetest /var/log/winetestbot/log - chmod g+w /var/log/winetestbot/log -- Install scripts/initd in /etc/init.d/winetestbot and activate it (on - OpenSUSE: "chkconfig winetestbot on", "service winetestbot start"). +- If the installation path is different from the default, then some paths + in the following files will need to be modified: + testbot/lib/startup.pl + testbot/scripts/CheckWineTestBot.pl +- Install scripts/initd in /etc/init.d/winetestbot and adjust the paths and + user name if necessary. Then activate it. + (typically "chkconfig winetestbot on" or "service winetestbot start") - Copy lib/WineTestBot/ConfigLocalTemplate.pl to lib/WineTestBot/ConfigLocal.pl and fill in the options for your site. - Restart Apache, you should now be able to browse to the home page. @@ -68,10 +67,10 @@ General setup for the web site: Janitorial tasks: - Run the Janitor.pl script once per day to perform the janitorial tasks. For instance: - 17 30 * * * /usr/lib/winetestbot/bin/Janitor.pl + 17 30 * * * /home/winehq/tools/testbot/bin/Janitor.pl - Run the CheckWineTestBot.pl script periodically to get notified in case the WineTestBot server dies. For instance: - * 5 * * * /usr/lib/winetestbot/scripts/CheckWineTestBot.pl + * 5 * * * /home/winehq/tools/testbot/scripts/CheckWineTestBot.pl Setup for Wine's patches site: - See http://source.winehq.org/patches/ for reference. @@ -90,15 +89,15 @@ Setup for Wine's patches site: and send that email address to the patches maintainer. - Arrange for the PatchNotificationHandler.pl script to be fed the notification emails. One way to do so would be to use procmail and - add the following lines to the .procmailrc file: + add the following lines to the $HOME/.procmailrc file: :0: * ^Subject: New patches available at - | /usr/lib/winetestbot/bin/PatchNotificationHandler.pl + | $HOME/tools/testbot/bin/PatchNotificationHandler.pl Setup for Winetest updates: - Use a cron job to run CheckForWinetestUpdate.pl periodically. For instance: - * 0 * * * /usr/lib/winetestbot/scripts/CheckForWinetestUpdate.pl + * 0 * * * /home/winehq/tools/testbot/scripts/CheckForWinetestUpdate.pl Setup for wine-patches: - FIXME: WineTestBot now expects to receive the patches to test from @@ -108,14 +107,14 @@ Setup for wine-patches: skipped. - Arrange for the WinePatchesHandler.pl script to be fed the wine-patches emails. One way to do so would be to subscribe the - winetest user to the wine-patches mailing list and to then add the + winehq user to the wine-patches mailing list and to then add the following lines to the .procmailrc file: :0: * ^List-Id: Wine Patch Submissions - | /usr/lib/winetestbot/bin/WinePatchesHandler.pl + | $HOME/tools/testbot/bin/WinePatchesHandler.pl - Or if you have a set of patches to test in the mbox format you can test with: - formail -s /usr/lib/winetestbot/bin/WinePatchesHandler.pl <mbox-file + formail -s $HOME/tools/testbot/bin/WinePatchesHandler.pl <mbox-file 2. VM hosts setup @@ -130,19 +129,18 @@ Dependencies: - Create a Linux VM and set it up so it can generate PE executables with MinGW. For instance on Debian you should install autoconf, - bison, flex, gcc, gcc-mingw-w64, git and make. If you are going to have - 64bit VMs then make sure MinGW can generate 64bit PE executables. + bison, flex, gcc, gcc-mingw-w64, git and make. If you are going to + have 64bit VMs then make sure MinGW can generate 64bit PE executables. - Install netcat. -- Create a new system group 'winetest' and a system user 'winetest', - make sure to make user winetest a member of group winetest. -- Unpack winetestbot source to /usr/lib/winetestbot (so this document - should be available as /usr/lib/winetestbot/doc/INSTALL.txt). -- Create the /var/lib/winetestbot and /var/log/winetestbot directories - and make them writable to group winetest. - mkdir /var/log/winetestbot /var/lib/winetestbot - chgrp winetest /var/log/winetestbot /var/lib/winetestbot - chmod g+w /var/log/winetestbot /var/lib/winetestbot -- Clone the Wine git repository to /var/lib/winetestbot/wine-git. +- Create a new system group 'winehq' and a system user 'winehq', + make sure to make user winehq a member of group winehq. +- Clone Wine's tools repository to $HOME/tools (so this document + should be available as $HOME/tools/testbot/doc/INSTALL.txt). +- Create the $HOME/tools/testbot/var and $HOME/tools/testbot/log + directories and make them writable to group winehq. + mkdir $HOME/tools/testbot/var $HOME/tools/testbot/log + chmod g+w $HOME/tools/testbot/var $HOME/tools/testbot/log +- Clone the Wine git repository to $HOME/tools/testbot/var/wine-git. - Take a snapshot of the running VM. Make sure restoring this snapshot will result in a running build VM. - Register this VM as a build VM on the web site. diff --git a/testbot/doc/vhost_winetestbot.conf b/testbot/doc/vhost_winetestbot.conf index 55061d9..ca55933 100644 --- a/testbot/doc/vhost_winetestbot.conf +++ b/testbot/doc/vhost_winetestbot.conf @@ -1,13 +1,13 @@ <VirtualHost *:80> - DocumentRoot /usr/lib/winetestbot/web/ + DocumentRoot /home/winehq/tools/testbot/web/ ServerName winetestbot.example.com ServerAdmin winetestbot(a)example.com - PerlRequire /usr/lib/winetestbot/lib/startup.pl + PerlRequire /home/winehq/tools/testbot/lib/startup.pl PerlSwitches -Tw - <Directory /usr/lib/winetestbot/web> + <Directory /home/winehq/tools/testbot/web> AddHandler perl-script .pl PerlResponseHandler ModPerl::Registry PerlOptions +ParseHeaders @@ -22,7 +22,7 @@ </VirtualHost> <VirtualHost 192.168.0.1:443> - DocumentRoot /usr/lib/winetestbot/web/ + DocumentRoot /home/winehq/tools/testbot/web/ ServerName winetestbot.example.com ServerAdmin winetestbot(a)example.com @@ -31,10 +31,10 @@ SSLCertificateFile /etc/apache2/ssl.crt/winetestbot.example.com.crt SSLCertificateKeyFile /etc/apache2/ssl.key/winetestbot.example.com.key - PerlRequire /usr/lib/winetestbot/lib/startup.pl + PerlRequire /home/winehq/tools/testbot/lib/startup.pl PerlSwitches -Tw - <Directory /usr/lib/winetestbot/web> + <Directory /home/winehq/tools/testbot/web> AddHandler perl-script .pl PerlResponseHandler ModPerl::Registry PerlOptions +ParseHeaders diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index df40a0c..f547a64 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -50,9 +50,9 @@ require Exporter; $JobArchiveDays $WebHostName); @EXPORT_OK = qw($DbDataSource $DbUsername $DbPassword); -$LogDir = "/var/log/winetestbot"; -$DataDir = "/var/lib/winetestbot"; -$BinDir = "/usr/lib/winetestbot/bin"; +$LogDir = "/home/winehq/tools/testbot/var"; +$DataDir = "/home/winehq/tools/testbot/var"; +$BinDir = "/home/winehq/tools/testbot/bin"; $MaxRevertingVMs = 1; $MaxRunningVMs = 2; diff --git a/testbot/lib/startup.pl b/testbot/lib/startup.pl index 1016447..ca67505 100644 --- a/testbot/lib/startup.pl +++ b/testbot/lib/startup.pl @@ -16,7 +16,7 @@ use strict; -use lib qw(/usr/lib/winetestbot/lib); +use lib qw(/home/winehq/tools/testbot/lib); use ObjectModel::CGI::Page; use WineTestBot::CGI::PageBase;

1 0

Francois Gouget : testbot/scripts: Update the init. d script so it works with the LSB init functions.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: tools Branch: master Commit: f00a4ec23c51d59934f209fb71110e11b72ca517 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f00a4ec23c51d59934f209fb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 4 14:40:35 2012 +0200 testbot/scripts: Update the init.d script so it works with the LSB init functions. This makes it work on Debian. --- testbot/scripts/initd | 340 +++++++++++++++++++++++++++++-------------------- 1 files changed, 200 insertions(+), 140 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=f00a4ec23c51d59934f2…

1 0

Francois Gouget : testbot/Engine: Trace the start and stop of the WineTestBot Engine.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: tools Branch: master Commit: 368982518d0c3a68792bba39c9ce990564a6f8c5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=368982518d0c3a68792bba39… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 4 14:40:21 2012 +0200 testbot/Engine: Trace the start and stop of the WineTestBot Engine. --- testbot/bin/Engine.pl | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 947c24c..dfd4923 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -46,6 +46,7 @@ use WineTestBot::VMs; sub FatalError { LogMsg "Engine: ", @_; + LogMsg "Engine: WineTestBot Engine shutdown caused by a fatal error\n"; exit 1; } @@ -637,6 +638,7 @@ sub main $SIG{CHLD} = \&REAPER; $WineTestBot::Engine::Notify::RunningInEngine = 1; + LogMsg "Engine: Starting the WineTestBot Engine\n"; InitVMs(); @@ -758,6 +760,7 @@ sub main } } + LogMsg "Engine: Normal WineTestBot Engine shutdown\n"; return 0; }

1 0

Francois Gouget : testbot/lib: Tweak Log. pm to not open the log file for every message.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: tools Branch: master Commit: 9267a1169b5d362c9499683b35a74a1454d4d309 URL: http://source.winehq.org/git/tools.git/?a=commit;h=9267a1169b5d362c9499683b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 4 14:40:08 2012 +0200 testbot/lib: Tweak Log.pm to not open the log file for every message. Also issue a meaningful message to stderr if we cannot open the log file. --- testbot/lib/WineTestBot/Log.pm | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/Log.pm b/testbot/lib/WineTestBot/Log.pm index a6762cc..6883968 100644 --- a/testbot/lib/WineTestBot/Log.pm +++ b/testbot/lib/WineTestBot/Log.pm @@ -32,16 +32,28 @@ require Exporter; @ISA = qw(Exporter); @EXPORT = qw(&LogMsg); -sub LogMsg +my $logfile; +sub LogMsg(@) { - my $oldumask = umask(002); - my $LOGFILE; - if (open LOGFILE, ">>$LogDir/log") + if (!defined $logfile) { - print LOGFILE scalar localtime, " ", @_; - close LOGFILE; + my $oldumask = umask(002); + if (open($logfile, ">>", "$LogDir/log")) + { + # Flush after each print + my $tmp=select($logfile); + $| = 1; + select($tmp); + } + else + { + require File::Basename; + print STDERR File::Basename::basename($0), ":warning: could not open '$LogDir/log' for writing: $!\n"; + $logfile = undef; + } + umask($oldumask); } - umask($oldumask); + print $logfile scalar localtime, " ", @_ if ($logfile); } 1;

1 0

Francois Gouget : testbot/scripts: Tweak CheckWineTestBot. pl to autodetect WineTestBot's lib directory.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: tools Branch: master Commit: a3d18e577b233c443a3ddd2bc2c2f85ab3771be6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=a3d18e577b233c443a3ddd2b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 4 14:38:08 2012 +0200 testbot/scripts: Tweak CheckWineTestBot.pl to autodetect WineTestBot's lib directory. --- testbot/scripts/CheckWineTestBot.pl | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/testbot/scripts/CheckWineTestBot.pl b/testbot/scripts/CheckWineTestBot.pl index 529fd94..2793a17 100755 --- a/testbot/scripts/CheckWineTestBot.pl +++ b/testbot/scripts/CheckWineTestBot.pl @@ -19,7 +19,14 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA use strict; -use lib "/usr/lib/winetestbot/lib"; + +my $Dir; +sub BEGIN +{ + $0 =~ m=^(.*)/[^/]*$=; + $Dir = $1; +} +use lib "$Dir/../lib"; use WineTestBot::Config; use WineTestBot::Engine::Notify;

1 0

Jacek Caban : jscript: Removed useless return statement in jsval_number.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 730479e6a4b00d9143bd4a6f7accccb726559257 URL: http://source.winehq.org/git/wine.git/?a=commit;h=730479e6a4b00d9143bd4a6f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 3 17:54:14 2012 +0200 jscript: Removed useless return statement in jsval_number. --- dlls/jscript/jsval.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/jsval.h b/dlls/jscript/jsval.h index d355b5e..c75204f 100644 --- a/dlls/jscript/jsval.h +++ b/dlls/jscript/jsval.h @@ -154,7 +154,6 @@ static inline jsval_t jsval_number(double n) ret.u.s.tag = 0x7ff00000; } } - return ret; #else ret.type = JSV_NUMBER; ret.u.n = n;

1 0

Jacek Caban : mshtml: Added ActiveX event binding test.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 5c15ca13d2c960b02ea8b8f8bce6bee9a55c1e22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c15ca13d2c960b02ea8b8f8b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 3 17:26:46 2012 +0200 mshtml: Added ActiveX event binding test. --- .gitignore | 2 + dlls/mshtml/tests/Makefile.in | 3 + dlls/mshtml/tests/activex.c | 341 +++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/rsrc.rc | 3 + dlls/mshtml/tests/test_tlb.idl | 55 +++++++ 5 files changed, 401 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c15ca13d2c960b02ea8b…

1 0

Jacek Caban : mshtml: Added support for binding ActiveX events with script event attribute.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: eda756dbb54d44b09441b1d53549a062c54d8822 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eda756dbb54d44b09441b1d53… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 3 17:26:28 2012 +0200 mshtml: Added support for binding ActiveX events with script event attribute. --- dlls/mshtml/pluginhost.c | 370 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/pluginhost.h | 3 + dlls/mshtml/script.c | 7 +- 3 files changed, 378 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eda756dbb54d44b09441b…

1 0

Marcus Meissner : advapi32: Avoid memory leak on pipe read failure ( Coverity).
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: aaabec2b3376c3012eceb7f9ae247e2b67949e18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaabec2b3376c3012eceb7f9a… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Oct 3 16:52:05 2012 +0200 advapi32: Avoid memory leak on pipe read failure (Coverity). --- dlls/advapi32/service.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index f69e78f..49d56d1 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -402,11 +402,13 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) { if (GetLastError() != ERROR_BROKEN_PIPE) ERR( "pipe read failed error %u\n", GetLastError() ); + HeapFree( GetProcessHeap(), 0, data ); break; } if (count != data_size) { ERR( "partial pipe read %u/%u\n", count, data_size ); + HeapFree( GetProcessHeap(), 0, data ); break; } }

1 0

Marcus Meissner : advapi32: Free wstr in error case to avoid leak (Coverity ).
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 91a767d75b12d67cabfebeb22b7cf176c8b6e4b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91a767d75b12d67cabfebeb22… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Oct 3 16:21:35 2012 +0200 advapi32: Free wstr in error case to avoid leak (Coverity). --- dlls/advapi32/security.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 8b60dd6..c86ca17 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -4861,17 +4861,25 @@ BOOL WINAPI ConvertSecurityDescriptorToStringSecurityDescriptorW(PSECURITY_DESCR wstr = wptr = LocalAlloc(0, (len + 1)*sizeof(WCHAR)); if (RequestedInformation & OWNER_SECURITY_INFORMATION) - if (!DumpOwner(SecurityDescriptor, &wptr, NULL)) + if (!DumpOwner(SecurityDescriptor, &wptr, NULL)) { + LocalFree (wstr); return FALSE; + } if (RequestedInformation & GROUP_SECURITY_INFORMATION) - if (!DumpGroup(SecurityDescriptor, &wptr, NULL)) + if (!DumpGroup(SecurityDescriptor, &wptr, NULL)) { + LocalFree (wstr); return FALSE; + } if (RequestedInformation & DACL_SECURITY_INFORMATION) - if (!DumpDacl(SecurityDescriptor, &wptr, NULL)) + if (!DumpDacl(SecurityDescriptor, &wptr, NULL)) { + LocalFree (wstr); return FALSE; + } if (RequestedInformation & SACL_SECURITY_INFORMATION) - if (!DumpSacl(SecurityDescriptor, &wptr, NULL)) + if (!DumpSacl(SecurityDescriptor, &wptr, NULL)) { + LocalFree (wstr); return FALSE; + } *wptr = 0; TRACE("ret: %s, %d\n", wine_dbgstr_w(wstr), len);

1 0

← Newer
1
...
79
80
81
82
83
84
85
...
96
Older →

Jump to page:

2025

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