September 2023 - Wine-commits

Rémi Bernon : dmcompos: Use PARENTSRC with dmusic.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: 6798b73452f84d31c936cf48417b3df10bfacab0 URL: https://gitlab.winehq.org/wine/wine/-/commit/6798b73452f84d31c936cf48417b3d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 30 19:56:53 2023 +0200 dmcompos: Use PARENTSRC with dmusic. --- dlls/dmcompos/Makefile.in | 1 + dlls/dmcompos/dmobject.c | 732 ---------------------------------------------- dlls/dmcompos/dmobject.h | 124 -------- 3 files changed, 1 insertion(+), 856 deletions(-)

1 0

Rémi Bernon : dmloader: Always return S_FALSE from DllCanUnloadNow.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: 30e5892c98cc3b7aa0754b542cb19e14d28ac5c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/30e5892c98cc3b7aa0754b542cb19e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 22 17:41:58 2023 +0200 dmloader: Always return S_FALSE from DllCanUnloadNow. --- dlls/dmloader/container.c | 3 --- dlls/dmloader/dmloader_main.c | 21 --------------------- dlls/dmloader/dmloader_private.h | 5 ----- dlls/dmloader/loader.c | 3 --- 4 files changed, 32 deletions(-) diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c index f2b284e1cb3..747c2a07341 100644 --- a/dlls/dmloader/container.c +++ b/dlls/dmloader/container.c @@ -137,7 +137,6 @@ static ULONG WINAPI IDirectMusicContainerImpl_Release(IDirectMusicContainer *ifa if (This->pStream) destroy_dmcontainer(This); HeapFree(GetProcessHeap(), 0, This); - unlock_module(); } return ref; @@ -666,8 +665,6 @@ HRESULT create_dmcontainer(REFIID lpcGUID, void **ppobj) obj->pContainedObjects = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(struct list)); list_init (obj->pContainedObjects); - lock_module(); - hr = IDirectMusicContainer_QueryInterface(&obj->IDirectMusicContainer_iface, lpcGUID, ppobj); IDirectMusicContainer_Release(&obj->IDirectMusicContainer_iface); diff --git a/dlls/dmloader/dmloader_main.c b/dlls/dmloader/dmloader_main.c index 512e6102d86..96d841e2b2d 100644 --- a/dlls/dmloader/dmloader_main.c +++ b/dlls/dmloader/dmloader_main.c @@ -36,8 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmloader); -LONG module_ref = 0; - typedef struct { IClassFactory IClassFactory_iface; HRESULT (*fnCreateInstance)(REFIID riid, void **ppv); @@ -73,15 +71,11 @@ static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID r static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) { - lock_module(); - return 2; /* non-heap based object */ } static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) { - unlock_module(); - return 1; /* non-heap based object */ } @@ -103,12 +97,6 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) { TRACE("(%d)\n", dolock); - - if (dolock) - lock_module(); - else - unlock_module(); - return S_OK; } @@ -123,15 +111,6 @@ static const IClassFactoryVtbl classfactory_vtbl = { static IClassFactoryImpl dm_loader_CF = {{&classfactory_vtbl}, create_dmloader}; static IClassFactoryImpl dm_container_CF = {{&classfactory_vtbl}, create_dmcontainer}; -/****************************************************************** - * DllCanUnloadNow (DMLOADER.@) - */ -HRESULT WINAPI DllCanUnloadNow (void) -{ - TRACE("() ref=%ld\n", module_ref); - - return module_ref ? S_FALSE : S_OK; -} /****************************************************************** * DllGetClassObject (DMLOADER.@) diff --git a/dlls/dmloader/dmloader_private.h b/dlls/dmloader/dmloader_private.h index 204c9689ffb..0aea1ba8499 100644 --- a/dlls/dmloader/dmloader_private.h +++ b/dlls/dmloader/dmloader_private.h @@ -44,11 +44,6 @@ #define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) -/* dmloader.dll global (for DllCanUnloadNow) */ -extern LONG module_ref; -static inline void lock_module(void) { InterlockedIncrement( &module_ref ); } -static inline void unlock_module(void) { InterlockedDecrement( &module_ref ); } - /***************************************************************************** * Interfaces */ diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 6c4b29ab5ea..f303f93baaa 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -157,7 +157,6 @@ static ULONG WINAPI IDirectMusicLoaderImpl_Release(IDirectMusicLoader8 *iface) for (i = 0; i < ARRAY_SIZE(classes); i++) HeapFree(GetProcessHeap(), 0, This->search_paths[i]); HeapFree(GetProcessHeap(), 0, This); - unlock_module(); } return ref; @@ -940,7 +939,5 @@ HRESULT create_dmloader(REFIID lpcGUID, void **ppobj) dls->bInvalidDefaultDLS = TRUE; } - lock_module(); - return IDirectMusicLoader_QueryInterface(&obj->IDirectMusicLoader8_iface, lpcGUID, ppobj); }

