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

Nikolay Sivov : xmllite/writer: Initial implementation of WriteElementString().
by Alexandre Julliard 21 May '14

21 May '14

Module: wine Branch: master Commit: f43a6d46da82c155bbeebded23466db65e836976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f43a6d46da82c155bbeebded2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 21 08:59:36 2014 +0400 xmllite/writer: Initial implementation of WriteElementString(). --- dlls/xmllite/tests/writer.c | 61 +++++++++++++++++++++++++++++++++ dlls/xmllite/writer.c | 79 ++++++++++++++++++++++++++++++++++--------- 2 files changed, 124 insertions(+), 16 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 7631b45..c92dce7 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -502,12 +502,41 @@ static void test_bom(void) IUnknown_Release(output); IStream_Release(stream); + /* WriteElementString */ + 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_WriteElementString(writer, NULL, aW, NULL, 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 valueW[] = {'v','a','l','u','e',0}; + static const char *str = "<a><b>value</b>"; static const WCHAR aW[] = {'a',0}; + static const WCHAR bW[] = {'b',0}; char *ptr; IXmlWriter *writer; IStream *stream; @@ -566,6 +595,38 @@ static void test_writestartelement(void) IStream_Release(stream); IXmlWriter_Release(writer); + + /* WriteElementString */ + hr = pCreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteElementString(writer, NULL, bW, NULL, valueW); + 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, NULL, aW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteElementString(writer, NULL, bW, NULL, valueW); + 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(!strncmp(ptr, str, strlen(str)), "got %s\n", ptr); + GlobalUnlock(hglobal); + + IStream_Release(stream); + IXmlWriter_Release(writer); } START_TEST(writer) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 1a21ef4..4a69474 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -37,6 +37,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(xmllite); DEFINE_GUID(IID_IXmlWriterOutput, 0xc1131708, 0x0f59, 0x477f, 0x93, 0x59, 0x7d, 0x33, 0x24, 0x51, 0xbc, 0x1a); static const WCHAR closepiW[] = {'?','>'}; +static const WCHAR ltW[] = {'<'}; +static const WCHAR gtW[] = {'>'}; struct output_buffer { @@ -52,7 +54,8 @@ typedef enum 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_ElemStarted /* writing element */ + XmlWriterState_ElemStarted, /* writing element */ + XmlWriterState_Content /* content is accepted at this point */ } XmlWriterState; typedef struct @@ -80,6 +83,7 @@ typedef struct _xmlwriter XmlConformanceLevel conformance; XmlWriterState state; BOOL bomwritten; + BOOL starttagopen; } xmlwriter; static inline xmlwriter *impl_from_IXmlWriter(IXmlWriter *iface) @@ -226,6 +230,20 @@ static HRESULT write_output_buffer_quoted(xmlwriteroutput *output, const WCHAR * return S_OK; } +/* TODO: test if we need to validate char range */ +static HRESULT write_output_qname(xmlwriteroutput *output, const WCHAR *prefix, const WCHAR *local_name) +{ + if (prefix) { + static const WCHAR colW[] = {':'}; + write_output_buffer(output, prefix, -1); + write_output_buffer(output, colW, 1); + } + + write_output_buffer(output, local_name, -1); + + return S_OK; +} + static void writeroutput_release_stream(xmlwriteroutput *writeroutput) { if (writeroutput->stream) { @@ -294,6 +312,17 @@ static HRESULT write_encoding_bom(xmlwriter *writer) return S_OK; } +static HRESULT writer_close_starttag(xmlwriter *writer) +{ + HRESULT hr; + + if (!writer->starttagopen) return S_OK; + hr = write_output_buffer(writer->output, gtW, 1); + writer->starttagopen = FALSE; + writer->state = XmlWriterState_Content; + return hr; +} + static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, void **ppvObject) { xmlwriter *This = impl_from_IXmlWriter(iface); @@ -498,16 +527,40 @@ static HRESULT WINAPI xmlwriter_WriteDocType(IXmlWriter *iface, LPCWSTR pwszName return E_NOTIMPL; } -static HRESULT WINAPI xmlwriter_WriteElementString(IXmlWriter *iface, LPCWSTR pwszPrefix, - LPCWSTR pwszLocalName, LPCWSTR pwszNamespaceUri, - LPCWSTR pwszValue) +static HRESULT WINAPI xmlwriter_WriteElementString(IXmlWriter *iface, LPCWSTR prefix, + LPCWSTR local_name, LPCWSTR uri, LPCWSTR value) { xmlwriter *This = impl_from_IXmlWriter(iface); + static const WCHAR closeW[] = {'<','/'}; - FIXME("%p %s %s %s %s\n", This, wine_dbgstr_w(pwszPrefix), wine_dbgstr_w(pwszLocalName), - wine_dbgstr_w(pwszNamespaceUri), wine_dbgstr_w(pwszValue)); + TRACE("(%p)->(%s %s %s %s)\n", This, wine_dbgstr_w(prefix), wine_dbgstr_w(local_name), + wine_dbgstr_w(uri), wine_dbgstr_w(value)); - return E_NOTIMPL; + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + case XmlWriterState_ElemStarted: + writer_close_starttag(This); + break; + default: + ; + } + + write_encoding_bom(This); + write_output_buffer(This->output, ltW, 1); + write_output_qname(This->output, prefix, local_name); + write_output_buffer(This->output, gtW, 1); + + if (value) + write_output_buffer(This->output, value, -1); + + write_output_buffer(This->output, closeW, 2); + write_output_qname(This->output, prefix, local_name); + write_output_buffer(This->output, gtW, 1); + This->state = XmlWriterState_Content; + + return S_OK; } static HRESULT WINAPI xmlwriter_WriteEndDocument(IXmlWriter *iface) @@ -703,7 +756,6 @@ static HRESULT WINAPI xmlwriter_WriteStartDocument(IXmlWriter *iface, XmlStandal static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR prefix, LPCWSTR local_name, LPCWSTR uri) { xmlwriter *This = impl_from_IXmlWriter(iface); - static const WCHAR ltW[] = {'<'}; TRACE("(%p)->(%s %s %s)\n", This, wine_dbgstr_w(prefix), wine_dbgstr_w(local_name), wine_dbgstr_w(uri)); @@ -718,16 +770,10 @@ static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR pre write_encoding_bom(This); This->state = XmlWriterState_ElemStarted; + This->starttagopen = TRUE; 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); + write_output_qname(This->output, prefix, local_name); return S_OK; } @@ -892,6 +938,7 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) writer->conformance = XmlConformanceLevel_Document; writer->state = XmlWriterState_Initial; writer->bomwritten = FALSE; + writer->starttagopen = FALSE; *obj = &writer->IXmlWriter_iface;

