February 2022 - Wine-Commits

Michael Stefaniuc : dmime: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 690e012f015e9cf52d6d207503a4ad87d2e89fc8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=690e012f015e9cf52d6d2075… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 8 23:14:49 2022 +0100 dmime: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/Makefile.in | 1 - dlls/dmime/audiopath.c | 10 +++---- dlls/dmime/dmobject.c | 20 +++++++------- dlls/dmime/graph.c | 8 +++--- dlls/dmime/lyricstrack.c | 32 +++++++++++----------- dlls/dmime/markertrack.c | 14 +++++----- dlls/dmime/paramcontroltrack.c | 24 ++++++++--------- dlls/dmime/performance.c | 60 +++++++++++++++++++++--------------------- dlls/dmime/segment.c | 58 ++++++++++++++++++++-------------------- dlls/dmime/segmentstate.c | 8 +++--- dlls/dmime/segtriggertrack.c | 34 ++++++++++++------------ dlls/dmime/seqtrack.c | 24 ++++++++--------- dlls/dmime/sysextrack.c | 24 ++++++++--------- dlls/dmime/tempotrack.c | 26 +++++++++--------- dlls/dmime/timesigtrack.c | 16 +++++------ dlls/dmime/wavetrack.c | 50 +++++++++++++++++------------------ 16 files changed, 204 insertions(+), 205 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=690e012f015e9cf52d6d…

1 0

