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

Nikolay Sivov : msxml3: Process CDATA section before reporting it.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: 6874bf3c4ed75c0acb2b1f15fb00278656b44200 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6874bf3c4ed75c0acb2b1f15f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 13 15:04:59 2013 +0400 msxml3: Process CDATA section before reporting it. --- dlls/msxml3/saxreader.c | 155 +++++++++++++++++++++++-------------- dlls/msxml3/tests/saxreader.c | 175 ++++++++++++++++++++++++++++++----------- 2 files changed, 225 insertions(+), 105 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6874bf3c4ed75c0acb2b1…

1 0

Jacek Caban : winnt.h: Added GCC variant of DEFAULT_UNREACHABLE macro.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: 15448724be0cd8eec6bb137f85c5f226d915a1a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15448724be0cd8eec6bb137f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 13 10:43:46 2013 +0100 winnt.h: Added GCC variant of DEFAULT_UNREACHABLE macro. --- include/winnt.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 0dac8b1..b701de3 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -376,8 +376,10 @@ extern "C" { /* Eliminate Microsoft C/C++ compiler warning 4715 */ #if defined(_MSC_VER) && (_MSC_VER > 1200) # define DEFAULT_UNREACHABLE default: __assume(0) +#elif defined(__clang__) || (defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)))) +# define DEFAULT_UNREACHABLE default: __builtin_unreachable() #else -# define DEFAULT_UNREACHABLE +# define DEFAULT_UNREACHABLE default: #endif /* Error Masks */

1 0

Vincent Povirk : gdiplus: Also get a DC for drawing WMF images.
by Alexandre Julliard March 13, 2013

March 13, 2013

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 : testbot: Tighten handling of the VM status in the task scripts.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: aae43a05737a693f784c8a719b6084b44c5411fc URL: http://source.winehq.org/git/tools.git/?a=commit;h=aae43a05737a693f784c8a71… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:52:30 2013 +0100 testbot: Tighten handling of the VM status in the task scripts. --- testbot/bin/WineRunBuild.pl | 15 +++++++++++++-- testbot/bin/WineRunReconfig.pl | 17 ++++++++++++++--- testbot/bin/WineRunTask.pl | 15 ++++++++++----- 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 236d3d0..3f5b592 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -61,8 +61,11 @@ sub FatalError($$$$) $Job->UpdateStatus(); my $VM = $Task->VM; - $VM->Status('dirty'); - $VM->Save(); + if ($VM->Status eq 'running') + { + $VM->Status('dirty'); + $VM->Save(); + } TaskComplete($JobKey, $StepKey, $TaskKey); exit 1; @@ -217,6 +220,13 @@ if (! defined($BaseName)) FatalError "Can't determine base name\n", $FullErrFileName, $Job, $Task; } +# Normally the Engine has already set the VM status to 'running'. +# Do it anyway in case we're called manually from the command line. +if ($VM->Status ne "idle" and $VM->Status ne "running") +{ + FatalError "The VM is not ready for use (" . $VM->Status . ")\n", + $FullErrFileName, $Job, $Task; +} $VM->Status('running'); my ($ErrProperty, $ErrMessage) = $VM->Save(); if (defined($ErrMessage)) @@ -224,6 +234,7 @@ if (defined($ErrMessage)) FatalError "Can't set VM status to running: $ErrMessage\n", $FullErrFileName, $Job, $Task; } + my $FileName = $Step->FileName; if (!$TA->SendFile("$StepDir/$FileName", "staging/$FileName", 0)) { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 7588045..0333705 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -61,8 +61,11 @@ sub FatalError($$$$) $Job->UpdateStatus(); my $VM = $Task->VM; - $VM->Status('dirty'); - $VM->Save(); + if ($VM->Status eq 'running') + { + $VM->Status('dirty'); + $VM->Save(); + } TaskComplete($JobKey, $StepKey, $TaskKey); exit 1; @@ -190,13 +193,21 @@ my $FullRawlogFileName = "$TaskDir/rawlog"; my $FullLogFileName = "$TaskDir/log"; my $FullErrFileName = "$TaskDir/err"; +# Normally the Engine has already set the VM status to 'running'. +# Do it anyway in case we're called manually from the command line. +if ($VM->Status ne "idle" and $VM->Status ne "running") +{ + FatalError "The VM is not ready for use (" . $VM->Status . ")\n", + $FullErrFileName, $Job, $Task; +} $VM->Status('running'); my ($ErrProperty, $ErrMessage) = $VM->Save(); -if (defined($ErrMessage)) +if (defined $ErrMessage) { FatalError "Can't set VM status to running: $ErrMessage\n", $FullErrFileName, $Job, $Task; } + my $Script = "#!/bin/sh\n" . "rm -f Reconfig.log\n" . "../bin/build/Reconfig.pl >>Reconfig.log 2>&1\n"; diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index ffbb421..abb92e0 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -204,9 +204,16 @@ my $FullLogFileName = "$TaskDir/log"; my $FullErrFileName = "$TaskDir/err"; my $FullScreenshotFileName = "$TaskDir/screenshot.png"; +# Normally the Engine has already set the VM status to 'running'. +# Do it anyway in case we're called manually from the command line. +if ($VM->Status ne "idle" and $VM->Status ne "running") +{ + FatalError "The VM is not ready for use (" . $VM->Status . ")\n", + $FullErrFileName, $Job, $Step, $Task; +} $VM->Status('running'); my ($ErrProperty, $ErrMessage) = $VM->Save(); -if (defined($ErrMessage)) +if (defined $ErrMessage) { FatalError "Can't set VM status to running: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; @@ -349,10 +356,8 @@ if (!defined $TestFailures) $Task->TestFailures($TestFailures); $Task->Save(); $Job->UpdateStatus(); -if ($Task->VM->Role ne "base") -{ - $Task->VM->PowerOff(); -} + +$VM->PowerOff() if ($VM->Role ne "base"); $VM->Status('dirty'); $VM->Save();

1 0

Francois Gouget : testbot/build: Staging is handled before starting the build task.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: 90a5a8d483a7132871465580f8f841e9fa97eb21 URL: http://source.winehq.org/git/tools.git/?a=commit;h=90a5a8d483a7132871465580… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:51:08 2013 +0100 testbot/build: Staging is handled before starting the build task. --- testbot/bin/WineRunBuild.pl | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 7fd87b2..236d3d0 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -217,15 +217,8 @@ if (! defined($BaseName)) FatalError "Can't determine base name\n", $FullErrFileName, $Job, $Task; } -my $ErrMessage = $Step->HandleStaging($JobId); -if (defined($ErrMessage)) -{ - FatalError "$ErrMessage\n", $FullErrFileName, $Job, $Task; -} - $VM->Status('running'); -my $ErrProperty; -($ErrProperty, $ErrMessage) = $VM->Save(); +my ($ErrProperty, $ErrMessage) = $VM->Save(); if (defined($ErrMessage)) { FatalError "Can't set VM status to running: $ErrMessage\n",

1 0

Francois Gouget : testbot/build: Remove an unused variable in WineRunBuild. pl.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: d26f41afd04edda9c8a23a56217ab6922deadbb2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d26f41afd04edda9c8a23a56… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:49:58 2013 +0100 testbot/build: Remove an unused variable in WineRunBuild.pl. --- testbot/bin/WineRunBuild.pl | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 20a43da..728777a 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -186,7 +186,6 @@ my $TA = $VM->GetAgent(); LogMsg "Task $JobId/$StepNo/$TaskNo started\n"; -my $RptFileName = $VM->Name . ".rpt"; my $StepDir = "$DataDir/jobs/$JobId/$StepNo"; my $TaskDir = "$StepDir/$TaskNo"; my $FullRawlogFileName = "$TaskDir/rawlog";

1 0

Francois Gouget : testbot/TestAgent: Enable libssh2 compression.
by Alexandre Julliard March 13, 2013

March 13, 2013

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/build: Clean up FatalError() and stop abusing it.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: 4c9e159874c219053ce5e9ba1d3964912f8d0987 URL: http://source.winehq.org/git/tools.git/?a=commit;h=4c9e159874c219053ce5e9ba… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:51:01 2013 +0100 testbot/build: Clean up FatalError() and stop abusing it. If not given an error file and a task it's equivalent to a simple LogMsg() + exit(). --- testbot/bin/WineRunBuild.pl | 91 +++++++++++++++++++--------------------- testbot/bin/WineRunReconfig.pl | 85 ++++++++++++++++++------------------- testbot/bin/WineRunTask.pl | 90 ++++++++++++++++++--------------------- 3 files changed, 125 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=4c9e159874c219053ce5…

1 0

Francois Gouget : testbot: Document the user account management procedures.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: eb909209aa2686f6fd5ba093e39fbb11b9ce35d6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=eb909209aa2686f6fd5ba093… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:37:38 2013 +0100 testbot: Document the user account management procedures. --- testbot/README | 25 +++++++++++++++++++++++++ testbot/doc/INSTALL.txt | 3 +++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/testbot/README b/testbot/README index 4f4cbc9..f15f82a 100644 --- a/testbot/README +++ b/testbot/README @@ -68,3 +68,28 @@ WineTestBot: --------------- See the doc/INSTALL.txt file. + + +5. USER ACCOUNT MANAGEMENT +-------------------------- + +When a user asks for an account, a provisional account is created immediately +but has to be 'activated' before it can be used. Also an email is sent to the +WineTestBot administrators. + +If the request is considered to be illegitimate / spam, the administrator +should directly delete the provisional account. Otherwise the account should +be approved. + +Approving the account will generate a 'password reset code' and send an email +to the user with a URL to visit to set the account password. That will activate +the account and make it usable. + + +Notes: +* Existing accounts can be suspended by unchecking the 'active' field. This + prevents the user from logging in and changing the password. +* Only accounts that have the 'wine-devel' role can submit jobs. So + administrators who also want to submit jobs should add it to their account + (see the doc/INSTALL.txt file). +* FIXME: Document how the LDAP integration works. diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 4c14668..a5655ec 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -58,6 +58,9 @@ General setup for the web site: 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'); +- If you want to be able to submit jobs from the same account you will likely + need to also give it the 'wine-devel' role: + mysql> insert into UserRoles values('<username>', wine-devel); - When you refresh the home page, you should now have an "Admin" menu in the sidebar.

1 0

Francois Gouget : testbot/TestAgent: Time the file transfers to provide speed statistics.
by Alexandre Julliard March 13, 2013

March 13, 2013

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