September 2019 - Wine-Commits

Zebediah Figura : strmbase: Get rid of the version fields from IEnumMediaTypesImpl.
by Alexandre Julliard Sept. 24, 2019

Sept. 24, 2019

Module: wine Branch: master Commit: bf01248ccb93f0e6af931390fce1a0538e8c4684 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf01248ccb93f0e6af931390… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 23 19:33:22 2019 -0500 strmbase: Get rid of the version fields from IEnumMediaTypesImpl. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/mediatype.c | 15 ++------------- dlls/strmbase/pin.c | 8 +------- dlls/strmbase/strmbase_private.h | 2 +- 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index 393264c094..bb59a81584 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -83,8 +83,6 @@ typedef struct IEnumMediaTypesImpl LONG refCount; BasePin *basePin; BasePin_GetMediaType enumMediaFunction; - BasePin_GetMediaTypeVersion mediaVersionFunction; - LONG currentVersion; ULONG count; ULONG uIndex; } IEnumMediaTypesImpl; @@ -96,7 +94,7 @@ static inline IEnumMediaTypesImpl *impl_from_IEnumMediaTypes(IEnumMediaTypes *if static const struct IEnumMediaTypesVtbl IEnumMediaTypesImpl_Vtbl; -HRESULT WINAPI EnumMediaTypes_Construct(BasePin *basePin, BasePin_GetMediaType enumFunc, BasePin_GetMediaTypeVersion versionFunc, IEnumMediaTypes ** ppEnum) +HRESULT WINAPI EnumMediaTypes_Construct(BasePin *basePin, BasePin_GetMediaType enumFunc, IEnumMediaTypes **ppEnum) { ULONG i; IEnumMediaTypesImpl * pEnumMediaTypes = CoTaskMemAlloc(sizeof(IEnumMediaTypesImpl)); @@ -111,7 +109,6 @@ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *basePin, BasePin_GetMediaType e pEnumMediaTypes->refCount = 1; pEnumMediaTypes->uIndex = 0; pEnumMediaTypes->enumMediaFunction = enumFunc; - pEnumMediaTypes->mediaVersionFunction = versionFunc; IPin_AddRef(&basePin->IPin_iface); pEnumMediaTypes->basePin = basePin; @@ -124,7 +121,6 @@ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *basePin, BasePin_GetMediaType e pEnumMediaTypes->count = i; *ppEnum = &pEnumMediaTypes->IEnumMediaTypes_iface; - pEnumMediaTypes->currentVersion = versionFunc(basePin); return S_OK; } @@ -180,9 +176,6 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Next(IEnumMediaTypes *iface, TRACE("iface %p, count %u, mts %p, ret_count %p.\n", iface, count, mts, ret_count); - if (enummt->currentVersion != enummt->mediaVersionFunction(enummt->basePin)) - return VFW_E_ENUM_OUT_OF_SYNC; - for (i = 0; i < count && enummt->uIndex + i < enummt->count; i++) { if (!(mts[i] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE))) @@ -209,9 +202,6 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Skip(IEnumMediaTypes *iface, ULONG cou TRACE("iface %p, count %u.\n", iface, count); - if (enummt->currentVersion != enummt->mediaVersionFunction(enummt->basePin)) - return VFW_E_ENUM_OUT_OF_SYNC; - enummt->uIndex += count; return enummt->uIndex > enummt->count ? S_FALSE : S_OK; @@ -232,7 +222,6 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Reset(IEnumMediaTypes * iface) i++; } This->count = i; - This->currentVersion = This->mediaVersionFunction(This->basePin); This->uIndex = 0; return S_OK; @@ -245,7 +234,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Clone(IEnumMediaTypes * iface, IEnumMe TRACE("(%p)->(%p)\n", iface, ppEnum); - hr = EnumMediaTypes_Construct(This->basePin, This->enumMediaFunction, This->mediaVersionFunction, ppEnum); + hr = EnumMediaTypes_Construct(This->basePin, This->enumMediaFunction, ppEnum); if (FAILED(hr)) return hr; return IEnumMediaTypes_Skip(*ppEnum, This->uIndex); diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 2fb9cf012f..7991fdc547 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -160,11 +160,6 @@ HRESULT WINAPI BasePinImpl_GetMediaType(BasePin *iface, int iPosition, AM_MEDIA_ return VFW_S_NO_MORE_ITEMS; } -LONG WINAPI BasePinImpl_GetMediaTypeVersion(BasePin *iface) -{ - return 1; -} - ULONG WINAPI BasePinImpl_AddRef(IPin *iface) { BasePin *pin = impl_from_IPin(iface); @@ -306,8 +301,7 @@ HRESULT WINAPI BasePinImpl_EnumMediaTypes(IPin *iface, IEnumMediaTypes **enum_me TRACE("iface %p, enum_media_types %p.\n", iface, enum_media_types); - return EnumMediaTypes_Construct(pin, pin->pFuncsTable->pfnGetMediaType, - BasePinImpl_GetMediaTypeVersion, enum_media_types); + return EnumMediaTypes_Construct(pin, pin->pFuncsTable->pfnGetMediaType, enum_media_types); } HRESULT WINAPI BasePinImpl_QueryInternalConnections(IPin * iface, IPin ** apPin, ULONG * cPin) diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h index 4b94735eb6..b5e6d4bd18 100644 --- a/dlls/strmbase/strmbase_private.h +++ b/dlls/strmbase/strmbase_private.h @@ -64,7 +64,7 @@ void QualityControlRender_EndRender(QualityControlImpl *This); HRESULT enum_pins_create(struct strmbase_filter *filter, IEnumPins **enum_pins); HRESULT WINAPI EnumMediaTypes_Construct(BasePin *pin, BasePin_GetMediaType enumFunc, - BasePin_GetMediaTypeVersion versionFunc, IEnumMediaTypes **enum_media_types) DECLSPEC_HIDDEN; + IEnumMediaTypes **enum_media_types) DECLSPEC_HIDDEN; HRESULT WINAPI RendererPosPassThru_RegisterMediaTime(IUnknown *iface, REFERENCE_TIME start); HRESULT WINAPI RendererPosPassThru_ResetMediaTime(IUnknown *iface);

1 0

Brendan Shanks : user32: Fix behavior of GetWindowInfo(0, NULL).
by Alexandre Julliard Sept. 24, 2019

Sept. 24, 2019

Module: wine Branch: master Commit: c8dbb0c4c1ec4cc7979715a6ebc02ece90ae220e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8dbb0c4c1ec4cc7979715a6… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Sep 23 10:41:07 2019 -0700 user32: Fix behavior of GetWindowInfo(0, NULL). Windows doesn't do a NULL check on the WINDOWINFO pointer. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 2 +- dlls/user32/win.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 6b600cb1bc..784849b2ba 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1007,7 +1007,7 @@ static void test_window_info(const char *hook, HWND hwnd) if (0) { /* crashes on XP, 2003 */ SetLastError(0xdeadbeef); ok(!pGetWindowInfo(0, NULL), "GetWindowInfo should fail\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "got error %d expected ERROR_INVALID_WINDOW_HANDLE\n", GetLastError()); } diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 3582262b7d..3323ed3e41 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3845,9 +3845,13 @@ UINT WINAPI GetWindowModuleFileNameW( HWND hwnd, LPWSTR module, UINT size ) */ BOOL WINAPI DECLSPEC_HOTPATCH GetWindowInfo( HWND hwnd, PWINDOWINFO pwi) { + RECT rcWindow, rcClient; + + if (!WIN_GetRectangles( hwnd, COORDS_SCREEN, &rcWindow, &rcClient )) return FALSE; if (!pwi) return FALSE; - if (!WIN_GetRectangles( hwnd, COORDS_SCREEN, &pwi->rcWindow, &pwi->rcClient )) return FALSE; + pwi->rcWindow = rcWindow; + pwi->rcClient = rcClient; pwi->dwStyle = GetWindowLongW(hwnd, GWL_STYLE); pwi->dwExStyle = GetWindowLongW(hwnd, GWL_EXSTYLE); pwi->dwWindowStatus = ((GetActiveWindow() == hwnd) ? WS_ACTIVECAPTION : 0);

1 0

Francois Gouget : testbot/LibvirtTool: Wait for the X session for live Wine snapshots.
by Alexandre Julliard Sept. 24, 2019

Sept. 24, 2019

Module: tools Branch: master Commit: 6a5e1e87900c85bd0fc60841170c8d520af0ab48 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6a5e1e87900c85bd0fc6084… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 24 11:10:08 2019 +0200 testbot/LibvirtTool: Wait for the X session for live Wine snapshots. The TestAgentd server may start before the X session. But we need the latter to run the Wine tests so make sure the X session has started before creating the live snapshot. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 72075ae..d1402bc 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -386,6 +386,29 @@ sub CreateSnapshot($$) { my ($Domain, $SnapshotName) = @_; + if ($VM->Type eq "wine") + { + # Make sure an X session has started before taking the snapshot + Debug(Elapsed($Start), " Waiting for the X session\n"); + LogMsg "Waiting for the $VMKey X session\n"; + my $TA = $VM->GetAgent(); + my $Pid = $TA->Run(["sh", "-c", "while ! xset -display :0.0 q >/dev/null; do sleep 1; done"], 0); + if (!$Pid) + { + FatalError("Could not check for the X session on the $VMKey VM\n"); + } + 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("An error occurred while waiting for the X session: $ErrMessage\n"); + } + $TA->Disconnect(); + } + if ($SleepAfterBoot != 0) { Debug(Elapsed($Start), " Sleeping for the $SnapshotName snapshot\n");

1 0

Francois Gouget : testbot/WineRunReconfig: Notify the administrator if the build fails.
by Alexandre Julliard Sept. 24, 2019

Sept. 24, 2019

Module: tools Branch: master Commit: df877ab52c672562541f78fba602ea1bf123e5b0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=df877ab52c672562541f78f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 24 11:00:40 2019 +0200 testbot/WineRunReconfig: Notify the administrator if the build fails. Build failures prevent the TestBot snapshot from being updated (leading to an out-of-date Wine and patches that fail to apply) and can typically only be fixed manually. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index fe36ad0..063bab2 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -438,6 +438,11 @@ if ($TA->GetFile("Reconfig.log", "$TaskDir/log")) { # We should not have badpatch errors and if the result line is missing we # probably already have an error message that explains why. + NotifyAdministrator("The ". $VM->Name ." build failed", + "The ". $VM->Name ." build failed:\n\n". + "$Summary->{Task}\n\n". + "See the link below for more details:\n". + MakeSecureURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n"); $NewStatus = "badbuild"; } }

1 0

Francois Gouget : testbot/WineRunReconfig: Fix a typo in a comment.
by Alexandre Julliard Sept. 24, 2019

Sept. 24, 2019

Module: tools Branch: master Commit: a46113d323c778a50a1e783ccd216d06b7e3f00f URL: https://source.winehq.org/git/tools.git/?a=commit;h=a46113d323c778a50a1e783… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 24 10:58:59 2019 +0200 testbot/WineRunReconfig: Fix a typo in a comment. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index a443027..fe36ad0 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -468,7 +468,7 @@ if ($NewStatus eq "completed") if ($FileName !~ m~^latest/~ and !$Summary->{$BaseName} and -f "$DataDir/latest/$BaseName") { - # This file was not updated to there is no point redownloading it. + # This file was not updated so there is no point in redownloading it. next; } Debug(Elapsed($Start), " Retrieving '$TaskDir/$BaseName'\n");

1 0

Francois Gouget : testbot/Engine: Return more specific errors when SendCmdReceiveReply() fails.
by Alexandre Julliard Sept. 24, 2019

Sept. 24, 2019

Module: tools Branch: master Commit: c5a6fa1b41b03452bb2167b002fb8056086c1ad0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c5a6fa1b41b03452bb2167b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 24 11:00:04 2019 +0200 testbot/Engine: Return more specific errors when SendCmdReceiveReply() fails. In case there is a doubt they now explicitly indicate which command failed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Engine/Notify.pm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index ddb14d2..de73425 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -82,7 +82,7 @@ sub Shutdown($$) my $Reply = SendCmdReceiveReply("shutdown $KillTasks $KillVMs\n"); if (length($Reply) < 1) { - return "Unrecognized reply received from engine"; + return "The Engine did not acknowledge the Shutdown command"; } if (substr($Reply, 0, 1) eq "1") { @@ -105,7 +105,7 @@ sub JobStatusChange($$$) my $Reply = SendCmdReceiveReply("jobstatuschange $JobKey $OldStatus $NewStatus\n"); if (length($Reply) < 1) { - return "Unrecognized reply received from engine"; + return "The Engine did not acknowledge the JobStatusChange command"; } if (substr($Reply, 0, 1) eq "1") { @@ -122,7 +122,7 @@ sub JobCancel($) my $Reply = SendCmdReceiveReply("jobcancel $JobKey\n"); if (length($Reply) < 1) { - return "Unrecognized reply received from engine"; + return "The Engine did not acknowledge the JobCancel command"; } if (substr($Reply, 0, 1) eq "1") { @@ -139,7 +139,7 @@ sub JobRestart($) my $Reply = SendCmdReceiveReply("jobrestart $JobKey\n"); if (length($Reply) < 1) { - return "Unrecognized reply received from engine"; + return "The Engine did not acknowledge the JobRestart command"; } if (substr($Reply, 0, 1) eq "1") { @@ -154,7 +154,7 @@ sub RescheduleJobs() my $Reply = SendCmdReceiveReply("reschedulejobs\n"); if (length($Reply) < 1) { - return "Unrecognized reply received from engine"; + return "The Engine did not acknowledge the RescheduleJobs command"; } if (substr($Reply, 0, 1) eq "1") { @@ -171,7 +171,7 @@ sub VMStatusChange($$$) my $Reply = SendCmdReceiveReply("vmstatuschange $VMKey $OldStatus $NewStatus\n"); if (length($Reply) < 1) { - return "Unrecognized reply received from engine"; + return "The Engine did not acknowledge the VMStatusChange notification"; } if (substr($Reply, 0, 1) eq "1") { @@ -186,7 +186,7 @@ sub WinePatchMLSubmission() my $Reply = SendCmdReceiveReply("winepatchmlsubmission\n"); if (length($Reply) < 1) { - return "Unrecognized reply received from engine"; + return "The Engine did not acknowledge the WinePatchMLSubmission command"; } if (substr($Reply, 0, 1) eq "1") { @@ -201,7 +201,7 @@ sub WinePatchWebSubmission() my $Reply = SendCmdReceiveReply("winepatchwebsubmission\n"); if (length($Reply) < 1) { - return "Unrecognized reply received from engine"; + return "The Engine did not acknowledge the WinePatchWebSubmission command"; } if (substr($Reply, 0, 1) eq "1") { @@ -218,7 +218,7 @@ sub GetScreenshot($) my $Reply = SendCmdReceiveReply("getscreenshot $VMName\n"); if (length($Reply) < 1) { - return "Unrecognized reply received from engine"; + return "The Engine did not acknowledge the GetScreenshot command"; } if (substr($Reply, 0, 1) eq "1") {

1 0

Francois Gouget : testbot: SetupRedirects() should not depend on prior logging.
by Alexandre Julliard Sept. 24, 2019

Sept. 24, 2019

Module: tools Branch: master Commit: b360a0b5e2b0099e8ba3b326ccb9905aa3d4ff6a URL: https://source.winehq.org/git/tools.git/?a=commit;h=b360a0b5e2b0099e8ba3b32… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 24 11:00:15 2019 +0200 testbot: SetupRedirects() should not depend on prior logging. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Log.pm | 59 +++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/testbot/lib/WineTestBot/Log.pm b/testbot/lib/WineTestBot/Log.pm index c39a557..7ac4dab 100644 --- a/testbot/lib/WineTestBot/Log.pm +++ b/testbot/lib/WineTestBot/Log.pm @@ -33,26 +33,28 @@ use WineTestBot::Config; my $logfile; my $logprefix; -sub LogMsg(@) +sub SetupLogging() { - if (!defined $logfile) + require File::Basename; + $logprefix = File::Basename::basename($0); + $logprefix =~ s/\.[^.]*$//; + my $oldumask = umask(002); + if (!open($logfile, ">>", "$LogDir/log")) { - require File::Basename; - $logprefix = File::Basename::basename($0); - $logprefix =~ s/\.[^.]*$//; - my $oldumask = umask(002); - if (!open($logfile, ">>", "$LogDir/log")) - { - print STDERR "$logprefix:warning: could not open '$LogDir/log' for writing: $!\n"; - open($logfile, ">>&=", 2); - } - umask($oldumask); - - # Flush after each print - my $tmp=select($logfile); - $| = 1; - select($tmp); + print STDERR "$logprefix:warning: could not open '$LogDir/log' for writing: $!\n"; + open($logfile, ">>&=", 2); } + umask($oldumask); + + # Flush after each print + my $tmp=select($logfile); + $| = 1; + select($tmp); +} + +sub LogMsg(@) +{ + SetupLogging() if (!defined $logfile); print $logfile scalar localtime, " ", $logprefix, "[$$]: ", @_ if ($logfile); } @@ -75,19 +77,18 @@ exec()-ing external tools so their error messages are not lost. sub SetupRedirects() { - if (defined $logfile) + SetupLogging() if (!defined $logfile); + + if (open(STDERR, ">>&", $logfile)) + { + # Make sure stderr still flushes after each print + my $tmp = select(STDERR); + $| = 1; + select($tmp); + } + else { - if (open(STDERR, ">>&", $logfile)) - { - # Make sure stderr still flushes after each print - my $tmp=select(STDERR); - $| = 1; - select($tmp); - } - else - { - LogMsg "unable to redirect stderr to '$logfile': $!\n"; - } + LogMsg "unable to redirect stderr to '$logfile': $!\n"; } }

1 0

Francois Gouget : testbot/TestAgent: Add the restart RPC.
by Alexandre Julliard Sept. 24, 2019

Sept. 24, 2019

Module: tools Branch: master Commit: 28c6aeaf86ddf6b8454d6ce59b5f1f16f50f4b82 URL: https://source.winehq.org/git/tools.git/?a=commit;h=28c6aeaf86ddf6b8454d6ce… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 24 11:06:43 2019 +0200 testbot/TestAgent: Add the restart RPC. This is similar to the upgrade RPC but leaves out sending the new server binary and allows changing the server command line which makes it more flexible. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 52 ++++++++ testbot/scripts/TestAgent | 14 ++- testbot/src/testagentd/platform.h | 2 +- testbot/src/testagentd/platform_unix.c | 45 +++++-- testbot/src/testagentd/platform_windows.c | 199 ++++++++++++++++++++++++++++-- testbot/src/testagentd/testagentd.c | 72 ++++++++++- 6 files changed, 356 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=28c6aeaf86ddf6b8454…

1 0

Francois Gouget : testbot/WineRunReconfig: Notify the administrator if recreating the snapshot failed.
by Alexandre Julliard Sept. 24, 2019

Sept. 24, 2019

Module: tools Branch: master Commit: 51503c04fea1dd065f35b921b9a3e19dc0cd3d20 URL: https://source.winehq.org/git/tools.git/?a=commit;h=51503c04fea1dd065f35b92… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 24 11:01:12 2019 +0200 testbot/WineRunReconfig: Notify the administrator if recreating the snapshot failed. It's possible that the connection to the hypervisor was lost right when the snapshot was being recreated. The TestBot may also be able to recreate the snapshot from the powered off base snapshot. But such failures are rare enough to warrant an investigation. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 063bab2..bfbc5ab 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -518,6 +518,11 @@ if ($NewStatus eq 'completed') # Without the snapshot the VM is not usable anymore but FatalError() will # just mark it as 'dirty'. It's only the next time it is used that the # problem will be noticed and that it will be taken offline. + NotifyAdministrator("The ". $VM->Name ." update failed", + "Could not recreate the $IdleSnapshot snapshot:\n\n". + "$ErrMessage\n\n". + "See the link below for more details:\n". + MakeSecureURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n"); FatalError("Could not recreate the $IdleSnapshot snapshot: $ErrMessage\n"); }

1 0

Francois Gouget : testbot/testagentd: Fix upgrades when there is more than one server running.
by Alexandre Julliard Sept. 24, 2019

Sept. 24, 2019

Module: tools Branch: master Commit: 2d8e40dad69c325415f927d37970a7849942f6b0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2d8e40dad69c325415f927d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 24 11:04:13 2019 +0200 testbot/testagentd: Fix upgrades when there is more than one server running. On Windows the second server will keep the old executable busy, preventing its deletion. So give up after a while. Usually the second server will be running with --set-time-only so upgrading it is not as important. If necessary this condition can be detected on the client by attempting to delete the old executable and checking for an error. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/testagentd/platform_windows.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index bb52a02..2d971a4 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -532,17 +532,20 @@ int platform_init(void) { /* This also serves to ensure the old server has released the port * before we attempt to open our own. + * But if a second server is running the deletion will never work so + * give up after a while. */ + int attempt = 0; do { if (!DeleteFileA(oldtestagentd)) Sleep(500); + attempt++; } - while (GetLastError() == ERROR_ACCESS_DENIED); + while (GetLastError() == ERROR_ACCESS_DENIED && attempt < 20); free(oldtestagentd); } - wVersionRequested = MAKEWORD(2, 2); rc = WSAStartup(wVersionRequested, &wsaData); if (rc)

1 0