May 2018 - Wine-devel - list.winehq.org

wine 3.7 can run VC + visual assist, but wine 3.8 can not.
by xinglp 16 May '18

16 May '18

I'm using archlinux, and WINEARCH=win32 If visual assist uninstalled, VC can run well on both wine 3.7 and wine 3.8. With wine 3.8 and visual assist installed, the VC immediately freezed after launch, no response at all. Also, when I replace /usr/lib32/wine with the same contents of wine 3.7, it became work again. Thanks.

2 1

[PATCH] kernel32: Add SetProcessAffinityUpdateMode stub.
by Gijs Vermeulen 16 May '18

16 May '18

From: Thomas Crider <gloriouseggroll(a)gmail.com> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- Fixes a crash in Dead Rising 4. .../api-ms-win-core-processthreads-l1-1-0.spec | 2 +- .../api-ms-win-core-processthreads-l1-1-1.spec | 2 +- .../api-ms-win-core-processthreads-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 7 +++++++ dlls/kernelbase/kernelbase.spec | 2 +- 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec index ff13d484f6..154c875f81 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec @@ -32,7 +32,7 @@ @ stdcall QueueUserAPC(ptr long long) kernel32.QueueUserAPC @ stdcall ResumeThread(long) kernel32.ResumeThread @ stdcall SetPriorityClass(long long) kernel32.SetPriorityClass -@ stub SetProcessAffinityUpdateMode +@ stdcall SetProcessAffinityUpdateMode(long long) kernel32.SetProcessAffinityUpdateMode @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters @ stdcall SetThreadPriority(long long) kernel32.SetThreadPriority @ stdcall SetThreadPriorityBoost(long long) kernel32.SetThreadPriorityBoost diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec index 381db8aa6e..ebbe55fe68 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec @@ -43,7 +43,7 @@ @ stdcall QueueUserAPC(ptr long long) kernel32.QueueUserAPC @ stdcall ResumeThread(long) kernel32.ResumeThread @ stdcall SetPriorityClass(long long) kernel32.SetPriorityClass -@ stub SetProcessAffinityUpdateMode +@ stdcall SetProcessAffinityUpdateMode(long long) kernel32.SetProcessAffinityUpdateMode @ stub SetProcessMitigationPolicy @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters @ stdcall SetThreadContext(long ptr) kernel32.SetThreadContext diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec index fc2feecdb0..db94c2e5e7 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -48,7 +48,7 @@ @ stdcall QueueUserAPC(ptr long long) kernel32.QueueUserAPC @ stdcall ResumeThread(long) kernel32.ResumeThread @ stdcall SetPriorityClass(long long) kernel32.SetPriorityClass -@ stub SetProcessAffinityUpdateMode +@ stdcall SetProcessAffinityUpdateMode(long long) kernel32.SetProcessAffinityUpdateMode @ stub SetProcessMitigationPolicy @ stdcall SetProcessPriorityBoost(long long) kernel32.SetProcessPriorityBoost @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index e78c1ca8ab..9ed5dfbccf 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1425,7 +1425,7 @@ @ stdcall SetNamedPipeHandleState(long ptr ptr ptr) @ stdcall SetPriorityClass(long long) @ stdcall SetProcessAffinityMask(long long) -# @ stub SetProcessAffinityUpdateMode +@ stdcall SetProcessAffinityUpdateMode(long long) @ stdcall SetProcessDEPPolicy(long) # @ stub SetProcessPreferredUILanguages @ stdcall SetProcessPriorityBoost(long long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index df3426b30b..baa6ec8afe 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3650,6 +3650,13 @@ cleanup: return !status; } +BOOL WINAPI SetProcessAffinityUpdateMode(HANDLE hProcess, DWORD flags) +{ + FIXME("(%p,0x%08x): stub\n", hProcess, flags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + /*********************************************************************** * K32GetProcessImageFileNameA (KERNEL32.@) */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 8cac67f0db..fb7fafe47b 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1452,7 +1452,7 @@ @ stdcall SetPriorityClass(long long) kernel32.SetPriorityClass @ stdcall SetPrivateObjectSecurity(long ptr ptr ptr long) advapi32.SetPrivateObjectSecurity @ stub SetPrivateObjectSecurityEx -@ stub SetProcessAffinityUpdateMode +@ stdcall SetProcessAffinityUpdateMode(long long) kernel32.SetProcessAffinityUpdateMode # @ stub SetProcessDefaultCpuSets # @ stub SetProcessGroupAffinity # @ stub SetProcessInformation -- 2.13.6