1 0

Piotr Caban : msvcrt: Rewrite qsort function.
by Alexandre Julliard 21 May '14

21 May '14

Module: wine Branch: master Commit: b703afda86ef962c617ff33f7b8a552ea550d1e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b703afda86ef962c617ff33f7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 21 11:57:13 2014 +0200 msvcrt: Rewrite qsort function. --- dlls/msvcrt/misc.c | 145 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 104 insertions(+), 41 deletions(-) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 7bb84c8..36d0608 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -229,41 +229,108 @@ void CDECL _chkesp(void) #endif /* __i386__ */ -/********************************************************************* - * Helper function for MSVCRT_qsort_s. - * - * Based on NTDLL_qsort in dlls/ntdll/misc.c - */ -static void MSVCRT_mergesort( void *arr, void *barr, size_t elemsize, - int (CDECL *compar)(void *, const void *, const void *), - size_t left, size_t right, void *context ) +static inline void swap(char *l, char *r, MSVCRT_size_t size) +{ + char tmp; + + while(size--) { + tmp = *l; + *l++ = *r; + *r++ = tmp; + } +} + +static void small_sort(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, + int (CDECL *compar)(void *, const void *, const void *), void *context) +{ + MSVCRT_size_t e, i; + char *max, *p; + + for(e=nmemb; e>1; e--) { + max = base; + for(i=1; i<e; i++) { + p = (char*)base + i*size; + if(compar(context, p, max) > 0) + max = p; + } + + if(p != max) + swap(p, max, size); + } +} + +static void quick_sort(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, + int (CDECL *compar)(void *, const void *, const void *), void *context) { - if (right>left) { - size_t i, j, k, m; - m=left+(right-left)/2; - MSVCRT_mergesort(arr, barr, elemsize, compar, left, m, context); - MSVCRT_mergesort(arr, barr, elemsize, compar, m+1, right, context); - -#define X(a,i) ((char*)a+elemsize*(i)) - for (i=m+1; i>left; i--) - memcpy (X(barr,(i-1)),X(arr,(i-1)),elemsize); - for (j=m; j<right; j++) - memcpy (X(barr,(right+m-j)),X(arr,(j+1)),elemsize); - - /* i=left; j=right; */ - for (k=left; i<=m && j>m; k++) { - if (i==j || compar(context, X(barr,i),X(barr,j))<=0) { - memcpy(X(arr,k),X(barr,i),elemsize); - i++; - } else { - memcpy(X(arr,k),X(barr,j),elemsize); - j--; + int stack_lo[8*sizeof(MSVCRT_size_t)], stack_hi[8*sizeof(MSVCRT_size_t)], stack_pos; + int beg, end, lo, hi, med; + + stack_pos = 0; + stack_lo[stack_pos] = 0; + stack_hi[stack_pos] = nmemb-1; + +#define X(i) ((char*)base+size*(i)) + while(stack_pos >= 0) { + beg = stack_lo[stack_pos]; + end = stack_hi[stack_pos--]; + + if(end-beg < 8) { + small_sort(X(beg), end-beg+1, size, compar, context); + continue; + } + + lo = beg; + hi = end; + med = (hi+lo+1)/2; + if(compar(context, X(lo), X(med)) > 0) + swap(X(lo), X(med), size); + if(compar(context, X(lo), X(hi)) > 0) + swap(X(lo), X(hi), size); + if(compar(context, X(med), X(hi)) > 0) + swap(X(med), X(hi), size); + + lo++; + hi--; + while(1) { + while(lo <= hi) { + if(lo!=med && compar(context, X(lo), X(med))>0) + break; + lo++; + } + + while(med != hi) { + if(compar(context, X(hi), X(med)) <= 0) + break; + hi--; } + + if(hi < lo) + break; + + swap(X(lo), X(hi), size); + if(hi == med) + med = lo; + lo++; + hi--; + } + + while(hi > beg) { + if(hi!=med && compar(context, X(hi), X(med))!=0) + break; + hi--; + } + + if(hi-beg >= end-lo) { + stack_lo[++stack_pos] = beg; + stack_hi[stack_pos] = hi; + stack_lo[++stack_pos] = lo; + stack_hi[stack_pos] = end; + }else { + stack_lo[++stack_pos] = lo; + stack_hi[stack_pos] = end; + stack_lo[++stack_pos] = beg; + stack_hi[stack_pos] = hi; } - for (; i<=m; i++, k++) - memcpy(X(arr,k),X(barr,i),elemsize); - for (; j>m; j--, k++) - memcpy(X(arr,k),X(barr,j),elemsize); } #undef X } @@ -271,13 +338,13 @@ static void MSVCRT_mergesort( void *arr, void *barr, size_t elemsize, /********************************************************************* * qsort_s (MSVCRT.@) * - * Based on NTDLL_qsort in dlls/ntdll/misc.c + * This function is trying to sort data doing identical comparisons + * as native does. There are still cases where it behaves differently. */ void CDECL MSVCRT_qsort_s(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, int (CDECL *compar)(void *, const void *, const void *), void *context) { - void *secondarr; - const size_t total_size = nmemb*size; + const MSVCRT_size_t total_size = nmemb*size; if (!MSVCRT_CHECK_PMT(base != NULL || (base == NULL && nmemb == 0))) return; if (!MSVCRT_CHECK_PMT(size > 0)) return; @@ -286,11 +353,7 @@ void CDECL MSVCRT_qsort_s(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, if (nmemb < 2) return; - secondarr = MSVCRT_malloc(total_size); - if (!secondarr) - return; - MSVCRT_mergesort(base, secondarr, size, compar, 0, nmemb-1, context); - MSVCRT_free(secondarr); + quick_sort(base, nmemb, size, compar, context); } /********************************************************************* @@ -299,7 +362,7 @@ void CDECL MSVCRT_qsort_s(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, void CDECL MSVCRT_qsort(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, int (CDECL *compar)(const void*, const void*)) { - return MSVCRT_qsort_s(base, nmemb, size, compare_wrapper, compar); + MSVCRT_qsort_s(base, nmemb, size, compare_wrapper, compar); } /*********************************************************************

