- Wine-Devel - list.winehq.org

[PATCH v3 8/9] tests/kernel32: Add MAX_PATH test for CreatePrivateNamespaceA.
by Mohamad Al-Jaf Feb. 23, 2022

Feb. 23, 2022

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- dlls/kernel32/tests/security.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/kernel32/tests/security.c b/dlls/kernel32/tests/security.c index ef6c703406e..b8ae1474a80 100644 --- a/dlls/kernel32/tests/security.c +++ b/dlls/kernel32/tests/security.c @@ -22,6 +22,7 @@ static HMODULE hdll; static HANDLE (WINAPI *pCreateBoundaryDescriptorA)(LPCSTR,ULONG); +static HANDLE (WINAPI *pCreatePrivateNamespaceA)(LPSECURITY_ATTRIBUTES,LPVOID,LPCSTR); static BOOL init_function_pointers(void) { @@ -30,6 +31,7 @@ static BOOL init_function_pointers(void) if (hdll) { pCreateBoundaryDescriptorA = (void *)GetProcAddress(hdll, "CreateBoundaryDescriptorA"); + pCreatePrivateNamespaceA = (void *)GetProcAddress(hdll, "CreatePrivateNamespaceA"); return TRUE; } @@ -59,11 +61,34 @@ void test_CreateBoundaryDescriptorA(void) ok(res == NULL && (error == ERROR_FILENAME_EXCED_RANGE), "expected name to exceed MAX_PATH\n"); } +void test_CreatePrivateNamespaceA(void) +{ + DWORD error; + HANDLE res; + CHAR buffer[MAX_PATH] = "test"; + CHAR overload[MAX_PATH + 5] = ""; + + for (int i = 0; i < (MAX_PATH + 5); i++) + overload[i] = 't'; + + res = pCreatePrivateNamespaceA(NULL, NULL, 0); + ok(res == NULL, "expected NULL pointer\n"); + + res = pCreatePrivateNamespaceA(NULL, NULL, buffer); + ok(res == NULL, "expected NULL pointer\n"); + + SetLastError(0xdeadbeef); + res = pCreatePrivateNamespaceA(NULL, NULL, overload); + error = GetLastError(); + ok(res == NULL && (error == ERROR_FILENAME_EXCED_RANGE), "expected prefix to exceed MAX_PATH\n"); +} + START_TEST(security) { if (init_function_pointers()) { test_CreateBoundaryDescriptorA(); + test_CreatePrivateNamespaceA(); FreeLibrary(hdll); } else -- 2.35.1

2 1

[PATCH 1/5] winegstreamer: Explicitly sleep in the DirectShow streaming thread after receiving EOS.
by Zebediah Figura Feb. 23, 2022

Feb. 23, 2022

Instead of waiting for another event from the wg_parser object. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- 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; -- 2.35.1

1 4

[PATCH 1/5] winegstreamer: Link the container pads and activate ours.
by Rémi Bernon Feb. 23, 2022

Feb. 23, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This series introduces a new wg_sample structure, which is used to pass media buffers from PE to unix and back, as well as their metadata. Initially the buffers are copied to GStreamer buffer, but the last patch of the series introduces a zero-copy mechanism, which is used for input buffers only for now. Testing shows that IMFTransform are usually keeping a reference on their input samples, and this makes it easier to keep the IMFSample alive as long as the unix side has a reference on them, reaping them on specific occasion to retrieve released samples and release their PE-side objects. For output buffers, zero-copy is also possible, using the same structure and mapping mechanism, but is a little trickier as transforms aren't apparently keeping a reference on the output samples they are passed across calls to ProcessOutput. They can also optionally allocate and provide samples themselves to the caller, instead of depending on their samples, but it's not how native transforms are working, and to keep the behavior and compatibility close we cannot safely rely on it. The idea, which will be proposed later, and for the H264 transform (as video buffers may be large, it makes most sense there), will be to decouple GStreamer decoding using a queue, and a buffer pool which will wait on ProcessOutput calls to provide output buffers to the pipeline. dlls/winegstreamer/wg_transform.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index d316071cf60..7160fd087b6 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -46,6 +46,7 @@ struct wg_transform { GstElement *container; GstPad *my_src, *my_sink; + GstPad *their_sink, *their_src; }; static GstFlowReturn transform_sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *buffer) @@ -64,6 +65,10 @@ NTSTATUS wg_transform_destroy(void *args) struct wg_transform *transform = args; gst_element_set_state(transform->container, GST_STATE_NULL); + gst_pad_unlink(transform->their_src, transform->my_sink); + gst_pad_unlink(transform->my_src, transform->their_sink); + g_object_unref(transform->their_sink); + g_object_unref(transform->their_src); g_object_unref(transform->container); g_object_unref(transform->my_sink); g_object_unref(transform->my_src); @@ -237,9 +242,22 @@ NTSTATUS wg_transform_create(void *args) goto out_free_sink_pad; } + if (!(transform->their_sink = gst_element_get_static_pad(first, "sink"))) + goto out_free_sink_pad; + if (!(transform->their_src = gst_element_get_static_pad(last, "src"))) + goto out_free_their_sink; + if (gst_pad_link(transform->my_src, transform->their_sink) < 0) + goto out_free_their_src; + if (gst_pad_link(transform->their_src, transform->my_sink) < 0) + goto out_unlink_src_pad; + if (!gst_pad_set_active(transform->my_sink, 1)) + goto out_unlink_sink_pad; + if (!gst_pad_set_active(transform->my_src, 1)) + goto out_unlink_sink_pad; + gst_element_set_state(transform->container, GST_STATE_PAUSED); if (!gst_element_get_state(transform->container, NULL, NULL, -1)) - goto out_free_sink_pad; + goto out_unlink_sink_pad; gst_caps_unref(sink_caps); gst_caps_unref(src_caps); @@ -248,6 +266,14 @@ NTSTATUS wg_transform_create(void *args) params->transform = transform; return STATUS_SUCCESS; +out_unlink_sink_pad: + gst_pad_unlink(transform->their_src, transform->my_sink); +out_unlink_src_pad: + gst_pad_unlink(transform->my_src, transform->their_sink); +out_free_their_src: + g_object_unref(transform->their_src); +out_free_their_sink: + g_object_unref(transform->their_sink); out_free_sink_pad: gst_object_unref(transform->my_sink); out_free_sink_caps: -- 2.34.1