2 2

[PATCH] ddraw: Silence noisy FIXME about unimplemented D3DPROCESSVERTICES_UPDATEEXTENTS.
by Gijs Vermeulen 16 May '18

16 May '18

From: Christian Costa <titan.costa(a)gmail.com> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- Fixes noisy fixme that floods the console (> 1000) in VENOM. CODENAME: OUTBREAK. dlls/ddraw/executebuffer.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index b20b9eda71..d8b4b39fd4 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -308,7 +308,10 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, ci->wStart, ci->wDest, ci->dwCount, ci->dwFlags); if (ci->dwFlags & D3DPROCESSVERTICES_UPDATEEXTENTS) - FIXME("D3DPROCESSVERTICES_UPDATEEXTENTS not implemented.\n"); + { + static int once; + if (!once++) FIXME("D3DPROCESSVERTICES_UPDATEEXTENTS not implemented.\n"); + } if (ci->dwFlags & D3DPROCESSVERTICES_NOCOLOR) FIXME("D3DPROCESSVERTICES_NOCOLOR not implemented.\n"); -- 2.13.6

2 1

[PATCH] dplayx: Check array index limit first.
by Andrey Gusev 16 May '18

16 May '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/dplayx/dplayx_global.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index 14c53a0c8d..90c3ed8d7e 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -120,7 +120,7 @@ static LPVOID DPLAYX_PrivHeapAlloc( DWORD flags, DWORD size ) /* Find blank area */ uBlockUsed = 0; - while( lpMemArea[ uBlockUsed ].used && uBlockUsed <= dwMaxBlock ) { uBlockUsed++; } + while( uBlockUsed <= dwMaxBlock && lpMemArea[ uBlockUsed ].used ) { uBlockUsed++; } if( uBlockUsed <= dwMaxBlock ) { -- 2.14.3

2 1

[PATCH] ole32: Check array index limit first.
by Andrey Gusev 16 May '18

16 May '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/ole32/filemoniker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 271e5bb8a8..6e3b00e590 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -1382,7 +1382,7 @@ static HRESULT FileMonikerImpl_Construct(FileMonikerImpl* This, LPCOLESTR lpszPa } else - if (lstrcmpW(tabStr[i],bkSlash)==0 && i<nb-1 && lstrcmpW(tabStr[i+1],bkSlash)==0){ + if (lstrcmpW(tabStr[i+1],bkSlash)==0 && i<nb-1 && lstrcmpW(tabStr[i],bkSlash)==0){ *tabStr[i]=0; sizeStr--; addBkSlash = FALSE; -- 2.14.3

2 1

[PATCH 4/4] schedsvc: Periodically check state of the running task instances.
by Dmitry Timoshkov 16 May '18

16 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 630e634a8f..c63966bdac 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -172,6 +172,25 @@ void check_task_state(void) update_job_status(job); } } + else if (job->instance_count) + { + DWORD exit_code = STILL_ACTIVE; + + TRACE("checking process %s\n", debugstr_w(job->info.Command)); + + if (job->process[job->instance_count - 1]) + GetExitCodeProcess(job->process[job->instance_count - 1], &exit_code); + + if (exit_code != STILL_ACTIVE) + { + CloseHandle(job->process[job->instance_count - 1]); + job->process[job->instance_count - 1] = NULL; + job->data.exit_code = exit_code; + job->data.status = SCHED_S_TASK_TERMINATED; + job->instance_count--; + update_job_status(job); + } + } } LeaveCriticalSection(&at_job_list_section); -- 2.16.3

1 0

[PATCH 3/4] schedsvc: Add support for running a task.
by Dmitry Timoshkov 16 May '18

