March 2013 - Wine-commits - list.winehq.org

Piotr Caban : wininet: Rename CACHEFILE_ENTRY to entry_header.
by Alexandre Julliard 13 Mar '13

13 Mar '13

Module: wine Branch: master Commit: 9d98ced7eccd200d81d625828c20ae499bca0b65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d98ced7eccd200d81d625828… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 13 17:16:23 2013 +0100 wininet: Rename CACHEFILE_ENTRY to entry_header. --- dlls/wininet/urlcache.c | 156 +++++++++++++++++++++++------------------------ 1 files changed, 76 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d98ced7eccd200d81d62…

1 0

Piotr Caban : wininet: Rename URL_CACHEFILE_ENTRY to entry_url.
by Alexandre Julliard 13 Mar '13

13 Mar '13

Module: wine Branch: master Commit: a448427bf957be91395ed087a3d3d9777ab85a4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a448427bf957be91395ed087a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 13 17:16:42 2013 +0100 wininet: Rename URL_CACHEFILE_ENTRY to entry_url. --- dlls/wininet/urlcache.c | 382 +++++++++++++++++++++++------------------------ 1 files changed, 190 insertions(+), 192 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a448427bf957be91395ed…

1 0

Vincent Povirk : gdiplus: Also get a DC for drawing WMF images.
by Alexandre Julliard 13 Mar '13

13 Mar '13

Module: wine Branch: master Commit: 6214e5b92cf79eade02fc5abaa72b38ef78c2d70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6214e5b92cf79eade02fc5aba… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 12 15:53:55 2013 -0500 gdiplus: Also get a DC for drawing WMF images. --- dlls/gdiplus/metafile.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 4345ece..ae905fc 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -536,7 +536,9 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics *graphics, memcpy(real_metafile->playback_points, destPoints, sizeof(PointF) * 3); stat = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, real_metafile->playback_points, 3); - if (stat == Ok && metafile->metafile_type == MetafileTypeEmf) + if (stat == Ok && (metafile->metafile_type == MetafileTypeEmf || + metafile->metafile_type == MetafileTypeWmfPlaceable || + metafile->metafile_type == MetafileTypeWmf)) stat = METAFILE_PlaybackGetDC((GpMetafile*)metafile); if (stat == Ok)

1 0

Francois Gouget : winetest: Link the individual test result pages to the configuration / dll versions page.
by Alexandre Julliard 13 Mar '13

13 Mar '13

Module: tools Branch: master Commit: 703b769e28a5be47d353c44e111aa7f463140e5e URL: http://source.winehq.org/git/tools.git/?a=commit;h=703b769e28a5be47d353c44e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 15:07:36 2013 +0100 winetest: Link the individual test result pages to the configuration / dll versions page. --- winetest/dissect | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index f2e18a2..fe80a44 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -407,6 +407,7 @@ for (my $i = 0; $i <= $#boxes; $i++) print FILE "<div class=\"navbar\">"; print FILE $boxes[$i]->{prev} ? "<a href=\"./$boxes[$i]->{prev}.html\">prev</a> | " : "prev | "; print FILE $boxes[$i]->{next} ? "<a href=\"./$boxes[$i]->{next}.html\">next</a> | " : "next | "; + print FILE "<a href=\"version.html\">info</a> | "; printf FILE "<a href=\"report.html%s\">full report</a> | ", $i ? "#$boxes[$i]->{id}" : ""; print FILE "<a href=\"..\">summary</a> | <a href=\"../..\">index</a></div>\n";

1 0

Francois Gouget : testbot/TestAgent: Time the file transfers to provide speed statistics.
by Alexandre Julliard 13 Mar '13

13 Mar '13

