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

[PATCH] comctl32/tests: More tests for HTREEITEM layout.
by Nikolay Sivov 12 Aug '18

12 Aug '18

Based on research by Zhiyi Zhang. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/treeview.c | 72 +++++++++++++++++++++++++++------- 1 file changed, 58 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 33edaaf4b4..14d814d8e0 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -2175,20 +2175,64 @@ struct _ITEM_DATA HTREEITEM parent; /* for root value of parent field is unidetified */ HTREEITEM nextsibling; HTREEITEM firstchild; + void *unk[2]; + DWORD unk2; + WORD pad; + WORD width; }; -static void _check_item(HTREEITEM item, HTREEITEM parent, HTREEITEM nextsibling, HTREEITEM firstchild, int line) +struct _ITEM_DATA_V6 { - struct _ITEM_DATA *data = (struct _ITEM_DATA*)item; + HTREEITEM parent; /* for root value of parent field is unidetified */ + HTREEITEM nextsibling; + HTREEITEM firstchild; + void *unk[3]; + DWORD unk2[2]; + WORD pad; + WORD width; +}; - ok_(__FILE__, line)(data->parent == parent, "parent %p, got %p\n", parent, data->parent); - ok_(__FILE__, line)(data->nextsibling == nextsibling, "sibling %p, got %p\n", nextsibling, data->nextsibling); - ok_(__FILE__, line)(data->firstchild == firstchild, "firstchild %p, got %p\n", firstchild, data->firstchild); +static void _check_item(HWND hwnd, HTREEITEM item, BOOL is_version_6, int line) +{ + struct _ITEM_DATA *data = (struct _ITEM_DATA *)item; + HTREEITEM parent, nextsibling, firstchild, root; + RECT rect; + BOOL ret; + + root = (HTREEITEM)SendMessageA(hwnd, TVM_GETNEXTITEM, TVGN_ROOT, (LPARAM)item); + parent = (HTREEITEM)SendMessageA(hwnd, TVM_GETNEXTITEM, TVGN_PARENT, (LPARAM)item); + nextsibling = (HTREEITEM)SendMessageA(hwnd, TVM_GETNEXTITEM, TVGN_NEXT, (LPARAM)item); + firstchild = (HTREEITEM)SendMessageA(hwnd, TVM_GETNEXTITEM, TVGN_CHILD, (LPARAM)item); + + *(HTREEITEM*)&rect = item; + ret = SendMessageA(hwnd, TVM_GETITEMRECT, TRUE, (LPARAM)&rect); + + ok_(__FILE__, line)(item == root ? data->parent != NULL : data->parent == parent, + "Unexpected parent item %p, got %p, %p\n", parent, data->parent, hwnd); + ok_(__FILE__, line)(data->nextsibling == nextsibling, "Unexpected sibling %p, got %p\n", + nextsibling, data->nextsibling); + ok_(__FILE__, line)(data->firstchild == firstchild, "Unexpected first child %p, got %p\n", + firstchild, data->firstchild); + if (ret) + { + WORD width; + + if (is_version_6) + { + struct _ITEM_DATA_V6 *data_v6 = (struct _ITEM_DATA_V6 *)item; + width = data_v6->width; + } + else + width = data->width; + todo_wine + ok_(__FILE__, line)(width == (rect.right - rect.left), "Width %d, rect width %d.\n", + width, rect.right - rect.left); + } } -#define check_item(a, b, c, d) _check_item(a, b, c, d, __LINE__) +#define CHECK_ITEM(a, b) _check_item(a, b, is_version_6, __LINE__) -static void test_htreeitem_layout(void) +static void test_htreeitem_layout(BOOL is_version_6) { TVINSERTSTRUCTA ins; HTREEITEM item1, item2; @@ -2198,27 +2242,27 @@ static void test_htreeitem_layout(void) fill_tree(hTree); /* root has some special pointer in parent field */ - check_item(hRoot, ((struct _ITEM_DATA*)hRoot)->parent, 0, hChild); - check_item(hChild, hRoot, 0, 0); + CHECK_ITEM(hTree, hRoot); + CHECK_ITEM(hTree, hChild); ins.hParent = hChild; ins.hInsertAfter = TVI_FIRST; U(ins).item.mask = 0; item1 = TreeView_InsertItemA(hTree, &ins); - check_item(item1, hChild, 0, 0); + CHECK_ITEM(hTree, item1); ins.hParent = hRoot; ins.hInsertAfter = TVI_FIRST; U(ins).item.mask = 0; item2 = TreeView_InsertItemA(hTree, &ins); - check_item(item2, hRoot, hChild, 0); + CHECK_ITEM(hTree, item2); SendMessageA(hTree, TVM_DELETEITEM, 0, (LPARAM)hChild); /* without children now */ - check_item(hRoot, ((struct _ITEM_DATA*)hRoot)->parent, 0, item2); + CHECK_ITEM(hTree, hRoot); DestroyWindow(hTree); } @@ -2870,7 +2914,7 @@ START_TEST(treeview) test_WM_PAINT(); test_delete_items(); test_cchildren(); - test_htreeitem_layout(); + test_htreeitem_layout(FALSE); test_TVS_CHECKBOXES(); test_TVM_GETNEXTITEM(); test_TVM_HITTEST(); @@ -2907,7 +2951,7 @@ START_TEST(treeview) test_treeview_classinfo(); test_delete_items(); test_cchildren(); - test_htreeitem_layout(); + test_htreeitem_layout(TRUE); test_TVM_GETNEXTITEM(); test_TVM_HITTEST(); test_WM_GETDLGCODE(); -- 2.18.0

