wine-commits October 2017

wine-commits@winehq.org

2 participants
478 discussions

Henri Verbeet : ddraw/tests: Add a test for the alpha and z-buffer blit flags.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: f6fd4013fbed40f90c2e2c1857e4ee37490fe697 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6fd4013fbed40f90c2e2c185… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 24 23:31:29 2017 +0200 ddraw/tests: Add a test for the alpha and z-buffer blit flags. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 45b01908da378f16a2612a012c52205daca0bbb1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 400 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f6fd4013fbed40f90c2e2…

1 0

Henri Verbeet : ddraw/tests: Introduce a helper function to create windows.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 278722ba81f5fc27a58e9852bc6fad6c4edbff48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=278722ba81f5fc27a58e9852b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 23 17:57:29 2017 +0200 ddraw/tests: Introduce a helper function to create windows. Mostly for consistency with other D3D tests. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a86af72270e61cafb37454bbdc8020681dd49b07) Conflicts: dlls/ddraw/tests/ddraw1.c dlls/ddraw/tests/ddraw2.c dlls/ddraw/tests/ddraw4.c dlls/ddraw/tests/ddraw7.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 148 ++++++++++++------------------ dlls/ddraw/tests/ddraw2.c | 170 +++++++++++++---------------------- dlls/ddraw/tests/ddraw4.c | 207 +++++++++++++++--------------------------- dlls/ddraw/tests/ddraw7.c | 223 ++++++++++++++++------------------------------ 4 files changed, 265 insertions(+), 483 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=278722ba81f5fc27a58e9…

1 0

Ken Thomases : winemac: Track whether a view has ever had an OpenGL context attached.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 17c4db48e2b355a7a1745e793ff226249a90affe URL: http://source.winehq.org/git/wine.git/?a=commit;h=17c4db48e2b355a7a1745e793… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon May 8 15:31:48 2017 -0500 winemac: Track whether a view has ever had an OpenGL context attached. ... rather than whether it currently has one. This is for OpenGLSurfaceMode=behind. In that mode, we need to make the window transparent wherever a GL-rendered view should not be clipped by GDI-rendered children or sibling views. Some apps attach a GL context to the view only temporarily, do some rendering, and then detach it. But the GL surface remains, with the rendered graphics. In order for those to show, the window needs to remain transparent even though none of its views has a GL context currently attached. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b6a4b2f593503a105dde01e7bd11ffdde243117a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index a68ba03..f951675 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -292,6 +292,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi { NSMutableArray* glContexts; NSMutableArray* pendingGlContexts; + BOOL _everHadGLContext; BOOL _cachedHasGLDescendant; BOOL _cachedHasGLDescendantValid; BOOL clearedGlSurface; @@ -302,6 +303,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi int backingSize[2]; } +@property (readonly, nonatomic) BOOL everHadGLContext; + - (void) addGLContext:(WineOpenGLContext*)context; - (void) removeGLContext:(WineOpenGLContext*)context; - (void) updateGLContexts; @@ -354,6 +357,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi @implementation WineContentView +@synthesize everHadGLContext = _everHadGLContext; + - (void) dealloc { [markedText release]; @@ -463,7 +468,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (void) addGLContext:(WineOpenGLContext*)context { - BOOL hadContext = [self hasGLContext]; + BOOL hadContext = _everHadGLContext; if (!glContexts) glContexts = [[NSMutableArray alloc] init]; if (!pendingGlContexts) @@ -485,6 +490,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [self setNeedsDisplay:YES]; } + _everHadGLContext = YES; if (!hadContext) [self invalidateHasGLDescendant]; [(WineWindow*)[self window] updateForGLSubviews]; @@ -492,11 +498,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (void) removeGLContext:(WineOpenGLContext*)context { - BOOL hadContext = [self hasGLContext]; [glContexts removeObjectIdenticalTo:context]; [pendingGlContexts removeObjectIdenticalTo:context]; - if (hadContext && ![self hasGLContext]) - [self invalidateHasGLDescendant]; [(WineWindow*)[self window] updateForGLSubviews]; } @@ -506,16 +509,11 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi context.needsUpdate = TRUE; } - - (BOOL) hasGLContext - { - return [glContexts count] || [pendingGlContexts count]; - } - - (BOOL) _hasGLDescendant { if ([self isHidden]) return NO; - if ([self hasGLContext]) + if (_everHadGLContext) return YES; for (WineContentView* view in [self subviews]) { @@ -2337,7 +2335,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi NSRect contentRect = [[self contentView] frame]; BOOL coveredByGLView = FALSE; WineContentView* view = (WineContentView*)[[self contentView] hitTest:NSMakePoint(NSMidX(contentRect), NSMidY(contentRect))]; - if ([view isKindOfClass:[WineContentView class]] && [view hasGLContext]) + if ([view isKindOfClass:[WineContentView class]] && view.everHadGLContext) { NSRect frame = [view convertRect:[view bounds] toView:nil]; if (NSContainsRect(frame, contentRect))

