May 2014 - Wine-commits - list.winehq.org

Nikolay Sivov : msxml3: Remove no longer used helper.
by Alexandre Julliard 15 May '14

15 May '14

Module: wine Branch: master Commit: 8e524667578aca111fc94bb69a4afc05a4b5df1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e524667578aca111fc94bb69… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 13 13:46:48 2014 +0400 msxml3: Remove no longer used helper. --- dlls/msxml3/msxml_private.h | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 167e74f..a57dc60 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -205,22 +205,6 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) return ret; } -static inline LPSTR heap_strdupWtoA(LPCWSTR str) -{ - LPSTR ret = NULL; - - if(str) { - DWORD len = WideCharToMultiByte(CP_ACP, 0, str, -1, NULL, 0, NULL, NULL); - ret = heap_alloc(len+1); - if(!ret) - return NULL; - - WideCharToMultiByte(CP_ACP, 0, str, -1, ret, len+1, NULL, NULL); - } - - return ret; -} - /* XSLProcessor parameter list */ struct xslprocessor_par {

1 0

Henri Verbeet : d2d1: Get rid of "optional" attributes.
by Alexandre Julliard 15 May '14

15 May '14

Module: wine Branch: master Commit: 71a27809f153e11c719909e35900c807e8712c1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=71a27809f153e11c719909e35… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 15 10:15:31 2014 +0200 d2d1: Get rid of "optional" attributes. --- include/d2d1.idl | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/include/d2d1.idl b/include/d2d1.idl index ef05f00..2ea05f1 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -291,80 +291,80 @@ interface ID2D1TessellationSink : IUnknown interface ID2D1Geometry : ID2D1Resource { HRESULT GetBounds( - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [out] D2D1_RECT_F *bounds ); HRESULT GetWidenedBounds( [in] float stroke_width, - [in, optional] ID2D1StrokeStyle *stroke_style, - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] ID2D1StrokeStyle *stroke_style, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [out] D2D1_RECT_F *bounds ); HRESULT StrokeContainsPoint( [in] D2D1_POINT_2F point, [in] float stroke_width, - [in, optional] ID2D1StrokeStyle *stroke_style, - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] ID2D1StrokeStyle *stroke_style, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [out] BOOL *contains ); HRESULT FillContainsPoint( [in] D2D1_POINT_2F point, - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [out] BOOL *contains ); HRESULT CompareWithGeometry( [in] ID2D1Geometry *geometry, - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [out] D2D1_GEOMETRY_RELATION *relation ); HRESULT Simplify( [in] D2D1_GEOMETRY_SIMPLIFICATION_OPTION option, - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [in] ID2D1SimplifiedGeometrySink *sink ); HRESULT Tessellate( - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [in] ID2D1TessellationSink *sink ); HRESULT CombineWithGeometry( [in] ID2D1Geometry *geometry, [in] D2D1_COMBINE_MODE combine_mode, - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [in] ID2D1SimplifiedGeometrySink *sink ); HRESULT Outline( - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [in] ID2D1SimplifiedGeometrySink *sink ); HRESULT ComputeArea( - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [out] float *area ); HRESULT ComputeLength( - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [out] float *length ); HRESULT ComputePointAtLength( [in] float length, - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, - [out, optional] D2D1_POINT_2F *point, - [out, optional] D2D1_POINT_2F *tangent + [out] D2D1_POINT_2F *point, + [out] D2D1_POINT_2F *tangent ); HRESULT Widen( [in] float stroke_width, - [in, optional] ID2D1StrokeStyle *stroke_style, - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] ID2D1StrokeStyle *stroke_style, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [in] ID2D1SimplifiedGeometrySink *sink );

1 0

Henri Verbeet : d2d1: Add the ID2D1BitmapBrush interface.
by Alexandre Julliard 15 May '14

15 May '14

