February 2022 - Wine-commits

Zebediah Figura : winegstreamer: Explicitly sleep in the DirectShow streaming thread after receiving EOS.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: 7da1828c4927faec011d1c15d2f3f9bbb43435b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7da1828c4927faec011d1c15… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 23 15:46:46 2022 -0600 winegstreamer: Explicitly sleep in the DirectShow streaming thread after receiving EOS. Instead of waiting for another event from the wg_parser object. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/quartz_parser.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 4afd265bca7..30afd0874ea 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -74,6 +74,7 @@ struct parser_source SourceSeeking seek; CRITICAL_SECTION flushing_cs; + CONDITION_VARIABLE eos_cv; HANDLE thread; /* This variable is read and written by both the streaming thread and @@ -81,6 +82,8 @@ struct parser_source * thread when the streaming thread is not running, or when it is blocked * by flushing_cs. */ bool need_segment; + + bool eos; }; static inline struct parser *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -823,6 +826,13 @@ static DWORD CALLBACK stream_thread(void *arg) EnterCriticalSection(&pin->flushing_cs); + if (pin->eos) + { + SleepConditionVariableCS(&pin->eos_cv, &pin->flushing_cs, INFINITE); + LeaveCriticalSection(&pin->flushing_cs); + continue; + } + if (!wg_parser_stream_get_event(pin->wg_stream, &event)) { LeaveCriticalSection(&pin->flushing_cs); @@ -839,6 +849,7 @@ static DWORD CALLBACK stream_thread(void *arg) case WG_PARSER_EVENT_EOS: IPin_EndOfStream(pin->pin.pin.peer); + pin->eos = true; break; case WG_PARSER_EVENT_NONE: @@ -973,17 +984,19 @@ static HRESULT parser_init_stream(struct strmbase_filter *iface) for (i = 0; i < filter->source_count; ++i) { + struct parser_source *pin = filter->sources[i]; HRESULT hr; - if (!filter->sources[i]->pin.pin.peer) + if (!pin->pin.pin.peer) continue; - if (FAILED(hr = IMemAllocator_Commit(filter->sources[i]->pin.pAllocator))) + if (FAILED(hr = IMemAllocator_Commit(pin->pin.pAllocator))) ERR("Failed to commit allocator, hr %#lx.\n", hr); - filter->sources[i]->need_segment = true; + pin->need_segment = true; + pin->eos = false; - filter->sources[i]->thread = CreateThread(NULL, 0, stream_thread, filter->sources[i], 0, NULL); + pin->thread = CreateThread(NULL, 0, stream_thread, pin, 0, NULL); } return S_OK; @@ -1009,6 +1022,7 @@ static HRESULT parser_cleanup_stream(struct strmbase_filter *iface) IMemAllocator_Decommit(pin->pin.pAllocator); + WakeConditionVariable(&pin->eos_cv); WaitForSingleObject(pin->thread, INFINITE); CloseHandle(pin->thread); pin->thread = NULL; @@ -1371,9 +1385,13 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, struct parser_source *flush_pin = filter->sources[i]; flush_pin->need_segment = true; + flush_pin->eos = false; if (flush_pin->pin.pin.peer) + { LeaveCriticalSection(&flush_pin->flushing_cs); + WakeConditionVariable(&flush_pin->eos_cv); + } } return S_OK; @@ -1613,6 +1631,7 @@ static struct parser_source *create_pin(struct parser *filter, InitializeCriticalSection(&pin->flushing_cs); pin->flushing_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": pin.flushing_cs"); + InitializeConditionVariable(&pin->eos_cv); filter->sources[filter->source_count++] = pin; return pin;

1 0