16 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 7b3e4979fd..630e634a8f 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -146,7 +146,32 @@ void check_task_state(void) update_job_status(job); } else if (job->data.flags & 0x04000000) - FIXME("Run(%s): not implemented\n", debugstr_w(job->info.Command)); + { + TRACE("running process %s\n", debugstr_w(job->info.Command)); + + if (job->instance_count >= MAX_INSTANCE_COUNT) + ERR("total instance count exceeded %u\n", MAX_INSTANCE_COUNT); + else + { + STARTUPINFOW si; + PROCESS_INFORMATION pi; + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + /* FIXME: also specify the target directory */ + if (CreateProcessW(job->info.Command, NULL, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + { + CloseHandle(pi.hThread); + job->process[job->instance_count++] = pi.hProcess; + } + + job->data.exit_code = 0; + job->data.status = SCHED_S_TASK_RUNNING; + job->data.flags &= ~0x04000000; + job->instance_count++; + update_job_status(job); + } + } } LeaveCriticalSection(&at_job_list_section); -- 2.16.3

1 0

[PATCH 2/4] schedsvc: Add support for task termination.
by Dmitry Timoshkov 16 May '18

16 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 68 insertions(+), 1 deletion(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 61771d87b3..7b3e4979fd 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -55,6 +55,8 @@ typedef struct SYSTEMTIME last_runtime; } FIXDLEN_DATA; +#define MAX_INSTANCE_COUNT 32 + struct job_t { struct list entry; @@ -62,6 +64,7 @@ struct job_t AT_ENUM info; FIXDLEN_DATA data; USHORT instance_count; + HANDLE process[MAX_INSTANCE_COUNT]; }; static LONG current_jobid = 1; @@ -76,16 +79,72 @@ static CRITICAL_SECTION_DEBUG cs_debug = }; static CRITICAL_SECTION at_job_list_section = { &cs_debug, -1, 0, 0, 0, 0 }; +static void update_job_status(struct job_t *job) +{ + HANDLE hfile; + DWORD try, size; + struct + { + UINT exit_code; + UINT status; + UINT flags; + SYSTEMTIME last_runtime; + WORD instance_count; + } state; + + try = 1; + for (;;) + { + hfile = CreateFileW(job->name, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + if (hfile == INVALID_HANDLE_VALUE) + { + if (try++ >= 3) + { + ERR("Failed to update %s, error %u\n", debugstr_w(job->name), GetLastError()); + return; + } + Sleep(100); + } + } + + if (SetFilePointer(hfile, FIELD_OFFSET(FIXDLEN_DATA, exit_code), NULL, FILE_BEGIN) != INVALID_SET_FILE_POINTER) + { + state.exit_code = job->data.exit_code; + state.status = job->data.status; + state.flags = job->data.flags; + state.last_runtime = job->data.last_runtime; + state.instance_count = job->instance_count; + WriteFile(hfile, &state, sizeof(state), &size, NULL); + } + + CloseHandle(hfile); +} + void check_task_state(void) { struct job_t *job; + WORD i; EnterCriticalSection(&at_job_list_section); LIST_FOR_EACH_ENTRY(job, &at_job_list, struct job_t, entry) { if (job->data.flags & 0x08000000) - FIXME("Terminate(%s): not implemented\n", debugstr_w(job->info.Command)); + { + TRACE("terminating process %s\n", debugstr_w(job->info.Command)); + + for (i = 0; i < job->instance_count; i++) + { + TerminateProcess(job->process[i], 0); + CloseHandle(job->process[i]); + } + + job->data.exit_code = 0; + job->data.status = SCHED_S_TASK_TERMINATED; + job->data.flags &= ~0x08000000; + job->instance_count = 0; + update_job_status(job); + } else if (job->data.flags & 0x04000000) FIXME("Run(%s): not implemented\n", debugstr_w(job->info.Command)); } @@ -339,6 +398,14 @@ static void free_job_info(AT_ENUM *info) static void free_job(struct job_t *job) { + WORD i; + + for (i = 0; i < job->instance_count; i++) + { + TerminateProcess(job->process[i], 0); + CloseHandle(job->process[i]); + } + free_job_info(&job->info); heap_free(job->name); heap_free(job); -- 2.16.3

1 0

[PATCH] testbot: Detect VM revert loops.
by Francois Gouget 16 May '18

16 May '18

VM revert loops typically happen when a VM is misconfigured such that the TestBot fails to access the TestAgent daemon after reverting it. This results in the VM being put offline until it is accessible again through Libvirt which is the case so that it is immediately put back online and reverted again leading to a new error. With this patch the VM is put in maintenance mode for an administrator to look at if it has too many consecutive errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This requires a database upgrade. testbot/bin/LibvirtTool.pl | 30 +++++++++++++++++++++++++----- testbot/ddl/update33.sql | 5 +++++ testbot/ddl/winetestbot.sql | 1 + testbot/doc/winetestbot-schema.dia | 23 +++++++++++++++++++++++ testbot/lib/WineTestBot/Config.pm | 7 +++++-- testbot/lib/WineTestBot/VMs.pm | 1 + testbot/web/admin/VMDetails.pl | 4 +++- 7 files changed, 63 insertions(+), 8 deletions(-) create mode 100644 testbot/ddl/update33.sql diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index f9a43bb77..91fe05358 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -193,23 +193,42 @@ sub FatalError($) my ($ErrMessage) = @_; Error $ErrMessage; - # Put the VM offline if nobody else modified its status before us + # Put the VM offline or mark it for maintenance + my $Errors = ($VM->Errors || 0) + 1; + my $NewStatus = $Errors < $MaxVMErrors ? "offline" : "maintenance"; + $VM = CreateVMs()->GetItem($VMKey); - $VM->Status("offline") if ($VM->Status eq $CurrentStatus); - $VM->ChildDeadline(undef); - $VM->ChildPid(undef); + # Put the VM offline if nobody else modified its status before us + if ($VM->Status eq $CurrentStatus) + { + $VM->Status($NewStatus); + $VM->ChildDeadline(undef); + $VM->ChildPid(undef); + $VM->Errors($Errors); + } + else + { + $NewStatus = ""; + } my ($ErrProperty, $SaveErrMessage) = $VM->Save(); if (defined $SaveErrMessage) { LogMsg "Could not put the $VMKey VM offline: $SaveErrMessage ($ErrProperty)\n"; } - elsif ($VM->Status eq "offline") + elsif ($NewStatus eq "offline") { NotifyAdministrator("Putting the $VMKey VM offline", "Could not perform the $Action operation on the $VMKey VM:\n". "\n$ErrMessage\n". "The VM has been put offline and the TestBot will try to regain access to it."); } + elsif ($NewStatus eq "maintenance") + { + NotifyAdministrator("The $VMKey VM needs maintenance", + "Got ". $VM->Errors ." consecutive errors working on the $VMKey VM:\n". + "\n$ErrMessage\n". + "An administrator needs to look at it and to put it back online."); + } exit 1; } @@ -244,6 +263,7 @@ sub ChangeStatus($$;$) $VM->Status($To); if ($Done) { + $VM->Errors(undef) if ($To eq "idle"); $VM->ChildDeadline(undef); $VM->ChildPid(undef); } diff --git a/testbot/ddl/update33.sql b/testbot/ddl/update33.sql new file mode 100644 index 000000000..7239f1dba --- /dev/null +++ b/testbot/ddl/update33.sql @@ -0,0 +1,5 @@ +USE winetestbot; + +ALTER TABLE VMs + ADD Errors INT(2) NULL + AFTER Status; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 89810ddc0..32eab4e3e 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -49,6 +49,7 @@ CREATE TABLE VMs Type ENUM('win32', 'win64', 'build') NOT NULL, Role ENUM('extra', 'base', 'winetest', 'retired', 'deleted') NOT NULL, Status ENUM('dirty', 'reverting', 'sleeping', 'idle', 'running', 'off', 'offline', 'maintenance') NOT NULL, + Errors INT(2) NULL, ChildPid INT(5) NULL, ChildDeadline DATETIME NULL, VirtURI VARCHAR(64) NOT NULL, diff --git a/testbot/doc/winetestbot-schema.dia b/testbot/doc/winetestbot-schema.dia index 61a722a21..2c720f2d2 100644 --- a/testbot/doc/winetestbot-schema.dia +++ b/testbot/doc/winetestbot-schema.dia @@ -2452,6 +2452,29 @@ <dia:string>##</dia:string> </dia:attribute> </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#Errors#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#INT(2)#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> <dia:string>#ChildPid#</dia:string> diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 2eb4f45a8..4f4c8d82a 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -29,7 +29,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $DbDataSource $DbUsername $DbPassword $MaxRevertingVMs $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxRunningVMs $MaxVMsWhenIdle $SleepAfterRevert $WaitForToolsInVM - $VMToolTimeout $MaxTaskTries $AdminEMail $RobotEMail + $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout $SingleTimeout $BuildTimeout $ReconfigTimeout $TimeoutMargin $TagPrefix $MaxUnitSize $ProjectName $PatchesMailingList $LDAPServer @@ -43,7 +43,7 @@ require Exporter; @EXPORT = qw($UseSSL $LogDir $DataDir $BinDir $MaxRevertingVMs $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxRunningVMs $MaxVMsWhenIdle $SleepAfterRevert $WaitForToolsInVM - $VMToolTimeout $MaxTaskTries $AdminEMail + $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout $SingleTimeout $BuildTimeout $ReconfigTimeout $TimeoutMargin $TagPrefix $MaxUnitSize $ProjectName $PatchesMailingList @@ -82,6 +82,9 @@ $SleepAfterRevert = 0; # Take into account $WaitForToolsInVM and $SleepAfterRevert $VMToolTimeout = 6 * 60; +# After three consecutive failures to revert a VM, put it in maintenance mode. +$MaxVMErrors = 3; + # How many times to run a test that fails before giving up. $MaxTaskTries = 3; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 9f5a2c78d..a29eebbba 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -667,6 +667,7 @@ my @PropertyDescriptors = ( CreateEnumPropertyDescriptor("Type", "Type of VM", !1, 1, ['win32', 'win64', 'build']), CreateEnumPropertyDescriptor("Role", "VM Role", !1, 1, ['extra', 'base', 'winetest', 'retired', 'deleted']), CreateEnumPropertyDescriptor("Status", "Current status", !1, 1, ['dirty', 'reverting', 'sleeping', 'idle', 'running', 'off', 'offline', 'maintenance']), + CreateBasicPropertyDescriptor("Errors", "Errors", !1, !1, "N", 2), CreateBasicPropertyDescriptor("ChildPid", "Child process id", !1, !1, "N", 5), CreateBasicPropertyDescriptor("ChildDeadline", "Child Deadline", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("VirtURI", "LibVirt URI of the VM", !1, 1, "A", 64), diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index 93e92763a..057147157 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -40,7 +40,7 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return "" if ($PropertyName =~ /^(?:ChildPid|ChildDeadline)$/); + return "" if ($PropertyName =~ /^(?:ChildPid|ChildDeadline|Errors)$/); return $self->SUPER::DisplayProperty($PropertyDescriptor); } @@ -53,6 +53,8 @@ sub Save($) if ($OldStatus ne $self->{Item}->Status) { + # The administrator action resets the consecutive error count + $self->{Item}->Errors(undef); my ($ErrProperty, $ErrMessage) = $self->{Item}->Validate(); if (!defined $ErrMessage) { -- 2.17.0

1 0

[PATCH] msi/tests: Break out of the loop if both components are found in test_MsiEnumComponentsEx.
by Hans Leidekker 16 May '18

16 May '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/tests/msi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 21a0358aa2..62afa6e747 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -13392,6 +13392,7 @@ static void test_MsiEnumComponentsEx(void) ok( !sid[0], "got \"%s\"\n", sid ); ok( !len, "unexpected length %u\n", len ); found1 = TRUE; + if (found2) break; } if (!strcmp( comp2, guid )) { @@ -13399,6 +13400,7 @@ static void test_MsiEnumComponentsEx(void) ok( sid[0], "empty sid\n" ); ok( len == strlen(sid), "unexpected length %u\n", len ); found2 = TRUE; + if (found1) break; } index++; guid[0] = 0; -- 2.11.0

1 0