May 2014 - Wine-Commits - list.winehq.org

Nikolay Sivov : xmllite/writer: Initial implementation of WriteStartElement().
by Alexandre Julliard May 21, 2014

May 21, 2014

Module: wine Branch: master Commit: 2177403b8ebefcf8641505f8946e429f9960cb6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2177403b8ebefcf8641505f89… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 21 00:24:49 2014 +0400 xmllite/writer: Initial implementation of WriteStartElement(). --- dlls/xmllite/tests/writer.c | 92 +++++++++++++++++++++++++++++++++++++++++++ dlls/xmllite/writer.c | 49 ++++++++++++++++++----- 2 files changed, 132 insertions(+), 9 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 6800cd2..7631b45 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -410,6 +410,7 @@ static void test_bom(void) static const WCHAR versionW[] = {'v','e','r','s','i','o','n','=','"','1','.','0','"',0}; static const WCHAR utf16W[] = {'u','t','f','-','1','6',0}; static const WCHAR xmlW[] = {'x','m','l',0}; + static const WCHAR aW[] = {'a',0}; IXmlWriterOutput *output; unsigned char *ptr; IXmlWriter *writer; @@ -473,8 +474,98 @@ static void test_bom(void) GlobalUnlock(hglobal); IUnknown_Release(output); + IStream_Release(stream); + + /* start with element */ + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = pCreateXmlWriterOutputWithEncodingName((IUnknown*)stream, NULL, utf16W, &output); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, output); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &hglobal); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ptr = GlobalLock(hglobal); + ok(ptr[0] == 0xff && ptr[1] == 0xfe, "got %x,%x\n", ptr[0], ptr[1]); + GlobalUnlock(hglobal); + + IUnknown_Release(output); + IStream_Release(stream); + IXmlWriter_Release(writer); +} + +static void test_writestartelement(void) +{ + static const WCHAR aW[] = {'a',0}; + char *ptr; + IXmlWriter *writer; + IStream *stream; + HGLOBAL hglobal; + HRESULT hr; + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = pCreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, aW, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, NULL, aW); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &hglobal); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ptr = GlobalLock(hglobal); + ok(!strncmp(ptr, "<a", 2), "got %s\n", ptr); + GlobalUnlock(hglobal); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + /* write another element without closing previous one */ + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteProcessingInstruction(writer, aW, aW); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + IStream_Release(stream); + IXmlWriter_Release(writer); } START_TEST(writer) @@ -485,6 +576,7 @@ START_TEST(writer) test_writer_create(); test_writeroutput(); test_writestartdocument(); + test_writestartelement(); test_flush(); test_omitxmldeclaration(); test_bom(); diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index a1f409c..1a21ef4 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -51,7 +51,8 @@ typedef enum XmlWriterState_Initial, /* output is not set yet */ XmlWriterState_Ready, /* SetOutput() was called, ready to start */ XmlWriterState_PIDocStarted, /* document was started with manually added 'xml' PI */ - XmlWriterState_DocStarted /* document was started with WriteStartDocument() */ + XmlWriterState_DocStarted, /* document was started with WriteStartDocument() */ + XmlWriterState_ElemStarted /* writing element */ } XmlWriterState; typedef struct @@ -593,11 +594,19 @@ static HRESULT WINAPI xmlwriter_WriteProcessingInstruction(IXmlWriter *iface, LP TRACE("(%p)->(%s %s)\n", This, wine_dbgstr_w(name), wine_dbgstr_w(text)); - if (This->state == XmlWriterState_Initial) + switch (This->state) + { + case XmlWriterState_Initial: return E_UNEXPECTED; - - if (This->state == XmlWriterState_DocStarted && !strcmpW(name, xmlW)) + case XmlWriterState_DocStarted: + if (!strcmpW(name, xmlW)) + return WR_E_INVALIDACTION; + break; + case XmlWriterState_ElemStarted: return WR_E_INVALIDACTION; + default: + ; + } write_encoding_bom(This); write_output_buffer(This->output, openpiW, sizeof(openpiW)/sizeof(WCHAR)); @@ -656,6 +665,7 @@ static HRESULT WINAPI xmlwriter_WriteStartDocument(IXmlWriter *iface, XmlStandal This->state = XmlWriterState_DocStarted; return S_OK; case XmlWriterState_DocStarted: + case XmlWriterState_ElemStarted: return WR_E_INVALIDACTION; default: ; @@ -690,15 +700,36 @@ static HRESULT WINAPI xmlwriter_WriteStartDocument(IXmlWriter *iface, XmlStandal return S_OK; } -static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR pwszPrefix, - LPCWSTR pwszLocalName, LPCWSTR pwszNamespaceUri) +static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR prefix, LPCWSTR local_name, LPCWSTR uri) { xmlwriter *This = impl_from_IXmlWriter(iface); + static const WCHAR ltW[] = {'<'}; - FIXME("%p %s %s %s\n", This, wine_dbgstr_w(pwszPrefix), wine_dbgstr_w(pwszLocalName), - wine_dbgstr_w(pwszNamespaceUri)); + TRACE("(%p)->(%s %s %s)\n", This, wine_dbgstr_w(prefix), wine_dbgstr_w(local_name), wine_dbgstr_w(uri)); - return E_NOTIMPL; + if (This->state == XmlWriterState_Initial) + return E_UNEXPECTED; + + if (!local_name) + return E_INVALIDARG; + + if (This->state == XmlWriterState_ElemStarted) + return WR_E_INVALIDACTION; + + write_encoding_bom(This); + This->state = XmlWriterState_ElemStarted; + + write_output_buffer(This->output, ltW, 1); + + if (prefix) { + static const WCHAR colW[] = {':'}; + write_output_buffer(This->output, prefix, -1); + write_output_buffer(This->output, colW, 1); + } + + write_output_buffer(This->output, local_name, -1); + + return S_OK; } static HRESULT WINAPI xmlwriter_WriteString(IXmlWriter *iface, LPCWSTR pwszText)