1 0

Rémi Bernon : dmloader: Use CRT allocation functions.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: 307b13bcf56f28f8e891c1b8d1bbf26d4ec4d2df URL: https://gitlab.winehq.org/wine/wine/-/commit/307b13bcf56f28f8e891c1b8d1bbf2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Sep 9 09:22:04 2023 +0200 dmloader: Use CRT allocation functions. --- dlls/dmloader/container.c | 33 +++++++++++++++------------------ dlls/dmloader/dmobject.c | 7 +++---- dlls/dmloader/loader.c | 19 ++++++++----------- dlls/dmloader/loaderstream.c | 28 +++++++++++----------------- 4 files changed, 37 insertions(+), 50 deletions(-)

1 0

Rémi Bernon : dmloader: Use PARENTSRC with dmusic.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: da8a8bbf9a7747f99d50beecfeea012067b2925b URL: https://gitlab.winehq.org/wine/wine/-/commit/da8a8bbf9a7747f99d50beecfeea01… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 30 19:55:51 2023 +0200 dmloader: Use PARENTSRC with dmusic. --- dlls/dmloader/Makefile.in | 1 + dlls/dmloader/dmobject.c | 732 ---------------------------------------------- dlls/dmloader/dmobject.h | 124 -------- 3 files changed, 1 insertion(+), 856 deletions(-)

1 0

