wine-commits September 2023

wine-commits@winehq.org

1 participants
920 discussions

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: 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 : 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 : 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: 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 : 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 : dmcompos: Use CRT allocation functions.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: 8a02434cf022f5e3644faee8329337ffe1cedaed URL: https://gitlab.winehq.org/wine/wine/-/commit/8a02434cf022f5e3644faee8329337… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Sep 9 09:19:08 2023 +0200 dmcompos: Use CRT allocation functions. --- dlls/dmcompos/chordmap.c | 33 ++++++++++++++------------------- dlls/dmcompos/chordmaptrack.c | 11 +++-------- dlls/dmcompos/composer.c | 11 +++-------- dlls/dmcompos/dmobject.c | 7 +++---- dlls/dmcompos/signposttrack.c | 11 +++-------- 5 files changed, 26 insertions(+), 47 deletions(-) diff --git a/dlls/dmcompos/chordmap.c b/dlls/dmcompos/chordmap.c index 86134451846..2ddddd3fd57 100644 --- a/dlls/dmcompos/chordmap.c +++ b/dlls/dmcompos/chordmap.c @@ -79,9 +79,7 @@ static ULONG WINAPI IDirectMusicChordMapImpl_Release(IDirectMusicChordMap *iface TRACE("(%p) ref=%ld\n", This, ref); - if (!ref) { - HeapFree(GetProcessHeap(), 0, This); - } + if (!ref) free(This); return ref; } @@ -310,23 +308,20 @@ static const IPersistStreamVtbl persiststream_vtbl = { /* for ClassFactory */ HRESULT create_dmchordmap(REFIID lpcGUID, void **ppobj) { - IDirectMusicChordMapImpl* obj; - HRESULT hr; + IDirectMusicChordMapImpl* obj; + HRESULT hr; - obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicChordMapImpl)); - if (NULL == obj) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - obj->IDirectMusicChordMap_iface.lpVtbl = &dmchordmap_vtbl; - obj->ref = 1; - dmobject_init(&obj->dmobj, &CLSID_DirectMusicChordMap, - (IUnknown *)&obj->IDirectMusicChordMap_iface); - obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl; - obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; + *ppobj = NULL; + if (!(obj = calloc(1, sizeof(*obj)))) return E_OUTOFMEMORY; + obj->IDirectMusicChordMap_iface.lpVtbl = &dmchordmap_vtbl; + obj->ref = 1; + dmobject_init(&obj->dmobj, &CLSID_DirectMusicChordMap, + (IUnknown *)&obj->IDirectMusicChordMap_iface); + obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl; + obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - hr = IDirectMusicChordMap_QueryInterface(&obj->IDirectMusicChordMap_iface, lpcGUID, ppobj); - IDirectMusicChordMap_Release(&obj->IDirectMusicChordMap_iface); + hr = IDirectMusicChordMap_QueryInterface(&obj->IDirectMusicChordMap_iface, lpcGUID, ppobj); + IDirectMusicChordMap_Release(&obj->IDirectMusicChordMap_iface); - return hr; + return hr; } diff --git a/dlls/dmcompos/chordmaptrack.c b/dlls/dmcompos/chordmaptrack.c index 35c64aab4a6..36079ef177a 100644 --- a/dlls/dmcompos/chordmaptrack.c +++ b/dlls/dmcompos/chordmaptrack.c @@ -77,9 +77,7 @@ static ULONG WINAPI chordmap_track_Release(IDirectMusicTrack8 *iface) TRACE("(%p) ref=%ld\n", This, ref); - if (!ref) { - HeapFree(GetProcessHeap(), 0, This); - } + if (!ref) free(This); return ref; } @@ -289,11 +287,8 @@ HRESULT create_dmchordmaptrack(REFIID lpcGUID, void **ppobj) IDirectMusicChordMapTrack* track; HRESULT hr; - track = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*track)); - if (!track) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } + *ppobj = NULL; + if (!(track = calloc(1, sizeof(*track)))) return E_OUTOFMEMORY; track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; track->ref = 1; dmobject_init(&track->dmobj, &CLSID_DirectMusicChordMapTrack, diff --git a/dlls/dmcompos/composer.c b/dlls/dmcompos/composer.c index 47e12358201..3451f2d4203 100644 --- a/dlls/dmcompos/composer.c +++ b/dlls/dmcompos/composer.c @@ -67,9 +67,7 @@ static ULONG WINAPI IDirectMusicComposerImpl_Release(IDirectMusicComposer *iface TRACE("(%p) ref=%ld\n", This, ref); - if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This); - } + if (!ref) free(This); return ref; } @@ -174,11 +172,8 @@ HRESULT create_dmcomposer(REFIID riid, void **ret_iface) IDirectMusicComposerImpl *obj; HRESULT hr; - obj = HeapAlloc(GetProcessHeap(), 0, sizeof(*obj)); - if (!obj) { - *ret_iface = NULL; - return E_OUTOFMEMORY; - } + *ret_iface = NULL; + if (!(obj = calloc(1, sizeof(*obj)))) return E_OUTOFMEMORY; obj->IDirectMusicComposer_iface.lpVtbl = &dmcomposer_vtbl; obj->ref = 1; diff --git a/dlls/dmcompos/dmobject.c b/dlls/dmcompos/dmobject.c index b526b23d031..07d887a376c 100644 --- a/dlls/dmcompos/dmobject.c +++ b/dlls/dmcompos/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/dmcompos/signposttrack.c b/dlls/dmcompos/signposttrack.c index 23ed67acebe..eccf87a4893 100644 --- a/dlls/dmcompos/signposttrack.c +++ b/dlls/dmcompos/signposttrack.c @@ -77,9 +77,7 @@ static ULONG WINAPI signpost_track_Release(IDirectMusicTrack8 *iface) TRACE("(%p) ref=%ld\n", This, ref); - if (!ref) { - HeapFree(GetProcessHeap(), 0, This); - } + if (!ref) free(This); return ref; } @@ -277,11 +275,8 @@ HRESULT create_dmsignposttrack(REFIID lpcGUID, void **ppobj) IDirectMusicSignPostTrack *track; HRESULT hr; - track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*track)); - if (!track) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } + *ppobj = NULL; + if (!(track = calloc(1, sizeof(*track)))) return E_OUTOFMEMORY; track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; track->ref = 1; dmobject_init(&track->dmobj, &CLSID_DirectMusicSignPostTrack,

