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

Stefan Dösinger : wined3d: Always store the palette index in the alpha component.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: c1cca63e5ddcf7e6235889ed95aec844495e5de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1cca63e5ddcf7e6235889ed9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 13 16:21:49 2014 +0200 wined3d: Always store the palette index in the alpha component. --- dlls/wined3d/surface.c | 184 ++++++++-------------------------------- dlls/wined3d/utils.c | 35 +------- dlls/wined3d/wined3d_private.h | 5 -- 3 files changed, 37 insertions(+), 187 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c1cca63e5ddcf7e623588…

1 0

Henri Verbeet : d2d1: Add the ID2D1DrawingStateBlock interface.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: d20be31395d39850da29651b90be83980ab575d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d20be31395d39850da29651b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 14 13:02:37 2014 +0200 d2d1: Add the ID2D1DrawingStateBlock interface. --- include/d2d1.idl | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/include/d2d1.idl b/include/d2d1.idl index c6b9288..6fcadee 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -19,10 +19,14 @@ import "unknwn.idl"; import "d2dbasetypes.h"; +interface ID2D1Factory; +interface IDWriteRenderingParams; + typedef D2D_POINT_2F D2D1_POINT_2F; typedef D2D_MATRIX_3X2_F D2D1_MATRIX_3X2_F; typedef D2D_RECT_F D2D1_RECT_F; typedef D2D_SIZE_F D2D1_SIZE_F; +typedef UINT64 D2D1_TAG; typedef enum D2D1_DEBUG_LEVEL { @@ -138,6 +142,22 @@ typedef enum D2D1_ARC_SIZE D2D1_ARC_SIZE_FORCE_DWORD = 0xffffffff, } D2D1_ARC_SIZE; +typedef enum D2D1_ANTIALIAS_MODE +{ + D2D1_ANTIALIAS_MODE_PER_PRIMITIVE = 0, + D2D1_ANTIALIAS_MODE_ALIASED = 1, + D2D1_ANTIALIAS_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_ANTIALIAS_MODE; + +typedef enum D2D1_TEXT_ANTIALIAS_MODE +{ + D2D1_TEXT_ANTIALIAS_MODE_DEFAULT = 0, + D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE = 1, + D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE = 2, + D2D1_TEXT_ANTIALIAS_MODE_ALIASED = 3, + D2D1_TEXT_ANTIALIAS_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_TEXT_ANTIALIAS_MODE; + typedef struct D2D1_BEZIER_SEGMENT { D2D1_POINT_2F point1; @@ -186,7 +206,14 @@ typedef struct D2D1_ARC_SEGMENT D2D1_ARC_SIZE arcSize; } D2D1_ARC_SEGMENT; -interface ID2D1Factory; +typedef struct D2D1_DRAWING_STATE_DESCRIPTION +{ + D2D1_ANTIALIAS_MODE antialiasMode; + D2D1_TEXT_ANTIALIAS_MODE textAntialiasMode; + D2D1_TAG tag1; + D2D1_TAG tag2; + D2D1_MATRIX_3X2_F transform; +} D2D1_DRAWING_STATE_DESCRIPTION; [ local, @@ -450,5 +477,26 @@ interface ID2D1PathGeometry : ID2D1Geometry ); } +[ + local, + object, + uuid(28506e39-ebf6-46a1-bb47-fd85565ab957) +] +interface ID2D1DrawingStateBlock : ID2D1Resource +{ + void GetDescription( + [out] D2D1_DRAWING_STATE_DESCRIPTION *desc + ); + void SetDescription( + [in] const D2D1_DRAWING_STATE_DESCRIPTION *desc + ); + void SetTextRenderingParams( + [in] IDWriteRenderingParams *text_rendering_params + ); + void GetTextRenderingParams( + [out] IDWriteRenderingParams **text_rendering_params + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Austin English : user32: Add a stub for RegisterTouchWindow.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: 6458aca761f56dffcdf117e81450720c26a0c53f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6458aca761f56dffcdf117e81… Author: Austin English <austinenglish(a)gmail.com> Date: Tue May 13 13:25:02 2014 -0500 user32: Add a stub for RegisterTouchWindow. --- dlls/user32/user32.spec | 1 + dlls/user32/win.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 0b5754e..1425dac 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -573,6 +573,7 @@ @ stdcall RegisterShellHookWindow (long) @ stdcall RegisterSystemThread(long long) @ stdcall RegisterTasklist (long) +@ stdcall RegisterTouchWindow(long long) # @ stub RegisterUserApiHook @ stdcall RegisterWindowMessageA(str) @ stdcall RegisterWindowMessageW(wstr) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 9e30321..c9660be 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3887,3 +3887,13 @@ LONG_PTR WINAPI SetWindowLongPtrA( HWND hwnd, INT offset, LONG_PTR newval ) { return WIN_SetWindowLong( hwnd, offset, sizeof(LONG_PTR), newval, FALSE ); } + +/***************************************************************************** + * RegisterTouchWindow (USER32.@) + */ +BOOL WINAPI RegisterTouchWindow(HWND hwnd, ULONG flags) +{ + FIXME("(%p %08x): stub\n", hwnd, flags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

1 0

Huw Davies : msxml3/tests: Fix test on win 8.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: 305db0f65bc3a2e227bb8cd1972fde3d60b3c2b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=305db0f65bc3a2e227bb8cd19… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 14 08:02:25 2014 +0100 msxml3/tests: Fix test on win 8. --- dlls/msxml3/tests/schema.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 484be86..f5d6fcd 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -1519,10 +1519,10 @@ static void test_get(void) if (!cache) return; hr = IXMLDOMSchemaCollection2_get(cache, NULL, NULL); - EXPECT_HR(hr, E_NOTIMPL); + ok(hr == E_NOTIMPL || hr == E_POINTER /* win8 */, "got %08x\n", hr); hr = IXMLDOMSchemaCollection2_get(cache, _bstr_("uri"), &node); - ok(hr == E_NOTIMPL || hr == E_POINTER /* win8 */, "got %08x\n", hr); + EXPECT_HR(hr, E_NOTIMPL); IXMLDOMSchemaCollection2_Release(cache);

1 0

Nikolay Sivov : xmllite/writer: Implement GetProperty().
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: d2737dde801b55a1feb4d7d489082d3ced33f2fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2737dde801b55a1feb4d7d48… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 14 11:52:13 2014 +0400 xmllite/writer: Implement GetProperty(). --- dlls/xmllite/reader.c | 6 ++--- dlls/xmllite/tests/writer.c | 23 +++++++++++++++++++ dlls/xmllite/writer.c | 52 ++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 75 insertions(+), 6 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 6e3f9cd..deb2d2e 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -123,7 +123,7 @@ static const char *debugstr_nodetype(XmlNodeType nodetype) return type_names[nodetype]; } -static const char *debugstr_prop(XmlReaderProperty prop) +static const char *debugstr_reader_prop(XmlReaderProperty prop) { static const char * const prop_names[] = { @@ -2537,7 +2537,7 @@ static HRESULT WINAPI xmlreader_GetProperty(IXmlReader* iface, UINT property, LO { xmlreader *This = impl_from_IXmlReader(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_prop(property), value); + TRACE("(%p)->(%s %p)\n", This, debugstr_reader_prop(property), value); if (!value) return E_INVALIDARG; @@ -2561,7 +2561,7 @@ static HRESULT WINAPI xmlreader_SetProperty(IXmlReader* iface, UINT property, LO { xmlreader *This = impl_from_IXmlReader(iface); - TRACE("(%p)->(%s %lu)\n", This, debugstr_prop(property), value); + TRACE("(%p)->(%s %lu)\n", This, debugstr_reader_prop(property), value); switch (property) { diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index b5935c1..738844f 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -71,6 +71,7 @@ static void test_writer_create(void) { HRESULT hr; IXmlWriter *writer; + LONG_PTR value; /* crashes native */ if (0) @@ -81,6 +82,28 @@ static void test_writer_create(void) hr = pCreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + /* check default properties values */ + value = 0; + hr = IXmlWriter_GetProperty(writer, XmlWriterProperty_ByteOrderMark, &value); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(value == TRUE, "got %ld\n", value); + + value = TRUE; + hr = IXmlWriter_GetProperty(writer, XmlWriterProperty_Indent, &value); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(value == FALSE, "got %ld\n", value); + + value = TRUE; + hr = IXmlWriter_GetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, &value); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(value == FALSE, "got %ld\n", value); + + value = XmlConformanceLevel_Auto; + hr = IXmlWriter_GetProperty(writer, XmlWriterProperty_ConformanceLevel, &value); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(value == XmlConformanceLevel_Document, "got %ld\n", value); + IXmlWriter_Release(writer); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index a58164b..2432602 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -52,6 +52,10 @@ typedef struct _xmlwriter LONG ref; IMalloc *imalloc; xmlwriteroutput *output; + BOOL indent; + BOOL bom; + BOOL omitxmldecl; + XmlConformanceLevel conformance; } xmlwriter; static inline xmlwriter *impl_from_IXmlWriter(IXmlWriter *iface) @@ -64,6 +68,23 @@ static inline xmlwriteroutput *impl_from_IXmlWriterOutput(IXmlWriterOutput *ifac return CONTAINING_RECORD(iface, xmlwriteroutput, IXmlWriterOutput_iface); } +static const char *debugstr_writer_prop(XmlWriterProperty prop) +{ + static const char * const prop_names[] = + { + "MultiLanguage", + "Indent", + "ByteOrderMark", + "OmitXmlDeclaration", + "ConformanceLevel" + }; + + if (prop > _XmlWriterProperty_Last) + return wine_dbg_sprintf("unknown property=%d", prop); + + return prop_names[prop]; +} + /* writer output memory allocation functions */ static inline void *writeroutput_alloc(xmlwriteroutput *output, size_t len) { @@ -191,13 +212,34 @@ static HRESULT WINAPI xmlwriter_SetOutput(IXmlWriter *iface, IUnknown *output) return writeroutput_query_for_stream(This->output); } -static HRESULT WINAPI xmlwriter_GetProperty(IXmlWriter *iface, UINT nProperty, LONG_PTR *ppValue) +static HRESULT WINAPI xmlwriter_GetProperty(IXmlWriter *iface, UINT property, LONG_PTR *value) { xmlwriter *This = impl_from_IXmlWriter(iface); - FIXME("%p %u %p\n", This, nProperty, ppValue); + TRACE("(%p)->(%s %p)\n", This, debugstr_writer_prop(property), value); - return E_NOTIMPL; + if (!value) return E_INVALIDARG; + + switch (property) + { + case XmlWriterProperty_Indent: + *value = This->indent; + break; + case XmlWriterProperty_ByteOrderMark: + *value = This->bom; + break; + case XmlWriterProperty_OmitXmlDeclaration: + *value = This->omitxmldecl; + break; + case XmlWriterProperty_ConformanceLevel: + *value = This->conformance; + break; + default: + FIXME("Unimplemented property (%u)\n", property); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT WINAPI xmlwriter_SetProperty(IXmlWriter *iface, UINT nProperty, LONG_PTR pValue) @@ -567,6 +609,10 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) writer->imalloc = imalloc; if (imalloc) IMalloc_AddRef(imalloc); writer->output = NULL; + writer->indent = FALSE; + writer->bom = TRUE; + writer->omitxmldecl = FALSE; + writer->conformance = XmlConformanceLevel_Document; *obj = &writer->IXmlWriter_iface;

1 0

Francois Gouget : testbot/WinePatchesWebSubmit: Improve robustness, particularly when the Engine is not running.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: tools Branch: master Commit: 82049e35353b4da6d074977cf1b05003c22283dd URL: http://source.winehq.org/git/tools.git/?a=commit;h=82049e35353b4da6d074977c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 7 16:43:47 2014 +0200 testbot/WinePatchesWebSubmit: Improve robustness, particularly when the Engine is not running. Now the Engine will automatically pick up patches from the patches website as part of its periodic 'SafetyNet' check. However WinePatchesWebSubmit can still be used to avoid the potential 10 minutes delay. Also, running WinePatchesWebSubmit when the Engine is stopped no longer has the side effect of leaking files in the staging directory. --- testbot/bin/Engine.pl | 86 +++++++++++++++++++----------- testbot/bin/WinePatchesWebSubmit.pl | 53 +++--------------- testbot/lib/WineTestBot/Engine/Notify.pm | 4 +- 3 files changed, 63 insertions(+), 80 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 2bb563a..72e165c 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -497,48 +497,73 @@ sub HandleWinePatchMLSubmission sub HandleWinePatchWebSubmission { - # Validate file name - if ($_[0] !~ m/([0-9a-fA-F]{32}_patch_\d+)/) + my $LatestWebPatchId = 0; + my $Patches = CreatePatches(); + foreach my $Patch (@{$Patches->GetItems()}) { - return "0Invalid file name"; + my $WebPatchId = $Patch->WebPatchId; + if (defined $WebPatchId and $LatestWebPatchId < $WebPatchId) + { + $LatestWebPatchId = $WebPatchId; + } } - my $FullFileName = "$DataDir/staging/$1"; - if ($_[1] !~ m/^(\d+)$/) + + # Rescan the directory for robustness in case the patches site has already + # expired $LatestWebPatchId+1 (for instance if the WineTestBot has not been + # run for a while). + my (@ErrMessages, @WebPatchIds); + if (opendir(my $dh, "$DataDir/webpatches")) { - return "0Invalid patch id"; + foreach my $Entry (readdir($dh)) + { + next if ($Entry !~ /^(\d+)$/); + my $WebPatchId = $1; + next if ($WebPatchId <= $LatestWebPatchId); + + my $Patches = CreatePatches($Patches); + $Patches->AddFilter("WebPatchId", [$WebPatchId]); + if (@{$Patches->GetKeys()}) + { + push @ErrMessages, "$WebPatchId already exists and yet the latest patch is $LatestWebPatchId"; + next; + } + push @WebPatchIds, $WebPatchId; + } + close($dh); } - my $WebPatchId = $1; - my $Patches = CreatePatches(); - $Patches->AddFilter("WebPatchId", [$WebPatchId]); - if (@{$Patches->GetKeys()}) + else { - LogMsg "Patch $WebPatchId already exists\n"; - return "1OK"; + return "0Unable to open '$DataDir/webpatches': $!"; } - # Create a working dir - my $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; - while (-e $WorkDir) + # Add the patches in increasing WebPatchId order so that next time + # $LatestWebPatchId still makes sense in case something goes wrong now + foreach my $WebPatchId (sort { $a <=> $b } @WebPatchIds) { - $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; - } - mkdir $WorkDir; + # Create a working dir + my $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; + while (-e $WorkDir) + { + $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; + } + mkdir $WorkDir; - # Process the patch - my $Parser = new MIME::Parser; - $Parser->output_dir($WorkDir); - my $Entity = $Parser->parse_open($FullFileName); - my $ErrMessage = CreatePatches()->NewPatch($Entity, $WebPatchId); + # Process the patch + my $Parser = new MIME::Parser; + $Parser->output_dir($WorkDir); + my $Entity = $Parser->parse_open("$DataDir/webpatches/$WebPatchId"); + my $ErrMessage = $Patches->NewPatch($Entity, $WebPatchId); + push @ErrMessages, $ErrMessage if (defined $ErrMessage); - # Clean up - if (!rmtree($WorkDir)) - { - # Not a fatal error but log it to help diagnosis - LogMsg "Unable to delete '$WorkDir': $!\n"; + # Clean up + if (!rmtree($WorkDir)) + { + # Not a fatal error but log it to help diagnosis + LogMsg "Unable to delete '$WorkDir': $!\n"; + } } - unlink($FullFileName); - return defined($ErrMessage) ? "0" . $ErrMessage : "1OK"; + return @ErrMessages ? "0". join("; ", @ErrMessages) : "1OK"; } sub HandleGetScreenshot @@ -629,6 +654,7 @@ sub SafetyNet { CheckJobs(); ScheduleJobs(); + HandleWinePatchWebSubmission(); my $Set = WineTestBot::PendingPatchSets::CreatePendingPatchSets(); my $ErrMessage = $Set->CheckForCompleteSet(); diff --git a/testbot/bin/WinePatchesWebSubmit.pl b/testbot/bin/WinePatchesWebSubmit.pl index d5b032a..15a5fd5 100755 --- a/testbot/bin/WinePatchesWebSubmit.pl +++ b/testbot/bin/WinePatchesWebSubmit.pl @@ -37,56 +37,15 @@ sub BEGIN } } -use File::Copy; -use WineTestBot::Config; use WineTestBot::Log; -use WineTestBot::Utils; -use WineTestBot::Patches; use WineTestBot::Engine::Notify; -my ($MaxCount) = @ARGV; -if (defined $MaxCount) +# Just tell the Engine to rescan the webpatches directory +my $ErrMessage = WinePatchWebSubmission(); +if (defined $ErrMessage) { - $MaxCount =~ m/^(\d+)$/; - $MaxCount = $1; + LogMsg "$ErrMessage\n"; + exit(1); } -my $LastWebPatchId = 0; -foreach my $Patch (@{CreatePatches()->GetItems()}) -{ - my $WebPatchId = $Patch->WebPatchId; - if (defined $WebPatchId and $LastWebPatchId < $WebPatchId) - { - $LastWebPatchId = $WebPatchId; - } -} - -while (1) -{ - $LastWebPatchId++; - my $NewPatch = "$DataDir/webpatches/$LastWebPatchId"; - last if (!-f $NewPatch); - - my $FileNameRandomPart = GenerateRandomString(32); - while (-e "$DataDir/staging/${FileNameRandomPart}_patch_$LastWebPatchId") - { - $FileNameRandomPart = GenerateRandomString(32); - } - my $StagingFileName = "$DataDir/staging/${FileNameRandomPart}_patch_$LastWebPatchId"; - - if (!copy($NewPatch, $StagingFileName)) - { - LogMsg "Unable to copy '$NewPatch' to '$StagingFileName': $!\n"; - exit 1; - } - - WinePatchWebSubmission("${FileNameRandomPart}_patch_$LastWebPatchId", $LastWebPatchId); - LogMsg "Added wine-patches patch $LastWebPatchId\n"; - if (defined $MaxCount) - { - $MaxCount--; - last if ($MaxCount == 0); - } -} - -exit; +exit(0); diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index 09191ee..1f93db4 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -233,9 +233,7 @@ sub WinePatchMLSubmission sub WinePatchWebSubmission { - my ($FileName, $WebPatchId) = @_; - - my $Reply = SendCmdReceiveReply("winepatchwebsubmission $FileName $WebPatchId\n"); + my $Reply = SendCmdReceiveReply("winepatchwebsubmission\n"); if (length($Reply) < 1) { return "Unrecognized reply received from engine";

1 0

Francois Gouget : testbot/VMs: Catch the Libvirt exceptions in IsPoweredOn ().
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: tools Branch: master Commit: f82c4e5293766e926c8b1bde2e353d58ab13d902 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f82c4e5293766e926c8b1bde… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 7 16:36:17 2014 +0200 testbot/VMs: Catch the Libvirt exceptions in IsPoweredOn(). --- testbot/lib/WineTestBot/VMs.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 1cf1a42..0aa06eb 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -352,7 +352,10 @@ sub IsPoweredOn($) my ($ErrMessage, $Domain) = $self->_GetDomain(); return undef if (defined $ErrMessage); - return $Domain->is_active(); + my $IsActive; + eval { $IsActive = $Domain->is_active() }; + return undef if ($@); + return $IsActive; } sub PowerOn

1 0

Francois Gouget : testbot/log2revtimes: Add a script to extract the VM revert times from the WineTestBot log and prepare them for analysis.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: tools Branch: master Commit: 8928cfed8b86c32d627ab8b0ace514d15b7469f3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=8928cfed8b86c32d627ab8b0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 12 19:31:27 2014 +0200 testbot/log2revtimes: Add a script to extract the VM revert times from the WineTestBot log and prepare them for analysis. --- testbot/scripts/log2revtimes | 324 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 324 insertions(+) diff --git a/testbot/scripts/log2revtimes b/testbot/scripts/log2revtimes new file mode 100755 index 0000000..2eac048 --- /dev/null +++ b/testbot/scripts/log2revtimes @@ -0,0 +1,324 @@ +#!/usr/bin/perl +# +# Parses the WineTestBot Engine's log to extract the VM revert times. +# +# Copyright 2013-2014 Francois Gouget +# +# 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 warnings; +use strict; + +use DateTime::Format::Strptime; + + +my $name0 = $0; +$name0 =~ s+^.*/++; + +sub error(@) +{ + print STDERR "$name0:error: ", @_; +} + + +# +# Command line parsing +# + +my $Usage; + +sub check_opt_val($$) +{ + my ($option, $val) = @_; + + if (defined $val) + { + error("$option can only be specified once\n"); + $Usage = 2; # but continue processing this option + } + if (!@ARGV) + { + error("missing value for $option\n"); + $Usage = 2; + return undef; + } + return shift @ARGV; +} + +sub CheckAndConvertDate($) +{ + my ($DateStr) = @_; + return undef if (!defined $DateStr); + + my $DateParser = DateTime::Format::Strptime->new( + pattern => '%Y/%m/%d', + time_zone => 'local', + ); + my $DT = $DateParser->parse_datetime($DateStr); + if (!defined $DT) + { + error("'$DateStr' is not a valid timestamp\n"); + $Usage = 2; + return undef; + } + return $DT->epoch; +} + +my ($OptLogFile, $OptMixed, $OptStart, $OptStop, $OptMaxLines); + +while (@ARGV) +{ + my $arg = shift @ARGV; + if ($arg eq "--help") + { + $Usage = 0; + } + elsif ($arg eq "--mixed") + { + $OptMixed = 1; + } + elsif ($arg eq "--start") + { + $OptStart = check_opt_val($arg, $OptStart); + } + elsif ($arg eq "--stop") + { + $OptStop = check_opt_val($arg, $OptStop); + } + elsif ($arg eq "--max-lines") + { + $OptMaxLines = check_opt_val($arg, $OptMaxLines); + } + elsif (!defined $OptLogFile) + { + $OptLogFile = $arg; + } + else + { + error("unexpected argument '$arg'\n"); + $Usage = 2; + } +} + +if (!defined $Usage) +{ + if (!defined $OptLogFile) + { + error("you must specify the log file to analyze\n"); + $Usage = 2; + } + $OptStart = CheckAndConvertDate($OptStart); + $OptStop = CheckAndConvertDate($OptStop); + if (defined $OptStart and defined $OptStop and $OptStop <= $OptStart) + { + error("the start date must be earlier than the stop date\n"); + $Usage = 2; + } + if (defined $OptMaxLines) + { + my $oldwarn = $SIG{__WARN__}; + $SIG{__WARN__} = sub { die $_[0] }; + my $bad = eval { $OptMaxLines < 1 }; + if (defined $oldwarn) + { + $SIG{__WARN__} = $oldwarn; + } + else + { + delete $SIG{__WARN__}; + } + if ($bad or $@) + { + error("the maximum line count is invalid\n"); + $Usage = 2; + } + } +} +if (defined $Usage) +{ + if ($Usage) + { + error("try '$name0 --help' for more information\n"); + exit $Usage; + } + print "Usage: $name0 [--help] LOGFILE\n"; + print "\n"; + print "Analyzes a WineTestBot log file and generates a report on stdout containing the revert times per VM. The report is tab-separated and is suitable for import into a spreadsheet.\n"; + print "\n"; + print "Where:\n"; + print " LOGFILE Is the log file to analyze.\n"; + print " --mixed Report the revert times of all the VMs together instead of\n"; + print " having a set of columns for each VM.\n"; + print " --start DATE Only report about revert starting on or after the specified\n"; + print " date (in yyyy/mm/dd format).\n"; + print " --stop DATE Only report about revert ending on or before the specified\n"; + print " date (in yyyy/mm/dd format).\n"; + print " --max-lines COUNT The maximum number of lines to return.\n"; + print " --help Shows this usage message.\n"; + exit 0; +} + + +# +# Log parsing +# + +my ($Lines, %VMReverts, %VMLines); + +sub AddRevert($$$$) +{ + my ($Date, $Duration, $VM, $Snapshot) = @_; + + if ($OptMixed) + { + print "$Date\t$Duration\t\"$VM\"\t\"$Snapshot\"\n"; + $Lines++; + return 0 if (defined $OptMaxLines and $Lines > $OptMaxLines); + } + else + { + # Skip reverts that have errors + return 1 if ($Duration < 0); + $VMReverts{$VM} ||= []; + push @{$VMReverts{$VM}}, [$Date, $Duration, $Snapshot]; + $VMLines{$VM}++; + return 0 if (defined $OptMaxLines and $VMLines{$VM} > $OptMaxLines); + } + return 1; +} + +if (open(my $fh, "<", $OptLogFile)) +{ + print "Timestamp\tDuration\tVM\tSnapshot\n" if ($OptMixed); + + my $DateParser = DateTime::Format::Strptime->new( + pattern => '%a %b %d %H:%M:%S %Y', + time_zone => 'local', + ); + + my (%Epochs, %Dates, %Snapshots); + my $Skip = defined $OptStart ? 1 : defined $OptStop ? 0 : undef; + foreach my $Line (<$fh>) + { + next if ($Line !~ s/^(.*?) RevertVM(?:\[[0-9]*\])?: (Reverting|Letting) ([a-zA-Z0-9-]+)//); + my ($DateStr, $Action, $VM) = ($1, $2, $3); + my $DT = $DateParser->parse_datetime($DateStr); + my $Epoch = $DT->epoch; + + if ($Skip) + { + if (defined $OptStart and $OptStart <= $Epoch) + { + $Skip = 0; + } + else + { + next; + } + } + elsif (defined $Skip and defined $OptStop and $Epoch > $OptStop) + { + last; + } + + if ($Action eq "Reverting") + { + if (defined $Epochs{$VM}) + { + # This revert never completed! + my $Snapshot = $Snapshots{$VM} || "Unknown"; + last if (!AddRevert($Dates{$VM}, -2, $VM, $Snapshot)); + } + + $Epochs{$VM} = $Epoch; + $Dates{$VM} = $DT->ymd("/") . " " . $DT->hms(); + $Snapshots{$VM} = $1 if ($Line =~ /to ([a-zA-Z0-9-]+)$/); + } + else + { + my $Snapshot = $Snapshots{$VM} || "Unknown"; + if (!defined $Epochs{$VM}) + { + # We don't have a start date for this revert! + last if (!AddRevert($Dates{$VM}, -1, $VM, "Unknown")); + } + else + { + my $Duration = $Epoch - $Epochs{$VM}; + last if (!AddRevert($Dates{$VM}, $Duration, $VM, $Snapshot)); + } + + delete $Epochs{$VM}; + delete $Dates{$VM}; + delete $Snapshots{$VM}; + } + } + close($fh); +} +else +{ + error("unable to open '$OptLogFile' for reading: $!\n"); + exit 1; +} + + +# +# Report output +# + +if (!$OptMixed) +{ + my $First=1; + foreach my $VM (sort keys %VMReverts) + { + print "\t" if (!$First); + $First = undef; + print "$VM\t\t"; + } + print "\n"; + + $First=1; + my $LineCount = 0; + foreach my $VM (sort keys %VMReverts) + { + print "\t" if (!$First); + $First = undef; + print "Date\tDuration\tSnapshot"; + $LineCount = $VMLines{$VM} if ($LineCount < $VMLines{$VM}); + } + print "\n"; + + for (my $i = 0; $i < $LineCount; $i++) + { + $First=1; + foreach my $VM (sort keys %VMReverts) + { + print "\t" if (!$First); + $First = undef; + + my $Revert = $VMReverts{$VM}->[$i]; + if ($Revert) + { + my ($Date, $Duration, $Snapshot) = @$Revert; + print "$Date\t$Duration\t$Snapshot"; + } + else + { + print "\t\t"; + } + } + print "\n"; + } +}

1 0

Francois Gouget : testbot/web: Fix handling of tasks error messages.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: tools Branch: master Commit: 02d6cb133c3d87be0ded493a8eaf96c81d48960c URL: http://source.winehq.org/git/tools.git/?a=commit;h=02d6cb133c3d87be0ded493a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 7 16:35:37 2014 +0200 testbot/web: Fix handling of tasks error messages. The <pre><code> tag nesting was broken for the error messages, resulting in unreadable multi-line error messages and an inability to view the later tasks reports. --- testbot/web/JobDetails.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index b1a3186..04ec3c5 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -402,10 +402,10 @@ sub GenerateBody { print "</code></pre>\n"; } + print "<br><pre><code>"; $PrintedDll = $CurrentDll; } - print "<br>\n"; - print "<pre><code>", $self->escapeHTML($Line), "\n"; + print $self->escapeHTML($Line), "\n"; } close ERRFILE; }

1 0

Francois Gouget : testbot/WinePatchesMLSubmit: Better handle errors and times when the Engine is not running.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: tools Branch: master Commit: 2cdc80043ed19e500164d4255a2551bb24089203 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2cdc80043ed19e500164d425… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 7 02:41:26 2014 +0200 testbot/WinePatchesMLSubmit: Better handle errors and times when the Engine is not running. WinePatchesMLSubmit must return a non-zero exit code in case it could not deliver the message so the caller gets a chance to handle the situation gracefully. Have the Engine scan the staging directory for pending patches from the mailing list and automatically handle them, in particular on startup. This makes it possible for WinePatchesMLSubmit to deliver the patches even if the Engine is not running which is more robust. This also fixes a potential source of staging files leak. --- testbot/bin/Engine.pl | 77 ++++++++++++++++-------------- testbot/bin/WinePatchesMLSubmit.pl | 24 +++++++--- testbot/lib/WineTestBot/Engine/Notify.pm | 4 +- 3 files changed, 61 insertions(+), 44 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index ea04461..2bb563a 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -446,36 +446,53 @@ sub HandleFoundWinetestUpdate sub HandleWinePatchMLSubmission { - # Validate file name - if ($_[0] !~ m/([0-9a-fA-F]{32}_wine-patches)/) + my $dh; + if (!opendir($dh, "$DataDir/staging")) { - return "0Invalid file name"; + return "0Unable to open '$DataDir/staging': $!"; } - my $FullMessageFileName = "$DataDir/staging/$1"; - # Create a working dir - my $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; - while (-e $WorkDir) + # Read the directory ahead as we'll be adding / removing entries + my @Entries = readdir($dh); + closedir($dh); + + my @ErrMessages; + foreach my $Entry (@Entries) { - $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; - } - mkdir $WorkDir; + # Validate file name + next if ($Entry !~ m/^([0-9a-fA-F]{32}_wine-patches)$/); + my $FullMessageFileName = "$DataDir/staging/$1"; - # Process the patch - my $Parser = new MIME::Parser; - $Parser->output_dir($WorkDir); - my $Entity = $Parser->parse_open($FullMessageFileName); - CreatePatches()->NewPatch($Entity); + # Create a work directory + my $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; + while (-e $WorkDir) + { + $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; + } + mkdir $WorkDir; - # Clean up - if (!rmtree($WorkDir)) - { - # Not a fatal error but log it to help diagnosis - LogMsg "Unable to delete '$WorkDir': $!\n"; + # Process the patch + my $Parser = new MIME::Parser; + $Parser->output_dir($WorkDir); + my $Entity = $Parser->parse_open($FullMessageFileName); + my $ErrMessage = CreatePatches()->NewPatch($Entity); + push @ErrMessages, $ErrMessage if (defined $ErrMessage); + + # Clean up + if (!rmtree($WorkDir)) + { + # Not a fatal error but log it to help diagnosis + LogMsg "Unable to delete '$WorkDir': $!\n"; + } + if (!unlink($FullMessageFileName)) + { + # This is more serious because it could cause a patch to be added + # again and again. But there is not much we can do. + LogMsg "Unable to delete '$FullMessageFileName': $!\n"; + } } - unlink($FullMessageFileName); - return "1OK"; + return @ErrMessages ? "0". join("; ", @ErrMessages) : "1OK"; } sub HandleWinePatchWebSubmission @@ -613,19 +630,6 @@ sub SafetyNet CheckJobs(); ScheduleJobs(); - if (opendir STAGING, "$DataDir/staging") - { - my @DirEntries = readdir STAGING; - closedir STAGING; - foreach my $DirEntry (@DirEntries) - { - if ($DirEntry =~ m/[0-9a-fA-F]{32}_wine-patches/) - { - HandleWinePatchMLSubmission($DirEntry); - } - } - } - my $Set = WineTestBot::PendingPatchSets::CreatePendingPatchSets(); my $ErrMessage = $Set->CheckForCompleteSet(); if (defined($ErrMessage)) @@ -737,6 +741,9 @@ sub main Cleanup(); + # Check for patches that arrived while the server was off. + HandleWinePatchMLSubmission(); + my $SockName = "$DataDir/socket/engine"; my $uaddr = sockaddr_un($SockName); my $proto = getprotobyname('tcp'); diff --git a/testbot/bin/WinePatchesMLSubmit.pl b/testbot/bin/WinePatchesMLSubmit.pl index ffc65cb..e904bbc 100755 --- a/testbot/bin/WinePatchesMLSubmit.pl +++ b/testbot/bin/WinePatchesMLSubmit.pl @@ -41,16 +41,28 @@ use File::Copy; use WineTestBot::Config; use WineTestBot::Utils; use WineTestBot::Engine::Notify; +use WineTestBot::Log; # Store the message in the staging dir -my $FileNameRandomPart = GenerateRandomString(32); -while (-e ("$DataDir/staging/${FileNameRandomPart}_wine-patches")) +my $FileName = GenerateRandomString(32) . "_wine-patches"; +while (-e ("$DataDir/staging/$FileName")) { - $FileNameRandomPart = GenerateRandomString(32); + $FileName = GenerateRandomString(32); } -copy(\*STDIN, "$DataDir/staging/${FileNameRandomPart}_wine-patches"); +if (!copy(\*STDIN, "$DataDir/staging/$FileName")) +{ + LogMsg "Unable to copy the email to '$FileName': $!\n"; + exit 1; +} + -# Let the engine handle it -WinePatchMLSubmission("${FileNameRandomPart}_wine-patches"); +# Notify the Engine of the new message +my $ErrMessage = WinePatchMLSubmission(); +if (defined $ErrMessage) +{ + # The Engine will pick up the email later so return success anyway. + # But still log the issue so it can be checked out. + LogMsg "$ErrMessage\n" +} exit 0; diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index f376337..09191ee 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -218,9 +218,7 @@ sub FoundWinetestUpdate sub WinePatchMLSubmission { - my $FileName = $_[0]; - - my $Reply = SendCmdReceiveReply("winepatchmlsubmission $FileName\n"); + my $Reply = SendCmdReceiveReply("winepatchmlsubmission\n"); if (length($Reply) < 1) { return "Unrecognized reply received from engine";

1 0