1 0

Piotr Caban : msvcrt: Add qsort_s tests.
by Alexandre Julliard 21 May '14

21 May '14

Module: wine Branch: master Commit: e95938c2d612e90c18e0772354add1a6949995fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=e95938c2d612e90c18e077235… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 21 11:57:24 2014 +0200 msvcrt: Add qsort_s tests. --- dlls/msvcrt/tests/misc.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index 523d277..7b940f1 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -32,6 +32,8 @@ static int (__cdecl *p_set_doserrno)(int); static int (__cdecl *p_set_errno)(int); static void (__cdecl *p__invalid_parameter)(const wchar_t*, const wchar_t*, const wchar_t*, unsigned int, uintptr_t); +static void (__cdecl *p_qsort_s)(void*, MSVCRT_size_t, MSVCRT_size_t, + int (__cdecl*)(void*, const void*, const void*), void*); static void init(void) { @@ -45,6 +47,7 @@ static void init(void) p_set_doserrno = (void *)GetProcAddress(hmod, "_set_doserrno"); p_set_errno = (void *)GetProcAddress(hmod, "_set_errno"); p__invalid_parameter = (void *)GetProcAddress(hmod, "_invalid_parameter"); + p_qsort_s = (void *)GetProcAddress(hmod, "qsort_s"); } static void test_rand_s(void) @@ -354,6 +357,126 @@ static void test__invalid_parameter(void) p__invalid_parameter(NULL, NULL, NULL, 0, 0); } +struct qsort_test +{ + int pos; + int *base; + + struct { + int l; + int r; + } cmp[64]; +}; + +int __cdecl qsort_comp(void *ctx, const void *l, const void *r) +{ + struct qsort_test *qt = ctx; + + if(qt) { + ok(qt->pos < 64, "qt->pos = %d\n", qt->pos); + ok(qt->cmp[qt->pos].l == (int*)l-qt->base, + "%d) l on %ld position\n", qt->pos, (long)((int*)l - qt->base)); + ok(qt->cmp[qt->pos].r == (int*)r-qt->base, + "%d) r on %ld position\n", qt->pos, (long)((int*)r - qt->base)); + qt->pos++; + } + + return *(int*)l%1000 - *(int*)r%1000; +} + +static void test_qsort_s(void) +{ + static const int nonstable_test[] = {9000, 8001, 7002, 6003, 1003, 5004, 4005, 3006, 2007}; + int tab[100], i; + + struct qsort_test small_sort = { + 0, tab, { + {1, 0}, {2, 1}, {3, 2}, {4, 3}, {5, 4}, {6, 5}, {7, 6}, + {1, 0}, {2, 1}, {3, 2}, {4, 3}, {5, 4}, {6, 5}, + {1, 0}, {2, 1}, {3, 2}, {4, 3}, {5, 4}, + {1, 0}, {2, 1}, {3, 2}, {4, 3}, + {1, 0}, {2, 1}, {3, 2}, + {1, 0}, {2, 1}, + {1, 0} + } + }, small_sort2 = { + 0, tab, { + {1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0}, {6, 0}, {7, 0}, + {1, 0}, {2, 1}, {3, 1}, {4, 1}, {5, 1}, {6, 1}, + {1, 0}, {2, 1}, {3, 2}, {4, 2}, {5, 2}, + {1, 0}, {2, 1}, {3, 2}, {4, 3}, + {1, 0}, {2, 1}, {3, 2}, + {1, 0}, {2, 1}, + {1, 0} + } + }, quick_sort = { + 0, tab, { + {0, 4}, {0, 8}, {4, 8}, + {1, 4}, {2, 4}, {3, 4}, {5, 4}, {6, 4}, {7, 4}, {7, 4}, {6, 4}, + {6, 4}, + {8, 7}, + {1, 0}, {2, 1}, {3, 2}, {4, 3}, {5, 4}, {6, 4}, + {1, 0}, {2, 1}, {3, 2}, {4, 3}, {5, 3}, + {1, 0}, {2, 1}, {3, 2}, {4, 2}, + {1, 0}, {2, 1}, {3, 2}, + {1, 0}, {2, 1}, + {1, 0} + } + }; + + if(!p_qsort_s) { + win_skip("qsort_s not available\n"); + return; + } + + for(i=0; i<8; i++) tab[i] = i; + p_qsort_s(tab, 8, sizeof(int), qsort_comp, &small_sort); + ok(small_sort.pos == 28, "small_sort.pos = %d\n", small_sort.pos); + for(i=0; i<8; i++) + ok(tab[i] == i, "tab[%d] = %d\n", i, tab[i]); + + for(i=0; i<8; i++) tab[i] = 7-i; + p_qsort_s(tab, 8, sizeof(int), qsort_comp, &small_sort2); + ok(small_sort2.pos == 28, "small_sort2.pos = %d\n", small_sort2.pos); + for(i=0; i<8; i++) + ok(tab[i] == i, "tab[%d] = %d\n", i, tab[i]); + + for(i=0; i<9; i++) tab[i] = i; + tab[5] = 1; + tab[6] = 2; + p_qsort_s(tab, 9, sizeof(int), qsort_comp, &quick_sort); + ok(quick_sort.pos == 34, "quick_sort.pos = %d\n", quick_sort.pos); + + /* show that qsort is not stable */ + for(i=0; i<9; i++) tab[i] = 8-i + 1000*(i+1); + tab[0] = 1003; + p_qsort_s(tab, 9, sizeof(int), qsort_comp, NULL); + for(i=0; i<9; i++) + ok(tab[i] == nonstable_test[i], "tab[%d] = %d, expected %d\n", i, tab[i], nonstable_test[i]); + + /* check if random data is sorted */ + srand(0); + for(i=0; i<100; i++) tab[i] = rand()%1000; + p_qsort_s(tab, 100, sizeof(int), qsort_comp, NULL); + for(i=1; i<100; i++) + ok(tab[i-1] <= tab[i], "data sorted incorrectly on position %d: %d <= %d\n", i, tab[i-1], tab[i]); + + /* test if random permutation is sorted correctly */ + for(i=0; i<100; i++) tab[i] = i; + for(i=0; i<100; i++) { + int b = rand()%100; + int e = rand()%100; + + if(b == e) continue; + tab[b] ^= tab[e]; + tab[e] ^= tab[b]; + tab[b] ^= tab[e]; + } + p_qsort_s(tab, 100, sizeof(int), qsort_comp, NULL); + for(i=0; i<100; i++) + ok(tab[i] == i, "data sorted incorrectly on position %d: %d\n", i, tab[i]); +} + START_TEST(misc) { int arg_c; @@ -380,4 +503,5 @@ START_TEST(misc) test__set_errno(); test__popen(arg_v[0]); test__invalid_parameter(); + test_qsort_s(); }