Module: wine Branch: master Commit: d156bf03a6bed139e3aaf32f829e07047f6f6f1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d156bf03a6bed139e3aaf32f8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 15 10:15:32 2014 +0200 d2d1: Add the ID2D1BitmapBrush interface. --- include/d2d1.idl | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 2ea05f1..88a733f 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -33,6 +33,18 @@ typedef D2D_SIZE_U D2D1_SIZE_U; typedef D2D_POINT_2U D2D1_POINT_2U; typedef D2D_RECT_U D2D1_RECT_U; +enum +{ + D2D1_INTERPOLATION_MODE_DEFINITION_NEAREST_NEIGHBOR = 0, + D2D1_INTERPOLATION_MODE_DEFINITION_LINEAR = 1, + D2D1_INTERPOLATION_MODE_DEFINITION_CUBIC = 2, + D2D1_INTERPOLATION_MODE_DEFINITION_MULTI_SAMPLE_LINEAR = 3, + D2D1_INTERPOLATION_MODE_DEFINITION_ANISOTROPIC = 4, + D2D1_INTERPOLATION_MODE_DEFINITION_HIGH_QUALITY_CUBIC = 5, + D2D1_INTERPOLATION_MODE_DEFINITION_FANT = 6, + D2D1_INTERPOLATION_MODE_DEFINITION_MIPMAP_LINEAR = 7, +}; + typedef enum D2D1_DEBUG_LEVEL { D2D1_DEBUG_LEVEL_NONE = 0, @@ -163,6 +175,21 @@ typedef enum D2D1_TEXT_ANTIALIAS_MODE D2D1_TEXT_ANTIALIAS_MODE_FORCE_DWORD = 0xffffffff, } D2D1_TEXT_ANTIALIAS_MODE; +typedef enum D2D1_EXTEND_MODE +{ + D2D1_EXTEND_MODE_CLAMP = 0, + D2D1_EXTEND_MODE_WRAP = 1, + D2D1_EXTEND_MODE_MIRROR = 2, + D2D1_EXTEND_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_EXTEND_MODE; + +typedef enum D2D1_BITMAP_INTERPOLATION_MODE +{ + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR = D2D1_INTERPOLATION_MODE_DEFINITION_NEAREST_NEIGHBOR, + D2D1_BITMAP_INTERPOLATION_MODE_LINEAR = D2D1_INTERPOLATION_MODE_DEFINITION_LINEAR, + D2D1_BITMAP_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_BITMAP_INTERPOLATION_MODE; + typedef struct D2D1_BEZIER_SEGMENT { D2D1_POINT_2F point1; @@ -562,5 +589,32 @@ interface ID2D1Brush : ID2D1Resource ); } +[ + local, + object, + uuid(2cd906aa-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1BitmapBrush : ID2D1Brush +{ + void SetExtendModeX( + [in] D2D1_EXTEND_MODE mode + ); + void SetExtendModeY( + [in] D2D1_EXTEND_MODE mode + ); + void SetInterpolationMode( + [in] D2D1_BITMAP_INTERPOLATION_MODE mode + ); + void SetBitmap( + [in] ID2D1Bitmap *bitmap + ); + D2D1_EXTEND_MODE GetExtendModeX(); + D2D1_EXTEND_MODE GetExtendModeY(); + D2D1_BITMAP_INTERPOLATION_MODE GetInterpolationMode(); + void GetBitmap( + [out] ID2D1Bitmap **bitmap + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Henri Verbeet : d2d1: Add the ID2D1SolidColorBrush interface.
by Alexandre Julliard 15 May '14

15 May '14

Module: wine Branch: master Commit: a4677f8670b0bcebfeec8a6fe1baae5810acc269 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4677f8670b0bcebfeec8a6fe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 15 10:15:33 2014 +0200 d2d1: Add the ID2D1SolidColorBrush interface. --- include/d2d1.idl | 14 ++++++++++++++ include/d2dbasetypes.h | 13 +++++++++++++ 2 files changed, 27 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 88a733f..7f7de1d 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -32,6 +32,7 @@ typedef UINT64 D2D1_TAG; typedef D2D_SIZE_U D2D1_SIZE_U; typedef D2D_POINT_2U D2D1_POINT_2U; typedef D2D_RECT_U D2D1_RECT_U; +typedef D2D_COLOR_F D2D1_COLOR_F; enum { @@ -616,5 +617,18 @@ interface ID2D1BitmapBrush : ID2D1Brush ); } +[ + local, + object, + uuid(2cd906a9-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1SolidColorBrush : ID2D1Brush +{ + void SetColor( + [in] const D2D1_COLOR_F *color + ); + D2D1_COLOR_F GetColor(); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory); diff --git a/include/d2dbasetypes.h b/include/d2dbasetypes.h index 61158ac..e5acff2 100644 --- a/include/d2dbasetypes.h +++ b/include/d2dbasetypes.h @@ -16,6 +16,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef D3DCOLORVALUE_DEFINED +typedef struct D3DCOLORVALUE +{ + float r; + float g; + float b; + float a; +} D3DCOLORVALUE; +#define D3DCOLORVALUE_DEFINED +#endif + +typedef D3DCOLORVALUE D2D_COLOR_F; + typedef struct D2D_POINT_2F { FLOAT x;

1 0

Henri Verbeet : d2d1: Add the ID2D1GradientStopCollection interface.
by Alexandre Julliard 15 May '14

15 May '14

Module: wine Branch: master Commit: 36c438145d7c4c50dd553b27c7f3867d4618bcd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36c438145d7c4c50dd553b27c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 15 10:15:34 2014 +0200 d2d1: Add the ID2D1GradientStopCollection interface. --- include/d2d1.idl | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 7f7de1d..21af6a7 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -191,6 +191,13 @@ typedef enum D2D1_BITMAP_INTERPOLATION_MODE D2D1_BITMAP_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff, } D2D1_BITMAP_INTERPOLATION_MODE; +typedef enum D2D1_GAMMA +{ + D2D1_GAMMA_2_2 = 0, + D2D1_GAMMA_1_0 = 1, + D2D1_GAMMA_FORCE_DWORD = 0xffffffff, +} D2D1_GAMMA; + typedef struct D2D1_BEZIER_SEGMENT { D2D1_POINT_2F point1; @@ -248,6 +255,12 @@ typedef struct D2D1_DRAWING_STATE_DESCRIPTION D2D1_MATRIX_3X2_F transform; } D2D1_DRAWING_STATE_DESCRIPTION; +typedef struct D2D1_GRADIENT_STOP +{ + float position; + D2D1_COLOR_F color; +} D2D1_GRADIENT_STOP; + [ local, object, @@ -630,5 +643,21 @@ interface ID2D1SolidColorBrush : ID2D1Brush D2D1_COLOR_F GetColor(); } +[ + local, + object, + uuid(2cd906a7-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1GradientStopCollection : ID2D1Resource +{ + UINT32 GetGradientStopCount(); + void GetGradientStops( + [out] D2D1_GRADIENT_STOP *stops, + [in] UINT32 stop_count + ); + D2D1_GAMMA GetColorInterpolationGamma(); + D2D1_EXTEND_MODE GetExtendMode(); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Francois Gouget : testbot/Engine: Remove the FoundWinetestUpdate() notification. It is redundent with RescheduleJobs().
by Alexandre Julliard 15 May '14

15 May '14

Module: tools Branch: master Commit: 8f115fe2bd150ca3b96614e881b3fbf473d2aacb URL: http://source.winehq.org/git/tools.git/?a=commit;h=8f115fe2bd150ca3b96614e8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:48:06 2014 +0200 testbot/Engine: Remove the FoundWinetestUpdate() notification. It is redundent with RescheduleJobs(). It did not use the $Bits parameter and just calls ScheduleJobs() which is what the RescheduleJobs() notification does already. --- testbot/bin/CheckForWinetestUpdate.pl | 2 +- testbot/bin/Engine.pl | 20 -------------------- testbot/lib/WineTestBot/Engine/Notify.pm | 19 +------------------ 3 files changed, 2 insertions(+), 39 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 6d33a5c..5d30913 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -251,7 +251,7 @@ else AddJob(1, $FileNameRandomPart, $Bits); } -FoundWinetestUpdate($Bits); +RescheduleJobs(); LogMsg "Submitted jobs\n"; diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 72e165c..f8b7e1e 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -425,25 +425,6 @@ sub HandleVMStatusChange return "1OK"; } -sub HandleFoundWinetestUpdate -{ - my $Bits = $_[0]; - - if ($Bits !~ /^(?:32|64)$/) - { - LogMsg "Invalid number of bits in foundwinetestupdate message\n"; - return "0Invalid number of bits"; - } - - my $ErrMessage = ScheduleJobs(); - if (defined($ErrMessage)) - { - LogMsg "Scheduling problem in HandleFoundWinetestUpdate: $ErrMessage\n"; - } - - return "1OK"; -} - sub HandleWinePatchMLSubmission { my $dh; @@ -594,7 +575,6 @@ sub HandleGetScreenshot } my %Handlers=( - "foundwinetestupdate" => \&HandleFoundWinetestUpdate, "getscreenshot" => \&HandleGetScreenshot, "jobcancel" => \&HandleJobCancel, "jobrestart" => \&HandleJobRestart, diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index 1f93db4..a241c81 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -34,7 +34,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $RunningInEngine); require Exporter; @ISA = qw(Exporter); @EXPORT = qw(&Shutdown &PingEngine &JobSubmit &JobStatusChange &JobCancel - &JobRestart &RescheduleJobs &VMStatusChange &FoundWinetestUpdate + &JobRestart &RescheduleJobs &VMStatusChange &WinePatchMLSubmission &WinePatchWebSubmission &GetScreenshot); @EXPORT_OK = qw($RunningInEngine); @@ -199,23 +199,6 @@ sub VMStatusChange return substr($Reply, 1); } -sub FoundWinetestUpdate -{ - my $Bits = $_[0]; - - my $Reply = SendCmdReceiveReply("foundwinetestupdate $Bits\n"); - if (length($Reply) < 1) - { - return "Unrecognized reply received from engine"; - } - if (substr($Reply, 0, 1) eq "1") - { - return undef; - } - - return substr($Reply, 1); -} - sub WinePatchMLSubmission { my $Reply = SendCmdReceiveReply("winepatchmlsubmission\n");

1 0

Francois Gouget : testbot/Engine: Remove the JobSubmit() notification. It' s redundant with RescheduleJobs().
by Alexandre Julliard 15 May '14

15 May '14

Module: tools Branch: master Commit: f70cf6ceb4a29d8d041d2e07ca0af04789b8e741 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f70cf6ceb4a29d8d041d2e07… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:48:11 2014 +0200 testbot/Engine: Remove the JobSubmit() notification. It's redundant with RescheduleJobs(). It does not need to call Step::HandleStaging() since the Job scheduler does that already. So then it's identical to the RescheduleJobs() notification. --- testbot/bin/Engine.pl | 34 ------------------------------ testbot/lib/WineTestBot/Engine/Notify.pm | 19 +---------------- testbot/web/Submit.pl | 8 ++++--- 3 files changed, 6 insertions(+), 55 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index f8b7e1e..6e2ff1c 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -257,39 +257,6 @@ sub HandlePing return "1pong\n"; } -sub HandleJobSubmit -{ - my $JobKey = $_[0]; - - my $Job = CreateJobs()->GetItem($JobKey); - if (! $Job) - { - LogMsg "JobSubmit for nonexistent job $JobKey\n"; - return "0Job $JobKey not found"; - } - # We've already determined that JobKey is valid, untaint it - $JobKey =~ m/^(.*)$/; - $JobKey = $1; - - my $ErrMessage; - foreach my $Step (@{$Job->Steps->GetItems()}) - { - $ErrMessage = $Step->HandleStaging($JobKey); - if (defined($ErrMessage)) - { - LogMsg "Staging problem: $ErrMessage\n"; - } - } - - $ErrMessage = ScheduleJobs(); - if (defined($ErrMessage)) - { - LogMsg "Scheduling problem in HandleJobSubmit: $ErrMessage\n"; - } - - return "1OK"; -} - sub HandleJobStatusChange { my ($JobKey, $OldStatus, $NewStatus) = @_; @@ -579,7 +546,6 @@ my %Handlers=( "jobcancel" => \&HandleJobCancel, "jobrestart" => \&HandleJobRestart, "jobstatuschange" => \&HandleJobStatusChange, - "jobsubmit" => \&HandleJobSubmit, "ping" => \&HandlePing, "shutdown" => \&HandleShutdown, "reschedulejobs" => \&HandleRescheduleJobs, diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index a241c81..d0d4890 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -33,7 +33,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $RunningInEngine); require Exporter; @ISA = qw(Exporter); -(a)EXPORT = qw(&Shutdown &PingEngine &JobSubmit &JobStatusChange &JobCancel +(a)EXPORT = qw(&Shutdown &PingEngine &JobStatusChange &JobCancel &JobRestart &RescheduleJobs &VMStatusChange &WinePatchMLSubmission &WinePatchWebSubmission &GetScreenshot); @EXPORT_OK = qw($RunningInEngine); @@ -99,23 +99,6 @@ sub PingEngine return 1 <= length($Reply) && substr($Reply, 0, 1) eq "1"; } -sub JobSubmit -{ - my $JobKey = $_[0]; - - my $Reply = SendCmdReceiveReply("jobsubmit $JobKey\n"); - if (length($Reply) < 1) - { - return "Unrecognized reply received from engine"; - } - if (substr($Reply, 0, 1) eq "1") - { - return undef; - } - - return substr($Reply, 1); -} - sub JobStatusChange { my ($JobKey, $OldStatus, $NewStatus) = @_; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 0d9d0b4..3bcfad9 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -917,14 +917,16 @@ sub OnSubmit $Jobs = undef; # Notify engine - if (defined(JobSubmit($JobKey))) + my $ErrMessage = RescheduleJobs(); + if (defined $ErrMessage) { + LogMsg "$ErrMessage\n"; $self->{Page} = 4; - $self->{JobKey} = $NewJob->GetKey(); + $self->{JobKey} = $JobKey; return !1; } - $self->Redirect("/JobDetails.pl?Key=" . $NewJob->Id); + $self->Redirect("/JobDetails.pl?Key=$JobKey"); exit; }

1 0

Francois Gouget : testbot: Better document the use of the staging directory.
by Alexandre Julliard 15 May '14

15 May '14

Module: tools Branch: master Commit: 7d4c644fccff381619dbc49a48ae644daf7b81b4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=7d4c644fccff381619dbc49a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:48:45 2014 +0200 testbot: Better document the use of the staging directory. Also remove an unused variable in CheckForWinetestUpdate. --- testbot/bin/CheckForWinetestUpdate.pl | 13 +++++++++---- testbot/web/Submit.pl | 6 ++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 5d30913..98165a3 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -175,7 +175,11 @@ umask 002; mkdir "$DataDir/latest"; mkdir "$DataDir/staging"; -my $LatestFileName = "$DataDir/latest/winetest${BitsSuffix}-latest.exe"; +# Store the new WineTest executable in the staging directory: +# - So we can compare it to the reference one in the latest directory to +# check that it is truly new. +# - Because we don't know the relevant Job and Step IDs yet and thus cannot +# put it in the jobs directory tree. my $FileNameRandomPart = GenerateRandomString(32); while (-e "$DataDir/staging/${FileNameRandomPart}_winetest${BitsSuffix}-latest.exe") { @@ -186,7 +190,7 @@ my $StagingFileName = "$DataDir/staging/${FileNameRandomPart}_winetest${BitsSuff my $UA = LWP::UserAgent->new(); $UA->agent("WineTestBot"); my $Request = HTTP::Request->new(GET => $WinetestUrl); -my $NowDate = gmtime; +my $LatestFileName = "$DataDir/latest/winetest${BitsSuffix}-latest.exe"; if (-r $LatestFileName) { my $Since = gmtime((stat $LatestFileName)[9]); @@ -230,14 +234,15 @@ if ($Bits == 32) { AddReconfigJob(); AddJob(1, $FileNameRandomPart, $Bits); - + + # Create another copy for the non-base VMs Job. $FileNameRandomPart = GenerateRandomString(32); while (-e "$DataDir/staging/${FileNameRandomPart}_winetest-latest.exe") { $FileNameRandomPart = GenerateRandomString(32); } $StagingFileName = "$DataDir/staging/${FileNameRandomPart}_winetest-latest.exe"; - if (! copy($LatestFileName, $StagingFileName)) + if (!copy($LatestFileName, $StagingFileName)) { LogMsg "Can't copy $LatestFileName to $StagingFileName: $!\n"; } diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 3bcfad9..d381150 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -792,8 +792,10 @@ sub OnSubmit return !1; } - # Make sure the file has a unique name even when not picked up directly - # by the engine + # Store the file in the staging directory until the relevant Job and Step + # IDs are known and it can be moved to the jobs directory tree. But rename + # it so it does not get overwritten if the user submits another one before + # the Engine gets around to doing so. my $FileNameRandomPart = GenerateRandomString(32); while (-e ("$DataDir/staging/${FileNameRandomPart}_" . $self->GetParam("FileName")))

1 0

Francois Gouget : testbot/CheckWinetestUpdate: Let the Engine handle moving staging files to the jobs directory.
by Alexandre Julliard 15 May '14

15 May '14

Module: tools Branch: master Commit: eeed0b5f0f4af7d985e9e72135f6f75ffe1c1d82 URL: http://source.winehq.org/git/tools.git/?a=commit;h=eeed0b5f0f4af7d985e9e721… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:51:04 2014 +0200 testbot/CheckWinetestUpdate: Let the Engine handle moving staging files to the jobs directory. Otherwise there is a race condition between CheckWinetestUpdate and the Engine. --- testbot/bin/CheckForWinetestUpdate.pl | 2 -- 1 file changed, 2 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 98165a3..fc24fb6 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -110,8 +110,6 @@ sub AddJob LogMsg "Failed to save job: $ErrMessage\n"; exit 1; } - - $NewStep->HandleStaging($NewJob->Id); } }

1 0

Francois Gouget : testbot/Engine: Fix a minor typo in a comment.
by Alexandre Julliard 15 May '14

15 May '14

Module: tools Branch: master Commit: 30e3a6d665925d7794f14d39c16d2506412e9ff0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=30e3a6d665925d7794f14d39… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:51:27 2014 +0200 testbot/Engine: Fix a minor typo in a comment. --- testbot/bin/Engine.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 6e2ff1c..ccaadc1 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -590,7 +590,7 @@ through the cracks, possibly because of an Engine restart. Specifically it updates the status of all the current Jobs, Steps and Tasks, then schedules Tasks to be run, checks the staging directory for wine-patches emails dropped by WinePatchesMLSubmit.pl, for notifications of -changes on Wine's Patches web site dropped by WinePatchesWebNotify.pl, and +changes on Wine's Patches web site dropped by WinePatchesWebSubmit.pl, and checks whether any pending patchsets are now complete and thus can be scheduled. =back

1 0