1 0

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

May 21, 2014

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

May 21, 2014

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 : shell32: Fix memory leak.
by Alexandre Julliard May 21, 2014

May 21, 2014

Module: wine Branch: master Commit: ee13e10cf6d05c7d08dfebb9f04c70eb3e7a0a9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee13e10cf6d05c7d08dfebb9f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 21 11:02:14 2014 -0500 shell32: Fix memory leak. --- dlls/shell32/xdg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/xdg.c b/dlls/shell32/xdg.c index 70811f6..1504f1f 100644 --- a/dlls/shell32/xdg.c +++ b/dlls/shell32/xdg.c @@ -572,6 +572,7 @@ void XDG_FreeParsedFile(XDG_PARSED_FILE *parsed) SHFree(group); group = next; } + SHFree(parsed->contents); SHFree(parsed); }

1 0

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

May 21, 2014

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

Francois Gouget : testbot: Add prototypes to the Perl utility functions.
by Alexandre Julliard May 21, 2014

May 21, 2014

Module: tools Branch: master Commit: 6518eb604c1b118d523b22cc649d8b82cff06f5f URL: http://source.winehq.org/git/tools.git/?a=commit;h=6518eb604c1b118d523b22cc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 19 00:05:52 2014 +0200 testbot: Add prototypes to the Perl utility functions. The prototypes let Perl detect when the wrong number of parameters is passed to these functions. Also standardize the way we retrieve their arguments. --- testbot/lib/WineTestBot/Utils.pm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index acfabb5..1084abd 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -33,9 +33,9 @@ require Exporter; @EXPORT = qw(&MakeSecureURL &SecureConnection &GenerateRandomString &BuildEMailRecipient); -sub MakeSecureURL +sub MakeSecureURL($) { - my $URL = shift; + my ($URL) = @_; my $Protocol = "http"; if ($UseSSL || SecureConnection()) @@ -46,14 +46,14 @@ sub MakeSecureURL return $Protocol . "://" . $ENV{"HTTP_HOST"} . $URL; } -sub SecureConnection +sub SecureConnection() { return defined($ENV{"HTTPS"}) && $ENV{"HTTPS"} eq "on"; } -sub GenerateRandomString +sub GenerateRandomString($) { - my $Len = $_[0]; + my ($Len) = @_; my $RandomString = ""; while (length($RandomString) < $Len) @@ -65,15 +65,15 @@ sub GenerateRandomString return substr($RandomString, 0, $Len); } -sub DateTimeToString +sub DateTimeToString($) { - my $Time = $_[0]; + my ($Time) = @_; # my ($Sec, $Min, $Hour, $MDay, $Mon, $Year, $WDay, $YDay, $IsDst) = localtime($Time); return strftime("%Y/%m/%d %H:%M:%S", localtime($Time)); } -sub BuildEMailRecipient +sub BuildEMailRecipient($$) { my ($EMailAddress, $Name) = @_;

1 0

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

May 21, 2014

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/lib: Always call the parent _initialize() and InitializeNew() methods, with the right arguments.
by Alexandre Julliard May 21, 2014

May 21, 2014

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

May 21, 2014

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/web: Make it easier to identify Submit' s temporary staging files.
by Alexandre Julliard May 21, 2014

May 21, 2014

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