1 0

Vincent Povirk : shell32: Fix memory leak.
by Alexandre Julliard 21 May '14

21 May '14

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: Add prototypes to the Perl utility functions.
by Alexandre Julliard 21 May '14

21 May '14

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/RevertVM: Always pass the current VM to FatalError().
by Alexandre Julliard 21 May '14

21 May '14

Module: tools Branch: master Commit: 650414651caddff186c348913ee228b8594abbe0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=650414651caddff186c34891… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 19 00:06:17 2014 +0200 testbot/RevertVM: Always pass the current VM to FatalError(). Without this argument it devolves to a two line LogMsg()+exit() combination. --- testbot/bin/RevertVM.pl | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/RevertVM.pl index 60a13f8..b2ae902 100755 --- a/testbot/bin/RevertVM.pl +++ b/testbot/bin/RevertVM.pl @@ -48,16 +48,14 @@ sub FatalError LogMsg $ErrMessage, "\n"; - if ($VM) - { - $VM->Status("offline"); - $VM->ChildPid(undef); - $VM->Save(); - - my $VMKey = $VM->GetKey(); - my $VMSnapshot = $VM->IdleSnapshot; - open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); - print SENDMAIL <<"EOF"; + $VM->Status("offline"); + $VM->ChildPid(undef); + $VM->Save(); + + my $VMKey = $VM->GetKey(); + my $VMSnapshot = $VM->IdleSnapshot; + open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); + print SENDMAIL <<"EOF"; From: $RobotEMail To: $AdminEMail Subject: VM $VMKey offline @@ -68,8 +66,7 @@ $ErrMessage The VM has been put offline. EOF - close(SENDMAIL); - } + close(SENDMAIL); exit 1; } @@ -86,7 +83,8 @@ if (! $VMKey) my $VM = CreateVMs()->GetItem($VMKey); if (! defined($VM)) { - FatalError "VM $VMKey doesn't exist"; + LogMsg "VM $VMKey doesn't exist\n"; + exit 1; } LogMsg "Reverting $VMKey to ", $VM->IdleSnapshot, "\n"; @@ -146,4 +144,4 @@ if (defined($ErrMessage)) LogMsg "Revert of $VMKey completed\n"; -exit; +exit 0;

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

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/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/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