Zebediah Figura : shlwapi/tests: Get rid of the redundant "expectret" field of TEST_ESCAPEW.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 2be4d455e35ab94abc620bf401eb3190a0086d8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2be4d455e35ab94abc620bf4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 8 20:05:35 2022 -0600 shlwapi/tests: Get rid of the redundant "expectret" field of TEST_ESCAPEW. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/url.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 8a645287b02..703bdcd0a55 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -293,39 +293,38 @@ static const TEST_URL_ESCAPE TEST_ESCAPE[] = { typedef struct _TEST_URL_ESCAPEW { const WCHAR url[INTERNET_MAX_URL_LENGTH]; DWORD flags; - HRESULT expectret; const WCHAR expecturl[INTERNET_MAX_URL_LENGTH]; const WCHAR win7url[INTERNET_MAX_URL_LENGTH]; /* <= Win7 */ const WCHAR vistaurl[INTERNET_MAX_URL_LENGTH]; /* <= Vista/2k8 */ } TEST_URL_ESCAPEW; static const TEST_URL_ESCAPEW TEST_ESCAPEW[] = { - {{' ','<','>','"',0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','2','0','%','3','C','%','3','E','%','2','2',0}}, - {{'{','}','|','\\',0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','7','B','%','7','D','%','7','C','%','5','C',0}}, - {{'^',']','[','`',0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','5','E','%','5','D','%','5','B','%','6','0',0}}, - {{'&','/','?','#',0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','2','6','/','?','#',0}}, - {{'M','a','s','s',0}, URL_ESCAPE_AS_UTF8, S_OK, {'M','a','s','s',0}}, + {{' ','<','>','"',0}, URL_ESCAPE_AS_UTF8, {'%','2','0','%','3','C','%','3','E','%','2','2',0}}, + {{'{','}','|','\\',0}, URL_ESCAPE_AS_UTF8, {'%','7','B','%','7','D','%','7','C','%','5','C',0}}, + {{'^',']','[','`',0}, URL_ESCAPE_AS_UTF8, {'%','5','E','%','5','D','%','5','B','%','6','0',0}}, + {{'&','/','?','#',0}, URL_ESCAPE_AS_UTF8, {'%','2','6','/','?','#',0}}, + {{'M','a','s','s',0}, URL_ESCAPE_AS_UTF8, {'M','a','s','s',0}}, /* broken < Win8/10 */ - {{'M','a',0xdf,0}, URL_ESCAPE_AS_UTF8, S_OK, {'M','a','%','C','3','%','9','F',0}, + {{'M','a',0xdf,0}, URL_ESCAPE_AS_UTF8, {'M','a','%','C','3','%','9','F',0}, {'M','a','%','D','F',0}}, /* 0x2070E */ - {{0xd841,0xdf0e,0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','F','0','%','A','0','%','9','C','%','8','E',0}, + {{0xd841,0xdf0e,0}, URL_ESCAPE_AS_UTF8, {'%','F','0','%','A','0','%','9','C','%','8','E',0}, {'%','E','F','%','B','F','%','B','D','%','E','F','%','B','F','%','B','D',0}, {0xd841,0xdf0e,0}}, /* 0x27A3E */ - {{0xd85e,0xde3e,0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','F','0','%','A','7','%','A','8','%','B','E',0}, + {{0xd85e,0xde3e,0}, URL_ESCAPE_AS_UTF8, {'%','F','0','%','A','7','%','A','8','%','B','E',0}, {'%','E','F','%','B','F','%','B','D','%','E','F','%','B','F','%','B','D',0}, {0xd85e,0xde3e,0}}, - {{0xd85e,0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','E','F','%','B','F','%','B','D',0}, + {{0xd85e,0}, URL_ESCAPE_AS_UTF8, {'%','E','F','%','B','F','%','B','D',0}, {0xd85e,0}}, - {{0xd85e,0x41}, URL_ESCAPE_AS_UTF8, S_OK, {'%','E','F','%','B','F','%','B','D','A',0}, + {{0xd85e,0x41}, URL_ESCAPE_AS_UTF8, {'%','E','F','%','B','F','%','B','D','A',0}, {0xd85e,'A',0}}, - {{0xdc00,0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','E','F','%','B','F','%','B','D',0}, + {{0xdc00,0}, URL_ESCAPE_AS_UTF8, {'%','E','F','%','B','F','%','B','D',0}, {0xdc00,0}}, - {{0xffff,0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','E','F','%','B','F','%','B','F',0}, + {{0xffff,0}, URL_ESCAPE_AS_UTF8, {'%','E','F','%','B','F','%','B','F',0}, {0xffff,0}}, }; @@ -962,8 +961,7 @@ static void test_UrlEscapeW(void) size = INTERNET_MAX_URL_LENGTH; ret = UrlEscapeW(TEST_ESCAPEW[i].url, ret_url, &size, TEST_ESCAPEW[i].flags); - ok(ret == TEST_ESCAPEW[i].expectret, "UrlEscapeW returned 0x%08x instead of 0x%08x for \"%s\"\n", - ret, TEST_ESCAPEW[i].expectret, wine_dbgstr_w(TEST_ESCAPEW[i].url)); + ok(ret == S_OK, "Got unexpected hr %#x for %s.\n", ret, debugstr_w(TEST_ESCAPEW[i].url)); ok(!lstrcmpW(ret_url, TEST_ESCAPEW[i].expecturl) || broken(!lstrcmpW(ret_url, TEST_ESCAPEW[i].vistaurl)) || broken(!lstrcmpW(ret_url, TEST_ESCAPEW[i].win7url)),

1 0

Zebediah Figura : shlwapi/tests: Get rid of the redundant "expectret" field of TEST_URL_CANONICALIZE.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 76b3a0512e2fb4da2f81722d8a65c14944caf12b URL: https://source.winehq.org/git/wine.git/?a=commit;h=76b3a0512e2fb4da2f81722d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 8 20:05:32 2022 -0600 shlwapi/tests: Get rid of the redundant "expectret" field of TEST_URL_CANONICALIZE. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/url.c | 235 +++++++++++++++++++++++------------------------ 1 file changed, 115 insertions(+), 120 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=76b3a0512e2fb4da2f81…

1 0

Zebediah Figura : qasf: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 73287cdff1556dd066a3566b008b606fb3144a70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73287cdff1556dd066a3566b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 8 20:04:41 2022 -0600 qasf: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/Makefile.in | 1 - dlls/qasf/dmowrapper.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/qasf/Makefile.in b/dlls/qasf/Makefile.in index d82abfeea7d..ee8fd0451e1 100644 --- a/dlls/qasf/Makefile.in +++ b/dlls/qasf/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = qasf.dll IMPORTS = strmbase dmoguids strmiids uuid ole32 oleaut32 diff --git a/dlls/qasf/dmowrapper.c b/dlls/qasf/dmowrapper.c index 54581b48bee..95e12e860ae 100644 --- a/dlls/qasf/dmowrapper.c +++ b/dlls/qasf/dmowrapper.c @@ -86,7 +86,7 @@ static HRESULT WINAPI buffer_SetLength(IMediaBuffer *iface, DWORD len) { struct buffer *buffer = impl_from_IMediaBuffer(iface); - TRACE("iface %p, len %u.\n", iface, len); + TRACE("iface %p, len %lu.\n", iface, len); return IMediaSample_SetActualDataLength(buffer->sample, len); } @@ -216,7 +216,7 @@ static HRESULT process_output(struct dmo_wrapper *filter, IMediaObject *dmo) if (FAILED(hr = IMemAllocator_GetBuffer(filter->sources[i].pin.pAllocator, &filter->sources[i].buffer.sample, NULL, NULL, 0))) { - ERR("Failed to get sample, hr %#x.\n", hr); + ERR("Failed to get sample, hr %#lx.\n", hr); goto out; } buffers[i].pBuffer = &filter->sources[i].buffer.IMediaBuffer_iface; @@ -263,7 +263,7 @@ static HRESULT process_output(struct dmo_wrapper *filter, IMediaObject *dmo) { if (FAILED(hr = IMemInputPin_Receive(filter->sources[i].pin.pMemInputPin, sample))) { - WARN("Downstream sink returned %#x.\n", hr); + WARN("Downstream sink returned %#lx.\n", hr); goto out; } IMediaSample_SetActualDataLength(sample, 0); @@ -300,7 +300,7 @@ static HRESULT WINAPI dmo_wrapper_sink_Receive(struct strmbase_sink *iface, IMed { if (FAILED(hr = IMediaObject_Discontinuity(dmo, index))) { - ERR("Discontinuity() failed, hr %#x.\n", hr); + ERR("Discontinuity() failed, hr %#lx.\n", hr); goto out; } @@ -324,7 +324,7 @@ static HRESULT WINAPI dmo_wrapper_sink_Receive(struct strmbase_sink *iface, IMed if (FAILED(hr = IMediaObject_ProcessInput(dmo, index, &filter->input_buffer.IMediaBuffer_iface, flags, start, stop - start))) { - ERR("ProcessInput() failed, hr %#x.\n", hr); + ERR("ProcessInput() failed, hr %#lx.\n", hr); goto out; } @@ -346,11 +346,11 @@ static HRESULT dmo_wrapper_sink_eos(struct strmbase_sink *iface) IUnknown_QueryInterface(filter->dmo, &IID_IMediaObject, (void **)&dmo); if (FAILED(hr = IMediaObject_Discontinuity(dmo, index))) - ERR("Discontinuity() failed, hr %#x.\n", hr); + ERR("Discontinuity() failed, hr %#lx.\n", hr); process_output(filter, dmo); if (FAILED(hr = IMediaObject_Flush(dmo))) - ERR("Flush() failed, hr %#x.\n", hr); + ERR("Flush() failed, hr %#lx.\n", hr); for (i = 0; i < filter->source_count; ++i) { @@ -372,7 +372,7 @@ static HRESULT dmo_wrapper_end_flush(struct strmbase_sink *iface) IUnknown_QueryInterface(filter->dmo, &IID_IMediaObject, (void **)&dmo); if (FAILED(hr = IMediaObject_Flush(dmo))) - ERR("Flush() failed, hr %#x.\n", hr); + ERR("Flush() failed, hr %#lx.\n", hr); for (i = 0; i < filter->source_count; ++i) {

1 0

Michael Stefaniuc : dmband: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 0990abd7b95274d20673f884f546ea9a2392905f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0990abd7b95274d20673f884… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 8 23:14:51 2022 +0100 dmband: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/Makefile.in | 1 - dlls/dmband/band.c | 44 +++++++++++++++++++++---------------------- dlls/dmband/bandtrack.c | 50 ++++++++++++++++++++++++------------------------- dlls/dmband/dmobject.c | 20 ++++++++++---------- dlls/dmband/dmutils.c | 6 +++--- 5 files changed, 60 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0990abd7b95274d20673…

1 0

Michael Stefaniuc : dmband/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: f586cfa52d37cf43dbbab803e62e3a13c5e4b7f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f586cfa52d37cf43dbbab803… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 8 23:14:50 2022 +0100 dmband/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/tests/Makefile.in | 1 - dlls/dmband/tests/dmband.c | 142 +++++++++++++++++++++--------------------- 2 files changed, 71 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f586cfa52d37cf43dbba…

1 0

Eric Pouech : schtasks: Enable compilation with long types.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 241c5fe8b68bae99490c4abc90fc6d400e2bb46e URL: https://source.winehq.org/git/wine.git/?a=commit;h=241c5fe8b68bae99490c4abc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 9 09:24:55 2022 +0100 schtasks: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/schtasks/Makefile.in | 1 - programs/schtasks/schtasks.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/programs/schtasks/Makefile.in b/programs/schtasks/Makefile.in index 63afc93a876..6eb8d530425 100644 --- a/programs/schtasks/Makefile.in +++ b/programs/schtasks/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = schtasks.exe IMPORTS = oleaut32 ole32 diff --git a/programs/schtasks/schtasks.c b/programs/schtasks/schtasks.c index 340aeaa56fb..c9434801db8 100644 --- a/programs/schtasks/schtasks.c +++ b/programs/schtasks/schtasks.c @@ -40,14 +40,14 @@ static ITaskFolder *get_tasks_root_folder(void) V_VT(&empty) = VT_EMPTY; hres = ITaskService_Connect(service, empty, empty, empty, empty); if (FAILED(hres)) { - FIXME("Connect failed: %08x\n", hres); + FIXME("Connect failed: %08lx\n", hres); return NULL; } hres = ITaskService_GetFolder(service, NULL, &root); ITaskService_Release(service); if (FAILED(hres)) { - FIXME("GetFolder failed: %08x\n", hres); + FIXME("GetFolder failed: %08lx\n", hres); return NULL; } @@ -70,7 +70,7 @@ static IRegisteredTask *get_registered_task(const WCHAR *name) SysFreeString(str); ITaskFolder_Release(root); if (FAILED(hres)) { - FIXME("GetTask failed: %08x\n", hres); + FIXME("GetTask failed: %08lx\n", hres); return NULL; } @@ -183,7 +183,7 @@ static int change_command(int argc, WCHAR *argv[]) hres = IRegisteredTask_put_Enabled(task, VARIANT_TRUE); if (FAILED(hres)) { IRegisteredTask_Release(task); - FIXME("put_Enabled failed: %08x\n", hres); + FIXME("put_Enabled failed: %08lx\n", hres); return 1; } }

1 0

Francois Gouget : testbot/LibvirtTool: Revert() does not need its own VM object.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: tools Branch: master Commit: 769aa02afbc0f223376d984c1fe979b4827ee40a URL: https://source.winehq.org/git/tools.git/?a=commit;h=769aa02afbc0f223376d984… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 8 23:43:24 2022 +0100 testbot/LibvirtTool: Revert() does not need its own VM object. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 51ed8e7..b572d15 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -446,9 +446,9 @@ sub CheckOff() return ChangeStatus("dirty", "off", "done"); } -sub SetupTestAgentd($$$$) +sub SetupTestAgentd($$$) { - my ($VM, $Booting, $UpgradeTestAgentd, $ResetStartCount) = @_; + my ($Booting, $UpgradeTestAgentd, $ResetStartCount) = @_; Debug(Elapsed($Start), " Setting up the $VMKey TestAgent server\n"); LogMsg "Setting up the $VMKey TestAgent server\n"; @@ -571,7 +571,6 @@ sub CreateSnapshot($$) sub Revert() { - my $VM = CreateVMs()->GetItem($VMKey); if (!$Debug and $VM->Status ne "reverting") { Error("The VM is not ready to be reverted (". $VM->Status .")\n"); @@ -647,7 +646,7 @@ sub Revert() # Set up the TestAgent server. Note that setting the locale will require a # reboot so reset start.count in that case. - SetupTestAgentd($VM, $Booting, ($CreateSnapshot or $SetLocale), $SetLocale); + SetupTestAgentd($Booting, ($CreateSnapshot or $SetLocale), $SetLocale); if ($CreateSnapshot) {

1 0

Francois Gouget : testbot/LibvirtTool: Include the VM name in error messages.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: tools Branch: master Commit: e070e093de5fde11616266df45933224d5d21252 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e070e093de5fde11616266d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 8 23:43:05 2022 +0100 testbot/LibvirtTool: Include the VM name in error messages. Multiple VMs may be reverted at the same time (either on the same VM host or on separate hosts) so this is needed to know which VM the error is about. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index b572d15..ae21834 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -132,7 +132,7 @@ if (!defined $Usage) $VM = CreateVMs()->GetItem($VMKey); if (!defined $VM) { - Error "VM $VMKey does not exist\n"; + Error "The $VMKey VM does not exist\n"; $Usage = 2; } } @@ -300,7 +300,7 @@ sub ShutDown() my $PTA = GetPrivilegedTA($VM->GetAgent()); if (!$PTA->Run($Cmd, 0)) { - Error "Could not run @$Cmd: ". $PTA->GetLastError() ."\n"; + Error "Could not run @$Cmd on $VMKey: ". $PTA->GetLastError() ."\n"; $Success = 0; } else @@ -468,14 +468,14 @@ sub SetupTestAgentd($$$) LogMsg "Upgrading the $VMKey TestAgent server from $Version\n"; if ($Version !~ / ([0-9]+)\.([0-9]+)$/) { - FatalError("Unsupported TestAgent server version: $Version\n"); + FatalError("Unsupported TestAgent server version on $VMKey: $Version\n"); } # We want 'TestAgentd --detach --show-restarts' on Windows but this was # not supported before this version and changing how the server is started # is too complex. if (!$TA->HasMinVersion(1, 7)) { - FatalError("The TestAgent server is too old to be upgraded: $Version\n"); + FatalError("The $VMKey TestAgent server is too old to be upgraded: $Version\n"); } if (!$TA->Upgrade("$DataDir/latest/TestAgentd.exe")) @@ -505,10 +505,10 @@ sub SetupTestAgentd($$$) # HTTPS certificates), but also for the build (if the time moves forward # during the build some ccache versions will return a compilation error). my $PTA = GetPrivilegedTA($TA); - FatalError("Cannot set the VM system time\n") if (!$PTA); + FatalError("Cannot set the $VMKey VM system time\n") if (!$PTA); if (!$PTA->SetTime()) { - FatalError("Setting the VM system time failed: ". $PTA->GetLastError() ."\n"); + FatalError("Setting the $VMKey VM system time failed: ". $PTA->GetLastError() ."\n"); } if ($Booting and $VM->Type eq "wine") @@ -517,16 +517,16 @@ sub SetupTestAgentd($$$) Debug(Elapsed($Start), " Waiting for the X session\n"); LogMsg "Waiting for the $VMKey X session\n"; my $Pid = $TA->Run(["sh", "-c", "while ! xset -display :0.0 q >/dev/null; do sleep 1; done"], 0); - FatalError("Could not check for the X session on $VMKey\n") if (!$Pid); + FatalError("Could not check for the $VMKey X session\n") if (!$Pid); if (!defined $TA->Wait($Pid, $SleepAfterBoot)) { my $ErrMessage = $TA->GetLastError(); if ($ErrMessage =~ /timed out waiting for the child process/) { - FatalError("Timed out waiting for the X session\n"); + FatalError("Timed out waiting for the $VMKey X session\n"); } - FatalError("An error occurred while waiting for the X session: $ErrMessage\n"); + FatalError("An error occurred while waiting for the $VMKey X session: $ErrMessage\n"); } } @@ -543,7 +543,7 @@ sub SetupTestAgentd($$$) my $Count = $TA->GetProperties("start.count"); if (defined $Count and $Count > 1) { - FatalError("The VM has been rebooted too many times: start.count=$Count > 1"); + FatalError("$VMKey has been rebooted too many times: start.count=$Count > 1"); } } $PTA->Disconnect(); @@ -573,7 +573,7 @@ sub Revert() { if (!$Debug and $VM->Status ne "reverting") { - Error("The VM is not ready to be reverted (". $VM->Status .")\n"); + Error("$VMKey is not ready to be reverted (". $VM->Status .")\n"); return 1; } $CurrentStatus = "reverting";

1 0

Francois Gouget : testbot/SetWinLocale: Provide a dummy reboot reason.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: tools Branch: master Commit: 33de404f4ee904ed8f6411e9cc06ba3a1ec497e6 URL: https://source.winehq.org/git/tools.git/?a=commit;h=33de404f4ee904ed8f6411e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 8 23:46:25 2022 +0100 testbot/SetWinLocale: Provide a dummy reboot reason. This matches LibvirtTool. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index b43b501..4cc3644 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -900,7 +900,7 @@ SetWinLocales($OptSysCopy, $OptDefCopy, $OptLocale, $CountryId, if ($OptReboot) { - my $Cmd = ["shutdown.exe", "/r", "/t", "0"]; + my $Cmd = ["shutdown.exe", "/r", "/d", "00:00", "/t", "0"]; Debug(Elapsed($Start), " Rebooting: ", join(" ", @$Cmd), "\n"); my $OldCount = $TA->GetProperties("start.count"); $TA->Run($Cmd, 0);

1 0