1 0

Zebediah Figura : secur32/tests: Zero-initialize contexts.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: cb528d1f4d442ac89a79701e1c52d51198427689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb528d1f4d442ac89a79701e1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 12 16:04:06 2017 -0500 secur32/tests: Zero-initialize contexts. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit abd38ab29383292aebc4a91c0b08c6c45b58e1c8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/secur32/tests/ntlm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 3b661c1..944126e 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -574,7 +574,7 @@ static void testInitializeSecurityContextFlags(void) { SECURITY_STATUS sec_status; PSecPkgInfoA pkg_info = NULL; - SspiData client; + SspiData client = {0}; SEC_WINNT_AUTH_IDENTITY_A id; ULONG req_attr, ctxt_attr; TimeStamp ttl; @@ -794,7 +794,7 @@ static void testAuth(ULONG data_rep, BOOL fake) SECURITY_STATUS sec_status; PSecPkgInfoA pkg_info = NULL; BOOL first = TRUE; - SspiData client, server; + SspiData client = {0}, server = {0}; SEC_WINNT_AUTH_IDENTITY_A id; SecPkgContext_Sizes ctxt_sizes; @@ -923,7 +923,7 @@ static void testSignSeal(void) SECURITY_STATUS sec_status; PSecPkgInfoA pkg_info = NULL; BOOL first = TRUE; - SspiData client, server; + SspiData client = {0}, server = {0}; SEC_WINNT_AUTH_IDENTITY_A id; static char sec_pkg_name[] = "NTLM"; SecBufferDesc crypt; @@ -1340,8 +1340,8 @@ static void test_cred_multiple_use(void) SEC_WINNT_AUTH_IDENTITY_A id; PSecPkgInfoA pkg_info = NULL; CredHandle cred; - CtxtHandle ctxt1; - CtxtHandle ctxt2; + CtxtHandle ctxt1 = {0}; + CtxtHandle ctxt2 = {0}; SecBufferDesc buffer_desc; SecBuffer buffers[1]; ULONG ctxt_attr; @@ -1400,7 +1400,7 @@ static void test_null_auth_data(void) SECURITY_STATUS status; PSecPkgInfoA info; CredHandle cred; - CtxtHandle ctx; + CtxtHandle ctx = {0}; SecBufferDesc buffer_desc; SecBuffer buffers[1]; char user[256];

1 0

Akihiro Sagawa : oleaut32: Fix parse error when converting non-ascii string to VT_DATE.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 4c8624fd93cdb5ba9c08b0fd320eaa4b5a23f6ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c8624fd93cdb5ba9c08b0fd3… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 17 00:00:07 2017 +0900 oleaut32: Fix parse error when converting non-ascii string to VT_DATE. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit efc86ec175fa2f67c649299f48ac96d1af9a1fa9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oleaut32/tests/vartype.c | 7 +++++++ dlls/oleaut32/vartype.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index ff495bd..0f39043 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -3410,6 +3410,8 @@ static void test_VarDateFromStr(void) SYSTEMTIME st; OLECHAR buff[128]; size_t i; + OLECHAR with_ideographic_spaceW[] = { '6','/','3','0','/','2','0','1','1',0x3000, + '1',':','2','0',':','3','4',0 }; lcid = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); @@ -3533,6 +3535,11 @@ static void test_VarDateFromStr(void) DFS("6/30/2011 01:20:34 PM"); EXPECT_DBL(40724.55594907407); /* Native fails "1999 January 3, 9AM". I consider that a bug in native */ + /* test a data with ideographic space */ + out = 0.0; + hres = pVarDateFromStr(with_ideographic_spaceW, lcid, LOCALE_NOUSEROVERRIDE, &out); + EXPECT_DBL(40724.05594907407); + /* test a non-english data string */ DFS("02.01.1970"); EXPECT_MISMATCH; DFS("02.01.1970 00:00:00"); EXPECT_MISMATCH; diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index fc5a025..000b66c 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -7679,7 +7679,7 @@ HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pd dp.dwCount++; strIn--; } - else if (isalpha(*strIn)) + else if (isalphaW(*strIn)) { BOOL bFound = FALSE;

1 0

Austin English : user32: Add LogicalToPhysicalPoint/ PhysicalToLogicalPoint stubs.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: bb87ed485a6861dc0a3b9142b11f2c6f020e2b58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb87ed485a6861dc0a3b9142b… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 18 13:20:07 2017 -0500 user32: Add LogicalToPhysicalPoint/PhysicalToLogicalPoint stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3b9e49b4d8815754e5c7b7a0c4f982e6efa0ac62) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec | 2 +- .../ext-ms-win-ntuser-window-l1-1-1.spec | 2 +- dlls/user32/user32.spec | 2 ++ dlls/user32/winpos.c | 24 ++++++++++++++++++++++ 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec b/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec index 69488d1..4b563ff 100644 --- a/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec +++ b/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec @@ -36,7 +36,7 @@ @ stdcall IsWindow(long) user32.IsWindow @ stdcall IsWindowUnicode(long) user32.IsWindowUnicode @ stdcall IsWindowVisible(long) user32.IsWindowVisible -@ stub LogicalToPhysicalPoint +@ stdcall LogicalToPhysicalPoint(long ptr) user32.LogicalToPhysicalPoint @ stdcall MoveWindow(long long long long long long) user32.MoveWindow @ stdcall RemovePropW(long wstr) user32.RemovePropW @ stdcall SetForegroundWindow(long) user32.SetForegroundWindow diff --git a/dlls/ext-ms-win-ntuser-window-l1-1-1/ext-ms-win-ntuser-window-l1-1-1.spec b/dlls/ext-ms-win-ntuser-window-l1-1-1/ext-ms-win-ntuser-window-l1-1-1.spec index 69488d1..4b563ff 100644 --- a/dlls/ext-ms-win-ntuser-window-l1-1-1/ext-ms-win-ntuser-window-l1-1-1.spec +++ b/dlls/ext-ms-win-ntuser-window-l1-1-1/ext-ms-win-ntuser-window-l1-1-1.spec @@ -36,7 +36,7 @@ @ stdcall IsWindow(long) user32.IsWindow @ stdcall IsWindowUnicode(long) user32.IsWindowUnicode @ stdcall IsWindowVisible(long) user32.IsWindowVisible -@ stub LogicalToPhysicalPoint +@ stdcall LogicalToPhysicalPoint(long ptr) user32.LogicalToPhysicalPoint @ stdcall MoveWindow(long long long long long long) user32.MoveWindow @ stdcall RemovePropW(long wstr) user32.RemovePropW @ stdcall SetForegroundWindow(long) user32.SetForegroundWindow diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 65a5bfe..c5ef0e7 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -488,6 +488,7 @@ @ stub LockWindowStation @ stdcall LockWindowUpdate(long) @ stdcall LockWorkStation() +@ stdcall LogicalToPhysicalPoint(long ptr) @ stdcall LookupIconIdFromDirectory(ptr long) @ stdcall LookupIconIdFromDirectoryEx(ptr long long long long) @ stub MBToWCSEx @@ -538,6 +539,7 @@ # @ stub PaintMenuBar @ stdcall PeekMessageA(ptr long long long long) @ stdcall PeekMessageW(ptr long long long long) +@ stdcall PhysicalToLogicalPoint(long ptr) @ stub PlaySoundEvent @ stdcall PostMessageA(long long long long) @ stdcall PostMessageW(long long long long) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index a6c2ce1..33644ff 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2948,3 +2948,27 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) else WINPOS_ShowIconTitle( hwnd, TRUE ); } } + +/*********************************************************************** + * LogicalToPhysicalPoint (USER32.@) + */ +BOOL WINAPI LogicalToPhysicalPoint(HWND hwnd, POINT *point) +{ + static int once; + + if (!once++) + FIXME("(%p %p) stub\n", hwnd, point); + return TRUE; +} + +/*********************************************************************** + * PhysicalToLogicalPoint (USER32.@) + */ +BOOL WINAPI PhysicalToLogicalPoint(HWND hwnd, POINT *point) +{ + static int once; + + if (!once++) + FIXME("(%p %p) stub\n", hwnd, point); + return TRUE; +}