1 0

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

14 Sep '23

Module: wine Branch: master Commit: 7d94983c735b9fd960ac6ad9d1618f1183f5d703 URL: https://gitlab.winehq.org/wine/wine/-/commit/7d94983c735b9fd960ac6ad9d1618f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 22 17:38:20 2023 +0200 dmcompos: Always return S_FALSE from DllCanUnloadNow. --- dlls/dmcompos/chordmap.c | 2 -- dlls/dmcompos/chordmaptrack.c | 2 -- dlls/dmcompos/composer.c | 2 -- dlls/dmcompos/dmcompos_main.c | 21 --------------------- dlls/dmcompos/dmcompos_private.h | 7 ------- dlls/dmcompos/signposttrack.c | 2 -- 6 files changed, 36 deletions(-) diff --git a/dlls/dmcompos/chordmap.c b/dlls/dmcompos/chordmap.c index adc17402f39..86134451846 100644 --- a/dlls/dmcompos/chordmap.c +++ b/dlls/dmcompos/chordmap.c @@ -81,7 +81,6 @@ static ULONG WINAPI IDirectMusicChordMapImpl_Release(IDirectMusicChordMap *iface if (!ref) { HeapFree(GetProcessHeap(), 0, This); - DMCOMPOS_UnlockModule(); } return ref; @@ -326,7 +325,6 @@ HRESULT create_dmchordmap(REFIID lpcGUID, void **ppobj) obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl; obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - DMCOMPOS_LockModule(); hr = IDirectMusicChordMap_QueryInterface(&obj->IDirectMusicChordMap_iface, lpcGUID, ppobj); IDirectMusicChordMap_Release(&obj->IDirectMusicChordMap_iface); diff --git a/dlls/dmcompos/chordmaptrack.c b/dlls/dmcompos/chordmaptrack.c index 66517340d70..35c64aab4a6 100644 --- a/dlls/dmcompos/chordmaptrack.c +++ b/dlls/dmcompos/chordmaptrack.c @@ -79,7 +79,6 @@ static ULONG WINAPI chordmap_track_Release(IDirectMusicTrack8 *iface) if (!ref) { HeapFree(GetProcessHeap(), 0, This); - DMCOMPOS_UnlockModule(); } return ref; @@ -301,7 +300,6 @@ HRESULT create_dmchordmaptrack(REFIID lpcGUID, void **ppobj) (IUnknown *)&track->IDirectMusicTrack8_iface); track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - DMCOMPOS_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface); diff --git a/dlls/dmcompos/composer.c b/dlls/dmcompos/composer.c index a2a58396ee5..47e12358201 100644 --- a/dlls/dmcompos/composer.c +++ b/dlls/dmcompos/composer.c @@ -69,7 +69,6 @@ static ULONG WINAPI IDirectMusicComposerImpl_Release(IDirectMusicComposer *iface if (ref == 0) { HeapFree(GetProcessHeap(), 0, This); - DMCOMPOS_UnlockModule(); } return ref; @@ -183,7 +182,6 @@ HRESULT create_dmcomposer(REFIID riid, void **ret_iface) obj->IDirectMusicComposer_iface.lpVtbl = &dmcomposer_vtbl; obj->ref = 1; - DMCOMPOS_LockModule(); hr = IDirectMusicComposer_QueryInterface(&obj->IDirectMusicComposer_iface, riid, ret_iface); IDirectMusicComposer_Release(&obj->IDirectMusicComposer_iface); diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index dff77aa4d32..f7b5755683e 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -38,8 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmcompos); -LONG DMCOMPOS_refCount = 0; - typedef struct { IClassFactory IClassFactory_iface; HRESULT (*fnCreateInstance)(REFIID riid, void **ret_iface); @@ -82,15 +80,11 @@ static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID r static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) { - DMCOMPOS_LockModule(); - return 2; /* non-heap based object */ } static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) { - DMCOMPOS_UnlockModule(); - return 1; /* non-heap based object */ } @@ -112,12 +106,6 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) { TRACE("(%d)\n", dolock); - - if (dolock) - DMCOMPOS_LockModule(); - else - DMCOMPOS_UnlockModule(); - return S_OK; } @@ -135,15 +123,6 @@ static IClassFactoryImpl ChordMapTrack_CF = {{&classfactory_vtbl}, create_dmchor static IClassFactoryImpl Template_CF = {{&classfactory_vtbl}, create_direct_music_template}; static IClassFactoryImpl SignPostTrack_CF = {{&classfactory_vtbl}, create_dmsignposttrack}; -/****************************************************************** - * DllCanUnloadNow (DMCOMPOS.@) - * - * - */ -HRESULT WINAPI DllCanUnloadNow(void) { - return DMCOMPOS_refCount != 0 ? S_FALSE : S_OK; -} - /****************************************************************** * DllGetClassObject (DMCOMPOS.@) diff --git a/dlls/dmcompos/dmcompos_private.h b/dlls/dmcompos/dmcompos_private.h index c04d7da6060..928b5a5a993 100644 --- a/dlls/dmcompos/dmcompos_private.h +++ b/dlls/dmcompos/dmcompos_private.h @@ -49,11 +49,4 @@ extern HRESULT create_dmcomposer(REFIID riid, void **ret_iface); extern HRESULT create_dmchordmaptrack(REFIID riid, void **ret_iface); extern HRESULT create_dmsignposttrack(REFIID riid, void **ret_iface); -/********************************************************************** - * Dll lifetime tracking declaration for dmcompos.dll - */ -extern LONG DMCOMPOS_refCount; -static inline void DMCOMPOS_LockModule(void) { InterlockedIncrement( &DMCOMPOS_refCount ); } -static inline void DMCOMPOS_UnlockModule(void) { InterlockedDecrement( &DMCOMPOS_refCount ); } - #endif /* __WINE_DMCOMPOS_PRIVATE_H */ diff --git a/dlls/dmcompos/signposttrack.c b/dlls/dmcompos/signposttrack.c index 249f37b7711..23ed67acebe 100644 --- a/dlls/dmcompos/signposttrack.c +++ b/dlls/dmcompos/signposttrack.c @@ -79,7 +79,6 @@ static ULONG WINAPI signpost_track_Release(IDirectMusicTrack8 *iface) if (!ref) { HeapFree(GetProcessHeap(), 0, This); - DMCOMPOS_UnlockModule(); } return ref; @@ -289,7 +288,6 @@ HRESULT create_dmsignposttrack(REFIID lpcGUID, void **ppobj) (IUnknown *)&track->IDirectMusicTrack8_iface); track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - DMCOMPOS_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface);

