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

Piotr Caban : user32: Fix LoadStringA behavior on 1-character long buffer.
by Alexandre Julliard 14 May '14

14 May '14

Module: wine Branch: master Commit: c2df317c4b7be489d63fd559d7fb6676578a0bb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2df317c4b7be489d63fd559d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 14 16:06:27 2014 +0200 user32: Fix LoadStringA behavior on 1-character long buffer. --- dlls/user32/resource.c | 3 ++- dlls/user32/tests/resource.c | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/user32/resource.c b/dlls/user32/resource.c index 1917d51..83442d8 100644 --- a/dlls/user32/resource.c +++ b/dlls/user32/resource.c @@ -310,7 +310,8 @@ INT WINAPI LoadStringA( HINSTANCE instance, UINT resource_id, LPSTR buffer, INT while (id--) p += *p + 1; - RtlUnicodeToMultiByteN( buffer, buflen - 1, &retval, p + 1, *p * sizeof(WCHAR) ); + if (buflen != 1) + RtlUnicodeToMultiByteN( buffer, buflen - 1, &retval, p + 1, *p * sizeof(WCHAR) ); } buffer[retval] = 0; TRACE("returning %s\n", debugstr_a(buffer)); diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index 9cb7380..2388adb 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -126,6 +126,13 @@ static void test_LoadStringA (void) ok( ret == -1 || broken(ret == 0), "LoadStringA did not return -1 when called with buflen = 0, got %d, err %d\n", ret, GetLastError()); + + SetLastError(0xdeadbeef); + buf[0] = 'a'; + ret = LoadStringA(hInst, 1, buf, 1); + ok( !ret, "LoadString returned %d\n", ret); + ok( buf[0] == 0, "buf[0] = %c (%x)\n", buf[0], buf[0]); + ok( GetLastError() == 0xdeadbeef, "GetLastError() = %d\n", GetLastError()); } static void test_accel1(void)

1 0

Piotr Caban : include: Add STATE_SYSTEM_* definition to oleacc.idl.
by Alexandre Julliard 14 May '14

14 May '14