Module: tools Branch: master Commit: 0dede3eb003bb3682ec3ce22ba10fb8daa2880a2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0dede3eb003bb3682ec3ce22… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 15:33:45 2013 +0100 testbot/TestAgent: Time the file transfers to provide speed statistics. --- testbot/lib/WineTestBot/TestAgent.pm | 37 ++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 074e4f0..f3d5f0a 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -53,6 +53,36 @@ sub debug(@) print STDERR @_ if ($Debug); } +my $time_hires; +sub now() +{ + local $@; + $time_hires=eval { require Time::HiRes } if (!defined $time_hires); + return eval { Time::HiRes::time() } if ($time_hires); + return time(); +} + +sub trace_speed($$) +{ + if ($Debug) + { + my ($Bytes, $Elapsed) = @_; + my $Speed = ""; + if ($Elapsed) + { + $Speed = $Bytes * 8 / $Elapsed / 1000; + $Speed = $Speed < 1000 ? sprintf(" (%.1fKb/s)", $Speed) : + sprintf(" (%.1fMb/s)", $Speed / 1000); + } + $Bytes = $Bytes < 8 * 1024 ? "$Bytes bytes" : + $Bytes < 8 * 1024 * 1024 ? sprintf("%.1fKiB", $Bytes / 1024) : + sprintf("%.1fMiB", $Bytes / 1024 / 1024); + $Elapsed = $Elapsed < 1 ? sprintf("%.1fms", $Elapsed * 1000) : + sprintf("%.1fs", $Elapsed); + debug("Transferred $Bytes in $Elapsed$Speed\n"); + } +} + sub new($$$;$) { my ($class, $Hostname, $Port, $Tunnel) = @_; @@ -396,6 +426,7 @@ sub _RecvFile($$$) my $Size = $self->_ExpectEntryHeader('d'); return undef if (!defined $Size); + my ($Bytes, $Start) = (0, now()); my $Success; eval { @@ -421,6 +452,7 @@ sub _RecvFile($$$) } $Size -= $r; my $w = syswrite($Dst, $Buffer, $r, 0); + $Bytes += $w if (defined $w); if (!defined $w or $w != $r) { alarm(0); @@ -437,6 +469,8 @@ sub _RecvFile($$$) $@ = "timed out while receiving '$Filename'" if ($@ =~ /^timeout /); $self->_SetError($FATAL, $@); } + + trace_speed($Bytes, now() - $Start); return $Success; } @@ -701,6 +735,7 @@ sub _SendFile($$$) return undef if (!defined $self->{fd}); debug(" SendFile($Filename)\n"); + my ($Bytes, $Start) = (0, now()); my $Success; eval { @@ -743,6 +778,8 @@ sub _SendFile($$$) $@ = "timed out while sending '$Filename'" if ($@ =~ /^timeout /); $self->_SetError($FATAL, $@); } + + trace_speed($Bytes, now() - $Start); return $Success; }

1 0

Francois Gouget : testbot/TestAgent: Enable libssh2 compression.
by Alexandre Julliard 13 Mar '13

13 Mar '13

Module: tools Branch: master Commit: b64151902405857b6a193e60782872470c482e96 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b64151902405857b6a193e60… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 15:33:51 2013 +0100 testbot/TestAgent: Enable libssh2 compression. --- testbot/lib/WineTestBot/TestAgent.pm | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index f3d5f0a..2b834f7 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -858,6 +858,11 @@ sub _Connect($) require Net::SSH2; $self->{ssh} = Net::SSH2->new(); $self->{ssh}->debug(1) if ($Debug > 1); + + # Set up compression + $self->{ssh}->method('COMP_CS', 'zlib', 'none'); + $self->{ssh}->method('COMP_SC', 'zlib', 'none'); + if (!$self->{ssh}->connect($self->{sshfd})) { $self->_SetError($FATAL, "Unable to connect to the SSH server: " . $self->_ssherror());

1 0

Francois Gouget : testbot/TestAgent: Send file data in 64KiB chunks to ( slightly) reduce overhead.
by Alexandre Julliard 13 Mar '13

13 Mar '13

Module: tools Branch: master Commit: 3e03d63c5a11c73a280b8fcb828f083db57f5f4d URL: http://source.winehq.org/git/tools.git/?a=commit;h=3e03d63c5a11c73a280b8fcb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 15:33:55 2013 +0100 testbot/TestAgent: Send file data in 64KiB chunks to (slightly) reduce overhead. --- testbot/lib/WineTestBot/TestAgent.pm | 2 +- testbot/src/testagentd/testagentd.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 2b834f7..645a18c 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -27,7 +27,7 @@ require Exporter; @ISA = qw(Exporter); @EXPORT_OK = qw(new); -my $BLOCK_SIZE = 4096; +my $BLOCK_SIZE = 65536; my $RPC_PING = 0; my $RPC_GETFILE = 1; diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index c06af72..534495d 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -37,7 +37,7 @@ */ #define PROTOCOL_VERSION "testagentd 1.2" -#define BLOCK_SIZE 4096 +#define BLOCK_SIZE 65536 const char *name0; int opt_debug = 0;