1 0

Francois Gouget : testbot: Keep reference copies of the Wine test task.log files.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: tools Branch: master Commit: 78cbe16aa7c0166bf21e0b7d1a8a5fee11f50b6c URL: https://gitlab.winehq.org/winehq/tools/-/commit/78cbe16aa7c0166bf21e0b7d1a8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 26 16:47:05 2023 +0200 testbot: Keep reference copies of the Wine test task.log files. They can contain warnings and errors too so the TestBot should keep reference files too to detect new entries. --- testbot/bin/UpdateTaskLogs | 15 ++++++++++----- testbot/bin/WineRunWineTest.pl | 2 +- testbot/lib/WineTestBot/LogUtils.pm | 23 +++++++++++++++++------ 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index 985e1dc0..eef3e522 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -355,7 +355,7 @@ sub ProcessTaskLogs($$$$) { # Save / delete the task's reference reports... all of them, # even if they were not supposed to exist (e.g. failed builds). - foreach my $ReportName (@$ReportNames) + foreach my $ReportName (@$ReportNames, "task.log") { # Also match the files related/derived from the report for the cleanup my $RefReportPaths = $Task->GetRefReportPaths($ReportName, "(?:\.err|\.errors)?"); @@ -402,6 +402,10 @@ sub ProcessTaskLogs($$$$) # Take a snapshot of the reference reports older than this Task foreach my $ReportName (@{GetLogFileNames($TaskDir)}) { + next if ($ReportName eq "testbot.log"); + # For Wine test tasks, only snapshot the task.log reference files that + # match a xxx.report report. + next if ($ReportName eq "task.log" and $Step->Type !~ /^(?:build|reconfig)$/); Debug(TaskKeyStr($Task) .": Snapshotting the reference reports for $ReportName\n"); my $ErrMessages = SnapshotLatestReport($Task, $ReportName); foreach my $ErrMessage (@$ErrMessages) @@ -467,7 +471,8 @@ sub ProcessTaskLogs($$$$) { foreach my $ReportName (@{GetLogFileNames($TaskDir)}) { - next if ($Step->Type eq "suite" and $ReportName !~ /\.report$/); + next if ($ReportName eq "testbot.log"); + next if ($ReportName eq "task.log" and $Task->VM->Type =~ /^win(?:32|64)$/); next if ($Step->Type eq "reconfig" and $ReportName !~ /\.log$/); next if (-z "$TaskDir/$ReportName"); $Rc += DoUpdateLatestReport($Task, $ReportName, "$TaskDir/$ReportName"); @@ -481,10 +486,10 @@ sub ProcessTaskLogs($$$$) sub ProcessLatestReports() { my $Rc = 0; - my $LatestGlob = "$DataDir/latest/*.report"; + my $LatestGlob = "$DataDir/latest/*"; # Delete or rename the old reference reports - foreach my $LatestReportPath (glob("$LatestGlob $LatestGlob.err")) + foreach my $LatestReportPath (glob("$LatestGlob.report $LatestGlob.report.err")) { my $RefReportName = basename($LatestReportPath); next if ($RefReportName !~ /^([a-zA-Z0-9_]+_[a-zA-Z0-9_]+\.report)(?:\.err)?$/); @@ -508,7 +513,7 @@ sub ProcessLatestReports() { 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_]+\.(?:log|report))(?:\.errors)?$/); $RefReportName = $1; # untaint $LatestReportPath = "$DataDir/latest/$RefReportName"; $Rc += Delete("$LatestReportPath.err"); diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index d685f819..002e7f3b 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -301,7 +301,7 @@ sub WrapUpAndExit($;$$$$$$$$) # case of a timeout. if ($Step->Type eq 'suite' and $Status eq 'completed' and !$TimedOut) { - my $ErrMessages = UpdateLatestReports($Task, @$ReportNames); + my $ErrMessages = UpdateLatestReports($Task, [@$ReportNames, "task.log"]); Error("$_\n") for (@$ErrMessages); } diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 8ea2dd50..40cf2c1e 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1674,8 +1674,8 @@ sub CreateLogErrorsCache($;$) Takes a snapshot of the reference WineTest results for the specified Task. -The reference reports are used to identify new failures, even long after the task has -been run. +The reference reports are used to identify new failures, even long after the +task has been run. Note also that comparing reports in this way may be a bit inaccurate right after a Wine commit due to delays in getting new WineTest results, etc. @@ -1699,12 +1699,23 @@ sub SnapshotLatestReport($$) # Ignore reference results more recent than the report next if ($ReportAge and -M $RefReportPath <= $ReportAge); - foreach my $Suffix ("", ".errors") + my @RefNames = ($RefReportName, "$RefReportName.errors"); + if ($ReportName ne "task.log") { - unlink "$TaskDir/$RefReportName$Suffix"; - if (!link("$RefReportPath$Suffix", "$TaskDir/$RefReportName$Suffix")) + # For non-build tasks, also snapshot the corresponding task.log file + my $TaskLog = $RefReportName; + $TaskLog =~ s/-$ReportName$/-task.log/; + if (-f "$DataDir/latest/$TaskLog") { - push @ErrMessages, "Could not create the '$RefReportName$Suffix' link: $!"; + push @RefNames, $TaskLog, "$TaskLog.errors"; + } + } + foreach my $RefName (@RefNames) + { + unlink "$TaskDir/$RefName"; + if (!link("$DataDir/latest/$RefName", "$TaskDir/$RefName")) + { + push @ErrMessages, "Could not create the '$RefName' link: $!"; } } }