Module: wine Branch: master Commit: b6284cfc63872a34cb5cfe4f4494f1a8187fb367 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6284cfc63872a34cb5cfe4f4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 14 16:06:40 2014 +0200 include: Add STATE_SYSTEM_* definition to oleacc.idl. --- include/oleacc.idl | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/include/oleacc.idl b/include/oleacc.idl index e9cf138..daf7dec 100644 --- a/include/oleacc.idl +++ b/include/oleacc.idl @@ -18,6 +18,7 @@ import "oaidl.idl"; +cpp_quote("#define NAVDIR_MIN 0") cpp_quote("#define NAVDIR_UP 1") cpp_quote("#define NAVDIR_DOWN 2") cpp_quote("#define NAVDIR_LEFT 3") @@ -26,6 +27,7 @@ cpp_quote("#define NAVDIR_NEXT 5") cpp_quote("#define NAVDIR_PREVIOUS 6") cpp_quote("#define NAVDIR_FIRSTCHILD 7") cpp_quote("#define NAVDIR_LASTCHILD 8") +cpp_quote("#define NAVDIR_MAX 9") cpp_quote("#define ROLE_SYSTEM_TITLEBAR 1") cpp_quote("#define ROLE_SYSTEM_MENUBAR 2") @@ -100,6 +102,45 @@ cpp_quote("#define SELFLAG_ADDSELECTION 0x08") cpp_quote("#define SELFLAG_REMOVESELECTION 0x10") cpp_quote("#define SELFLAG_VALID 0x1f") +cpp_quote("#ifndef STATE_SYSTEM_UNAVAILABLE") +cpp_quote("#define STATE_SYSTEM_NORMAL 0x00000000") +cpp_quote("#define STATE_SYSTEM_UNAVAILABLE 0x00000001") +cpp_quote("#define STATE_SYSTEM_SELECTED 0x00000002") +cpp_quote("#define STATE_SYSTEM_FOCUSED 0x00000004") +cpp_quote("#define STATE_SYSTEM_PRESSED 0x00000008") +cpp_quote("#define STATE_SYSTEM_CHECKED 0x00000010") +cpp_quote("#define STATE_SYSTEM_MIXED 0x00000020") +cpp_quote("#define STATE_SYSTEM_INDETERMINATE STATE_SYSTEM_MIXED") +cpp_quote("#define STATE_SYSTEM_READONLY 0x00000040") +cpp_quote("#define STATE_SYSTEM_HOTTRACKED 0x00000080") +cpp_quote("#define STATE_SYSTEM_DEFAULT 0x00000100") +cpp_quote("#define STATE_SYSTEM_EXPANDED 0x00000200") +cpp_quote("#define STATE_SYSTEM_COLLAPSED 0x00000400") +cpp_quote("#define STATE_SYSTEM_BUSY 0x00000800") +cpp_quote("#define STATE_SYSTEM_FLOATING 0x00001000") +cpp_quote("#define STATE_SYSTEM_MARQUEED 0x00002000") +cpp_quote("#define STATE_SYSTEM_ANIMATED 0x00004000") +cpp_quote("#define STATE_SYSTEM_INVISIBLE 0x00008000") +cpp_quote("#define STATE_SYSTEM_OFFSCREEN 0x00010000") +cpp_quote("#define STATE_SYSTEM_SIZEABLE 0x00020000") +cpp_quote("#define STATE_SYSTEM_MOVEABLE 0x00040000") +cpp_quote("#define STATE_SYSTEM_SELFVOICING 0x00080000") +cpp_quote("#define STATE_SYSTEM_FOCUSABLE 0x00100000") +cpp_quote("#define STATE_SYSTEM_SELECTABLE 0x00200000") +cpp_quote("#define STATE_SYSTEM_LINKED 0x00400000") +cpp_quote("#define STATE_SYSTEM_TRAVERSED 0x00800000") +cpp_quote("#define STATE_SYSTEM_MULTISELECTABLE 0x01000000") +cpp_quote("#define STATE_SYSTEM_EXTSELECTABLE 0x02000000") +cpp_quote("#define STATE_SYSTEM_ALERT_LOW 0x04000000") +cpp_quote("#define STATE_SYSTEM_ALERT_MEDIUM 0x08000000") +cpp_quote("#define STATE_SYSTEM_ALERT_HIGH 0x10000000") +cpp_quote("#define STATE_SYSTEM_PROTECTED 0x20000000") +cpp_quote("#define STATE_SYSTEM_VALID 0x7FFFFFFF") +cpp_quote("#endif") +cpp_quote("#ifndef STATE_SYSTEM_HASPOPUP") +cpp_quote("#define STATE_SYSTEM_HASPOPUP 0x40000000") +cpp_quote("#endif") + typedef GUID MSAAPROPID; typedef enum AnnoScope

1 0

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

14 May '14

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 14 May '14

14 May '14

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

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

14 May '14

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

Francois Gouget : testbot/Engine: Rename the TaskComplete() notification to RescheduleJobs().
by Alexandre Julliard 14 May '14

14 May '14