1 0

Francois Gouget : testbot: Don't hardcode the WineTestBot name.
by Alexandre Julliard 13 Mar '13

13 Mar '13

Module: tools Branch: master Commit: 9e7cc538135367f1846b782e7b5b1caf609aca8c URL: http://source.winehq.org/git/tools.git/?a=commit;h=9e7cc538135367f1846b782e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 15:37:28 2013 +0100 testbot: Don't hardcode the WineTestBot name. --- testbot/bin/RevertVM.pl | 2 +- testbot/bin/WineSendLog.pl | 4 ++-- testbot/lib/WineTestBot/ConfigLocalTemplate.pl | 8 ++++---- testbot/lib/WineTestBot/Users.pm | 4 ++-- testbot/scripts/CheckWineTestBot.pl | 2 +- testbot/web/Feedback.pl | 4 ++-- testbot/web/Register.pl | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/RevertVM.pl index 7d3359e..f9edeb7 100755 --- a/testbot/bin/RevertVM.pl +++ b/testbot/bin/RevertVM.pl @@ -57,7 +57,7 @@ sub FatalError my $VMSnapshot = $VM->IdleSnapshot; open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); print SENDMAIL <<"EOF"; -From: <$RobotEMail> (Marvin) +From: $RobotEMail To: $AdminEMail Subject: VM $VMKey offline diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 04e9009..515b6c8 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -190,7 +190,7 @@ sub SendLog my @SortedKeys = sort @{$StepsTasks->GetKeys()}; open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); - print SENDMAIL "From: Marvin <$RobotEMail>\n"; + print SENDMAIL "From: $RobotEMail\n"; print SENDMAIL "To: $To\n"; my $Subject = "TestBot job " . $Job->Id . " results"; my $Description = $Job->GetDescription(); @@ -425,7 +425,7 @@ EOF if ($Messages) { open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); - print SENDMAIL "From: Marvin <$RobotEMail>\n"; + print SENDMAIL "From: $RobotEMail\n"; print SENDMAIL "To: $To\n"; print SENDMAIL "Cc: $WinePatchCc\n"; print SENDMAIL "Subject: Re: ", $Job->Patch->Subject, "\n"; diff --git a/testbot/lib/WineTestBot/ConfigLocalTemplate.pl b/testbot/lib/WineTestBot/ConfigLocalTemplate.pl index 38e6a3a..544ac3e 100644 --- a/testbot/lib/WineTestBot/ConfigLocalTemplate.pl +++ b/testbot/lib/WineTestBot/ConfigLocalTemplate.pl @@ -31,10 +31,10 @@ $WineTestBot::Config::DbUsername = "winetestbot"; # The password of the database account $WineTestBot::Config::DbPassword = ""; -# Email address of the WineTestBot administrator +# Name and email address of the WineTestBot administrator $WineTestBot::Config::AdminEMail = undef; -# From address of mails sent by WineTestBot to users +# Name and address for the 'From' field of mails sent by WineTestBot $WineTestBot::Config::RobotEMail = undef; # If set, sends the results to the specified email address instead of the @@ -42,8 +42,8 @@ $WineTestBot::Config::RobotEMail = undef; # can provide useful results to Wine developers. $WineTestBot::Config::WinePatchToOverride = $WineTestBot::Config::AdminEMail; -# If set, CC the results to the specified email address, for instance the -# wine-devel mailing list. +# If set, CC the results to the specified name + email address, for instance +# the wine-devel mailing list. $WineTestBot::Config::WinePatchCc = ""; # Email address to send the results to for integration with the Wine Patches diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index 2e6eedc..54c07bf 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -149,7 +149,7 @@ sub Approve my $Recipient = $self->GetEMailRecipient(); open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); print SENDMAIL <<"EOF"; -From: <$RobotEMail> (Marvin) +From: $RobotEMail To: $Recipient Subject: winetestbot account request @@ -189,7 +189,7 @@ sub SendResetCode my $Recipient = $self->GetEMailRecipient(); open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); print SENDMAIL <<"EOF"; -From: <$RobotEMail> (Marvin) +From: $RobotEMail To: $Recipient Subject: winetestbot account request diff --git a/testbot/scripts/CheckWineTestBot.pl b/testbot/scripts/CheckWineTestBot.pl index 6415dc3..5e8a053 100755 --- a/testbot/scripts/CheckWineTestBot.pl +++ b/testbot/scripts/CheckWineTestBot.pl @@ -49,7 +49,7 @@ if (! PingEngine()) open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); print SENDMAIL <<"EOF"; -From: <$RobotEMail> (Marvin) +From: $RobotEMail To: $AdminEMail Subject: WineTestBot engine died diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index 626a7f8..c266ce4 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -111,8 +111,8 @@ sub OnSend open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); print SENDMAIL <<"EOF"; -From: <$RobotEMail> (Marvin) -To: <$AdminEMail> +From: $RobotEMail +To: $AdminEMail Subject: winetestbot feedback EOF diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl index 6d8e7f4..766d363 100644 --- a/testbot/web/Register.pl +++ b/testbot/web/Register.pl @@ -116,8 +116,8 @@ sub OnSendRequest open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); print SENDMAIL <<"EOF"; -From: <$RobotEMail> (Marvin) -To: <$AdminEMail> +From: $RobotEMail +To: $AdminEMail Subject: winetestbot account request $Msg

