wine-commits May 2014

wine-commits@winehq.org

2 participants
404 discussions

Nikolay Sivov : scrrun: Use existing helper to return file size.
by Alexandre Julliard 21 May '14

21 May '14

Module: wine Branch: master Commit: 05a80d0f189c199d13fb23ef8af619c8d701a612 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05a80d0f189c199d13fb23ef8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 20 15:27:34 2014 +0400 scrrun: Use existing helper to return file size. --- dlls/scrrun/filesystem.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 6473210..94b8083 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -2635,6 +2635,7 @@ static HRESULT WINAPI file_get_DateLastAccessed(IFile *iface, DATE *pdate) static HRESULT WINAPI file_get_Size(IFile *iface, VARIANT *pvarSize) { struct file *This = impl_from_IFile(iface); + ULARGE_INTEGER size; WIN32_FIND_DATAW fd; HANDLE f; @@ -2648,14 +2649,10 @@ static HRESULT WINAPI file_get_Size(IFile *iface, VARIANT *pvarSize) return create_error(GetLastError()); FindClose(f); - if(fd.nFileSizeHigh || fd.nFileSizeLow>INT_MAX) { - V_VT(pvarSize) = VT_R8; - V_R8(pvarSize) = ((ULONGLONG)fd.nFileSizeHigh<<32) + fd.nFileSizeLow; - }else { - V_VT(pvarSize) = VT_I4; - V_I4(pvarSize) = fd.nFileSizeLow; - } - return S_OK; + size.LowPart = fd.nFileSizeLow; + size.HighPart = fd.nFileSizeHigh; + + return variant_from_largeint(&size, pvarSize); } static HRESULT WINAPI file_get_Type(IFile *iface, BSTR *pbstrType)

1 0

Stefan Dösinger : include: Sync an attribute to the Windows 8.1 SDK.
by Alexandre Julliard 21 May '14

21 May '14

