winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
April 2013
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
579 discussions
Start a n
N
ew thread
Michael Stefaniuc : dplayx: Add a separate refcount for IDirectPlayLobby2A.
by Alexandre Julliard
18 Apr '13
18 Apr '13
Module: wine Branch: master Commit: 4d9882572c5109fc855d51c084b6a9ac7b987e3c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4d9882572c5109fc855d51c08…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 17 22:12:53 2013 +0200 dplayx: Add a separate refcount for IDirectPlayLobby2A. --- dlls/dplayx/dplobby.c | 159 +++++++++++++++++++++++++++++++++++++++++++- dlls/dplayx/tests/dplayx.c | 2 +- 2 files changed, 158 insertions(+), 3 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d9882572c5109fc855d5…
1
0
0
0
Michael Stefaniuc : dplayx: Add a separate refcount for IDirectPlayLobbyA.
by Alexandre Julliard
18 Apr '13
18 Apr '13
Module: wine Branch: master Commit: 2314df86dfe38f6b0b4f3996defa28db237c4802 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2314df86dfe38f6b0b4f3996d…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 17 22:12:04 2013 +0200 dplayx: Add a separate refcount for IDirectPlayLobbyA. --- dlls/dplayx/dplobby.c | 150 +++++++++++++++++++++++++++++++++++++++++++- dlls/dplayx/tests/dplayx.c | 2 +- 2 files changed, 149 insertions(+), 3 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=2314df86dfe38f6b0b4f3…
1
0
0
0
Michael Stefaniuc : dplayx: Add a separate refcount for IDirectPlayLobby.
by Alexandre Julliard
18 Apr '13
18 Apr '13
Module: wine Branch: master Commit: ffdeda566c7dc2457ca0e0c1a27b1bf3deedd8e9 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ffdeda566c7dc2457ca0e0c1a…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 17 22:10:53 2013 +0200 dplayx: Add a separate refcount for IDirectPlayLobby. --- dlls/dplayx/dplobby.c | 151 +++++++++++++++++++++++++++++++++++++++++++- dlls/dplayx/tests/dplayx.c | 6 +- 2 files changed, 151 insertions(+), 6 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=ffdeda566c7dc2457ca0e…
1
0
0
0
Michael Stefaniuc : dplayx: Get rid of the IDirectPlayLobbyImpl aliases.
by Alexandre Julliard
18 Apr '13
18 Apr '13
Module: wine Branch: master Commit: d9d1b6ade71f92b4323ecae5f500781e7afb16fb URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d9d1b6ade71f92b4323ecae5f…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 17 22:10:08 2013 +0200 dplayx: Get rid of the IDirectPlayLobbyImpl aliases. --- dlls/dplayx/dplobby.c | 24 +++++------------------- 1 files changed, 5 insertions(+), 19 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index c6b02c8..85a9ea2 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -36,16 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dplay); -/***************************************************************************** - * Predeclare the interface implementation structures - */ -typedef struct IDirectPlayLobbyImpl IDirectPlayLobbyAImpl; -typedef struct IDirectPlayLobbyImpl IDirectPlayLobbyWImpl; -typedef struct IDirectPlayLobbyImpl IDirectPlayLobby2AImpl; -typedef struct IDirectPlayLobbyImpl IDirectPlayLobby2WImpl; -typedef struct IDirectPlayLobbyImpl IDirectPlayLobby3AImpl; -typedef struct IDirectPlayLobbyImpl IDirectPlayLobby3WImpl; - /* Forward declarations for this module helper methods */ HRESULT DPL_CreateCompoundAddress ( LPCDPCOMPOUNDADDRESSELEMENT lpElements, DWORD dwElementCount, LPVOID lpAddress, LPDWORD lpdwAddressSize, BOOL bAnsiInterface )DECLSPEC_HIDDEN; @@ -102,7 +92,7 @@ static inline IDirectPlayLobbyImpl *impl_from_IDirectPlayLobby3A( IDirectPlayLob static BOOL DPL_CreateLobby1( LPVOID lpDPL ) { - IDirectPlayLobbyAImpl *This = lpDPL; + IDirectPlayLobbyImpl *This = lpDPL; This->dpl = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->dpl) ) ); if ( This->dpl == NULL ) @@ -117,7 +107,7 @@ static BOOL DPL_CreateLobby1( LPVOID lpDPL ) static BOOL DPL_DestroyLobby1( LPVOID lpDPL ) { - IDirectPlayLobbyAImpl *This = lpDPL; + IDirectPlayLobbyImpl *This = lpDPL; if( This->dpl->dwMsgThread ) { @@ -259,12 +249,8 @@ static ULONG WINAPI IDirectPlayLobby3Impl_Release(IDirectPlayLobby3 *iface) * Returns an IDirectPlay interface. * */ -static HRESULT DPL_ConnectEx -( IDirectPlayLobbyAImpl* This, - DWORD dwFlags, - REFIID riid, - LPVOID* lplpDP, - IUnknown* pUnk) +static HRESULT DPL_ConnectEx( IDirectPlayLobbyImpl *This, DWORD dwFlags, REFIID riid, void **lplpDP, + IUnknown* pUnk) { HRESULT hr; DWORD dwOpenFlags = 0; @@ -789,7 +775,7 @@ static HRESULT WINAPI IDirectPlayLobby3Impl_ReceiveLobbyMessage( IDirectPlayLobb typedef struct tagRunApplicationEnumStruct { - IDirectPlayLobbyAImpl* This; + IDirectPlayLobbyImpl *This; GUID appGUID; LPSTR lpszPath;
1
0
0
0
Michael Stefaniuc : dplayx: Get rid of the LPDIRECTPLAYLOBBY usage.
by Alexandre Julliard
18 Apr '13
18 Apr '13
Module: wine Branch: master Commit: f6e4aa77626849f0589a63c0439e3a5675fbc81a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f6e4aa77626849f0589a63c04…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 17 22:09:15 2013 +0200 dplayx: Get rid of the LPDIRECTPLAYLOBBY usage. --- dlls/dplayx/dplobby.c | 31 ++++++++++++------------------- dlls/dplayx/tests/dplayx.c | 6 +++--- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index ea4ecfe..c6b02c8 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -1365,9 +1365,8 @@ static HRESULT WINAPI IDirectPlayLobby3Impl_ConnectEx( IDirectPlayLobby3 *iface, return DPL_ConnectEx( This, dwFlags, riid, lplpDP, pUnk ); } -static HRESULT WINAPI IDirectPlayLobby3AImpl_ConnectEx -( LPDIRECTPLAYLOBBY3A iface, DWORD dwFlags, REFIID riid, - LPVOID* lplpDP, IUnknown* pUnk ) +static HRESULT WINAPI IDirectPlayLobby3AImpl_ConnectEx( IDirectPlayLobby3A *iface, DWORD dwFlags, + REFIID riid, void **lplpDP, IUnknown *pUnk ) { IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface ); return DPL_ConnectEx( This, dwFlags, riid, lplpDP, pUnk ); @@ -1380,8 +1379,8 @@ static HRESULT WINAPI IDirectPlayLobby3Impl_RegisterApplication( IDirectPlayLobb return DP_OK; } -static HRESULT WINAPI IDirectPlayLobby3AImpl_RegisterApplication -( LPDIRECTPLAYLOBBY3A iface, DWORD dwFlags, LPDPAPPLICATIONDESC lpAppDesc ) +static HRESULT WINAPI IDirectPlayLobby3AImpl_RegisterApplication( IDirectPlayLobby3A *iface, + DWORD flags, DPAPPLICATIONDESC *appdesc ) { FIXME(":stub\n"); return DP_OK; @@ -1394,8 +1393,8 @@ static HRESULT WINAPI IDirectPlayLobby3Impl_UnregisterApplication( IDirectPlayLo return DP_OK; } -static HRESULT WINAPI IDirectPlayLobby3AImpl_UnregisterApplication -( LPDIRECTPLAYLOBBY3A iface, DWORD dwFlags, REFGUID lpAppDesc ) +static HRESULT WINAPI IDirectPlayLobby3AImpl_UnregisterApplication( IDirectPlayLobby3A *iface, + DWORD flags, REFGUID appdesc ) { FIXME(":stub\n"); return DP_OK; @@ -1418,8 +1417,8 @@ static HRESULT WINAPI IDirectPlayLobby3Impl_WaitForConnectionSettings( IDirectPl return hr; } -static HRESULT WINAPI IDirectPlayLobby3AImpl_WaitForConnectionSettings -( LPDIRECTPLAYLOBBY3A iface, DWORD dwFlags ) +static HRESULT WINAPI IDirectPlayLobby3AImpl_WaitForConnectionSettings( IDirectPlayLobby3A *iface, + DWORD dwFlags ) { HRESULT hr = DP_OK; BOOL bStartWait = !(dwFlags & DPLWAIT_CANCEL); @@ -1518,11 +1517,8 @@ HRESULT dplobby_create( REFIID riid, void **ppv ) * DirectPlayLobbyCreateA (DPLAYX.4) * */ -HRESULT WINAPI DirectPlayLobbyCreateA( LPGUID lpGUIDDSP, - LPDIRECTPLAYLOBBYA *lplpDPL, - IUnknown *lpUnk, - LPVOID lpData, - DWORD dwDataSize ) +HRESULT WINAPI DirectPlayLobbyCreateA( GUID *lpGUIDDSP, IDirectPlayLobbyA **lplpDPL, + IUnknown *lpUnk, void *lpData, DWORD dwDataSize ) { TRACE("lpGUIDDSP=%p lplpDPL=%p lpUnk=%p lpData=%p dwDataSize=%08x\n", lpGUIDDSP,lplpDPL,lpUnk,lpData,dwDataSize); @@ -1550,11 +1546,8 @@ HRESULT WINAPI DirectPlayLobbyCreateA( LPGUID lpGUIDDSP, * DirectPlayLobbyCreateW (DPLAYX.5) * */ -HRESULT WINAPI DirectPlayLobbyCreateW( LPGUID lpGUIDDSP, - LPDIRECTPLAYLOBBY *lplpDPL, - IUnknown *lpUnk, - LPVOID lpData, - DWORD dwDataSize ) +HRESULT WINAPI DirectPlayLobbyCreateW( GUID *lpGUIDDSP, IDirectPlayLobby **lplpDPL, + IUnknown *lpUnk, void *lpData, DWORD dwDataSize ) { TRACE("lpGUIDDSP=%p lplpDPL=%p lpUnk=%p lpData=%p dwDataSize=%08x\n", lpGUIDDSP,lplpDPL,lpUnk,lpData,dwDataSize); diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 991b3c6..d22583e 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -652,7 +652,7 @@ static void init_TCPIP_provider( IDirectPlay4 *pDP, LPCSTR strIPAddressString, W DPCOMPOUNDADDRESSELEMENT addressElements[3]; LPVOID pAddress = NULL; DWORD dwAddressSize = 0; - LPDIRECTPLAYLOBBY3 pDPL; + IDirectPlayLobby3 *pDPL; HRESULT hr; hr = CoCreateInstance( &CLSID_DirectPlayLobby, NULL, CLSCTX_ALL, @@ -799,7 +799,7 @@ static BOOL CALLBACK EnumConnections_cb( LPCGUID lpguidSP, { lpCallbackData callbackData = lpContext; - LPDIRECTPLAYLOBBY pDPL; + IDirectPlayLobby *pDPL; HRESULT hr; @@ -2877,7 +2877,7 @@ static void test_GetPlayerAddress(void) { IDirectPlay4 *pDP[2]; - LPDIRECTPLAYLOBBY3 pDPL; + IDirectPlayLobby3 *pDPL; DPSESSIONDESC2 dpsd; DPID dpid[2]; CallbackData callbackData;
1
0
0
0
Michael Stefaniuc : dplayx: Assimilate the IDirectPlayLobby3 methods.
by Alexandre Julliard
18 Apr '13
18 Apr '13
Module: wine Branch: master Commit: 0870290ca6716838b7ae8ec05b751d02430ccc9e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0870290ca6716838b7ae8ec05…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 17 22:07:06 2013 +0200 dplayx: Assimilate the IDirectPlayLobby3 methods. --- dlls/dplayx/dplobby.c | 160 +++++++++++++++++-------------------------------- 1 files changed, 56 insertions(+), 104 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=0870290ca6716838b7ae8…
1
0
0
0
Francois Gouget : testbot/Engine: --kill-vms should also shut down idle VMs .
by Alexandre Julliard
18 Apr '13
18 Apr '13
Module: tools Branch: master Commit: 206b1f72fa92795c27944715b152e69dc3e3898f URL:
http://source.winehq.org/git/tools.git/?a=commit;h=206b1f72fa92795c27944715…
Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 18 19:24:58 2013 +0200 testbot/Engine: --kill-vms should also shut down idle VMs. --- testbot/bin/Engine.pl | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 670945a..2438298 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -180,11 +180,15 @@ sub Cleanup(;$$) if ($VM->IsPoweredOn()) { - next if ($VM->Status eq "idle"); if ($KillVMs) { kill("TERM", $VM->ChildPid) if (defined $VM->ChildPid); } + elsif ($VM->Status eq "idle") + { + # Assume these are still ready for use + next; + } elsif (($VM->Status eq "reverting" or $VM->Status eq "sleeping") and defined $VM->ChildPid and kill(0, $VM->ChildPid)) {
1
0
0
0
Francois Gouget : testbot: Fix handling of tests for dll names containing dots or dashes.
by Alexandre Julliard
18 Apr '13
18 Apr '13
Module: tools Branch: master Commit: 0a9fded16c707af4b147eb88d25be4eb9ef85426 URL:
http://source.winehq.org/git/tools.git/?a=commit;h=0a9fded16c707af4b147eb88…
Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 18 19:24:43 2013 +0200 testbot: Fix handling of tests for dll names containing dots or dashes. Conformance tests for 'dlls' containing dots in their name, 'winspool.drv' for instance, should be allowed. Wine does not support conformance tests for dlls containing dashes in their names however, 'api-ms-*' for instance, so reject those. --- testbot/bin/WineRunBuild.pl | 12 +++++++----- testbot/web/Submit.pl | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index c230316..98a9211 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -202,14 +202,16 @@ foreach my $OtherStep (@{$Job->Steps->GetItems()}) $Run64 = 1 if ($OtherStep->FileType eq "exe64"); my $OtherFileName = $OtherStep->FileName; - if ($OtherFileName =~ m/^([\w_\-]+)(|\.exe)_test(|64)\.exe$/) + if ($OtherFileName =~ m/^([\w_.]+)_test(?:64)?\.exe$/) { - if (defined $BaseName and $BaseName ne $1) + my $OtherBaseName = $1; + $OtherBaseName =~ s/\.exe$//; + if (defined $BaseName and $BaseName ne $OtherBaseName) { - FatalError "$1 doesn't match previously found $BaseName\n", + FatalError "$OtherBaseName doesn't match previously found $BaseName\n", $FullErrFileName, $Job, $Task; } - $BaseName = $1; + $BaseName = $OtherBaseName; } } if (!defined $BaseName) @@ -292,7 +294,7 @@ if ($NewStatus eq "completed") next if ($OtherStep->No == $StepNo); my $OtherFileName = $OtherStep->FileName; - next if ($OtherFileName !~ /^[\w_\-]+(?:|\.exe)_test(?:|64)\.exe$/); + next if ($OtherFileName !~ /^[\w_.]+_test(?:64)?\.exe$/); my $OtherStepDir = "$DataDir/jobs/$JobId/" . $OtherStep->No; mkdir $OtherStepDir; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 42ca77a..f73ae6a 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -470,9 +470,9 @@ sub Validate elsif ($self->{Page} == 3 && $self->GetParam("Page") == 3) { if (($self->GetParam("FileType") eq "patchdlls" && - ! ($self->GetParam("TestExecutable") =~ m/^[a-zA-Z0-9_]+_test\.exe/)) || + ! ($self->GetParam("TestExecutable") =~ m/^[\w_.]+_test\.exe/)) || ($self->GetParam("FileType") eq "patchprograms") && - ! ($self->GetParam("TestExecutable") =~ m/^[a-zA-Z0-9_]+\.exe_test\.exe/)) + ! ($self->GetParam("TestExecutable") =~ m/^[\w_.]+\.exe_test\.exe/)) { $self->{ErrMessage} = "Invalid name for Test executable"; $self->{ErrField} = "TestExecutable";
1
0
0
0
Francois Gouget : testbot/web: Uncheck maintenance and offline VMs for jobs submitted through the web.
by Alexandre Julliard
18 Apr '13
18 Apr '13
Module: tools Branch: master Commit: 92a374fa4ad5d8aea20eb021cc0126d06734ca04 URL:
http://source.winehq.org/git/tools.git/?a=commit;h=92a374fa4ad5d8aea20eb021…
Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 18 19:20:45 2013 +0200 testbot/web: Uncheck maintenance and offline VMs for jobs submitted through the web. Developers will still be able to schedule jobs on them but they will do so knowingly. --- testbot/web/Submit.pl | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index bbab0e0..42ca77a 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -256,16 +256,20 @@ sub GenerateFields { print " (", $self->CGI->escapeHTML($VM->Description), ")"; } + my $Checked = 1; if ($VM->Status eq 'offline') { print " [offline]"; + $Checked = undef; } elsif ($VM->Status eq 'maintenance') { print " [maintenance]"; + $Checked = undef; } print "</label><div class='ItemValue'><input type='checkbox' name='$FieldName'"; - if ($self->GetParam("Page") == 1 || $self->GetParam($FieldName)) + if ($Checked and + ($self->GetParam("Page") == 1 || $self->GetParam($FieldName))) { print " checked='checked'"; }
1
0
0
0
Francois Gouget : testbot: Simplify and / or optimize some regular expressions.
by Alexandre Julliard
18 Apr '13
18 Apr '13
Module: tools Branch: master Commit: a13c885191e14ad205d61e33374aebfe7ee0186b URL:
http://source.winehq.org/git/tools.git/?a=commit;h=a13c885191e14ad205d61e33…
Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 18 19:20:29 2013 +0200 testbot: Simplify and / or optimize some regular expressions. --- testbot/bin/WineSendLog.pl | 6 +++--- testbot/lib/WineTestBot/Patches.pm | 2 +- testbot/web/Submit.pl | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 4e678bd..0b31e7c 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -392,7 +392,8 @@ EOF my ($BotFailure, $MessagesFromErr) = CheckErrLog("$TaskDir/err"); if (! $BotFailure) { - my $Bits = ($StepTask->FileName =~ /_test64\.exe$/ ? 64 : 32); + $StepTask->FileName =~ m/^(.*)_test(64)?\.exe$/; + my ($BaseName, $Bits) = ($1, $2 || "32"); my $LatestName = "$DataDir/latest/" . $StepTask->VM->Name . "_$Bits"; my ($LatestBotFailure, $Dummy) = CheckErrLog("$LatestName.err"); my $MessagesFromLog = ""; @@ -400,9 +401,8 @@ EOF { if (defined($StepTask->CmdLineArg)) { - $StepTask->FileName =~ m/^(.*)_test(64)?\.exe/; $MessagesFromLog = CompareLogs("$LatestName.log", "$TaskDir/log", - $1, $StepTask->CmdLineArg); + $BaseName, $StepTask->CmdLineArg); } } else diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 186398d..a478fbf 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -131,7 +131,7 @@ sub Submit my $Line; while (defined($Line = <BODY>)) { - if ($Line =~ m/^\+\+\+ .*\/(dlls|programs)\/([^\/]+)\/tests\/([^\/\s]+)/) + if ($Line =~ m~^\+\+\+ .*/(dlls|programs)/([^/]+)/tests/([^/\s]+)~) { my $FileType = "patch$1"; my $BaseName = $2; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 1288bf0..bbab0e0 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -564,7 +564,7 @@ sub DetermineFileType my $PrevMinus = !1; while (defined($Line = <FH>)) { - if ($Line =~ m/^\+\+\+ .*\/(dlls|programs)\/([^\/]+)\/tests\/([^\/\s]+)/) + if ($Line =~ m~^\+\+\+ .*/(dlls|programs)/([^/]+)/tests/([^/\s]+)~) { $FileType = "patch$1"; my $ThisDllBaseName = $2; @@ -875,7 +875,7 @@ sub OnSubmit my $FileName=$self->GetParam("TestExecutable"); if ($Bits eq "64") { - $FileName =~ s/^([a-zA-Z0-9_.]+)_test\.exe/\1_test64.exe/; + $FileName =~ s/_test\.exe$/_test64.exe/; } $TestStep->FileName($FileName); $TestStep->InStaging(!1);
1
0
0
0
← Newer
1
...
19
20
21
22
23
24
25
...
58
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
Results per page:
10
25
50
100
200