2 1

[PATCH] wmp/tests: Fix a minor leak on error path (Coverity)
by Nikolay Sivov 12 Aug '18

12 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wmp/tests/media.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c index 218b80f1e6..aeca6180b0 100644 --- a/dlls/wmp/tests/media.c +++ b/dlls/wmp/tests/media.c @@ -309,7 +309,7 @@ static BOOL test_wmp(void) LONG progress; IWMPMedia *media; static const WCHAR currentPosition[] = {'c','u','r','r','e','n','t','P','o','s','i','t','i','o','n',0}; - BSTR bstrcurrentPosition = SysAllocString(currentPosition); + BSTR bstrcurrentPosition; hres = CoCreateInstance(&CLSID_WindowsMediaPlayer, NULL, CLSCTX_INPROC_SERVER, &IID_IOleObject, (void**)&oleobj); if(hres == REGDB_E_CLASSNOTREG) { @@ -344,6 +344,7 @@ static BOOL test_wmp(void) ok(hres == S_OK, "get_controls failed: %08x\n", hres); ok(controls != NULL, "controls = NULL\n"); + bstrcurrentPosition = SysAllocString(currentPosition); hres = IWMPControls_get_isAvailable(controls, bstrcurrentPosition, &vbool); ok(hres == S_OK, "IWMPControls_get_isAvailable failed: %08x\n", hres); ok(vbool == VARIANT_FALSE, "unexpected value\n"); -- 2.18.0

1 0

[PATCH vkd3d v3 1/7] vkd3d: Fix pthread_setname_np(3) call on Mac OS.
by Chip Davis 10 Aug '18

10 Aug '18

That function exists on Mac, but it only takes a single argument, the thread's new name. That's OK for our purposes, since we were calling it on pthread_self anyhow. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- Notes: Try 2: Pull the pthread_setname_np(3) call into a header. Try 3: Detect which variant of pthread_setname_np(3) we have at configure time. configure.ac | 28 ++++++++++++++++++++++++++++ libs/vkd3d/command.c | 4 +--- libs/vkd3d/vkd3d_private.h | 11 +++++++++++ 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 2773a15..973105b 100644 --- a/configure.ac +++ b/configure.ac @@ -94,6 +94,34 @@ VKD3D_CHECK_FUNC([HAVE_SYNC_ADD_AND_FETCH], [__sync_add_and_fetch], [__sync_add_ VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_and_fetch((int *)0, 0)]) VKD3D_CHECK_LIB_FUNCS([pthread_setname_np], [$PTHREAD_LIBS]) +AS_IF([test "x$ac_cv_func_pthread_setname_np" = xyes], + [AC_MSG_CHECKING([which variant of pthread_setname_np is present]) + AC_CACHE_VAL([vkd3d_cv_pthread_setname_np_variant], + [vkd3d_cv_pthread_setname_np_variant=unknown + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [#ifdef HAVE_PTHREAD_H + #include <pthread.h> + #endif + ], + [pthread_setname_np(pthread_self(), "conftest");])], + [vkd3d_cv_pthread_setname_np_variant=twoarg], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [#ifdef HAVE_PTHREAD_H + #include <pthread.h> + #endif + ], + [pthread_setname_np("conftest");])], + [vkd3d_cv_pthread_setname_np_variant=onearg])])]) + AS_CASE(["$vkd3d_cv_pthread_setname_np_variant"], + [onearg], + [AC_DEFINE([HAVE_PTHREAD_SETNAME_NP_ONEARG], [1], + [Define to 1 if you have the version of pthread_setname_np(3) that only accepts a name.]) + AC_MSG_RESULT([name only])], + [twoarg], + [AC_DEFINE([HAVE_PTHREAD_SETNAME_NP_TWOARG], [1], + [Define to 1 if you have the version of pthread_setname_np(3) that accepts a pthread handle and name.]) + AC_MSG_RESULT([pthread handle and name])], + [AC_MSG_RESULT([unknown])])]) AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"]) AM_CONDITIONAL([HAVE_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"]) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 4db9967..042d2f1 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -199,9 +199,7 @@ static void *vkd3d_fence_worker_main(void *arg) struct vkd3d_fence_worker *worker = arg; int rc; -#ifdef HAVE_PTHREAD_SETNAME_NP - pthread_setname_np(pthread_self(), "vkd3d_worker"); -#endif + vkd3d_set_thread_name("vkd3d_worker"); for (;;) { diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 8efb930..ca9fbaf 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -86,6 +86,17 @@ struct vkd3d_vulkan_info VkPhysicalDeviceSparseProperties sparse_properties; }; +static inline void vkd3d_set_thread_name(const char *name) +{ +#ifdef HAVE_PTHREAD_SETNAME_NP +#ifdef HAVE_PTHREAD_SETNAME_NP_ONEARG + pthread_setname_np(name); +#elif defined(HAVE_PTHREAD_SETNAME_NP_TWOARG) + pthread_setname_np(pthread_self(), name); +#endif +#endif +} + struct vkd3d_instance { VkInstance vk_instance; -- 2.18.0

3 15

[PATCH 1/3] kernel32: Implement stub for SetProcessMitigationPolicy
by Fabian Maurer 10 Aug '18

10 Aug '18

This is needed by x64 chromium sandbox for >= win8. Not doing anything but returning true is enough to make it work, though security won't be perfect. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- ...api-ms-win-core-processthreads-l1-1-1.spec | 2 +- ...api-ms-win-core-processthreads-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/process.c | 10 ++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- include/winnt.h | 19 +++++++++++++++++++ 6 files changed, 33 insertions(+), 3 deletions(-) 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 ebbe55fe68..616fa63909 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 @@ -44,7 +44,7 @@ @ stdcall ResumeThread(long) kernel32.ResumeThread @ stdcall SetPriorityClass(long long) kernel32.SetPriorityClass @ stdcall SetProcessAffinityUpdateMode(long long) kernel32.SetProcessAffinityUpdateMode -@ stub SetProcessMitigationPolicy +@ stdcall SetProcessMitigationPolicy(long ptr long) kernel32.SetProcessMitigationPolicy @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters @ stdcall SetThreadContext(long ptr) kernel32.SetThreadContext @ stdcall SetThreadIdealProcessorEx(long ptr ptr) kernel32.SetThreadIdealProcessorEx 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 db94c2e5e7..8de6c5b66c 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 @@ -49,7 +49,7 @@ @ stdcall ResumeThread(long) kernel32.ResumeThread @ stdcall SetPriorityClass(long long) kernel32.SetPriorityClass @ stdcall SetProcessAffinityUpdateMode(long long) kernel32.SetProcessAffinityUpdateMode -@ stub SetProcessMitigationPolicy +@ stdcall SetProcessMitigationPolicy(long ptr long) kernel32.SetProcessMitigationPolicy @ stdcall SetProcessPriorityBoost(long long) kernel32.SetProcessPriorityBoost @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters @ stdcall SetThreadContext(long ptr) kernel32.SetThreadContext diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index de6f007999..812ffc6ad4 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1427,6 +1427,7 @@ @ stdcall SetProcessAffinityMask(long long) @ stdcall SetProcessAffinityUpdateMode(long long) @ stdcall SetProcessDEPPolicy(long) +@ stdcall SetProcessMitigationPolicy(long ptr long) # @ stub SetProcessPreferredUILanguages @ stdcall SetProcessPriorityBoost(long long) @ stdcall SetProcessShutdownParameters(long long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 4e6ba1118e..a2801df874 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4389,3 +4389,13 @@ BOOL WINAPI BaseFlushAppcompatCache(void) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/********************************************************************** + * SetProcessMitigationPolicy (KERNEL32.@) + */ +BOOL WINAPI SetProcessMitigationPolicy(PROCESS_MITIGATION_POLICY migitation_policy, void *buffer, SIZE_T length) +{ + FIXME("(%d, %p, %lu): stub\n", migitation_policy, buffer, length); + + return TRUE; +} diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index fb7fafe47b..f07ab7bf9a 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1456,7 +1456,7 @@ # @ stub SetProcessDefaultCpuSets # @ stub SetProcessGroupAffinity # @ stub SetProcessInformation -# @ stub SetProcessMitigationPolicy +@ stdcall SetProcessMitigationPolicy(long ptr long) kernel32.SetProcessMitigationPolicy # @ stub SetProcessPreferredUILanguages @ stdcall SetProcessPriorityBoost(long long) kernel32.SetProcessPriorityBoost @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters diff --git a/include/winnt.h b/include/winnt.h index 7f822c4aec..e9e5989f24 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6273,6 +6273,25 @@ typedef enum _RTL_UMS_SCHEDULER_REASON typedef void (CALLBACK *PRTL_UMS_SCHEDULER_ENTRY_POINT)(RTL_UMS_SCHEDULER_REASON,ULONG_PTR,PVOID); +typedef enum _PROCESS_MITIGATION_POLICY { + ProcessDEPPolicy, + ProcessASLRPolicy, + ProcessDynamicCodePolicy, + ProcessStrictHandleCheckPolicy, + ProcessSystemCallDisablePolicy, + ProcessMitigationOptionsMask, + ProcessExtensionPointDisablePolicy, + ProcessControlFlowGuardPolicy, + ProcessSignaturePolicy, + ProcessFontDisablePolicy, + ProcessImageLoadPolicy, + ProcessSystemCallFilterPolicy, + ProcessPayloadRestrictionPolicy, + ProcessChildProcessPolicy, + ProcessSideChannelIsolationPolicy, + MaxProcessMitigationPolicy +} PROCESS_MITIGATION_POLICY, *PPROCESS_MITIGATION_POLICY; + #ifdef __cplusplus } #endif -- 2.18.0

1 2

[PATCH] testbot: Only send an email when a job is really done.
by Francois Gouget 10 Aug '18

10 Aug '18

In particular don't send a report if it is requeued or was canceled. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- 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 464b6db45..4478d479b 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -307,7 +307,7 @@ sub HandleJobStatusChange($$$) LogMsg "Invalid JobKey $JobKey in jobstatuschange message\n"; } - if ($OldStatus eq "running" && $NewStatus ne "running") + if ($OldStatus eq "running" and $NewStatus !~ /^(?:canceled|queued|running)$/) { my $Pid = fork; if (!defined $Pid) -- 2.18.0

1 0

[PATCH] testbot/build: Log the wine commit id the patch is tested on.
by Francois Gouget 10 Aug '18

10 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 4 +++- testbot/bin/build/WineTest.pl | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index da145837b..920fc8204 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -93,7 +93,9 @@ sub ApplyPatch($) my ($PatchFile) = @_; InfoMsg "Applying patch\n"; - system("cd '$DataDir/wine' && set -x && ". + system("cd '$DataDir/wine' && ". + "echo wine:HEAD=`git rev-parse HEAD` && ". + "set -x && ". "git apply --verbose ". ShQuote($PatchFile) ." && ". "git add -A"); if ($? != 0) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 5ef8e614e..1fa59c297 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -90,7 +90,9 @@ sub ApplyPatch($) my ($PatchFile) = @_; InfoMsg "Applying patch\n"; - system("cd '$DataDir/wine' && set -x && ". + system("cd '$DataDir/wine' && ". + "echo wine:HEAD=`git rev-parse HEAD` && ". + "set -x && ". "git apply --verbose ". ShQuote($PatchFile) ." && ". "git add -A"); if ($? != 0) -- 2.18.0

1 0

[PATCH] testbot: Use List::Util::max() instead of reimplementing it.
by Francois Gouget 10 Aug '18

10 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Activity.pm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index b3e576a19..a8885a4e1 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -28,7 +28,9 @@ WineTestBot::Activity - reconstruct the TestBot's activity from its history rec use Exporter 'import'; our @EXPORT = qw(GetActivity GetStatistics); +use List::Util qw(max); use Scalar::Util qw(weaken); + use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::RecordGroups; @@ -40,12 +42,6 @@ sub _UpdateMin($$) $_[0] = $_[1] if (!defined $_[0] or $_[1] < $_[0]); } -sub max($$) -{ - my ($a, $b) = @_; - return $a > $b ? $a : $b; -} - =pod =over 12 @@ -442,8 +438,7 @@ sub GetStatistics($;$) # Of course this only works for statistics about VM operations and running # tasks (so running.time, reverting.time, etc) not for those about idle or # off VMs (idle.time, etc.). - $ActivitySeconds = $Seconds + 60 + - ($SuiteTimeout > $ReconfigTimeout ? $SuiteTimeout : $ReconfigTimeout); + $ActivitySeconds = $Seconds + 60 + max($SuiteTimeout, $ReconfigTimeout); } my ($Activity, $Counters) = GetActivity($VMs, $ActivitySeconds); $GlobalStats->{"recordgroups.count"} = $Counters->{recordgroups}; -- 2.18.0

1 0

[PATCH] testbot/WineRun*: FatalError() does not return so remove the following else.
by Francois Gouget 10 Aug '18

10 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 4 ++-- testbot/bin/WineRunReconfig.pl | 4 ++-- testbot/bin/WineRunTask.pl | 4 ++-- testbot/bin/WineRunWineTest.pl | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 10c098936..47e4b3bbd 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -316,11 +316,11 @@ if ($VM->Type ne "build") { FatalError("This is not a build VM! (" . $VM->Type . ")\n"); } -elsif (!$Debug and $VM->Status ne "running") +if (!$Debug and $VM->Status ne "running") { FatalError("The VM is not ready for use (" . $VM->Status . ")\n"); } -elsif (!$VM->GetDomain()->IsPoweredOn()) +if (!$VM->GetDomain()->IsPoweredOn()) { FatalError("The VM is not powered on\n"); } diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 8a3d955a7..24a24d067 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -316,11 +316,11 @@ if ($VM->Type ne "build" and $VM->Type ne "wine") { FatalError("This is neither a build nor a Wine VM! (" . $VM->Type . ")\n"); } -elsif (!$Debug and $VM->Status ne "running") +if (!$Debug and $VM->Status ne "running") { FatalError("The VM is not ready for use (" . $VM->Status . ")\n"); } -elsif (!$VM->GetDomain()->IsPoweredOn()) +if (!$VM->GetDomain()->IsPoweredOn()) { FatalError("The VM is not powered on\n"); } diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 974ff3b51..204f86305 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -372,11 +372,11 @@ if ($VM->Type ne "win32" and $VM->Type ne "win64") { FatalError("This is not a Windows VM! (" . $VM->Type . ")\n"); } -elsif (!$Debug and $VM->Status ne "running") +if (!$Debug and $VM->Status ne "running") { FatalError("The VM is not ready for use (" . $VM->Status . ")\n"); } -elsif (!$VM->GetDomain()->IsPoweredOn()) +if (!$VM->GetDomain()->IsPoweredOn()) { FatalError("The VM is not powered on\n"); } diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index e7aa72ec9..ee4c8537a 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -373,11 +373,11 @@ if ($VM->Type ne "wine") { FatalError("This is not a Wine VM! (" . $VM->Type . ")\n"); } -elsif (!$Debug and $VM->Status ne "running") +if (!$Debug and $VM->Status ne "running") { FatalError("The VM is not ready for use (" . $VM->Status . ")\n"); } -elsif (!$VM->GetDomain()->IsPoweredOn()) +if (!$VM->GetDomain()->IsPoweredOn()) { FatalError("The VM is not powered on\n"); } -- 2.18.0

1 0

[PATCH] testbot: Remove an unneeded POSIX( qw(:errno_h) import.
by Francois Gouget 10 Aug '18

10 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Tasks.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 54ebf5360..70b620544 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -67,7 +67,6 @@ Status is set to skipped. use WineTestBot::WineTestBotObjects; our @ISA = qw(WineTestBot::WineTestBotItem); -use POSIX qw(:errno_h); use File::Path; use ObjectModel::BackEnd; use WineTestBot::Config; -- 2.18.0

1 0

[PATCH] testbot: A couple of indentation fixes in WineTestBot::Log.
by Francois Gouget 10 Aug '18

10 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Log.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/Log.pm b/testbot/lib/WineTestBot/Log.pm index b73f005c3..5dc933add 100644 --- a/testbot/lib/WineTestBot/Log.pm +++ b/testbot/lib/WineTestBot/Log.pm @@ -123,15 +123,15 @@ sub Time() sub Elapsed($) { - my ($Start) = @_; - return sprintf("%0.2f", Time()-$Start); + my ($Start) = @_; + return sprintf("%0.2f", Time() - $Start); } sub PrettyElapsed($) { - my ($Start) = @_; - require WineTestBot::Utils; - return WineTestBot::Utils::DurationToString(Time()-$Start); + my ($Start) = @_; + require WineTestBot::Utils; + return WineTestBot::Utils::DurationToString(Time() - $Start); } 1; -- 2.18.0

1 0