1 0

André Hentschel : wpcap: Fix build with newer pcap versions.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 773cad9f16ecc9aaf751e05cdf2f6f408c582305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=773cad9f16ecc9aaf751e05cd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jul 21 15:16:51 2017 +0200 wpcap: Fix build with newer pcap versions. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 28173f06932edd85a64a952120d29b9bb1e762ea) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wpcap/wpcap.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index b770067..fe46903 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -19,6 +19,11 @@ */ #include <pcap/pcap.h> + +/* pcap.h might define those: */ +#undef SOCKET +#undef INVALID_SOCKET + #include "winsock2.h" #include "windef.h" #include "winbase.h"

1 0

Francois Gouget : testbot: Power off Libvirt domains in one operation.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: tools Branch: master Commit: ccf23fd22fa8491a6abf026a989c855669cac2d8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ccf23fd22fa8491a6abf026a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 19 14:54:41 2017 +0200 testbot: Power off Libvirt domains in one operation. When all goes well. In case of trouble use get_state() to check if the virtual machine is powered off anyway. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LibvirtDomain.pm | 48 +++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/testbot/lib/WineTestBot/LibvirtDomain.pm b/testbot/lib/WineTestBot/LibvirtDomain.pm index f8caffa..9ca98eb 100644 --- a/testbot/lib/WineTestBot/LibvirtDomain.pm +++ b/testbot/lib/WineTestBot/LibvirtDomain.pm @@ -253,6 +253,23 @@ sub IsPoweredOn($) return ($State == Sys::Virt::Domain::STATE_RUNNING); } +sub _GetStateName($) +{ + my ($State) = @_; + + my %StateNames = { + Sys::Virt::Domain::STATE_NOSTATE => "no state", + Sys::Virt::Domain::STATE_RUNNING => "running", + Sys::Virt::Domain::STATE_BLOCKED => "blocked", + Sys::Virt::Domain::STATE_PAUSED => "paused", + Sys::Virt::Domain::STATE_SHUTDOWN => "shutdown", + Sys::Virt::Domain::STATE_SHUTOFF => "shutoff", + Sys::Virt::Domain::STATE_CRASHED => "crashed", + Sys::Virt::Domain::STATE_PMSUSPENDED => "pmsuspended", + }; + return $StateNames{$State} || "unknown"; +} + sub PowerOff($) { my ($self) = @_; @@ -260,21 +277,26 @@ sub PowerOff($) my ($ErrMessage, $Domain) = $self->_GetDomain(); return $ErrMessage if (defined $ErrMessage); - if ($self->IsPoweredOn()) + eval { $Domain->destroy() }; + return undef if (!$@); # Success + $ErrMessage = _eval_err(); + + # destroy() sets $@->code to Sys::Virt::Error::ERR_OPERATION_INVALID (55) + # if the domain was already off. But this could happen for other reasons so + # just check the domain state. + my ($State, $_Reason); + eval { ($State, $_Reason) = $Domain->get_state() }; + if ($@) { - eval { $Domain->destroy() }; - if ($@) - { - $ErrMessage = _eval_err(); - } - elsif ($self->IsPoweredOn()) - { - $ErrMessage = "The VM is still active"; - } + # Only return the initial error + return $self->_Reset("Could not power off ". $self->{VM}->Name .": $ErrMessage"); } - - return undef if (!defined $ErrMessage); - return $self->_Reset("Could not power off ". $self->{VM}->Name .": $ErrMessage"); + if ($State == Sys::Virt::Domain::STATE_SHUTOFF) + { + # This is what we wanted so ignore past errors + return undef; + } + return $self->_Reset($self->{VM}->Name ." is not off (". _GetStateName($State) ."): $ErrMessage"); } my %_StreamData;

1 0

Francois Gouget : testbot: Remove LibvirtDomain::_UpdateStatus().
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: tools Branch: master Commit: 604683507c18dbd865730b32d4d5deae9bf21cc2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=604683507c18dbd865730b32… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 19 14:54:35 2017 +0200 testbot: Remove LibvirtDomain::_UpdateStatus(). It was needed to resynchronize the VM status field during the Engine initialization. However nowadays the Engine delegates this to LibvirtTool which does not want the VM status to be changed behind this back and thus bypasses _UpdateStatus(). The bypass is explicit in the case of PowerOff(), $NoStatus=1, and implicit in the RevertToSnapshot() case: _UpdateStatus() does nothing if get_state() == STATE_RUNNING (which is the case for our VMs) and $VM->Status ne "off". Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 4 ++-- testbot/lib/WineTestBot/LibvirtDomain.pm | 35 ++++---------------------------- 2 files changed, 6 insertions(+), 33 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index ab97261..51f03b4 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -305,7 +305,7 @@ sub PowerOff() { # Power off VMs no matter what their initial status is $CurrentStatus = $VM->Status; - my $ErrMessage = $VM->GetDomain()->PowerOff(1); + my $ErrMessage = $VM->GetDomain()->PowerOff(); FatalError("$ErrMessage\n") if (defined $ErrMessage); return ChangeStatus(undef, "off", "done"); @@ -338,7 +338,7 @@ sub Revert() # Some QEmu/KVM versions are buggy and cannot revert a running VM Debug(Elapsed($Start), " Powering off the VM\n"); my $Domain = $VM->GetDomain(); - my $ErrMessage = $Domain->PowerOff(1); + my $ErrMessage = $Domain->PowerOff(); if (defined $ErrMessage) { LogMsg "Could not power off $VMKey: $ErrMessage\n"; diff --git a/testbot/lib/WineTestBot/LibvirtDomain.pm b/testbot/lib/WineTestBot/LibvirtDomain.pm index 1b74315..f8caffa 100644 --- a/testbot/lib/WineTestBot/LibvirtDomain.pm +++ b/testbot/lib/WineTestBot/LibvirtDomain.pm @@ -151,32 +151,6 @@ sub _GetDomain($) return (undef, $Domain); } -sub _UpdateStatus($$) -{ - my ($self, $Domain) = @_; - - return undef if ($self->{VM}->Status eq "offline"); - - my ($State, $Reason); - eval { ($State, $Reason) = $Domain->get_state() }; - return $self->_Reset(_eval_err()) if ($@); - - if ($State == Sys::Virt::Domain::STATE_SHUTDOWN or - $State == Sys::Virt::Domain::STATE_SHUTOFF or - $State == Sys::Virt::Domain::STATE_CRASHED) - { - $self->{VM}->Status("off"); - $self->{VM}->Save(); - } - elsif ($self->{VM}->Status eq "off") - { - $self->{VM}->Status("dirty"); - $self->{VM}->Save(); - } - - return undef; -} - sub _GetSnapshot($$) { my ($self, $SnapshotName) = @_; @@ -233,7 +207,7 @@ sub RevertToSnapshot($) # Note that if the snapshot was of a powered off domain, this boots it up eval { $Snapshot->revert_to(Sys::Virt::DomainSnapshot::REVERT_RUNNING) }; - return $@ ? $self->_Reset(_eval_err()) : $self->_UpdateStatus($Domain); + return $@ ? $self->_Reset(_eval_err()) : undef; } sub CreateSnapshot($) @@ -279,9 +253,9 @@ sub IsPoweredOn($) return ($State == Sys::Virt::Domain::STATE_RUNNING); } -sub PowerOff($$) +sub PowerOff($) { - my ($self, $NoStatus) = @_; + my ($self) = @_; my ($ErrMessage, $Domain) = $self->_GetDomain(); return $ErrMessage if (defined $ErrMessage); @@ -298,9 +272,8 @@ sub PowerOff($$) $ErrMessage = "The VM is still active"; } } - $ErrMessage ||= $self->_UpdateStatus($Domain) if (!$NoStatus); - return undef if (!defined $ErrMessage); + return undef if (!defined $ErrMessage); return $self->_Reset("Could not power off ". $self->{VM}->Name .": $ErrMessage"); }

1 0

Francois Gouget : testbot: Base LibvirtDomain::IsPoweredOn() on get_state( ).
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: tools Branch: master Commit: bfb23ab81b1bd15ba180fcc05a9d4ef0624134f8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=bfb23ab81b1bd15ba180fcc0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 19 14:54:16 2017 +0200 testbot: Base LibvirtDomain::IsPoweredOn() on get_state(). is_active() returns true even if the VM is in the process of being reverted (i.e. it uses resources) which is not what we are after. So use get_state() which provides more detailed information. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LibvirtDomain.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/LibvirtDomain.pm b/testbot/lib/WineTestBot/LibvirtDomain.pm index 20d619a..1b74315 100644 --- a/testbot/lib/WineTestBot/LibvirtDomain.pm +++ b/testbot/lib/WineTestBot/LibvirtDomain.pm @@ -273,9 +273,10 @@ sub IsPoweredOn($) return undef; } - my $IsActive; - eval { $IsActive = $Domain->is_active() }; - return $@ ? $self->_Reset(undef) : $IsActive; + my ($State, $_Reason); + eval { ($State, $_Reason) = $Domain->get_state() }; + return $self->_Reset(undef) if ($@); + return ($State == Sys::Virt::Domain::STATE_RUNNING); } sub PowerOff($$)

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2017