Rémi Bernon : dmscript: Always return S_FALSE from DllCanUnloadNow.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: b02b32f9b7eef9c5ed88ef60886f3b64954b5a47 URL: https://gitlab.winehq.org/wine/wine/-/commit/b02b32f9b7eef9c5ed88ef60886f3b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 22 17:42:13 2023 +0200 dmscript: Always return S_FALSE from DllCanUnloadNow. --- dlls/dmscript/dmscript_main.c | 22 ---------------------- dlls/dmscript/dmscript_private.h | 7 ------- dlls/dmscript/script.c | 2 -- dlls/dmscript/scripttrack.c | 2 -- 4 files changed, 33 deletions(-) diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index f6785176aec..db5f163b829 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -38,8 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmscript); -LONG DMSCRIPT_refCount = 0; - typedef struct { IClassFactory IClassFactory_iface; HRESULT (*fnCreateInstance)(REFIID riid, void **ppv, IUnknown *pUnkOuter); @@ -82,15 +80,11 @@ static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID r static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) { - DMSCRIPT_LockModule(); - return 2; /* non-heap based object */ } static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) { - DMSCRIPT_UnlockModule(); - return 1; /* non-heap based object */ } @@ -107,12 +101,6 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) { TRACE("(%d)\n", dolock); - - if (dolock) - DMSCRIPT_LockModule(); - else - DMSCRIPT_UnlockModule(); - return S_OK; } @@ -140,16 +128,6 @@ static IClassFactoryImpl ScriptAutoImplAudioPath_CF = {{&classfactory_vtbl}, create_unimpl_instance}; static IClassFactoryImpl ScriptAutoImplSong_CF = {{&classfactory_vtbl}, create_unimpl_instance}; -/****************************************************************** - * DllCanUnloadNow (DMSCRIPT.@) - * - * - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return DMSCRIPT_refCount != 0 ? S_FALSE : S_OK; -} - /****************************************************************** * DllGetClassObject (DMSCRIPT.@) diff --git a/dlls/dmscript/dmscript_private.h b/dlls/dmscript/dmscript_private.h index 90808d59f00..f715c083523 100644 --- a/dlls/dmscript/dmscript_private.h +++ b/dlls/dmscript/dmscript_private.h @@ -48,13 +48,6 @@ extern HRESULT DMUSIC_CreateDirectMusicScriptImpl(REFIID riid, void **ppobj, IUn extern HRESULT DMUSIC_CreateDirectMusicScriptTrack(REFIID riid, void **ppobj, IUnknown *pUnkOuter); -/********************************************************************** - * Dll lifetime tracking declaration for dmscript.dll - */ -extern LONG DMSCRIPT_refCount; -static inline void DMSCRIPT_LockModule(void) { InterlockedIncrement( &DMSCRIPT_refCount ); } -static inline void DMSCRIPT_UnlockModule(void) { InterlockedDecrement( &DMSCRIPT_refCount ); } - /***************************************************************************** * Misc. */ diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index 375eebf69aa..dbfcdca7d83 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -94,7 +94,6 @@ static ULONG WINAPI IDirectMusicScriptImpl_Release(IDirectMusicScript *iface) HeapFree(GetProcessHeap(), 0, This->pwzLanguage); HeapFree(GetProcessHeap(), 0, This->pwzSource); HeapFree(GetProcessHeap(), 0, This); - DMSCRIPT_UnlockModule(); } return ref; @@ -508,7 +507,6 @@ HRESULT DMUSIC_CreateDirectMusicScriptImpl(REFIID lpcGUID, void **ppobj, IUnknow obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl; obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - DMSCRIPT_LockModule(); hr = IDirectMusicScript_QueryInterface(&obj->IDirectMusicScript_iface, lpcGUID, ppobj); IDirectMusicScript_Release(&obj->IDirectMusicScript_iface); diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index fbe454c09e5..92dd6d15ec6 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -86,7 +86,6 @@ static ULONG WINAPI script_track_Release(IDirectMusicTrack8 *iface) if (!ref) { HeapFree(GetProcessHeap(), 0, This); - DMSCRIPT_UnlockModule(); } return ref; @@ -338,7 +337,6 @@ HRESULT DMUSIC_CreateDirectMusicScriptTrack(REFIID riid, void **ret_iface, IUnkn track->desc.guidClass = CLSID_DirectMusicScriptTrack; track->ref = 1; - DMSCRIPT_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, riid, ret_iface); IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface);

1 0

