September 2013 - Wine-Commits

Thomas Faber : comctl32: Remove superfluous const from DPA/ DSA function signatures.
by Alexandre Julliard Sept. 30, 2013

Sept. 30, 2013

Module: wine Branch: master Commit: 43dd359ebe7649da81c5b69a6a95594ac4f14db2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43dd359ebe7649da81c5b69a6… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Sep 28 17:18:03 2013 +0200 comctl32: Remove superfluous const from DPA/DSA function signatures. --- dlls/comctl32/dpa.c | 20 ++++++++++---------- dlls/comctl32/dsa.c | 14 +++++++------- dlls/comctl32/tests/dpa.c | 20 ++++++++++---------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c index dbe9bf8..11dd14f 100644 --- a/dlls/comctl32/dpa.c +++ b/dlls/comctl32/dpa.c @@ -174,7 +174,7 @@ HRESULT WINAPI DPA_LoadStream (HDPA *phDpa, PFNDPASTREAM loadProc, * NOTES * No more information available yet! */ -HRESULT WINAPI DPA_SaveStream (const HDPA hDpa, PFNDPASTREAM saveProc, +HRESULT WINAPI DPA_SaveStream (HDPA hDpa, PFNDPASTREAM saveProc, IStream *pStream, LPVOID pData) { LARGE_INTEGER position; @@ -397,7 +397,7 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags, * Success: TRUE * Failure: FALSE */ -BOOL WINAPI DPA_Destroy (const HDPA hdpa) +BOOL WINAPI DPA_Destroy (HDPA hdpa) { TRACE("(%p)\n", hdpa); @@ -471,7 +471,7 @@ BOOL WINAPI DPA_Grow (HDPA hdpa, INT nGrow) * - If 'hdpa' is a NULL-Pointer, the original implementation crashes, * this implementation just returns NULL. */ -HDPA WINAPI DPA_Clone (const HDPA hdpa, const HDPA hdpaNew) +HDPA WINAPI DPA_Clone (const HDPA hdpa, HDPA hdpaNew) { INT nNewItems, nSize; HDPA hdpaTemp; @@ -528,7 +528,7 @@ HDPA WINAPI DPA_Clone (const HDPA hdpa, const HDPA hdpaNew) * Success: pointer * Failure: NULL */ -LPVOID WINAPI DPA_GetPtr (const HDPA hdpa, INT nIndex) +LPVOID WINAPI DPA_GetPtr (HDPA hdpa, INT nIndex) { TRACE("(%p %d)\n", hdpa, nIndex); @@ -592,7 +592,7 @@ INT WINAPI DPA_GetPtrIndex (HDPA hdpa, LPCVOID p) * Success: index of the inserted pointer * Failure: -1 */ -INT WINAPI DPA_InsertPtr (const HDPA hdpa, INT i, LPVOID p) +INT WINAPI DPA_InsertPtr (HDPA hdpa, INT i, LPVOID p) { TRACE("(%p %d %p)\n", hdpa, i, p); @@ -627,7 +627,7 @@ INT WINAPI DPA_InsertPtr (const HDPA hdpa, INT i, LPVOID p) * Success: TRUE * Failure: FALSE */ -BOOL WINAPI DPA_SetPtr (const HDPA hdpa, INT i, LPVOID p) +BOOL WINAPI DPA_SetPtr (HDPA hdpa, INT i, LPVOID p) { LPVOID *lpTemp; @@ -678,7 +678,7 @@ BOOL WINAPI DPA_SetPtr (const HDPA hdpa, INT i, LPVOID p) * Success: deleted pointer * Failure: NULL */ -LPVOID WINAPI DPA_DeletePtr (const HDPA hdpa, INT i) +LPVOID WINAPI DPA_DeletePtr (HDPA hdpa, INT i) { LPVOID *lpDest, *lpSrc, lpTemp = NULL; INT nSize; @@ -731,7 +731,7 @@ LPVOID WINAPI DPA_DeletePtr (const HDPA hdpa, INT i) * Success: TRUE * Failure: FALSE */ -BOOL WINAPI DPA_DeleteAllPtrs (const HDPA hdpa) +BOOL WINAPI DPA_DeleteAllPtrs (HDPA hdpa) { TRACE("(%p)\n", hdpa); @@ -814,7 +814,7 @@ static VOID DPA_QuickSort (LPVOID *lpPtrs, INT l, INT r, * Success: TRUE * Failure: FALSE */ -BOOL WINAPI DPA_Sort (const HDPA hdpa, PFNDPACOMPARE pfnCompare, LPARAM lParam) +BOOL WINAPI DPA_Sort (HDPA hdpa, PFNDPACOMPARE pfnCompare, LPARAM lParam) { if (!hdpa || !pfnCompare) return FALSE; @@ -846,7 +846,7 @@ BOOL WINAPI DPA_Sort (const HDPA hdpa, PFNDPACOMPARE pfnCompare, LPARAM lParam) * Success: index of the pointer in the array. * Failure: -1 */ -INT WINAPI DPA_Search (const HDPA hdpa, LPVOID pFind, INT nStart, +INT WINAPI DPA_Search (HDPA hdpa, LPVOID pFind, INT nStart, PFNDPACOMPARE pfnCompare, LPARAM lParam, UINT uOptions) { if (!hdpa || !pfnCompare || !pFind) diff --git a/dlls/comctl32/dsa.c b/dlls/comctl32/dsa.c index 13f63e2..71837db 100644 --- a/dlls/comctl32/dsa.c +++ b/dlls/comctl32/dsa.c @@ -100,7 +100,7 @@ HDSA WINAPI DSA_Create (INT nSize, INT nGrow) * Success: TRUE * Failure: FALSE */ -BOOL WINAPI DSA_Destroy (const HDSA hdsa) +BOOL WINAPI DSA_Destroy (HDSA hdsa) { TRACE("(%p)\n", hdsa); @@ -128,7 +128,7 @@ BOOL WINAPI DSA_Destroy (const HDSA hdsa) * Success: TRUE * Failure: FALSE */ -BOOL WINAPI DSA_GetItem (const HDSA hdsa, INT nIndex, LPVOID pDest) +BOOL WINAPI DSA_GetItem (HDSA hdsa, INT nIndex, LPVOID pDest) { LPVOID pSrc; @@ -159,7 +159,7 @@ BOOL WINAPI DSA_GetItem (const HDSA hdsa, INT nIndex, LPVOID pDest) * Success: pointer to an item * Failure: NULL */ -LPVOID WINAPI DSA_GetItemPtr (const HDSA hdsa, INT nIndex) +LPVOID WINAPI DSA_GetItemPtr (HDSA hdsa, INT nIndex) { LPVOID pSrc; @@ -192,7 +192,7 @@ LPVOID WINAPI DSA_GetItemPtr (const HDSA hdsa, INT nIndex) * Success: TRUE * Failure: FALSE */ -BOOL WINAPI DSA_SetItem (const HDSA hdsa, INT nIndex, LPVOID pSrc) +BOOL WINAPI DSA_SetItem (HDSA hdsa, INT nIndex, LPVOID pSrc) { INT nSize, nNewItems; LPVOID pDest, lpTemp; @@ -248,7 +248,7 @@ BOOL WINAPI DSA_SetItem (const HDSA hdsa, INT nIndex, LPVOID pSrc) * Success: position of the new item * Failure: -1 */ -INT WINAPI DSA_InsertItem (const HDSA hdsa, INT nIndex, LPVOID pSrc) +INT WINAPI DSA_InsertItem (HDSA hdsa, INT nIndex, LPVOID pSrc) { INT nNewItems, nSize; LPVOID lpTemp, lpDest; @@ -309,7 +309,7 @@ INT WINAPI DSA_InsertItem (const HDSA hdsa, INT nIndex, LPVOID pSrc) * Success: number of the deleted element * Failure: -1 */ -INT WINAPI DSA_DeleteItem (const HDSA hdsa, INT nIndex) +INT WINAPI DSA_DeleteItem (HDSA hdsa, INT nIndex) { LPVOID lpDest,lpSrc; INT nSize; @@ -361,7 +361,7 @@ INT WINAPI DSA_DeleteItem (const HDSA hdsa, INT nIndex) * Success: TRUE * Failure: FALSE */ -BOOL WINAPI DSA_DeleteAllItems (const HDSA hdsa) +BOOL WINAPI DSA_DeleteAllItems (HDSA hdsa) { TRACE("(%p)\n", hdsa); diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index e359139..644f3aa 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -40,24 +40,24 @@ typedef struct _STREAMDATA DWORD dwItems; } STREAMDATA, *PSTREAMDATA; -static HDPA (WINAPI *pDPA_Clone)(const HDPA,const HDPA); +static HDPA (WINAPI *pDPA_Clone)(const HDPA,HDPA); static HDPA (WINAPI *pDPA_Create)(INT); static HDPA (WINAPI *pDPA_CreateEx)(INT,HANDLE); -static PVOID (WINAPI *pDPA_DeleteAllPtrs)(const HDPA); -static PVOID (WINAPI *pDPA_DeletePtr)(const HDPA,INT); -static BOOL (WINAPI *pDPA_Destroy)(const HDPA); +static PVOID (WINAPI *pDPA_DeleteAllPtrs)(HDPA); +static PVOID (WINAPI *pDPA_DeletePtr)(HDPA,INT); +static BOOL (WINAPI *pDPA_Destroy)(HDPA); static VOID (WINAPI *pDPA_DestroyCallback)(HDPA,PFNDPAENUMCALLBACK,PVOID); static VOID (WINAPI *pDPA_EnumCallback)(HDPA,PFNDPAENUMCALLBACK,PVOID); -static INT (WINAPI *pDPA_GetPtr)(const HDPA,INT); -static INT (WINAPI *pDPA_GetPtrIndex)(const HDPA,PVOID); +static INT (WINAPI *pDPA_GetPtr)(HDPA,INT); +static INT (WINAPI *pDPA_GetPtrIndex)(HDPA,PVOID); static BOOL (WINAPI *pDPA_Grow)(HDPA,INT); -static INT (WINAPI *pDPA_InsertPtr)(const HDPA,INT,PVOID); +static INT (WINAPI *pDPA_InsertPtr)(HDPA,INT,PVOID); static HRESULT (WINAPI *pDPA_LoadStream)(HDPA*,PFNDPASTREAM,IStream*,LPVOID); -static BOOL (WINAPI *pDPA_Merge)(const HDPA,const HDPA,DWORD,PFNDPACOMPARE,PFNDPAMERGE,LPARAM); +static BOOL (WINAPI *pDPA_Merge)(HDPA,HDPA,DWORD,PFNDPACOMPARE,PFNDPAMERGE,LPARAM); static HRESULT (WINAPI *pDPA_SaveStream)(HDPA,PFNDPASTREAM,IStream*,LPVOID); static INT (WINAPI *pDPA_Search)(HDPA,PVOID,INT,PFNDPACOMPARE,LPARAM,UINT); -static BOOL (WINAPI *pDPA_SetPtr)(const HDPA,INT,PVOID); -static BOOL (WINAPI *pDPA_Sort)(const HDPA,PFNDPACOMPARE,LPARAM); +static BOOL (WINAPI *pDPA_SetPtr)(HDPA,INT,PVOID); +static BOOL (WINAPI *pDPA_Sort)(HDPA,PFNDPACOMPARE,LPARAM); #define COMCTL32_GET_PROC(func, ord) \ ((p ## func = (PVOID)GetProcAddress(hcomctl32,(LPCSTR)ord)) ? 1 \

1 0

Bruno Jesus : include: Move struct WSABUF and WSAMSG to ws2def.h.
by Alexandre Julliard Sept. 30, 2013

Sept. 30, 2013

Module: wine Branch: master Commit: 266811b88e9108fe3dd3c727f931e6ee780c5d9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=266811b88e9108fe3dd3c727f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Sep 28 11:58:04 2013 -0300 include: Move struct WSABUF and WSAMSG to ws2def.h. --- include/mswsock.h | 9 --------- include/winsock2.h | 6 ------ include/ws2def.h | 15 +++++++++++++++ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/mswsock.h b/include/mswsock.h index 610dd2c..3e41345 100644 --- a/include/mswsock.h +++ b/include/mswsock.h @@ -157,15 +157,6 @@ typedef struct _TRANSMIT_PACKETS_ELEMENT { } DUMMYUNIONNAME; } TRANSMIT_PACKETS_ELEMENT, *PTRANSMIT_PACKETS_ELEMENT, *LPTRANSMIT_PACKETS_ELEMENT; -typedef struct _WSAMSG { - LPSOCKADDR name; - INT namelen; - LPWSABUF lpBuffers; - DWORD dwBufferCount; - WSABUF Control; - DWORD dwFlags; -} WSAMSG, *PWSAMSG, *LPWSAMSG; - typedef struct _WSACMSGHDR { SIZE_T cmsg_len; INT cmsg_level; diff --git a/include/winsock2.h b/include/winsock2.h index 7516d25..c4e013b 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -345,12 +345,6 @@ DECL_WINELIB_TYPE_AW(WSASERVICECLASSINFO) DECL_WINELIB_TYPE_AW(PWSASERVICECLASSINFO) DECL_WINELIB_TYPE_AW(LPWSASERVICECLASSINFO) -typedef struct _WSABUF -{ - ULONG len; - CHAR* buf; -} WSABUF, *LPWSABUF; - #define WSAEVENT HANDLE #define LPWSAEVENT LPHANDLE #define WSAOVERLAPPED OVERLAPPED diff --git a/include/ws2def.h b/include/ws2def.h index ac68e2b..6255c68 100644 --- a/include/ws2def.h +++ b/include/ws2def.h @@ -78,6 +78,21 @@ typedef enum { ScopeLevelGlobal = 14 } SCOPE_LEVEL; +typedef struct _WSABUF +{ + ULONG len; + CHAR* buf; +} WSABUF, *LPWSABUF; + +typedef struct _WSAMSG { + LPSOCKADDR name; + INT namelen; + LPWSABUF lpBuffers; + DWORD dwBufferCount; + WSABUF Control; + DWORD dwFlags; +} WSAMSG, *PWSAMSG, *LPWSAMSG; + /* * Macros for retrieving control message data returned by WSARecvMsg() */

1 0

Bruno Jesus : ws2_32/tests: Fix an ok() call comment.
by Alexandre Julliard Sept. 30, 2013

Sept. 30, 2013

Module: wine Branch: master Commit: d811747a148224c7ec7f8ada0da606679d4bbda7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d811747a148224c7ec7f8ada0… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Sep 28 11:57:50 2013 -0300 ws2_32/tests: Fix an ok() call comment. --- dlls/ws2_32/tests/sock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b085f0b..705981d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5814,7 +5814,7 @@ static void test_getpeername(void) sa_len = 0; ret = getpeername(sock, (struct sockaddr*)&sa_out, &sa_len); - ok(ret == SOCKET_ERROR, "Expected getpeername to return 0, got %d\n", ret); + ok(ret == SOCKET_ERROR, "Expected getpeername to return SOCKET_ERROR, got %d\n", ret); ok(WSAGetLastError() == WSAEFAULT, "Expected WSAGetLastError() to return WSAEFAULT, got %d\n", WSAGetLastError());

1 0

Marcus Meissner : wintrust: Fixed some memory leaks (Coverity).
by Alexandre Julliard Sept. 30, 2013

Sept. 30, 2013

Module: wine Branch: master Commit: a090b46f727b9ccd0efd97cce0f870d56ad31519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a090b46f727b9ccd0efd97cce… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 29 14:17:45 2013 +0200 wintrust: Fixed some memory leaks (Coverity). --- dlls/wintrust/crypt.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 341f45b..0ed45d3 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -909,6 +909,7 @@ HANDLE WINAPI CryptCATOpen(LPWSTR pwszFileName, DWORD fdwOpenFlags, HCRYPTPROV h if (!CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_PARAM, i, NULL, &size)) { CryptMsgClose(hmsg); + HeapFree(GetProcessHeap(), 0, cc); return INVALID_HANDLE_VALUE; } sum += size; @@ -916,6 +917,7 @@ HANDLE WINAPI CryptCATOpen(LPWSTR pwszFileName, DWORD fdwOpenFlags, HCRYPTPROV h if (!(cc->attr = HeapAlloc(GetProcessHeap(), 0, sizeof(*cc->attr) * cc->attr_count + sum))) { CryptMsgClose(hmsg); + HeapFree(GetProcessHeap(), 0, cc); SetLastError(ERROR_OUTOFMEMORY); return INVALID_HANDLE_VALUE; } @@ -926,12 +928,14 @@ HANDLE WINAPI CryptCATOpen(LPWSTR pwszFileName, DWORD fdwOpenFlags, HCRYPTPROV h { CryptMsgClose(hmsg); HeapFree(GetProcessHeap(), 0, cc->attr); + HeapFree(GetProcessHeap(), 0, cc); return INVALID_HANDLE_VALUE; } if (!CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_PARAM, i, p, &size)) { CryptMsgClose(hmsg); HeapFree(GetProcessHeap(), 0, cc->attr); + HeapFree(GetProcessHeap(), 0, cc); return INVALID_HANDLE_VALUE; } p += size; @@ -948,6 +952,7 @@ HANDLE WINAPI CryptCATOpen(LPWSTR pwszFileName, DWORD fdwOpenFlags, HCRYPTPROV h cc->magic = CRYPTCAT_MAGIC; return cc; } + HeapFree(GetProcessHeap(), 0, cc); return INVALID_HANDLE_VALUE; }

1 0

Marcus Meissner : msvcrt: Restore a stack mark on error (Coverity).
by Alexandre Julliard Sept. 30, 2013

Sept. 30, 2013

Module: wine Branch: master Commit: e9358909f8bc940da4bd614dd68d5142b599f447 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9358909f8bc940da4bd614dd… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 29 23:08:38 2013 +0200 msvcrt: Restore a stack mark on error (Coverity). --- dlls/msvcrt/undname.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index ec974a0..057d40a 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -539,8 +539,10 @@ static char* get_template_name(struct parsed_symbol* sym) struct array array_pmt; sym->names.start = sym->names.num; - if (!(name = get_literal_string(sym))) + if (!(name = get_literal_string(sym))) { + sym->names.start = start_mark; return FALSE; + } str_array_init(&array_pmt); args = get_args(sym, &array_pmt, FALSE, '<', '>'); if (args != NULL)

1 0

Lucas Zawacki : Portuguese translation for release 1.7.3
by Jeremy Newman Sept. 30, 2013

Sept. 30, 2013

Module: website Branch: master Commit: d11b74335ff5d135318be6648af7c4df4913ed22 URL: http://source.winehq.org/git/website.git/?a=commit;h=d11b74335ff5d135318be6… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Mon Sep 30 13:00:44 2013 -0300 Portuguese translation for release 1.7.3 --- news/pt/2013092701.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/pt/2013092701.xml b/news/pt/2013092701.xml new file mode 100644 index 0000000..377d512 --- /dev/null +++ b/news/pt/2013092701.xml @@ -0,0 +1,15 @@ +<news> +<date>27 de Setembro de 2013</date> +<title>Wine 1.7.3 lançado</title> +<body> + A versão de desenvolvimento 1.7.3 já está disponível agora. + <a href="{$root}/announce/1.7.3">Novidades</a> desta versão: +<ul> + <li>Nova versão do motor Gecko baseado no Firefox 24.</li> + <li>Trabalho de preparação para o stream de comandos do Direct3D.</li> + <li>Correções no gerenciamento de janelas no driver de Mac.</li> + <li>Suporte para funções IPHLPAPI no Android.</li> + <li>Várias correções de bugs.</li> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.3.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e irão aparecer em breve em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

Francois Gouget : testbot/VMs: Shut down VMs before reverting them.
by Alexandre Julliard Sept. 30, 2013

Sept. 30, 2013

Module: tools Branch: master Commit: d07df9daf9e3e2bc1ec27bd5140f9c99245f6088 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d07df9daf9e3e2bc1ec27bd5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 27 20:01:22 2013 +0200 testbot/VMs: Shut down VMs before reverting them. This is a workaround for a bug in some QEmu/KVM versions. --- testbot/bin/RevertVM.pl | 11 +++++++++++ testbot/lib/WineTestBot/VMs.pm | 7 ++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/RevertVM.pl index acd3b5b..5f98191 100755 --- a/testbot/bin/RevertVM.pl +++ b/testbot/bin/RevertVM.pl @@ -97,6 +97,17 @@ if (defined($ErrMessage)) FatalError "Can't change status for VM $VMKey: $ErrMessage", $VM; } +if ($VM->IsPoweredOn()) +{ + # Some QEmu/KVM versions are buggy and cannot revert a running VM + $ErrMessage = $VM->PowerOff(1); + if (defined $ErrMessage) + { + LogMsg "Could not shut down $VMKey: $ErrMessage\n"; + LogMsg "Trying the revert anyway\n"; + } +} + $ErrMessage = $VM->RevertToSnapshot($VM->IdleSnapshot); if (defined($ErrMessage)) { diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index c92b534..37d1c4f 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -362,9 +362,9 @@ sub PowerOn return $self->UpdateStatus($Domain); } -sub PowerOff +sub PowerOff($$) { - my ($self) = @_; + my ($self, $NoStatus) = @_; my ($ErrMessage, $Domain) = $self->_GetDomain(); return $ErrMessage if (defined $ErrMessage); @@ -372,7 +372,8 @@ sub PowerOff eval { $Domain->destroy() }; return $@->message() if ($@); - return $self->UpdateStatus($Domain); + return $self->UpdateStatus($Domain) if (!$NoStatus); + return undef; } sub GetAgent($)

1 0

Francois Gouget : testbot/VMs: Turn VM:: Hypervisors into a singleton so we maintain a single connection per hypervisor as was intended .
by Alexandre Julliard Sept. 30, 2013

Sept. 30, 2013

Module: tools Branch: master Commit: b9435d67f2b924d1d3e66e052a6375c3155b74e9 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b9435d67f2b924d1d3e66e05… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 27 19:58:26 2013 +0200 testbot/VMs: Turn VM::Hypervisors into a singleton so we maintain a single connection per hypervisor as was intended. --- testbot/lib/WineTestBot/VMs.pm | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 2cfeb54..c92b534 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -48,13 +48,17 @@ require Exporter; @EXPORT_OK = qw(new); +my $Singleton; sub new($) { my ($class) = @_; - my $self = {}; - $self = bless $self, $class; - return $self; + if (!defined $Singleton) + { + $Singleton = {}; + $Singleton = bless $Singleton, $class; + } + return $Singleton; } =pod @@ -75,8 +79,8 @@ sub GetHypervisor($$) my $Key = $URI || ""; if (!defined $self->{$Key}) { - eval { $self->{$Key} = Sys::Virt->new(uri => $URI); }; - return ($@->message(), undef) if ($@); + eval { $self->{$Key} = Sys::Virt->new(uri => $URI); }; + return ($@->message(), undef) if ($@); } return (undef, $self->{$Key});

1 0

Francois Gouget : testbot/VMs: Import WineTestBot::Log before using it!.
by Alexandre Julliard Sept. 30, 2013

Sept. 30, 2013

Module: tools Branch: master Commit: b2e2bb56adf74492305973122627fa38677bbd01 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b2e2bb56adf7449230597312… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 27 19:57:16 2013 +0200 testbot/VMs: Import WineTestBot::Log before using it!. --- testbot/lib/WineTestBot/VMs.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 04aeb3c..2cfeb54 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -521,9 +521,9 @@ sub RunRevert { $ENV{PATH} = "/usr/bin:/bin"; delete $ENV{ENV}; + require WineTestBot::Log; WineTestBot::Log::SetupRedirects(); exec("$BinDir/RevertVM.pl", $self->GetKey()) or - require WineTestBot::Log; WineTestBot::Log::LogMsg("Unable to exec RevertVM.pl: $!\n"); exit(1); }

1 0

Francois Gouget : testbot: Log the task pids.
by Alexandre Julliard Sept. 30, 2013

Sept. 30, 2013

Module: tools Branch: master Commit: 392d2725a12296a04e687b6e2de82eb58e060c0f URL: http://source.winehq.org/git/tools.git/?a=commit;h=392d2725a12296a04e687b6e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 27 19:57:03 2013 +0200 testbot: Log the task pids. This makes it easier to analyze the logs as multiple instances of a given task can be running in parallel. --- testbot/lib/WineTestBot/Log.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/lib/WineTestBot/Log.pm b/testbot/lib/WineTestBot/Log.pm index b88ba6f..99bc03b 100644 --- a/testbot/lib/WineTestBot/Log.pm +++ b/testbot/lib/WineTestBot/Log.pm @@ -54,7 +54,7 @@ sub LogMsg(@) $| = 1; select($tmp); } - print $logfile scalar localtime, " ", $logprefix, ": ", @_ if ($logfile); + print $logfile scalar localtime, " ", $logprefix, "[$$]: ", @_ if ($logfile); } sub SetupRedirects()

1 0