3 17

[PATCH v3 7/9] tests/kernel32: Add MAX_PATH test for CreateBoundaryDescriptorA.
by Mohamad Al-Jaf Feb. 23, 2022

Feb. 23, 2022

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- dlls/kernel32/tests/Makefile.in | 1 + dlls/kernel32/tests/security.c | 71 +++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 dlls/kernel32/tests/security.c diff --git a/dlls/kernel32/tests/Makefile.in b/dlls/kernel32/tests/Makefile.in index db106ab9fc9..517a9e27f09 100644 --- a/dlls/kernel32/tests/Makefile.in +++ b/dlls/kernel32/tests/Makefile.in @@ -31,6 +31,7 @@ SOURCES = \ profile.c \ resource.c \ resource.rc \ + security.c \ sync.c \ thread.c \ time.c \ diff --git a/dlls/kernel32/tests/security.c b/dlls/kernel32/tests/security.c new file mode 100644 index 00000000000..ef6c703406e --- /dev/null +++ b/dlls/kernel32/tests/security.c @@ -0,0 +1,71 @@ +/* + * Unit tests for security functions + * + * Copyright (c) 2022 Mohamad Al-Jaf + * + * 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 + */ + +#include "wine/test.h" + +static HMODULE hdll; +static HANDLE (WINAPI *pCreateBoundaryDescriptorA)(LPCSTR,ULONG); + +static BOOL init_function_pointers(void) +{ + hdll = GetModuleHandleA("kernel32.dll"); + + if (hdll) + { + pCreateBoundaryDescriptorA = (void *)GetProcAddress(hdll, "CreateBoundaryDescriptorA"); + return TRUE; + } + + return FALSE; +} + +void test_CreateBoundaryDescriptorA(void) +{ + DWORD error; + HANDLE res; + CHAR buffer[MAX_PATH] = "test"; + CHAR overload[MAX_PATH + 5] = ""; + + for (int i = 0; i < (MAX_PATH + 5); i++) + overload[i] = 't'; + + res = pCreateBoundaryDescriptorA(NULL, 0); + ok(res == NULL, "expected NULL pointer\n"); + + res = pCreateBoundaryDescriptorA(buffer, 0); + todo_wine + ok(res != NULL, "expected HANDLE to boundary descriptor\n"); + + SetLastError(0xdeadbeef); + res = pCreateBoundaryDescriptorA(overload, 0); + error = GetLastError(); + ok(res == NULL && (error == ERROR_FILENAME_EXCED_RANGE), "expected name to exceed MAX_PATH\n"); +} + +START_TEST(security) +{ + if (init_function_pointers()) + { + test_CreateBoundaryDescriptorA(); + FreeLibrary(hdll); + } + else + skip("could not load kernel32.dll\n"); +} -- 2.35.1