Module: wine Branch: master Commit: 98a6b702130bbae3f88380ff92af77cac5066df0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98a6b702130bbae3f88380ff9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 20 13:09:17 2014 +0200 include: Sync an attribute to the Windows 8.1 SDK. --- include/shobjidl.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index c9297a8..ae42c2e 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -3350,7 +3350,7 @@ interface ITransferAdviseSink : IUnknown HRESULT FileFailure([in] IShellItem *item, [in, unique, string] LPCWSTR itemname, [in] HRESULT hr, - [out, unique, size_is(crename)] LPWSTR rename, + [in, out, unique, size_is(crename)] LPWSTR rename, [in] ULONG crename); HRESULT SubStreamFailure([in] IShellItem *item, [in, string] LPCWSTR stream,

1 0

Vincent Povirk : ole32: Invalidate all caches when the transaction sig changes.
by Alexandre Julliard 21 May '14

21 May '14

Module: wine Branch: master Commit: d89d43648fd55b13bb478903139b2071f0fb8f56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d89d43648fd55b13bb4789031… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 20 14:30:16 2014 -0500 ole32: Invalidate all caches when the transaction sig changes. --- dlls/ole32/storage32.c | 191 ++++++++++++++++++++++++++++-------------------- 1 file changed, 111 insertions(+), 80 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 39fa68f..a880e2a 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -102,6 +102,7 @@ static const IStorageVtbl Storage32InternalImpl_Vtbl; /* Method definitions for the Storage32InternalImpl class. */ static StorageInternalImpl* StorageInternalImpl_Construct(StorageBaseImpl* parentStorage, DWORD openFlags, DirRef storageDirEntry); +static HRESULT StorageImpl_Refresh(StorageImpl *This, BOOL new_object, BOOL create); static void StorageImpl_Destroy(StorageBaseImpl* iface); static void StorageImpl_Invalidate(StorageBaseImpl* iface); static HRESULT StorageImpl_Flush(StorageBaseImpl* iface); @@ -2667,6 +2668,7 @@ static HRESULT StorageImpl_GetTransactionSig(StorageBaseImpl *base, { StorageImpl *This = (StorageImpl*)base; HRESULT hr=S_OK; + DWORD oldTransactionSig = This->transactionSig; if (refresh) { @@ -2680,8 +2682,18 @@ static HRESULT StorageImpl_GetTransactionSig(StorageBaseImpl *base, if (SUCCEEDED(hr)) { - /* FIXME: Throw out everything and reload the file if this changed. */ StorageUtl_ReadDWord(data, 0, &This->transactionSig); + + if (oldTransactionSig != This->transactionSig) + { + /* Someone else wrote to this, so toss all cached information. */ + TRACE("signature changed\n"); + + hr = StorageImpl_Refresh(This, FALSE, FALSE); + } + + if (FAILED(hr)) + This->transactionSig = oldTransactionSig; } } @@ -3005,71 +3017,12 @@ static HRESULT StorageImpl_GrabLocks(StorageImpl *This, DWORD openFlags) return hr; } -static HRESULT StorageImpl_Construct( - HANDLE hFile, - LPCOLESTR pwcsName, - ILockBytes* pLkbyt, - DWORD openFlags, - BOOL fileBased, - BOOL create, - ULONG sector_size, - StorageImpl** result) +static HRESULT StorageImpl_Refresh(StorageImpl *This, BOOL new_object, BOOL create) { - StorageImpl* This; - HRESULT hr = S_OK; + HRESULT hr=S_OK; DirEntry currentEntry; DirRef currentEntryRef; - - if ( FAILED( validateSTGM(openFlags) )) - return STG_E_INVALIDFLAG; - - This = HeapAlloc(GetProcessHeap(), 0, sizeof(StorageImpl)); - if (!This) - return E_OUTOFMEMORY; - - memset(This, 0, sizeof(StorageImpl)); - - list_init(&This->base.strmHead); - - list_init(&This->base.storageHead); - - This->base.IStorage_iface.lpVtbl = &Storage32Impl_Vtbl; - This->base.IPropertySetStorage_iface.lpVtbl = &IPropertySetStorage_Vtbl; - This->base.IDirectWriterLock_iface.lpVtbl = &DirectWriterLockVtbl; - This->base.baseVtbl = &StorageImpl_BaseVtbl; - This->base.openFlags = (openFlags & ~STGM_CREATE); - This->base.ref = 1; - This->base.create = create; - - if (openFlags == (STGM_DIRECT_SWMR|STGM_READWRITE|STGM_SHARE_DENY_WRITE)) - This->base.lockingrole = SWMR_Writer; - else if (openFlags == (STGM_DIRECT_SWMR|STGM_READ|STGM_SHARE_DENY_NONE)) - This->base.lockingrole = SWMR_Reader; - else - This->base.lockingrole = SWMR_None; - - This->base.reverted = FALSE; - - /* - * Initialize the big block cache. - */ - This->bigBlockSize = sector_size; - This->smallBlockSize = DEF_SMALL_BLOCK_SIZE; - if (hFile) - hr = FileLockBytesImpl_Construct(hFile, openFlags, pwcsName, &This->lockBytes); - else - { - This->lockBytes = pLkbyt; - ILockBytes_AddRef(pLkbyt); - } - - if (FAILED(hr)) - goto end; - - hr = StorageImpl_GrabLocks(This, openFlags); - - if (FAILED(hr)) - goto end; + BlockChainStream *blockChainStream; if (create) { @@ -3095,7 +3048,7 @@ static HRESULT StorageImpl_Construct( This->rootStartBlock = 1; This->smallBlockLimit = LIMIT_TO_USE_SMALL_BLOCK; This->smallBlockDepotStart = BLOCK_END_OF_CHAIN; - if (sector_size == 4096) + if (This->bigBlockSize == 4096) This->bigBlockSizeBits = MAX_BIG_BLOCK_SIZE_BITS; else This->bigBlockSizeBits = MIN_BIG_BLOCK_SIZE_BITS; @@ -3129,7 +3082,7 @@ static HRESULT StorageImpl_Construct( if (FAILED(hr)) { - goto end; + return hr; } } @@ -3156,8 +3109,7 @@ static HRESULT StorageImpl_Construct( This->extBigBlockDepotLocations = HeapAlloc(GetProcessHeap(), 0, sizeof(ULONG) * cache_size); if (!This->extBigBlockDepotLocations) { - hr = E_OUTOFMEMORY; - goto end; + return E_OUTOFMEMORY; } This->extBigBlockDepotLocationsSize = cache_size; @@ -3167,8 +3119,7 @@ static HRESULT StorageImpl_Construct( if (current_block == BLOCK_END_OF_CHAIN) { WARN("File has too few extended big block depot blocks.\n"); - hr = STG_E_DOCFILECORRUPT; - goto end; + return STG_E_DOCFILECORRUPT; } This->extBigBlockDepotLocations[i] = current_block; current_block = Storage32Impl_GetNextExtendedBlock(This, current_block); @@ -3183,20 +3134,24 @@ static HRESULT StorageImpl_Construct( /* * Create the block chain abstractions. */ - if(!(This->rootBlockChain = + if(!(blockChainStream = BlockChainStream_Construct(This, &This->rootStartBlock, DIRENTRY_NULL))) { - hr = STG_E_READFAULT; - goto end; + return STG_E_READFAULT; } + if (!new_object) + BlockChainStream_Destroy(This->rootBlockChain); + This->rootBlockChain = blockChainStream; - if(!(This->smallBlockDepotChain = + if(!(blockChainStream = BlockChainStream_Construct(This, &This->smallBlockDepotStart, DIRENTRY_NULL))) { - hr = STG_E_READFAULT; - goto end; + return STG_E_READFAULT; } + if (!new_object) + BlockChainStream_Destroy(This->smallBlockDepotChain); + This->smallBlockDepotChain = blockChainStream; /* * Write the root storage entry (memory only) @@ -3249,20 +3204,96 @@ static HRESULT StorageImpl_Construct( if (FAILED(hr)) { - hr = STG_E_READFAULT; - goto end; + return STG_E_READFAULT; } /* * Create the block chain abstraction for the small block root chain. */ - if(!(This->smallBlockRootChain = + if(!(blockChainStream = BlockChainStream_Construct(This, NULL, This->base.storageDirEntry))) { - hr = STG_E_READFAULT; + return STG_E_READFAULT; } + if (!new_object) + BlockChainStream_Destroy(This->smallBlockRootChain); + This->smallBlockRootChain = blockChainStream; + + if (!new_object) + { + int i; + for (i=0; i<BLOCKCHAIN_CACHE_SIZE; i++) + { + BlockChainStream_Destroy(This->blockChainCache[i]); + This->blockChainCache[i] = NULL; + } + } + + return hr; +} + +static HRESULT StorageImpl_Construct( + HANDLE hFile, + LPCOLESTR pwcsName, + ILockBytes* pLkbyt, + DWORD openFlags, + BOOL fileBased, + BOOL create, + ULONG sector_size, + StorageImpl** result) +{ + StorageImpl* This; + HRESULT hr = S_OK; + + if ( FAILED( validateSTGM(openFlags) )) + return STG_E_INVALIDFLAG; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(StorageImpl)); + if (!This) + return E_OUTOFMEMORY; + + memset(This, 0, sizeof(StorageImpl)); + + list_init(&This->base.strmHead); + + list_init(&This->base.storageHead); + + This->base.IStorage_iface.lpVtbl = &Storage32Impl_Vtbl; + This->base.IPropertySetStorage_iface.lpVtbl = &IPropertySetStorage_Vtbl; + This->base.IDirectWriterLock_iface.lpVtbl = &DirectWriterLockVtbl; + This->base.baseVtbl = &StorageImpl_BaseVtbl; + This->base.openFlags = (openFlags & ~STGM_CREATE); + This->base.ref = 1; + This->base.create = create; + + if (openFlags == (STGM_DIRECT_SWMR|STGM_READWRITE|STGM_SHARE_DENY_WRITE)) + This->base.lockingrole = SWMR_Writer; + else if (openFlags == (STGM_DIRECT_SWMR|STGM_READ|STGM_SHARE_DENY_NONE)) + This->base.lockingrole = SWMR_Reader; + else + This->base.lockingrole = SWMR_None; + + This->base.reverted = FALSE; + + /* + * Initialize the big block cache. + */ + This->bigBlockSize = sector_size; + This->smallBlockSize = DEF_SMALL_BLOCK_SIZE; + if (hFile) + hr = FileLockBytesImpl_Construct(hFile, openFlags, pwcsName, &This->lockBytes); + else + { + This->lockBytes = pLkbyt; + ILockBytes_AddRef(pLkbyt); + } + + if (SUCCEEDED(hr)) + hr = StorageImpl_GrabLocks(This, openFlags); + + if (SUCCEEDED(hr)) + hr = StorageImpl_Refresh(This, TRUE, create); -end: if (FAILED(hr)) { IStorage_Release(&This->base.IStorage_iface);

1 0

Vincent Povirk : ole32: Use a snapshot file when sharing storages for writing.
by Alexandre Julliard 21 May '14

21 May '14

Module: wine Branch: master Commit: 77e3de5828bedbaf0685ceb4350d064d365c1a83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77e3de5828bedbaf0685ceb43… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri May 9 15:57:19 2014 -0500 ole32: Use a snapshot file when sharing storages for writing. --- dlls/ole32/storage32.c | 533 +++++++++++++++++++++++++++++++++++++++++++++--- dlls/ole32/storage32.h | 12 +- 2 files changed, 510 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=77e3de5828bedbaf0685c…

1 0

Francois Gouget : testbot/lib: Always call the parent _initialize() and InitializeNew() methods, with the right arguments.
by Alexandre Julliard 21 May '14

21 May '14

Module: tools Branch: master Commit: 261fcf10d4d16b2c85ec5bb225733ef1b3ece485 URL: http://source.winehq.org/git/tools.git/?a=commit;h=261fcf10d4d16b2c85ec5bb2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 21 17:44:59 2014 +0200 testbot/lib: Always call the parent _initialize() and InitializeNew() methods, with the right arguments. Although Item::_initialize() is empty now, it is improper for subclasses to assume so and skip calling it or not pass it the right arguments. Similarly, although Item::InitializeNew() does not currently use its Collection argument, subclasses should not assume so. --- testbot/lib/ObjectModel/Collection.pm | 3 ++- testbot/lib/ObjectModel/Item.pm | 3 ++- testbot/lib/WineTestBot/Branches.pm | 4 ++-- testbot/lib/WineTestBot/CGI/Sessions.pm | 4 ++-- testbot/lib/WineTestBot/Jobs.pm | 8 ++++---- testbot/lib/WineTestBot/Patches.pm | 4 ++-- testbot/lib/WineTestBot/Steps.pm | 2 +- testbot/lib/WineTestBot/StepsTasks.pm | 2 +- testbot/lib/WineTestBot/Tasks.pm | 2 +- testbot/lib/WineTestBot/Users.pm | 4 ++-- testbot/lib/WineTestBot/VMs.pm | 6 ++++-- 11 files changed, 23 insertions(+), 19 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index a356990..7dbcf63 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -102,7 +102,8 @@ sub new sub _initialize { - my ($self) = @_; + # $MasterObject may be required for some Collections. + my ($self, $MasterObject) = @_; $self->{AllScopeItems}->{ref($self)} ||= {}; } diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 47aea03..0cc07ab 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -72,11 +72,12 @@ sub new sub _initialize { + #my ($self, $Collection) = @_; } sub InitializeNew { - my $self = shift; + my ($self, $_Collection) = @_; $self->{IsModified} = !1; } diff --git a/testbot/lib/WineTestBot/Branches.pm b/testbot/lib/WineTestBot/Branches.pm index 0b37e89..f434569 100644 --- a/testbot/lib/WineTestBot/Branches.pm +++ b/testbot/lib/WineTestBot/Branches.pm @@ -35,10 +35,10 @@ require Exporter; sub InitializeNew { - my $self = shift; + my ($self, $Collection) = @_; $self->IsDefault(!1); - $self->SUPER::InitializeNew(); + $self->SUPER::InitializeNew($Collection); } package WineTestBot::Branches; diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index a053036..3fbef8a 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -36,9 +36,9 @@ use vars qw(@ISA @EXPORT); sub InitializeNew { - my $self = shift; + my ($self, $Collection) = @_; - $self->SUPER::InitializeNew(@_); + $self->SUPER::InitializeNew($Collection); $self->Permanent(!1); } diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 4532d4e..60241e0 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -62,23 +62,23 @@ require Exporter; sub _initialize { - my $self = shift; + my ($self, $Collection) = @_; - $self->SUPER::_initialize(@_); + $self->SUPER::_initialize($Collection); $self->{OldStatus} = undef; } sub InitializeNew { - my $self = shift; + my ($self, $Collection) = @_; $self->Archived(!1); $self->Branch(CreateBranches()->GetDefaultBranch()); $self->Status("queued"); $self->Submitted(time()); - $self->SUPER::InitializeNew(); + $self->SUPER::InitializeNew($Collection); } sub Status diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 70c47f7..bb7ea3f 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -49,11 +49,11 @@ require Exporter; sub InitializeNew { - my $self = shift; + my ($self, $Collection) = @_; $self->Received(time()); - $self->SUPER::InitializeNew(); + $self->SUPER::InitializeNew($Collection); } =pod diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index e937866..2a7ee35 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -53,7 +53,7 @@ sub InitializeNew $self->DebugLevel(1); $self->ReportSuccessfulTests(!1); - $self->SUPER::InitializeNew(@_); + $self->SUPER::InitializeNew($Collection); } sub HandleStaging diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 8a29196..a5facda 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -120,7 +120,7 @@ sub _initialize my $self = shift; my $Job = $_[0]; - $self->SUPER::_initialize(@_); + $self->SUPER::_initialize($Job); foreach my $Step (@{$Job->Steps->GetItems()}) { diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index dd22749..02dd220 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -54,7 +54,7 @@ sub InitializeNew my $Keys = $Collection->GetKeys(); $self->No(scalar @$Keys + 1); - $self->SUPER::InitializeNew(@_); + $self->SUPER::InitializeNew($Collection); } =pod diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index 46828a3..047e5d7 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -40,11 +40,11 @@ require Exporter; sub InitializeNew { - my $self = shift; + my ($self, $Collection) = @_; $self->Status('active'); $self->Password("*"); - $self->SUPER::InitializeNew(); + $self->SUPER::InitializeNew($Collection); } sub GeneratePasswordHash diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 0aa06eb..e4a5a59 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -223,6 +223,8 @@ sub _initialize($$) { my ($self, $VMs) = @_; + $self->SUPER::_initialize($VMs); + $self->{Hypervisors} = $VMs->{Hypervisors}; $self->{Hypervisor} = undef; $self->{Domain} = undef; @@ -231,12 +233,12 @@ sub _initialize($$) sub InitializeNew { - my $self = shift; + my ($self, $Collection) = @_; $self->Status("idle"); $self->IdleSnapshot("wtb"); - $self->SUPER::InitializeNew(@_); + $self->SUPER::InitializeNew($Collection); } sub GetHost($)

1 0

Francois Gouget : testbot/web: Make sure Page::_initialize() is always called, with the right arguments.
by Alexandre Julliard 21 May '14

21 May '14

Module: tools Branch: master Commit: df51375c707cd94119417f68e55cfe9b610ce21a URL: http://source.winehq.org/git/tools.git/?a=commit;h=df51375c707cd94119417f68… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 21 17:44:40 2014 +0200 testbot/web: Make sure Page::_initialize() is always called, with the right arguments. Although Page::_initialize() is empty now, it is improper for subclasses to assume so and skip calling it or not pass it the right arguments. --- testbot/lib/ObjectModel/CGI/FormPage.pm | 5 ++--- testbot/lib/ObjectModel/CGI/ItemPage.pm | 2 +- testbot/lib/ObjectModel/CGI/Page.pm | 5 +++-- testbot/lib/WineTestBot/CGI/PageBase.pm | 1 + testbot/web/Feedback.pl | 4 ++-- testbot/web/ForgotPassword.pl | 4 ++-- testbot/web/Login.pl | 4 ++-- testbot/web/Logout.pl | 4 +++- testbot/web/ResetPassword.pl | 4 ++-- testbot/web/Submit.pl | 4 ++-- testbot/web/index.pl | 4 ++-- 11 files changed, 22 insertions(+), 19 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index c9dfb04..0bf8694 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -36,10 +36,9 @@ require Exporter; sub _initialize { - my $self = shift; - my $PropertyDescriptors = shift; + my ($self, $Request, $RequiredRole, $PropertyDescriptors) = @_; - $self->SUPER::_initialize(@_); + $self->SUPER::_initialize($Request, $RequiredRole); $self->{PropertyDescriptors} = $PropertyDescriptors; $self->{HasRequired} = !1; diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 16736fe..46925f3 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -42,7 +42,7 @@ sub _initialize $self->{Collection} = $Collection; - $self->SUPER::_initialize($Collection->GetPropertyDescriptors(), @_); + $self->SUPER::_initialize($Request, $RequiredRole, $Collection->GetPropertyDescriptors()); if (defined($self->GetParam("Key"))) { diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 331243c..8bbd1ae 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -37,7 +37,7 @@ require Exporter; sub new { my $class = shift; - my $Request = $_[0]; + my ($Request, $RequiredRole) = @_; my $self = {Request => $Request, CGIObj => CGI->new($Request), @@ -45,12 +45,13 @@ sub new ErrField => undef}; $self = bless $self, $class; $self->{PageBase} = &$PageBaseCreator($self, @_); - $self->_initialize(@_); + $self->_initialize($Request, $RequiredRole); return $self; } sub _initialize { + #my ($self, $Request, $RequiredRole) = @_; } sub GetParam diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 7e12e80..7d75c5e 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -68,6 +68,7 @@ sub new sub _initialize { + #my ($self, $Page, $Request, $RequiredRole) = @_; } sub CheckSecurePage diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index c266ce4..b923c11 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -29,7 +29,7 @@ use WineTestBot::Config; sub _initialize { - my $self = shift; + my ($self, $Request, $RequiredRole) = @_; my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Name", "Name", !1, !1, "A", 40), @@ -37,7 +37,7 @@ sub _initialize CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, 1, "A", 1024), ); - $self->SUPER::_initialize(\@PropertyDescriptors); + $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); my $Session = $self->GetCurrentSession(); if (defined($Session)) diff --git a/testbot/web/ForgotPassword.pl b/testbot/web/ForgotPassword.pl index a22d441..dc35a2b 100644 --- a/testbot/web/ForgotPassword.pl +++ b/testbot/web/ForgotPassword.pl @@ -31,7 +31,7 @@ use WineTestBot::CGI::Sessions; sub _initialize { - my $self = shift; + my ($self, $Request, $RequiredRole) = @_; $self->GetPageBase()->CheckSecurePage(); @@ -39,7 +39,7 @@ sub _initialize CreateBasicPropertyDescriptor("Name", "Username or EMail", 1, 1, "A", 40), ); - $self->SUPER::_initialize(\@PropertyDescriptors); + $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); } sub GetTitle diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index 4002948..e6a4945 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -32,7 +32,7 @@ use WineTestBot::CGI::Sessions; sub _initialize { - my $self = shift; + my ($self, $Request, $RequiredRole) = @_; $self->GetPageBase()->CheckSecurePage(); @@ -42,7 +42,7 @@ sub _initialize CreateBasicPropertyDescriptor("AutoLogin", "Log me in automatically each visit", !1, !1, "B", 1), ); - $self->SUPER::_initialize(\@PropertyDescriptors); + $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); } sub GetTitle diff --git a/testbot/web/Logout.pl b/testbot/web/Logout.pl index 696bb95..24d3ac3 100644 --- a/testbot/web/Logout.pl +++ b/testbot/web/Logout.pl @@ -29,7 +29,9 @@ use CGI::Cookie; sub _initialize { - my $self = shift; + my ($self, $Request, $RequiredRole) = @_; + + $self->SUPER::_initialize($Request, $RequiredRole); $self->{WasLoggedIn} = undef; diff --git a/testbot/web/ResetPassword.pl b/testbot/web/ResetPassword.pl index dff05cf..73a7258 100644 --- a/testbot/web/ResetPassword.pl +++ b/testbot/web/ResetPassword.pl @@ -31,7 +31,7 @@ use WineTestBot::CGI::Sessions; sub _initialize { - my $self = shift; + my ($self, $Request, $RequiredRole) = @_; $self->GetPageBase()->CheckSecurePage(); @@ -42,7 +42,7 @@ sub _initialize CreateBasicPropertyDescriptor("Password2", "Password (repeat)", !1, 1, "A", 32), ); - $self->SUPER::_initialize(\@PropertyDescriptors); + $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); } sub GetTitle diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 695ba76..03b9af2 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -39,7 +39,7 @@ use WineTestBot::VMs; sub _initialize { - my $self = shift; + my ($self, $Request, $RequiredRole) = @_; $self->{Page} = $self->GetParam("Page") || 1; @@ -62,7 +62,7 @@ sub _initialize $self->{ShowAll} = defined($self->GetParam("ShowAll")); } - $self->SUPER::_initialize(undef); + $self->SUPER::_initialize($Request, $RequiredRole, undef); } sub GetTitle diff --git a/testbot/web/index.pl b/testbot/web/index.pl index d0ba188..25f5e0e 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -194,9 +194,9 @@ use WineTestBot::VMs; sub _initialize { - my $self = shift; + my ($self, $Request, $RequiredRole) = @_; - $self->SUPER::_initialize(@_); + $self->SUPER::_initialize($Request, $RequiredRole); } sub OutputDot

1 0

Francois Gouget : testbot/Janitor: Check and clean up the staging directory.
by Alexandre Julliard 21 May '14

21 May '14

Module: tools Branch: master Commit: cc218ea2c267f2aee508b5d9ed26a9886b29302f URL: http://source.winehq.org/git/tools.git/?a=commit;h=cc218ea2c267f2aee508b5d9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 21 16:21:36 2014 +0200 testbot/Janitor: Check and clean up the staging directory. Purge unsubmitted jobs (web/Submit.pl) as soon as they are a day old. There should be no file older than $JobPurgeDays. Report them so they are investigated and delete them after a 7 days grace period. Detect unknown files and report them so their source can be investigated. --- testbot/bin/Janitor.pl | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index b195dff..24b2b28 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -214,3 +214,54 @@ if (%DeletedUsers or %DeletedVMs) } } } + +# Check the content of the staging directory +if (opendir(my $dh, "$DataDir/staging")) +{ + # We will be deleting files so read the directory in one go + my @Entries = readdir($dh); + close($dh); + foreach my $Entry (@Entries) + { + next if ($Entry eq "." or $Entry eq ".."); + $Entry =~ m%^([^/]+)$%; + my $FileName = "$DataDir/staging/$1"; + my $Age = int((-M $FileName) + 0.5); + + if ($Entry =~ /^[0-9a-f]{32}-websubmit_/) + { + if ($Age >= 1 and !unlink $FileName) + { + # The user abandonned the submit procedure half-way + LogMsg "Could not delete '$FileName': $!\n" if (!unlink($FileName)); + } + } + else + { + if ($Entry !~ /^[0-9a-f]{32}_(?:patch|patch\.diff|wine-patches|winetest(?:64)?-latest\.exe|work)$/) + { + LogMsg "Found a suspicious staging file: $Entry\n"; + } + + if ($JobPurgeDays != 0) + { + if ($Age >= $JobPurgeDays + 7) + { + if ((-d $FileName and !rmtree($FileName)) or + !unlink($FileName)) + { + LogMsg "Could not delete '$FileName': $!\n"; + } + } + elsif ($Age > $JobPurgeDays) + { + LogMsg "'$FileName' is $Age days old and should have been deleted already. It will be deleted in ", $JobPurgeDays + 7 - $Age, " day(s).\n"; + } + } + } + } +} +else +{ + LogMsg "0Unable to open '$DataDir/staging': $!"; +}

1 0

Francois Gouget : testbot/web: Make it easier to identify Submit' s temporary staging files.
by Alexandre Julliard 21 May '14

21 May '14

Module: tools Branch: master Commit: 79460be9dd65f78183c9291d574cac2313e798f5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=79460be9dd65f78183c9291d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 21 16:21:15 2014 +0200 testbot/web: Make it easier to identify Submit's temporary staging files. It also ensures that GetTmpStagingFullPath() won't get a collision between the session id and the random part of an existing staging file, no matter what filename the user picks. Finally, this will make it possible to better check the content of the staging directory. --- testbot/lib/WineTestBot/Steps.pm | 2 +- testbot/web/Submit.pl | 38 ++++++++++++++++++-------------------- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 0431bc0..e937866 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -67,7 +67,7 @@ sub HandleStaging } my $FileName = $self->FileName; - if ($FileName !~ m/^[0-9a-f]+_(.*)$/) + if ($FileName !~ m/^[0-9a-z-]+_(.*)$/) { return "Can't split staging filename"; } diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 574c160..695ba76 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -24,6 +24,8 @@ use CGI qw(:standard); use Fcntl; use IO::Handle; use POSIX qw(:fcntl_h); +use File::Basename; + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::FreeFormPage; use WineTestBot::Branches; @@ -430,17 +432,13 @@ sub GetPropertyValue return $self->SUPER::GetPropertyValue(@_); } -sub GetStagingFileName +sub GetTmpStagingFullPath { my $self = shift; my $FileName = $_[0]; - if (! $FileName) - { - return undef; - } - - return "$DataDir/staging/" . $self->GetCurrentSession()->Id . "_$FileName"; + return undef if (!$FileName); + return "$DataDir/staging/" . $self->GetCurrentSession()->Id . "-websubmit_$FileName"; } sub Validate @@ -666,7 +664,7 @@ sub OnPage1Next $self->{ErrMessage} = "File: Name is too long"; return !1; } - my $StagingFile = $self->GetStagingFileName($FileName); + my $StagingFile = $self->GetTmpStagingFullPath($FileName); my $OldUMask = umask(002); if (! open (OUTFILE,">$StagingFile")) { @@ -756,7 +754,7 @@ sub OnPage2Prev { my $self = shift; - my $StagingFileName = $self->GetStagingFileName($self->GetParam("FileName")); + my $StagingFileName = $self->GetTmpStagingFullPath($self->GetParam("FileName")); if ($StagingFileName) { unlink($StagingFileName); @@ -796,20 +794,20 @@ sub OnSubmit # IDs are known and it can be moved to the jobs directory tree. But rename # it so it does not get overwritten if the user submits another one before # the Engine gets around to doing so. + my $BaseName = $self->GetParam("FileName"); my $FileNameRandomPart = GenerateRandomString(32); - while (-e ("$DataDir/staging/${FileNameRandomPart}_" . - $self->GetParam("FileName"))) + while (-e "$DataDir/staging/${FileNameRandomPart}_$BaseName") { $FileNameRandomPart = GenerateRandomString(32); } - if (! rename("$DataDir/staging/" . $self->GetCurrentSession()->Id . "_" . - $self->GetParam("FileName"), - "$DataDir/staging/${FileNameRandomPart}_" . - $self->GetParam("FileName"))) + my $StagingFileName = "${FileNameRandomPart}_$BaseName"; + + my $TmpStagingFullPath = $self->GetTmpStagingFullPath($BaseName); + if (!rename($TmpStagingFullPath, "$DataDir/staging/$StagingFileName")) { - # Can't give the file a unique name. Maybe we're lucky and using the - # session id works - $FileNameRandomPart = $self->GetCurrentSession()->Id; + # Use the existing staging file and hope for the best. + $self->{ErrMessage} = "Could not rename '$TmpStagingFullPath' to '$DataDir/staging/$StagingFileName': $!"; + $StagingFileName = basename($TmpStagingFullPath); } # See also Patches::Submit() in lib/WineTestBot/Patches.pm @@ -839,7 +837,7 @@ sub OnSubmit { # This is a patch so add a build step... my $BuildStep = $Steps->Add(); - $BuildStep->FileName($FileNameRandomPart . "_" . $self->GetParam("FileName")); + $BuildStep->FileName($StagingFileName); $BuildStep->FileType($FileType); $BuildStep->InStaging(1); $BuildStep->Type("build"); @@ -888,7 +886,7 @@ sub OnSubmit } else { - $TestStep->FileName($FileNameRandomPart . "_" . $self->GetParam("FileName")); + $TestStep->FileName($StagingFileName); $TestStep->InStaging(1); } $TestStep->FileType("exe$Bits");

1 0

Francois Gouget : testbot/CheckForWinetestUpdate: Improve error handling and plug staging file leaks.
by Alexandre Julliard 21 May '14

21 May '14

Module: tools Branch: master Commit: ed692db13e0b97d4b535fadae700d51fe45aa695 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ed692db13e0b97d4b535fada… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 21 16:19:57 2014 +0200 testbot/CheckForWinetestUpdate: Improve error handling and plug staging file leaks. The leaks would happen whenever there was no non-base VM, no 64-bit VM, or CheckForWinetestUpdate would exit prematurely due to an error. Also let AddJob() handle the staging file. This greatly simplifies the calling code. Finally, fix the indentation in a couple of places. --- testbot/bin/CheckForWinetestUpdate.pl | 167 ++++++++++++++++++--------------- 1 file changed, 89 insertions(+), 78 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index df3c63e..4eb2555 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -44,6 +44,7 @@ use LWP::UserAgent; use HTTP::Request; use HTTP::Response; use HTTP::Status; + use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::Users; @@ -52,9 +53,29 @@ use WineTestBot::Utils; use WineTestBot::VMs; use WineTestBot::Engine::Notify; + +my %WineTestUrls = ( + 32 => "http://test.winehq.org/builds/winetest-latest.exe", + 64 => "http://test.winehq.org/builds/winetest64-latest.exe" +); + + sub AddJob { - my ($BaseJob, $FileNameRandomPart, $Bits) = @_; + my ($BaseJob, $LatestBaseName, $Bits) = @_; + + # Create a copy in staging so it can then be moved into the job directory + my $FileNameRandomPart = GenerateRandomString(32); + while (-e "$DataDir/staging/${FileNameRandomPart}_$LatestBaseName") + { + $FileNameRandomPart = GenerateRandomString(32); + } + my $StagingFileName = "$DataDir/staging/${FileNameRandomPart}_$LatestBaseName"; + if (!copy("$DataDir/latest/$LatestBaseName", $StagingFileName)) + { + LogMsg "Could not copy '$DataDir/latest/$LatestBaseName' to '$StagingFileName': $!\n"; + return 0; + } # First create a new job my $Jobs = CreateJobs(); @@ -62,7 +83,7 @@ sub AddJob $NewJob->User(GetBatchUser()); $NewJob->Priority($BaseJob && $Bits == 32 ? 8 : 9); $NewJob->Remarks("WineTest: " . - ($Bits == 32 ? ($BaseJob ? "base" : "other") : "64-bit") . + ($Bits == 64 ? "64-bit" : $BaseJob ? "base" : "other") . " VMs"); # Add a step to the job @@ -70,7 +91,7 @@ sub AddJob my $NewStep = $Steps->Add(); my $BitsSuffix = ($Bits == 64 ? "64" : ""); $NewStep->Type("suite"); - $NewStep->FileName("${FileNameRandomPart}_winetest${BitsSuffix}-latest.exe"); + $NewStep->FileName("${FileNameRandomPart}_$LatestBaseName"); $NewStep->FileType($Bits == 64 ? "exe64" : "exe32"); $NewStep->InStaging(1); @@ -80,18 +101,18 @@ sub AddJob my $VMs = CreateVMs(); if ($Bits == 64) { - $VMs->AddFilter("Type", ["win64"]); - $VMs->AddFilter("Role", ["base", "winetest"]); + $VMs->AddFilter("Type", ["win64"]); + $VMs->AddFilter("Role", ["base", "winetest"]); } elsif ($BaseJob) { - $VMs->AddFilter("Type", ["win32", "win64"]); - $VMs->AddFilter("Role", ["base"]); + $VMs->AddFilter("Type", ["win32", "win64"]); + $VMs->AddFilter("Role", ["base"]); } else { - $VMs->AddFilter("Type", ["win32", "win64"]); - $VMs->AddFilter("Role", ["winetest"]); + $VMs->AddFilter("Type", ["win32", "win64"]); + $VMs->AddFilter("Role", ["winetest"]); } foreach my $VMKey (@{$VMs->SortKeysBySortOrder($VMs->GetKeys())}) { @@ -102,15 +123,21 @@ sub AddJob } # Now save the whole thing - if ($HasTasks) + if (!$HasTasks) + { + unlink($StagingFileName); + return 1; + } + + my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + if (defined $ErrMessage) { - (my $ErrKey, my $ErrProperty, my $ErrMessage) = $Jobs->Save(); - if (defined($ErrMessage)) - { - LogMsg "Failed to save job: $ErrMessage\n"; - exit 1; - } + LogMsg "Failed to save job: $ErrMessage\n"; + unlink($StagingFileName); + return 0; } + + return 1; } sub AddReconfigJob @@ -141,22 +168,18 @@ sub AddReconfigJob # Now save the whole thing my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); - if (defined($ErrMessage)) + if (defined $ErrMessage) { LogMsg "Failed to save reconfig job: $ErrMessage\n"; - exit 1; + return 0; } } -my $WINETEST32_URL = "http://test.winehq.org/builds/winetest-latest.exe"; -my $WINETEST64_URL = "http://test.winehq.org/builds/winetest64-latest.exe"; - my $Bits = $ARGV[0]; -if (! $Bits) +if (!$Bits) { die "Usage: CheckForWinetestUpdate.pl <bits>"; } - if ($Bits =~ m/^(32|64)$/) { $Bits = $1; @@ -165,30 +188,14 @@ else { die "Invalid number of bits $Bits"; } - -my $WinetestUrl = ($Bits == 64 ? $WINETEST64_URL : $WINETEST32_URL); my $BitsSuffix = ($Bits == 64 ? "64" : ""); -umask 002; -mkdir "$DataDir/latest"; -mkdir "$DataDir/staging"; - -# Store the new WineTest executable in the staging directory: -# - So we can compare it to the reference one in the latest directory to -# check that it is truly new. -# - Because we don't know the relevant Job and Step IDs yet and thus cannot -# put it in the jobs directory tree. -my $FileNameRandomPart = GenerateRandomString(32); -while (-e "$DataDir/staging/${FileNameRandomPart}_winetest${BitsSuffix}-latest.exe") -{ - $FileNameRandomPart = GenerateRandomString(32); -} -my $StagingFileName = "$DataDir/staging/${FileNameRandomPart}_winetest${BitsSuffix}-latest.exe"; - +# Download the winetest executable if new my $UA = LWP::UserAgent->new(); $UA->agent("WineTestBot"); -my $Request = HTTP::Request->new(GET => $WinetestUrl); -my $LatestFileName = "$DataDir/latest/winetest${BitsSuffix}-latest.exe"; +my $Request = HTTP::Request->new(GET => $WineTestUrls{$Bits}); +my $LatestBaseName = "winetest${BitsSuffix}-latest.exe"; +my $LatestFileName = "$DataDir/latest/$LatestBaseName"; if (-r $LatestFileName) { my $Since = gmtime((stat $LatestFileName)[9]); @@ -202,60 +209,64 @@ if ($Response->code != RC_OK) LogMsg "Unexpected HTTP response code ", $Response->code, "\n"; exit 1; } - exit; + exit 0; } +# Store the new WineTest executable in the staging directory: +# - So we can compare it to the reference one in the latest directory to +# verify that it truly is new. +# - Because we don't know the relevant Job and Step IDs yet and thus cannot +# put it in the jobs directory tree. +umask 002; +mkdir "$DataDir/staging"; +my $FileNameRandomPart = GenerateRandomString(32); +while (-e "$DataDir/staging/${FileNameRandomPart}_winetest${BitsSuffix}-latest.exe") +{ + $FileNameRandomPart = GenerateRandomString(32); +} +my $StagingFileName = "$DataDir/staging/${FileNameRandomPart}_winetest${BitsSuffix}-latest.exe"; + my $NewFile = 1; -if (! open STAGINGFILE, ">$StagingFileName") +if (open(my $fh, ">", $StagingFileName)) +{ + print $fh $Response->decoded_content(); + close($fh); +} +else { - LogMsg "Can't create staging file $StagingFileName: $!\n"; + LogMsg "Could not create staging file '$StagingFileName': $!\n"; exit 1; } -print STAGINGFILE $Response->decoded_content(); -close STAGINGFILE; if (-r $LatestFileName) { $NewFile = compare($StagingFileName, $LatestFileName) != 0; } -if (! $NewFile) +if (!$NewFile) { - unlink $StagingFileName; - exit; + # Nothing to do + unlink($StagingFileName); + exit 0; } -if (! copy($StagingFileName, $LatestFileName)) + +# Save the WineTest executable in the latest directory for the next round +mkdir "$DataDir/latest"; +if (!move($StagingFileName, $LatestFileName)) { - LogMsg "Can't copy $StagingFileName to $LatestFileName: $!\n"; + LogMsg "Could not move '$StagingFileName' to '$LatestFileName': $!\n"; } utime time, $Response->last_modified, $LatestFileName; -if ($Bits == 32) -{ - AddReconfigJob(); - AddJob(1, $FileNameRandomPart, $Bits); +# A new executable means there have been commits so update Wine. Create this +# job first purely to make the WineTestBot job queue look nice, and arbitrarily +# do it only for 32-bit executables to avoid redundant updates. +my $rc = 0; +$rc = 1 if ($Bits == 32 and !AddReconfigJob()); - # Create another copy for the non-base VMs Job. - $FileNameRandomPart = GenerateRandomString(32); - while (-e "$DataDir/staging/${FileNameRandomPart}_winetest-latest.exe") - { - $FileNameRandomPart = GenerateRandomString(32); - } - $StagingFileName = "$DataDir/staging/${FileNameRandomPart}_winetest-latest.exe"; - if (!copy($LatestFileName, $StagingFileName)) - { - LogMsg "Can't copy $LatestFileName to $StagingFileName: $!\n"; - } - else - { - AddJob(!1, $FileNameRandomPart, $Bits); - } -} -else -{ - AddJob(1, $FileNameRandomPart, $Bits); -} +$rc = 1 if (!AddJob(1, $LatestBaseName, $Bits)); +$rc = 1 if ($Bits == 32 and !AddJob(!1, $LatestBaseName, $Bits)); RescheduleJobs(); LogMsg "Submitted jobs\n"; -exit; +exit $rc;

1 0

Francois Gouget : testbot: Give a higher priority to wine-patches jobs than to the WineTest runs.
by Alexandre Julliard 21 May '14

21 May '14

Module: tools Branch: master Commit: 7e7ae89a6d9cca635a9958c597ec27efe9b17db9 URL: http://source.winehq.org/git/tools.git/?a=commit;h=7e7ae89a6d9cca635a9958c5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 21 16:31:36 2014 +0200 testbot: Give a higher priority to wine-patches jobs than to the WineTest runs. --- testbot/bin/CheckForWinetestUpdate.pl | 2 +- testbot/lib/WineTestBot/Patches.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index e9f07ac..df3c63e 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -60,7 +60,7 @@ sub AddJob my $Jobs = CreateJobs(); my $NewJob = $Jobs->Add(); $NewJob->User(GetBatchUser()); - $NewJob->Priority($BaseJob && $Bits == 32 ? 6 : 7); + $NewJob->Priority($BaseJob && $Bits == 32 ? 8 : 9); $NewJob->Remarks("WineTest: " . ($Bits == 32 ? ($BaseJob ? "base" : "other") : "64-bit") . " VMs"); diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index a4aed22..70c47f7 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -192,7 +192,7 @@ sub Submit # Create a new job for this patch my $NewJob = $Jobs->Add(); $NewJob->User($User); - $NewJob->Priority(9); + $NewJob->Priority(6); my $PropertyDescriptor = $Jobs->GetPropertyDescriptorByName("Remarks"); my $Subject = $self->Subject; $Subject =~ s/\[PATCH[^\]]*]//i;

1 0

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 May 2014