Giovanni Mascellani : include: Clarify docs for PFN_vkd3d_shader_close_include.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: vkd3d Branch: master Commit: 2a92fc1676269d9e2d251dd42f49992b562185d1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2a92fc1676269d9e2d251dd… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Feb 24 09:20:14 2022 +0100 include: Clarify docs for PFN_vkd3d_shader_close_include. Clarify the contract about memory management of the code parameter and reference callbacks by their name as fields of struct vkd3d_shader_preprocess_info rather than by their type (like it is already done above). Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 1eae0bb..5a60b37 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -787,8 +787,7 @@ typedef int (*PFN_vkd3d_shader_open_include)(const char *filename, bool local, * vkd3d_shader_preprocess_info. * * \param code Contents of the included file, which were allocated by the - * \ref PFN_vkd3d_shader_open_include callback. The source code was allocated by - * the user and thus need not be freed by vkd3d_shader_free_shader_code(). + * \ref pfn_open_include callback. The user must free them. * * \param context The user-defined pointer passed to struct * vkd3d_shader_preprocess_info.

1 0

Zebediah Figura : tests: Add some simple tests for HLSL function calls.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: vkd3d Branch: master Commit: cdd7f3d3627e43db1ae12e4c330adf138925c88d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cdd7f3d3627e43db1ae12e4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 24 15:06:13 2022 +0100 tests: Add some simple tests for HLSL function calls. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 + tests/hlsl-function.shader_test | 164 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 166 insertions(+) diff --git a/Makefile.am b/Makefile.am index 2425706..57cf578 100644 --- a/Makefile.am +++ b/Makefile.am @@ -65,6 +65,7 @@ vkd3d_shader_tests = \ tests/hlsl-cross.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ + tests/hlsl-function.shader_test \ tests/hlsl-function-overload.shader_test \ tests/hlsl-gather-offset.shader_test \ tests/hlsl-gather.shader_test \ @@ -316,6 +317,7 @@ XFAIL_TESTS = \ tests/hlsl-bool-cast.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ + tests/hlsl-function.shader_test \ tests/hlsl-function-overload.shader_test \ tests/hlsl-gather.shader_test \ tests/hlsl-intrinsic-override.shader_test \ diff --git a/tests/hlsl-function.shader_test b/tests/hlsl-function.shader_test new file mode 100644 index 0000000..8d17605 --- /dev/null +++ b/tests/hlsl-function.shader_test @@ -0,0 +1,164 @@ +[pixel shader fail] + +float4 func(); + +float4 main() : sv_target +{ + return func(); +} + +% It's legal to call an undefined function in unused code, though. + +[pixel shader] + +float4 func(); + +float4 unused() +{ + return func(); +} + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail] + +void func(inout float o) +{ + o += 0.1; +} + +float4 main() : sv_target +{ + float x = 0; + func(x + 1); + return 0; +} + +[pixel shader fail] + +void func(inout float2 o) +{ + o += 0.1; +} + +float4 main() : sv_target +{ + float2 x = 0; + func(x.yy); + return 0; +} + +[pixel shader fail] + +void func(out float o) +{ + o = 0.1; +} + +float4 main() : sv_target +{ + const float x = 0; + func(x); + return x; +} + +[pixel shader fail] + +void func(inout float o) +{ +} + +float4 main() : sv_target +{ + const float x = 0; + func(x); + return x; +} + +[pixel shader fail] + +void func() +{ +} + +float4 main() : sv_target +{ + return func(); +} + +[pixel shader fail] + +void foo() +{ +} + +void bar() +{ + return foo(); +} + +float4 main() : sv_target +{ + bar(); + return 0; +} + +[pixel shader fail] + +float4 main() : sv_target +{ + func(); + return 0; +} + +void func() +{ +} + +[pixel shader] + +float func(in float a, out float b, inout float c) +{ + c -= 0.2; + b = a * 2; + return a + 0.2; +} + +float4 main() : sv_target +{ + float x[2], ret; + + x[0] = 0.1; + x[1] = 0.9; + ret = func(0.3, x[0], x[1]); + + return float4(ret, x[0], x[1], 0); +} + +[test] +draw quad +probe all rgba (0.5, 0.6, 0.7, 0) + +[pixel shader] + +void func(in float a, inout float2 b) +{ + b.y += 0.1; + b *= a; +} + +float4 main() : sv_target +{ + float3 q = float3(0.1, 0.2, 0.3); + + func(3.0, q.zx); + func(0.5, q.yz); + return float4(q, 0); +} + +[test] +draw quad +probe all rgba (0.6, 0.1, 0.5, 0)

1 0

Zebediah Figura : tests: Add some tests for casting output arguments to functions.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: vkd3d Branch: master Commit: 8b2bd02a53a93812aab7b0b785b057a4280c15a3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8b2bd02a53a93812aab7b0b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 24 15:06:14 2022 +0100 tests: Add some tests for casting output arguments to functions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 + tests/hlsl-function-cast.shader_test | 87 ++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+) diff --git a/Makefile.am b/Makefile.am index 57cf578..e4f92bb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -66,6 +66,7 @@ vkd3d_shader_tests = \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function.shader_test \ + tests/hlsl-function-cast.shader_test \ tests/hlsl-function-overload.shader_test \ tests/hlsl-gather-offset.shader_test \ tests/hlsl-gather.shader_test \ @@ -318,6 +319,7 @@ XFAIL_TESTS = \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function.shader_test \ + tests/hlsl-function-cast.shader_test \ tests/hlsl-function-overload.shader_test \ tests/hlsl-gather.shader_test \ tests/hlsl-intrinsic-override.shader_test \ diff --git a/tests/hlsl-function-cast.shader_test b/tests/hlsl-function-cast.shader_test new file mode 100644 index 0000000..4f80ac5 --- /dev/null +++ b/tests/hlsl-function-cast.shader_test @@ -0,0 +1,87 @@ +% Test implicit and explicit casts on function output parameters. + +[pixel shader] + +uniform float4 f; + +void func(out float4 o) +{ + o = f; +} + +float4 main() : sv_target +{ + int4 x; + func(x); + return x; +} + +[test] +uniform 0 float4 -1.9 -1.0 2.9 4.0 +draw quad +probe all rgba (-1.0, -1.0, 2.0, 4.0) + +% As above, but cast "x" to float4 first. + +[pixel shader] + +uniform float4 f; + +void func(out float4 o) +{ + o = f; +} + +float4 main() : sv_target +{ + int4 x; + func((float4)x); + return x; +} + +[test] +uniform 0 float4 -1.9 -1.0 2.9 4.0 +draw quad +probe all rgba (-1.0, -1.0, 2.0, 4.0) + +% As above, but declare "x" as float4 and cast it to int4. + +[pixel shader] + +uniform float4 f; + +void func(out float4 o) +{ + o = f; +} + +float4 main() : sv_target +{ + float4 x; + func((int4)x); + return x; +} + +[test] +uniform 0 float4 -1.9 -1.0 2.9 4.0 +draw quad +probe all rgba (-1.0, -1.0, 2.0, 4.0) + +[pixel shader] + +void func(inout float4 a) +{ + a += 0.1; +} + +float4 main(uniform int4 i) : sv_target +{ + int4 x = i; + func(x); + return x; +} + +[test] +uniform 0 int4 -2 0 1 -3000000 +draw quad +probe all rgba (-1.0, 0.0, 1.0, -3000000.0)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Return false from hlsl_offset_from_deref() if the offset falls out of bounds.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: vkd3d Branch: master Commit: 7f166c4da45ada4986999be938dce38626c3e980 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7f166c4da45ada4986999be… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 24 15:06:15 2022 +0100 vkd3d-shader/hlsl: Return false from hlsl_offset_from_deref() if the offset falls out of bounds. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl_codegen.c | 25 +++++++++++++++++-------- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index be515e3..043d7fb 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -790,7 +790,7 @@ unsigned int hlsl_combine_writemasks(unsigned int first, unsigned int second); unsigned int hlsl_map_swizzle(unsigned int swizzle, unsigned int writemask); unsigned int hlsl_swizzle_from_writemask(unsigned int writemask); -bool hlsl_offset_from_deref(const struct hlsl_deref *deref, unsigned int *offset); +bool hlsl_offset_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, unsigned int *offset); unsigned int hlsl_offset_from_deref_safe(struct hlsl_ctx *ctx, const struct hlsl_deref *deref); struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, const struct hlsl_type *type); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 17a7649..e416647 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -349,15 +349,16 @@ static void copy_propagation_set_value(struct copy_propagation_var_def *var_def, } } -static struct hlsl_ir_node *copy_propagation_compute_replacement(const struct copy_propagation_state *state, - const struct hlsl_deref *deref, unsigned int count, unsigned int *swizzle) +static struct hlsl_ir_node *copy_propagation_compute_replacement(struct hlsl_ctx *ctx, + const struct copy_propagation_state *state, const struct hlsl_deref *deref, + unsigned int count, unsigned int *swizzle) { const struct hlsl_ir_var *var = deref->var; struct copy_propagation_var_def *var_def; struct hlsl_ir_node *node = NULL; unsigned int offset, i; - if (!hlsl_offset_from_deref(deref, &offset)) + if (!hlsl_offset_from_deref(ctx, deref, &offset)) return NULL; if (!(var_def = copy_propagation_get_var_def(state, var))) @@ -414,7 +415,7 @@ static bool copy_propagation_transform_load(struct hlsl_ctx *ctx, return false; } - if (!(new_node = copy_propagation_compute_replacement(state, &load->src, dimx, &swizzle))) + if (!(new_node = copy_propagation_compute_replacement(ctx, state, &load->src, dimx, &swizzle))) return false; if (type->type != HLSL_CLASS_OBJECT) @@ -435,7 +436,7 @@ static bool copy_propagation_transform_object_load(struct hlsl_ctx *ctx, struct hlsl_ir_node *node; unsigned int swizzle; - if (!(node = copy_propagation_compute_replacement(state, deref, 1, &swizzle))) + if (!(node = copy_propagation_compute_replacement(ctx, state, deref, 1, &swizzle))) return false; /* Only HLSL_IR_LOAD can produce an object. */ @@ -468,7 +469,7 @@ static void copy_propagation_record_store(struct hlsl_ctx *ctx, struct hlsl_ir_s if (!(var_def = copy_propagation_create_var_def(ctx, state, var))) return; - if (hlsl_offset_from_deref(lhs, &offset)) + if (hlsl_offset_from_deref(ctx, lhs, &offset)) { unsigned int writemask = store->writemask; @@ -1546,7 +1547,7 @@ static bool type_is_single_reg(const struct hlsl_type *type) return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; } -bool hlsl_offset_from_deref(const struct hlsl_deref *deref, unsigned int *offset) +bool hlsl_offset_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, unsigned int *offset) { struct hlsl_ir_node *offset_node = deref->offset.node; @@ -1564,6 +1565,14 @@ bool hlsl_offset_from_deref(const struct hlsl_deref *deref, unsigned int *offset return false; *offset = hlsl_ir_constant(offset_node)->value[0].u; + + if (*offset >= deref->var->data_type->reg_size) + { + hlsl_error(ctx, &deref->offset.node->loc, VKD3D_SHADER_ERROR_HLSL_OFFSET_OUT_OF_BOUNDS, + "Dereference is out of bounds."); + return false; + } + return true; } @@ -1571,7 +1580,7 @@ unsigned int hlsl_offset_from_deref_safe(struct hlsl_ctx *ctx, const struct hlsl { unsigned int offset; - if (hlsl_offset_from_deref(deref, &offset)) + if (hlsl_offset_from_deref(ctx, deref, &offset)) return offset; hlsl_fixme(ctx, &deref->offset.node->loc, "Dereference with non-constant offset of type %s.", diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 1de67f4..5ab8494 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -115,6 +115,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION = 5016, VKD3D_SHADER_ERROR_HLSL_NOT_IMPLEMENTED = 5017, VKD3D_SHADER_ERROR_HLSL_INVALID_TEXEL_OFFSET = 5018, + VKD3D_SHADER_ERROR_HLSL_OFFSET_OUT_OF_BOUNDS = 5019, VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION = 5300,

1 0

Francois Gouget : testbot/LibvirtTool: Add support for creating adm snapshots.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: tools Branch: master Commit: 712ba348088535efc69b0e7c28642eba1cd16c3b URL: https://source.winehq.org/git/tools.git/?a=commit;h=712ba348088535efc69b0e7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 24 19:02:08 2022 +0100 testbot/LibvirtTool: Add support for creating adm snapshots. This adds a task to run TestAgentd without elevated privileges and modifies the original task so it does not interfere. Note that schtasks.exe asks for a password so use the Powershell APIs instead. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 19 ++++++- testbot/bin/LibvirtTool.ps1 | 119 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 137 insertions(+), 1 deletion(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index ff834ef..bd676f0 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -610,7 +610,7 @@ sub GetSnapshotConfig($) { $Config->{locale} ||= $1; # take only the last match } - elsif ($Config->{base} =~ s/-(live|off|tsign|u8)$//) + elsif ($Config->{base} =~ s/-(adm|live|off|tsign|u8)$//) { $Config->{$1} = 1; } @@ -693,6 +693,23 @@ sub CreateSnapshot($$$$) } } + if ($Config->{adm}) + { + # Takes effect after the next reboot + my $PS1 = "$0.ps1"; + $PS1 =~ s/\.pl//; + if (!$TA->SendFile($PS1, "$Name0.ps1", 0)) + { + FatalError("Could not send '$Name0.ps1'\n"); + } + if (RunAndWait($PTA, ["powershell.exe", "-ExecutionPolicy", "ByPass", + "-File", "$Name0.ps1", "admin", $AgentPort])) + { + FatalError("Could not set up the TestAgentd tasks on $VMKey\n"); + } + $PTA->Rm("$Name0.ps1"); + } + $Reboot = 1; } diff --git a/testbot/bin/LibvirtTool.ps1 b/testbot/bin/LibvirtTool.ps1 new file mode 100644 index 0000000..e2b2d12 --- /dev/null +++ b/testbot/bin/LibvirtTool.ps1 @@ -0,0 +1,119 @@ +# Shows or sets up the TestAgentd tasks +# +# Copyright 2022 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 + +$Name0 = (Get-Item $MyInvocation.InvocationName).Basename + + +# +# Show the existing tasks +# + +function ShowTask($Name) +{ + $Task = Get-ScheduledTask -TaskName $Name -ErrorAction SilentlyContinue + if ($Task -ne $null) + { + Write-Output "$Name.User=$($Task.Principal.UserId)" + Write-Output "$Name.RunLevel=$($Task.Principal.RunLevel)" + Write-Output "$Name.Execute=$($Task.Actions.Execute)" + Write-Output "$Name.Arguments=$($Task.Actions.Arguments)" + Write-Output "$Name.WorkingDirectory=$($Task.Actions.WorkingDirectory)" + Write-Output "$Name.NotOnBatteries=$($Task.Settings.DisallowStartIfOnBatteries)" + } + else + { + Write-Output "$Name=<no such task>" + } +} + +function ShowTasks() +{ + ShowTask "TestAgentd" + ShowTask "TestAgentdAdm" + exit 0 +} + + +# +# Sets up split tasks +# + +function SetupAdminTasks($Argv) +{ + $Port = [int]$Argv[1] + $Task = Get-ScheduledTask -TaskName TestAgentd -ErrorAction SilentlyContinue + if ($Task -eq $null) + { + echo "$Name0:error: the TestAgentd task does not exist!" + exit 1 + } + $WorkDir = $Task.Actions.WorkingDirectory + if ($WorkDir -eq $null) + { + $WorkDir = Split-Path $Task.Actions.Execute + } + + # Modify the 'elevated privileges' server to start on the alternate port + $HighPort = $Port + 1 + $Action = New-ScheduledTaskAction -Execute $Task.Actions.Execute -Argument "--detach --set-time-only $HighPort" -WorkingDirectory $WorkDir + Set-ScheduledTask -TaskName TestAgentd -Action $Action + + # Add a 'regular privileges' server on the regular port + $Action = New-ScheduledTaskAction -Execute $Task.Actions.Execute -Argument "--detach --show-restarts $Port" -WorkingDirectory $WorkDir + $AdmTask = Get-ScheduledTask -TaskName TestAgentdAdm -ErrorAction SilentlyContinue + if ($AdmTask -eq $null) + { + Register-ScheduledTask -TaskName TestAgentdAdm -Action $Action -Trigger $Task.Triggers -Settings $Task.Settings + } + else + { + Set-ScheduledTask -TaskName TestAgentdAdm -Action $Action + } + exit 0 +} + + +# +# Main +# + +function ShowUsage() +{ + Write-Output "Usage: $Name0 show" + Write-Output "or $Name0 admin PORT" + Write-Output "" + Write-Output "Shows or modifies the Windows locales." + Write-Output "" + Write-Output "Where:" + Write-Output " show Shows the existing TestAgentd tasks." + Write-Output " admin Sets up a separate not-elevated-privileges task." + Write-Output " PORT Specifies the port TestAgentd should listen on." + Write-Output " -? Shows this help message." +} + +$Action = $args[0] +if ($Action -eq "show") { ShowTasks } +if ($Action -eq "admin") { SetupAdminTasks $args } +$Rc = 0 +if ($Action -and $Action -ne "-?" -and $Action -ne "-h" -and $Action -ne "help") +{ + echo "$Name0:error: unknown action $Action" + $Rc = 2 +} +ShowUsage +exit $Rc

1 0

Francois Gouget : testbot/reporttest: Add a .gitignore file.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: tools Branch: master Commit: 36cf4e6280465715b1cbe06e3e1769186bc78de0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=36cf4e6280465715b1cbe06… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 24 18:43:43 2022 +0100 testbot/reporttest: Add a .gitignore file. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/testbot/src/reporttest/.gitignore b/testbot/src/reporttest/.gitignore new file mode 100644 index 0000000..4626a6a --- /dev/null +++ b/testbot/src/reporttest/.gitignore @@ -0,0 +1,3 @@ +*.obj +*.res +ReportTest.exe

1 0

Francois Gouget : testbot/testagentd: Update the .gitignore file for 64-bit.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: tools Branch: master Commit: e6be460c3fc746e4a5c07370cf84b6ee4fc91acc URL: https://source.winehq.org/git/tools.git/?a=commit;h=e6be460c3fc746e4a5c0737… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 24 18:43:48 2022 +0100 testbot/testagentd: Update the .gitignore file for 64-bit. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/testagentd/.gitignore | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/src/testagentd/.gitignore b/testbot/src/testagentd/.gitignore index 1fbbafe..d1228c2 100644 --- a/testbot/src/testagentd/.gitignore +++ b/testbot/src/testagentd/.gitignore @@ -1,4 +1,6 @@ *.o -*.obj -TestAgentd.exe +*.obj32 +*.obj64 +TestAgentd32.exe +TestAgentd64.exe winetestbot.iso

1 0

Francois Gouget : testbot/TestAgent: Make the SetTime() leeway configurable.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: tools Branch: master Commit: 8fc1ff73214835d5b6d7d43beaab197e74d31662 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8fc1ff73214835d5b6d7d43… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 24 18:57:47 2022 +0100 testbot/TestAgent: Make the SetTime() leeway configurable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 7934070..6457b4d 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -1400,16 +1400,17 @@ sub Rm($@) return $self->_RecvErrorList(); } -sub SetTime($) +sub SetTime($;$) { - my ($self) = @_; - debug("SetTime\n"); + my ($self, $Leeway) = @_; + $Leeway ||= 30; + debug("SetTime $Leeway\n"); # Send the command if (!$self->_StartRPC($RPC_SETTIME) or !$self->_SendListSize('ArgC', 2) or !$self->_SendUInt64('Time', time()) or - !$self->_SendUInt32('Leeway', 30)) + !$self->_SendUInt32('Leeway', $Leeway)) { return undef; }

1 0

Francois Gouget : testbot/LibvirtTool: Fix detecting the 'high privileges' TestAgentd.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: tools Branch: master Commit: ca643751c642a636e5b2755de6ee92cab74937df URL: https://source.winehq.org/git/tools.git/?a=commit;h=ca643751c642a636e5b2755… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 24 19:01:03 2022 +0100 testbot/LibvirtTool: Fix detecting the 'high privileges' TestAgentd. The SetTime() leeway should be 0 otherwise it may skip actually setting the time and thus not fail if privileges are insufficient. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 5e3e7af..ff834ef 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -278,7 +278,7 @@ sub GetPrivilegedTA($) my ($TA) = @_; # Use SetTime() to detect if privileged operations are allowed. - return $TA->SetTime() ? $TA : $VM->GetAgent(1); + return $TA->SetTime(0) ? $TA : $VM->GetAgent(1); } sub RunAndWait($$) @@ -582,7 +582,7 @@ sub PrepareVM($) # during the build some ccache versions will return a compilation error). my $PTA = GetPrivilegedTA($TA); FatalError("$VMKey has no privileged TestAgent server\n") if (!$PTA); - if (!$PTA->SetTime()) + if (!$PTA->SetTime(0)) { FatalError("Setting the $VMKey system time failed: ". $PTA->GetLastError() ."\n"); }

1 0