1 0

Francois Gouget : testbot/CheckForWinetestUpdate: Use a shorter name for the WineTest jobs.
by Alexandre Julliard 13 Mar '13

13 Mar '13

Module: tools Branch: master Commit: 918d9a53cca257efa6d384dde4c4d075aeee2559 URL: http://source.winehq.org/git/tools.git/?a=commit;h=918d9a53cca257efa6d384dd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:19:03 2013 +0100 testbot/CheckForWinetestUpdate: Use a shorter name for the WineTest jobs. --- testbot/bin/CheckForWinetestUpdate.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 2e28cdc..c776fe5 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -60,7 +60,7 @@ sub AddJob my $NewJob = $Jobs->Add(); $NewJob->User(WineTestBot::Users->GetBatchUser()); $NewJob->Priority($BaseJob && $Bits == 32 ? 6 : 7); - $NewJob->Remarks("http://test.winehq.org job - " . + $NewJob->Remarks("WineTest: " . ($Bits == 32 ? ($BaseJob ? "base" : "other") : "64-bit") . " VMs");

1 0

Francois Gouget : testbot: Fix a typo in the MySQL setup section.
by Alexandre Julliard 13 Mar '13

13 Mar '13

Module: tools Branch: master Commit: 11bfc2af4c49a4a544eaf00e2b7f5517512333c6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=11bfc2af4c49a4a544eaf00e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:37:21 2013 +0100 testbot: Fix a typo in the MySQL setup section. The sample winetestbot.sql script now sets up the required winetestbot privileges. Also some more documentation formatting tweaks. --- testbot/doc/INSTALL.txt | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 4e4e33c..4c14668 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -14,10 +14,8 @@ Dependencies: MySQL setup: - Create a new 'winetestbot' database and its tables using the ddl/winetestbot.sql script. -- Set the 'winetestbot' user password - INSERT, UPDATE and DELETE on all tables in the database. So this is - something like: - SET PASSWORD FOR 'winetestbot'@'localhost' = PASSWORD('mypassword'); +- Make sure to change the 'winetestbot' user password. Typically: + SET PASSWORD FOR 'winetestbot'@'localhost' = PASSWORD('mypassword'); Apache setup: - Create a new virtual host, use doc/vhost_winetestbot.conf as a @@ -55,11 +53,11 @@ General setup for the web site: - Register a new account for yourself. - Using the mysql client, set the ResetCode in your Users entry to a known value, e.g. - mysql> update Users set ResetCode = 'a' where Name = '<username>'; + mysql> update Users set ResetCode = 'a' where Name = '<username>'; - Browse to http://server.name/ResetPassword.pl and enter your username, the resetcode you just updated and a new password. - Make yourself admin by adding a row to UserRoles: - mysql> insert into UserRoles values('<username>', 'admin'); + mysql> insert into UserRoles values('<username>', 'admin'); - When you refresh the home page, you should now have an "Admin" menu in the sidebar. @@ -113,7 +111,7 @@ Setup for wine-patches: | $HOME/tools/testbot/bin/WinePatchesMLSubmit.pl - Or if you have a set of patches to test in the mbox format you can test with: - formail -ds $HOME/tools/testbot/bin/WinePatchesMLSubmit.pl <mbox-file + formail -ds $HOME/tools/testbot/bin/WinePatchesMLSubmit.pl <mbox-file 2. VM hosts setup

1 0