Module: tools Branch: master Commit: 8e09345b413f4bc7acd64d3dcc3691b20934ab6a URL: http://source.winehq.org/git/tools.git/?a=commit;h=8e09345b413f4bc7acd64d3d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 7 02:34:31 2014 +0200 testbot/Engine: Rename the TaskComplete() notification to RescheduleJobs(). It did not actually use the Task ID and only calls ScheduleJobs() so the new name is more accurate. --- testbot/bin/Engine.pl | 6 +++--- testbot/bin/WineRunBuild.pl | 4 ++-- testbot/bin/WineRunReconfig.pl | 4 ++-- testbot/bin/WineRunTask.pl | 4 ++-- testbot/lib/WineTestBot/Engine/Notify.pm | 8 +++----- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index f0570d7..ea04461 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -390,12 +390,12 @@ sub HandleJobRestart return "1OK"; } -sub HandleTaskComplete +sub HandleRescheduleJobs { my $ErrMessage = ScheduleJobs(); if (defined($ErrMessage)) { - LogMsg "Scheduling problem in HandleTaskComplete: $ErrMessage\n"; + LogMsg "Scheduling problem in HandleRescheduleJobs: $ErrMessage\n"; } return "1OK"; @@ -560,7 +560,7 @@ my %Handlers=( "jobsubmit" => \&HandleJobSubmit, "ping" => \&HandlePing, "shutdown" => \&HandleShutdown, - "taskcomplete" => \&HandleTaskComplete, + "reschedulejobs" => \&HandleRescheduleJobs, "vmstatuschange" => \&HandleVMStatusChange, "winepatchmlsubmission" => \&HandleWinePatchMLSubmission, "winepatchwebsubmission" => \&HandleWinePatchWebSubmission, diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index e8561c9..b07454b 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -76,7 +76,7 @@ sub FatalError($$$$) $VM->Save(); } - TaskComplete($JobKey, $StepKey, $TaskKey); + RescheduleJobs(); exit 1; } @@ -333,7 +333,7 @@ $Task = undef; $Step = undef; $Job = undef; -TaskComplete($JobId, $StepNo, $TaskNo); +RescheduleJobs(); LogMsg "Task $JobId/$StepNo/$TaskNo completed\n"; exit 0; diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 562b9d1..555f4e4 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -76,7 +76,7 @@ sub FatalError($$$$) $VM->Save(); } - TaskComplete($JobKey, $StepKey, $TaskKey); + RescheduleJobs(); exit 1; } @@ -291,7 +291,7 @@ $Task = undef; $Step = undef; $Job = undef; -TaskComplete($JobId, $StepNo, $TaskNo); +RescheduleJobs(); LogMsg "Task $JobId/$StepNo/$TaskNo completed\n"; exit 0; diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index efeac8d..2413a76 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -84,7 +84,7 @@ sub FatalError($$$$$) $VM->Status('dirty'); $VM->Save(); - TaskComplete($JobKey, $StepKey, $TaskKey); + RescheduleJobs(); exit 1; } @@ -383,7 +383,7 @@ $Task = undef; $Step = undef; $Job = undef; -TaskComplete($JobId, $StepNo, $TaskNo); +RescheduleJobs(); LogMsg "Task $JobId/$StepNo/$TaskNo (" . $VM->Name . ") completed\n"; exit 0; diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index 1a1ab6d..f376337 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 &TaskComplete &VMStatusChange &FoundWinetestUpdate + &JobRestart &RescheduleJobs &VMStatusChange &FoundWinetestUpdate &WinePatchMLSubmission &WinePatchWebSubmission &GetScreenshot); @EXPORT_OK = qw($RunningInEngine); @@ -167,11 +167,9 @@ sub JobRestart return substr($Reply, 1); } -sub TaskComplete +sub RescheduleJobs { - my ($JobKey, $StepKey, $TaskKey) = @_; - - my $Reply = SendCmdReceiveReply("taskcomplete $JobKey $StepKey $TaskKey\n"); + my $Reply = SendCmdReceiveReply("reschedulejobs\n"); if (length($Reply) < 1) { return "Unrecognized reply received from engine";

1 0

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

14 May '14

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

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

14 May '14

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/VMs: Catch the Libvirt exceptions in IsPoweredOn ().
by Alexandre Julliard 14 May '14

14 May '14

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/WinePatchesWebSubmit: Improve robustness, particularly when the Engine is not running.
by Alexandre Julliard 14 May '14

14 May '14

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