1 0

Francois Gouget : testbot: Snapshot the reference reports early.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: tools Branch: master Commit: 856148104c40f153dcc91435b02a84c05b918f77 URL: https://gitlab.winehq.org/winehq/tools/-/commit/856148104c40f153dcc91435b02… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jun 25 12:02:58 2023 +0200 testbot: Snapshot the reference reports early. Only WineRunWineTest.pl really needs it so the task.log reference reports are available early enough. But apply the change to all 4 scripts for consistency. --- testbot/bin/WineRunBuild.pl | 12 ++++++++---- testbot/bin/WineRunReconfig.pl | 12 ++++++++---- testbot/bin/WineRunTask.pl | 11 ++++++++--- testbot/bin/WineRunWineTest.pl | 21 ++++++++++++++------- 4 files changed, 38 insertions(+), 18 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 64fe45ec..979470a1 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -388,6 +388,14 @@ if (!$Pid) } +# +# Snapshot the reference reports +# + +my $ErrMessages = SnapshotLatestReport($Task, "task.log"); +LogTaskError("$_\n") for (@$ErrMessages); + + # # From that point on we want to at least try to grab the build # log before giving up @@ -425,10 +433,6 @@ if ($TA->GetFile("Build.log", "$TaskDir/task.log")) $TAError = $ErrMessage = undef; # ...but keep keep the task.log ones $TaskFailures = $LogInfo->{eCount}; - - # Grab a copy of the reference report - my $ErrMessages = SnapshotLatestReport($Task, "task.log"); - LogTaskError("$_\n") for (@$ErrMessages); } elsif ($LogInfo->{Task} eq "badpatch") { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 5d58411b..73d16f3a 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -396,6 +396,14 @@ if (!$Pid) } +# +# Snapshot the reference reports +# + +my $ErrMessages = SnapshotLatestReport($Task, "task.log"); +LogTaskError("$_\n") for (@$ErrMessages); + + # # From that point on we want to at least try to grab the build # log before giving up @@ -435,10 +443,6 @@ if ($TA->GetFile("Reconfig.log", "$TaskDir/task.log")) $TAError = $ErrMessage = undef; # ...but keep keep the task.log ones $TaskFailures = $LogInfo->{eCount}; - - # Grab a copy of the reference report - my $ErrMessages = SnapshotLatestReport($Task, "task.log"); - LogTaskError("$_\n") for (@$ErrMessages); } elsif (defined $LogInfo->{BadLog}) { diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 3b514fb1..e48c73b4 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -515,6 +515,14 @@ if (!$Pid) } +# +# Snapshot the reference reports +# + +my $ErrMessages = SnapshotLatestReport($Task, $RptFileName); +LogTaskError("$_\n") for (@$ErrMessages); + + # # From that point on we want to at least try to grab the test # log and a screenshot before giving up @@ -569,9 +577,6 @@ if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName")) } else { - # Grab a copy of the reference report - my $ErrMessages = SnapshotLatestReport($Task, $RptFileName); - LogTaskError("$_\n") for (@$ErrMessages); my $LogErrMsg = CreateLogErrorsCache($LogInfo, $Task); LogTaskError("$LogErrMsg\n") if (defined $LogErrMsg); diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index ad869a96..d685f819 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -301,7 +301,7 @@ sub WrapUpAndExit($;$$$$$$$$) # case of a timeout. if ($Step->Type eq 'suite' and $Status eq 'completed' and !$TimedOut) { - my $ErrMessages = UpdateLatestReports($Task, $ReportNames); + my $ErrMessages = UpdateLatestReports($Task, @$ReportNames); Error("$_\n") for (@$ErrMessages); } @@ -486,6 +486,18 @@ if (!$Pid) } +# +# Snapshot the reference reports +# + +foreach my $ReportName (@$ReportNames) +{ + Debug(Elapsed($Start), " Snapshotting '$ReportName'\n"); + my $ErrMessages = SnapshotLatestReport($Task, $ReportName); + LogTaskError("$_\n") for (@$ErrMessages); +} + + # # From that point on we want to at least try to grab the task log # and a screenshot before giving up @@ -528,10 +540,7 @@ if ($TA->GetFile("Task.log", "$TaskDir/task.log")) $TAError = $ErrMessage = $PossibleCrash = undef; # Reset the timeout error but keep the task.log ones $TaskFailures = $LogInfo->{eCount}; - - # Grab a copy of the reference report - my $ErrMessages = SnapshotLatestReport($Task, "task.log"); - LogTaskError("$_\n") for (@$ErrMessages); + # The reference task.log files will be grabbed along with matching reports. } elsif ($LogInfo->{Task} eq "badpatch") { @@ -602,8 +611,6 @@ foreach my $RptFileName (@$ReportNames) else { # Grab a copy of the reference report - my $ErrMessages = SnapshotLatestReport($Task, $RptFileName); - LogTaskError("$_\n") for (@$ErrMessages); my $LogErrMsg = CreateLogErrorsCache($LogInfo, $Task); LogTaskError("$LogErrMsg\n") if (defined $LogErrMsg);

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
92
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2023