Rémi Bernon : dmscript: Use CRT allocation functions.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: f49b5ca85ec4bae5272ee102aa129a85a20dfd78 URL: https://gitlab.winehq.org/wine/wine/-/commit/f49b5ca85ec4bae5272ee102aa129a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Sep 9 09:23:38 2023 +0200 dmscript: Use CRT allocation functions. --- dlls/dmscript/dmobject.c | 7 +++---- dlls/dmscript/script.c | 27 ++++++++++++--------------- dlls/dmscript/scripttrack.c | 9 ++------- 3 files changed, 17 insertions(+), 26 deletions(-) diff --git a/dlls/dmscript/dmobject.c b/dlls/dmscript/dmobject.c index b526b23d031..07d887a376c 100644 --- a/dlls/dmscript/dmobject.c +++ b/dlls/dmscript/dmobject.c @@ -28,7 +28,6 @@ #include "dmusics.h" #include "dmobject.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(dmobj); WINE_DECLARE_DEBUG_CHANNEL(dmfile); @@ -375,7 +374,7 @@ HRESULT stream_next_chunk(IStream *stream, struct chunk_entry *chunk) /* Reads chunk data of the form: DWORD - size of array element element[] - Array of elements - The caller needs to heap_free() the array. + The caller needs to free() the array. */ HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk, void **array, unsigned int *count, DWORD elem_size) @@ -400,10 +399,10 @@ HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk, *count = (chunk->size - sizeof(DWORD)) / elem_size; size = *count * elem_size; - if (!(*array = heap_alloc(size))) + if (!(*array = malloc(size))) return E_OUTOFMEMORY; if (FAILED(hr = stream_read(stream, *array, size))) { - heap_free(*array); + free(*array); *array = NULL; return hr; } diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index dbfcdca7d83..01d4bcd0290 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -89,11 +89,11 @@ static ULONG WINAPI IDirectMusicScriptImpl_Release(IDirectMusicScript *iface) TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { - HeapFree(GetProcessHeap(), 0, This->pHeader); - HeapFree(GetProcessHeap(), 0, This->pVersion); - HeapFree(GetProcessHeap(), 0, This->pwzLanguage); - HeapFree(GetProcessHeap(), 0, This->pwzSource); - HeapFree(GetProcessHeap(), 0, This); + free(This->pHeader); + free(This->pVersion); + free(This->pwzLanguage); + free(This->pwzSource); + free(This); } return ref; @@ -275,36 +275,36 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS switch (Chunk.fccID) { case DMUS_FOURCC_SCRIPT_CHUNK: { TRACE_(dmfile)(": script header chunk\n"); - This->pHeader = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, Chunk.dwSize); + This->pHeader = calloc(1, Chunk.dwSize); IStream_Read (pStm, This->pHeader, Chunk.dwSize, NULL); break; } case DMUS_FOURCC_SCRIPTVERSION_CHUNK: { TRACE_(dmfile)(": script version chunk\n"); - This->pVersion = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, Chunk.dwSize); + This->pVersion = calloc(1, Chunk.dwSize); IStream_Read (pStm, This->pVersion, Chunk.dwSize, NULL); TRACE_(dmfile)("version: 0x%08lx.0x%08lx\n", This->pVersion->dwVersionMS, This->pVersion->dwVersionLS); break; } case DMUS_FOURCC_SCRIPTLANGUAGE_CHUNK: { TRACE_(dmfile)(": script language chunk\n"); - This->pwzLanguage = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, Chunk.dwSize); + This->pwzLanguage = calloc(1, Chunk.dwSize); IStream_Read (pStm, This->pwzLanguage, Chunk.dwSize, NULL); TRACE_(dmfile)("using language: %s\n", debugstr_w(This->pwzLanguage)); break; } case DMUS_FOURCC_SCRIPTSOURCE_CHUNK: { TRACE_(dmfile)(": script source chunk\n"); - This->pwzSource = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, Chunk.dwSize); + This->pwzSource = calloc(1, Chunk.dwSize); IStream_Read (pStm, This->pwzSource, Chunk.dwSize, NULL); if (TRACE_ON(dmscript)) { int count = WideCharToMultiByte(CP_ACP, 0, This->pwzSource, -1, NULL, 0, NULL, NULL); - LPSTR str = HeapAlloc(GetProcessHeap (), 0, count); + LPSTR str = malloc(count); WideCharToMultiByte(CP_ACP, 0, This->pwzSource, -1, str, count, NULL, NULL); str[count-1] = '\n'; TRACE("source:\n"); fwrite( str, 1, count, stderr ); - HeapFree(GetProcessHeap(), 0, str); + free(str); } break; } @@ -497,10 +497,7 @@ HRESULT DMUSIC_CreateDirectMusicScriptImpl(REFIID lpcGUID, void **ppobj, IUnknow if (pUnkOuter) return CLASS_E_NOAGGREGATION; - obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicScriptImpl)); - if (!obj) - return E_OUTOFMEMORY; - + if (!(obj = calloc(1, sizeof(*obj)))) return E_OUTOFMEMORY; obj->IDirectMusicScript_iface.lpVtbl = &dmscript_vtbl; obj->ref = 1; dmobject_init(&obj->dmobj, &CLSID_DirectMusicScript, (IUnknown*)&obj->IDirectMusicScript_iface); diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index 92dd6d15ec6..74d45afacbe 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -84,9 +84,7 @@ static ULONG WINAPI script_track_Release(IDirectMusicTrack8 *iface) TRACE("(%p) ref=%ld\n", This, ref); - if (!ref) { - HeapFree(GetProcessHeap(), 0, This); - } + if (!ref) free(This); return ref; } @@ -326,10 +324,7 @@ HRESULT DMUSIC_CreateDirectMusicScriptTrack(REFIID riid, void **ret_iface, IUnkn if (pUnkOuter) return CLASS_E_NOAGGREGATION; - track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*track)); - if (!track) - return E_OUTOFMEMORY; - + if (!(track = calloc(1, sizeof(*track)))) return E_OUTOFMEMORY; track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; track->IPersistStream_iface.lpVtbl = &persist_vtbl; track->desc.dwSize = sizeof(track->desc);