2 1

[PATCH] mshtm: Don't try to bind custom events to Gecko event target.
by Jacek Caban Feb. 23, 2022

Feb. 23, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH] dmusic: Sync up the dmobject.c files
by Michael Stefaniuc Feb. 23, 2022

Feb. 23, 2022

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Got out of sync with the build without -DWINE_NO_LONG_TYPES patches. dlls/dmcompos/dmobject.c | 2 +- dlls/dmscript/dmobject.c | 2 +- dlls/dmstyle/dmobject.c | 2 +- dlls/dmusic/dmobject.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dmcompos/dmobject.c b/dlls/dmcompos/dmobject.c index 84b08e0d772..b526b23d031 100644 --- a/dlls/dmcompos/dmobject.c +++ b/dlls/dmcompos/dmobject.c @@ -295,7 +295,7 @@ static HRESULT stream_read(IStream *stream, void *data, ULONG size) hr = IStream_Read(stream, data, size, &read); if (FAILED(hr)) - TRACE_(dmfile)("IStream_Read failed: %08lx\n", hr); + TRACE_(dmfile)("IStream_Read failed: %#lx\n", hr); else if (!read && read < size) { /* All or nothing: Handle a partial read due to end of stream as an error */ TRACE_(dmfile)("Short read: %lu < %lu\n", read, size); diff --git a/dlls/dmscript/dmobject.c b/dlls/dmscript/dmobject.c index 84b08e0d772..b526b23d031 100644 --- a/dlls/dmscript/dmobject.c +++ b/dlls/dmscript/dmobject.c @@ -295,7 +295,7 @@ static HRESULT stream_read(IStream *stream, void *data, ULONG size) hr = IStream_Read(stream, data, size, &read); if (FAILED(hr)) - TRACE_(dmfile)("IStream_Read failed: %08lx\n", hr); + TRACE_(dmfile)("IStream_Read failed: %#lx\n", hr); else if (!read && read < size) { /* All or nothing: Handle a partial read due to end of stream as an error */ TRACE_(dmfile)("Short read: %lu < %lu\n", read, size); diff --git a/dlls/dmstyle/dmobject.c b/dlls/dmstyle/dmobject.c index 84b08e0d772..b526b23d031 100644 --- a/dlls/dmstyle/dmobject.c +++ b/dlls/dmstyle/dmobject.c @@ -295,7 +295,7 @@ static HRESULT stream_read(IStream *stream, void *data, ULONG size) hr = IStream_Read(stream, data, size, &read); if (FAILED(hr)) - TRACE_(dmfile)("IStream_Read failed: %08lx\n", hr); + TRACE_(dmfile)("IStream_Read failed: %#lx\n", hr); else if (!read && read < size) { /* All or nothing: Handle a partial read due to end of stream as an error */ TRACE_(dmfile)("Short read: %lu < %lu\n", read, size); diff --git a/dlls/dmusic/dmobject.c b/dlls/dmusic/dmobject.c index 84b08e0d772..b526b23d031 100644 --- a/dlls/dmusic/dmobject.c +++ b/dlls/dmusic/dmobject.c @@ -295,7 +295,7 @@ static HRESULT stream_read(IStream *stream, void *data, ULONG size) hr = IStream_Read(stream, data, size, &read); if (FAILED(hr)) - TRACE_(dmfile)("IStream_Read failed: %08lx\n", hr); + TRACE_(dmfile)("IStream_Read failed: %#lx\n", hr); else if (!read && read < size) { /* All or nothing: Handle a partial read due to end of stream as an error */ TRACE_(dmfile)("Short read: %lu < %lu\n", read, size); -- 2.34.1

1 0

[PATCH] ntdll: Do not force 2G stack limit for the main thread of 64 bit process.
by Paul Gofman Feb. 23, 2022

Feb. 23, 2022

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Dragon Quest Builders 2 define 2GB default stack size in 64bit PE header. Since the first thread has 2GB VM limit enforced for native stack the stack allocation fails and the process cannot be created. dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/thread.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index ab12a4ea1c0..5eb201bd90b 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -2169,7 +2169,7 @@ static void start_main_thread(void) if (p___wine_main_wargv) *p___wine_main_wargv = main_wargv; *(ULONG_PTR *)&peb->CloudFileFlags = get_image_address(); set_load_order_app_name( main_wargv[0] ); - init_thread_stack( teb, is_win64 ? 0x7fffffff : 0, 0, 0 ); + init_thread_stack( teb, 0, 0, 0 ); NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); load_ntdll(); if (main_image_info.Machine != current_machine) load_wow64_ntdll( main_image_info.Machine ); diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 618ebb82bfb..0488129aa4c 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1156,7 +1156,8 @@ NTSTATUS init_thread_stack( TEB *teb, ULONG_PTR zero_bits, SIZE_T reserve_size, #ifdef _WIN64 /* 32-bit stack */ - if ((status = virtual_alloc_thread_stack( &stack, zero_bits, reserve_size, commit_size, 0 ))) + if ((status = virtual_alloc_thread_stack( &stack, zero_bits ? zero_bits : 0x7fffffff, + reserve_size, commit_size, 0 ))) return status; wow_teb->Tib.StackBase = PtrToUlong( stack.StackBase ); wow_teb->Tib.StackLimit = PtrToUlong( stack.StackLimit ); -- 2.35.1

1 0

[PATCH vkd3d 2/2] demos: Support building on Windows without -DUNICODE.
by Alexandre Julliard Feb. 23, 2022

Feb. 23, 2022

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- demos/demo_win32.h | 6 +++--- demos/gears.c | 2 +- demos/triangle.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/demos/demo_win32.h b/demos/demo_win32.h index d2a54989e9a7..53fbc06351a1 100644 --- a/demos/demo_win32.h +++ b/demos/demo_win32.h @@ -200,12 +200,12 @@ static inline bool demo_init(struct demo *demo, void *user_data) wc.cbClsExtra = 0; wc.cbWndExtra = 0; wc.hInstance = GetModuleHandle(NULL); - wc.hIcon = LoadIconW(NULL, IDI_APPLICATION); - wc.hCursor = LoadCursorW(NULL, IDC_ARROW); + wc.hIcon = LoadIcon(NULL, IDI_APPLICATION); + wc.hCursor = LoadCursor(NULL, IDC_ARROW); wc.hbrBackground = (HBRUSH)GetStockObject(WHITE_BRUSH); wc.lpszMenuName = NULL; wc.lpszClassName = DEMO_WINDOW_CLASS_NAME; - wc.hIconSm = LoadIconW(NULL, IDI_WINLOGO); + wc.hIconSm = LoadIcon(NULL, IDI_WINLOGO); if (!RegisterClassExW(&wc)) return false; diff --git a/demos/gears.c b/demos/gears.c index 2045b3cdd842..9ed87b1084cf 100644 --- a/demos/gears.c +++ b/demos/gears.c @@ -877,7 +877,7 @@ static int cxg_main(void) return EXIT_SUCCESS; } -#ifdef _WIN32 +#if defined(_WIN32) && defined(_UNICODE) int wmain(void) #else int main(void) diff --git a/demos/triangle.c b/demos/triangle.c index bac1cdc59d88..77bd128957fa 100644 --- a/demos/triangle.c +++ b/demos/triangle.c @@ -392,7 +392,7 @@ static int cxt_main(void) return EXIT_SUCCESS; } -#ifdef _WIN32 +#if defined(_WIN32) && defined(_UNICODE) int wmain(void) #else int main(void) -- 2.34.1

2 5

[tools 1/2] testbot/LibvirtTool: Separate ShutDown() from ShutDownIfOffSnapshot().
by Francois Gouget Feb. 23, 2022

Feb. 23, 2022

ShutDown() unconditionally performs a clean shutdown while ShutDownIfOffSnapshot() only does so if the VM is currently running a snapshot that requests them (contains '-off' in its name). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 50 ++++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 6364b306d9..759d8ec762 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -311,6 +311,35 @@ sub Halt($$) =pod =over 12 +=item C<ShutDown()> + +Attempt a clean shutdown of the VM (regardless of its current snapshot). + +Returns 0 if the shutdown failed, 1 otherwise. +=back +=cut + +sub ShutDown($$) +{ + my ($Domain, $TA) = @_; + + if (Halt($TA, 0)) + { + Debug(Elapsed($Start), " Waiting for the VM to shut down\n"); + my $Deadline = time() + $WaitForShutdown; + while (time() <= $Deadline) + { + return 1 if (!$Domain->IsPoweredOn()); + sleep(1); + } + Error "Timed out waiting for $VMKey to perform a clean shutdown\n"; + } + return 0; +} + +=pod +=over 12 + =item C<ShutDownIfOffSnapshot()> Attempt a clean shutdown of the VM if it is running a snapshot that requests @@ -320,6 +349,8 @@ Returns 0 if the shutdown failed, 2 if it was successful and 1 if the VM was already powered off or a shutdown was not needed. =back =cut +=back +=cut sub ShutDownIfOffSnapshot() { @@ -333,22 +364,15 @@ sub ShutDownIfOffSnapshot() Debug(Elapsed($Start), " Performing a clean shutdown of $VMKey/$CurrentSnapshot\n"); LogMsg "Performing a clean shutdown of $VMKey/$CurrentSnapshot\n"; - return 0 if (!Halt($VM->GetAgent(), 0)); - - Debug(Elapsed($Start), " Waiting for the VM to shut down\n"); - my $Deadline = time() + $WaitForShutdown; - while (time() <= $Deadline) + if (ShutDown($Domain, $VM->GetAgent())) { - if (!$Domain->IsPoweredOn()) - { - Debug(Elapsed($Start), " Successfully shut down $VMKey\n"); - LogMsg "Successfully shut down $VMKey\n"; - return 2; - } - sleep(1); + Debug(Elapsed($Start), " Successfully shut down $VMKey\n"); + LogMsg "Successfully shut down $VMKey\n"; + return 2; } - Error "Timed out waiting for $VMKey to perform a clean shutdown. Forcefully shutting down now...\n"; + # In fact the caller will do so + Error "Forcefully shutting down $VMKey/$CurrentSnapshot now...\n"; return 0; } -- 2.30.2

1 1

[tools] testbo/web: Rename and fix a loop variable declaration.
by Francois Gouget Feb. 23, 2022

Feb. 23, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/JobDetails.pl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 8d4270af1e..eef7a17838 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -423,8 +423,7 @@ sub GenerateFullLog($$$$) next if ($Group->{LineNo}); print "<div class='LogDllName'>$GroupName</div>\n"; - my $i = 0; - for my $i (0..@{$Group->{Errors}} - 1) + for my $ErrIndex (0..@{$Group->{Errors}} - 1) { if ($IsEmpty) { @@ -432,8 +431,8 @@ sub GenerateFullLog($$$$) $IsEmpty = 0; } - my $Line = $Group->{Errors}->[$i]; - my $Category = $Group->{IsNew}->[$i] ? "new" : "error"; + my $Line = $Group->{Errors}->[$ErrIndex]; + my $Category = $Group->{IsNew}->[$ErrIndex] ? "new" : "error"; my $Html = $self->escapeHTML($Line); print "<span class='log-$Category'>$Html</span>\n"; } -- 2.30.2

1 0