1 0

Rémi Bernon : dmscript: Use PARENTSRC with dmusic.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: d6f049e8a59a606c82a747e896735826eb6052e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/d6f049e8a59a606c82a747e8967358… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 30 19:55:16 2023 +0200 dmscript: Use PARENTSRC with dmusic. --- dlls/dmscript/Makefile.in | 1 + dlls/dmscript/dmobject.c | 732 ---------------------------------------------- dlls/dmscript/dmobject.h | 124 -------- 3 files changed, 1 insertion(+), 856 deletions(-)

1 0

Rémi Bernon : dmime: Use PARENTSRC with dmusic.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: aeea45946abee7bb673c12c24bd6b590dcb98c72 URL: https://gitlab.winehq.org/wine/wine/-/commit/aeea45946abee7bb673c12c24bd6b5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 30 19:56:28 2023 +0200 dmime: Use PARENTSRC with dmusic. --- dlls/dmime/Makefile.in | 1 + dlls/dmime/dmobject.c | 731 ------------------------------------------------- dlls/dmime/dmobject.h | 124 --------- 3 files changed, 1 insertion(+), 855 deletions(-)

1 0

Francois Gouget : testbot: Include the step and task number in the reference file logs.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: tools Branch: master Commit: 13631f0cc172671b60755cb2a6c25226fac69824 URL: https://gitlab.winehq.org/winehq/tools/-/commit/13631f0cc172671b60755cb2a6c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 22 02:05:50 2023 +0200 testbot: Include the step and task number in the reference file logs. While the test report name is unique per job when running the full suite (i.e. 1 win32.log, 1 wow32.log, etc), our reference files now include the task.log files and those are not, neither for full test suite jobs, nor for Wine update ones. So to avoid having collisions in the task.log reference file names, use the full jobid.stepno.taskno in their names. --- testbot/bin/Janitor.pl | 2 +- testbot/bin/UpdateTaskLogs | 6 +++--- testbot/lib/WineTestBot/LogUtils.pm | 4 ++-- testbot/lib/WineTestBot/Tasks.pm | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 169bc3cb..4e4b26f8 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -347,7 +347,7 @@ if (opendir(my $dh, "$DataDir/latest")) my $TTL = $JobPurgeDays ? $JobPurgeDays - $Age : undef; # Keep the regexp in sync with WineTestBot::Task::GetRefReportName() - if ($Entry !~ /^[a-zA-Z0-9_]+-job[0-9]+-[a-zA-Z0-9_]+\.(?:log|report)(?:\.errors)?$/) + if ($Entry !~ /^[a-zA-Z0-9_]+-job[0-9.]+-[a-zA-Z0-9_]+\.(?:log|report)(?:\.errors)?$/) { my $Deletion = defined $TTL ? " (deletion in $TTL days)" : ""; Error "Found a suspicious file$Deletion: latest/$Entry\n"; diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index b2357250..985e1dc0 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -218,7 +218,7 @@ sub DoUpdateLatestReport($$$) my ($Task, $ReportName, $SrcReportPath) = @_; # Keep the name as is when saving an existing reference report - my $SrcIsRef = ($SrcReportPath =~ /-job\d+-/); + my $SrcIsRef = ($SrcReportPath =~ /-job[0-9.]+-/); my $RefReportName = $SrcIsRef ? basename($SrcReportPath) : $Task->GetRefReportName($ReportName); return 0 if ($LatestFiles{$RefReportName}); @@ -504,11 +504,11 @@ sub ProcessLatestReports() } # Then perform cleanups and rebuild missing files - foreach my $LatestReportPath (glob("$LatestGlob $LatestGlob.errors")) + foreach my $LatestReportPath (glob("$LatestGlob.report $LatestGlob.report.errors $LatestGlob.log $LatestGlob.log.errors")) { my $RefReportName = basename($LatestReportPath); # Keep the regexp in sync with WineTestBot::Task::GetRefReportName() - next if ($RefReportName !~ /^([a-zA-Z0-9_]+-job[0-9]+-[a-zA-Z0-9_]+\.report)(?:\.errors)?$/); + next if ($RefReportName !~ /^([a-zA-Z0-9_]+-job[0-9.]+-[a-zA-Z0-9_]+\.report)(?:\.errors)?$/); $RefReportName = $1; # untaint $LatestReportPath = "$DataDir/latest/$RefReportName"; $Rc += Delete("$LatestReportPath.err"); diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index f660274e..ab32fc75 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1745,7 +1745,7 @@ sub _DeduplicateLatestReport($) my ($RefReportName) = @_; my $LatestGlob = $RefReportName; - $LatestGlob =~ s/-job\d+-/-job*-/; + $LatestGlob =~ s/-job[0-9.]+-/-job*-/; my @LatestPaths = glob("$DataDir/latest/$LatestGlob"); return undef if (@LatestPaths <= 1); @@ -1762,7 +1762,7 @@ sub _DeduplicateLatestReport($) my $ErrMessage; my $ReportRE = $RefReportName; - $ReportRE =~ s/^([a-zA-Z0-9_]+)-job\d+-([a-zA-Z0-9_]+)$/\\Q$1\\E-job[0-9]+-\\Q$2/; + $ReportRE =~ s/^([a-zA-Z0-9_]+)-job[0-9.]+-([a-zA-Z0-9_]+)$/\\Q$1\\E-job[0-9.]+-\\Q$2/; foreach my $LogPath (sort { $LatestAges{$a} <=> $LatestAges{$b} } @LatestPaths) { my $LogName = basename($LogPath); diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index b6332d2d..41ac0c58 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -139,7 +139,7 @@ sub GetReportNames($) sub GetRefReportName($$) { my ($self, $ReportName) = @_; - return sprintf("%s-job%06d-%s", $self->VM->Name, $self->JobId, $ReportName); + return sprintf("%s-job%06d.%d.%d-%s", $self->VM->Name, $self->JobId, $self->StepNo, $self->No, $ReportName); } sub GetRefReportPaths($$;$$) @@ -156,7 +156,7 @@ sub GetRefReportPaths($$;$$) my %RefReportPaths; foreach my $RefReportPath (glob($RefGlob)) { - next if ($RefReportPath !~ m~^\Q$Dir\E/(\Q$VMName\E-job[0-9]+-\Q$ReportName\E)$ExtraRE$~); + next if ($RefReportPath !~ m~^\Q$Dir\E/(\Q$VMName\E-job[0-9.]+-\Q$ReportName\E)$ExtraRE$~); my $RefReportName = $1; # untaint next if ($RefReportPaths{$RefReportName}); $RefReportPaths{$RefReportName} = "$Dir/$RefReportName";

1 0

Francois Gouget : testbot/LogUtils: Fix the deduplication reference report regular expression.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: tools Branch: master Commit: 83b26f48a7c3218609db1137e3ba4c32a889b8d0 URL: https://gitlab.winehq.org/winehq/tools/-/commit/83b26f48a7c3218609db1137e3b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 26 19:39:54 2023 +0200 testbot/LogUtils: Fix the deduplication reference report regular expression. Perl does not allow \Q and \E inside RE variables and one of the \E was missing anyway. Also the report names contain a dot. Luckily the VM names cannot contain RE wildcards, and the report names only contain a single dot which should not cause mismatches. --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index ab32fc75..56025688 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1762,7 +1762,7 @@ sub _DeduplicateLatestReport($) my $ErrMessage; my $ReportRE = $RefReportName; - $ReportRE =~ s/^([a-zA-Z0-9_]+)-job[0-9.]+-([a-zA-Z0-9_]+)$/\\Q$1\\E-job[0-9.]+-\\Q$2/; + $ReportRE =~ s/^([a-zA-Z0-9_]+)-job[0-9.]+-([a-zA-Z0-9_.]+)$/$1-job[0-9.]+-$2/; foreach my $LogPath (sort { $LatestAges{$a} <=> $LatestAges{$b} } @LatestPaths) { my $LogName = basename($LogPath);

1 0