July 2017 - Wine-commits - list.winehq.org

Fabian Maurer : gdiplus: Avoid division by zero in SOFTWARE_GdipDrawThinPath.
by Alexandre Julliard 25 Jul '17

25 Jul '17

Module: wine Branch: master Commit: 400cfb0fd9d0f25316b680882fce938d2f0724b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=400cfb0fd9d0f25316b680882… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Jul 25 00:50:09 2017 +0200 gdiplus: Avoid division by zero in SOFTWARE_GdipDrawThinPath. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c5c66a9..43cd6ac 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3615,6 +3615,9 @@ static GpStatus SOFTWARE_GdipDrawThinPath(GpGraphics *graphics, GpPen *pen, GpPa end_pointi.X = floorf(end_point.X); end_pointi.Y = floorf(end_point.Y); + if(start_pointi.X == end_pointi.X && start_pointi.Y == end_pointi.Y) + continue; + /* draw line segment */ if (abs(start_pointi.Y - end_pointi.Y) > abs(start_pointi.X - end_pointi.X)) {

1 0

Michael Stefaniuc : dmloader: Handle NULL and empty path strings in SetSearchDirectory().
by Alexandre Julliard 25 Jul '17

25 Jul '17

Module: wine Branch: master Commit: 2e3a8a6fb8e0dfc58f84f1f10445387f9153f44a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e3a8a6fb8e0dfc58f84f1f10… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jul 25 20:57:18 2017 +0200 dmloader: Handle NULL and empty path strings in SetSearchDirectory(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/loader.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index aa5dfed..6d58d43 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -522,9 +522,14 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetSearchDirectory(IDirectMusicLoad TRACE("(%p, %s, %s, %d)\n", This, debugstr_dmguid(class), debugstr_w(path), clear); - attr = GetFileAttributesW(path); - if (attr == INVALID_FILE_ATTRIBUTES || !(attr & FILE_ATTRIBUTE_DIRECTORY)) - return DMUS_E_LOADER_BADPATH; + if (!path) + return E_POINTER; + + if (path[0]) { + attr = GetFileAttributesW(path); + if (attr == INVALID_FILE_ATTRIBUTES || !(attr & FILE_ATTRIBUTE_DIRECTORY)) + return DMUS_E_LOADER_BADPATH; + } if (clear) FIXME("clear flag ignored\n");

1 0

Michael Stefaniuc : dmloader/tests: Add more SetSearchDirectory() tests.
by Alexandre Julliard 25 Jul '17

25 Jul '17

Module: wine Branch: master Commit: d60aead138869d14ae2a72750df33bc9620cfb9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d60aead138869d14ae2a72750… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jul 25 20:57:19 2017 +0200 dmloader/tests: Add more SetSearchDirectory() tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/tests/loader.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index b24b2e2..136b054 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -49,6 +49,7 @@ static void test_directory(void) HRESULT hr; WCHAR con[] = {'c', 'o', 'n', 0}; WCHAR path[MAX_PATH]; + WCHAR empty[] = {0}; WCHAR invalid_path[] = {'/', 'i', 'n', 'v', 'a', 'l', 'i', 'd', ' ', 'p', 'a', 't', 'h', 0}; hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC, &IID_IDirectMusicLoader8, @@ -60,9 +61,16 @@ static void test_directory(void) ok(hr == S_FALSE, "ScanDirectory for \"con\" files failed with %#x\n", hr); /* SetSearchDirectory with invalid path */ + hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, NULL, 0); + ok(hr == E_POINTER, "SetSearchDirectory failed with %#x\n", hr); hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, invalid_path, 0); ok(hr == DMUS_E_LOADER_BADPATH, "SetSearchDirectory failed with %#x\n", hr); + /* SetSearchDirectory with the current directory */ + GetCurrentDirectoryW(ARRAY_SIZE(path), path); + hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, path, 0); + ok(hr == S_OK, "SetSearchDirectory failed with %#x\n", hr); + /* Two consecutive SetSearchDirectory with the same path */ GetTempPathW(ARRAY_SIZE(path), path); hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, path, 0); @@ -74,11 +82,29 @@ static void test_directory(void) hr = IDirectMusicLoader_SetSearchDirectory(loader, &CLSID_DirectSoundWave, path, 0); ok(hr == S_FALSE, "Second SetSearchDirectory failed with %#x\n", hr); + /* Invalid GUIDs */ + if (0) + IDirectMusicLoader_SetSearchDirectory(loader, NULL, path, 0); /* Crashes on Windows */ + hr = IDirectMusicLoader_SetSearchDirectory(loader, &IID_IDirectMusicLoader8, path, 0); + todo_wine ok(hr == S_OK, "SetSearchDirectory failed with %#x\n", hr); + /* NULL extension is not an error */ hr = IDirectMusicLoader_ScanDirectory(loader, &CLSID_DirectSoundWave, NULL, NULL); ok(hr == S_FALSE, "ScanDirectory for \"wav\" files failed, received %#x\n", hr); IDirectMusicLoader_Release(loader); + + /* An empty path is a valid path */ + hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC, &IID_IDirectMusicLoader8, + (void**)&loader); + ok(hr == S_OK, "Couldn't create Loader %#x\n", hr); + hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, empty, 0); + todo_wine ok(hr == S_OK, "SetSearchDirectory failed with %#x\n", hr); + hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, empty, 0); + ok(hr == S_FALSE, "SetSearchDirectory failed with %#x\n", hr); + hr = IDirectMusicLoader_ScanDirectory(loader, &CLSID_DirectMusicContainer, con, NULL); + ok(hr == S_FALSE, "ScanDirectory for \"con\" files failed with %#x\n", hr); + IDirectMusicLoader_Release(loader); } static void test_release_object(void)

1 0

Michael Stefaniuc : dmloader/tests: Add some EnableCache() tests.
by Alexandre Julliard 25 Jul '17

25 Jul '17

Module: wine Branch: master Commit: 693b40f7dcf2d14a8d4ef18762ebce241a8687ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=693b40f7dcf2d14a8d4ef1876… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jul 25 20:57:20 2017 +0200 dmloader/tests: Add some EnableCache() tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/tests/loader.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index 136b054..74d8e3c 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -107,6 +107,40 @@ static void test_directory(void) IDirectMusicLoader_Release(loader); } +static void test_caching(void) +{ + IDirectMusicLoader8 *loader = NULL; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC, &IID_IDirectMusicLoader8, + (void**)&loader); + ok(hr == S_OK, "Couldn't create Loader %#x\n", hr); + + /* Invalid GUID */ + if (0) /* Crashes on Windows */ + IDirectMusicLoader_EnableCache(loader, NULL, TRUE); + hr = IDirectMusicLoader_EnableCache(loader, &IID_IDirectMusicLoader8, TRUE); + ok(hr == S_FALSE, "EnableCache failed with %#x\n", hr); + + /* Caching is enabled by default */ + hr = IDirectMusicLoader_EnableCache(loader, &CLSID_DirectMusicContainer, TRUE); + ok(hr == S_FALSE, "EnableCache failed with %#x\n", hr); + hr = IDirectMusicLoader_EnableCache(loader, &GUID_DirectMusicAllTypes, TRUE); + todo_wine ok(hr == S_FALSE, "EnableCache failed with %#x\n", hr); + + /* Disabling/enabling the cache for all types */ + hr = IDirectMusicLoader_EnableCache(loader, &GUID_DirectMusicAllTypes, FALSE); + ok(hr == S_OK, "EnableCache failed with %#x\n", hr); + hr = IDirectMusicLoader_EnableCache(loader, &CLSID_DirectMusicContainer, FALSE); + ok(hr == S_FALSE, "EnableCache failed with %#x\n", hr); + hr = IDirectMusicLoader_EnableCache(loader, &GUID_DirectMusicAllTypes, TRUE); + ok(hr == S_OK, "EnableCache failed with %#x\n", hr); + hr = IDirectMusicLoader_EnableCache(loader, &CLSID_DirectMusicContainer, TRUE); + ok(hr == S_FALSE, "EnableCache failed with %#x\n", hr); + + IDirectMusicLoader_Release(loader); +} + static void test_release_object(void) { HRESULT hr; @@ -362,6 +396,7 @@ START_TEST(loader) return; } test_directory(); + test_caching(); test_release_object(); test_simple_playing(); test_COM();

1 0

Michael Stefaniuc : dmloader: Use a bitfield to store the per class cache enable info.
by Alexandre Julliard 25 Jul '17

25 Jul '17

Module: wine Branch: master Commit: 8b9812666606a8a93a5ac7ee714e81f8d8475555 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b9812666606a8a93a5ac7ee7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jul 25 20:57:21 2017 +0200 dmloader: Use a bitfield to store the per class cache enable info. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/dmloader_private.h | 3 +- dlls/dmloader/loader.c | 122 ++++++++++++++++++++++++--------------- dlls/dmloader/tests/loader.c | 12 ++-- 3 files changed, 84 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8b9812666606a8a93a5ac…

1 0

Michael Stefaniuc : dmloader: Move struct definitions to the files they are used in.
by Alexandre Julliard 25 Jul '17

25 Jul '17

Module: wine Branch: master Commit: a8900c9bbbde0132c7f6b2282992974774757c5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8900c9bbbde0132c7f6b2282… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jul 25 20:57:22 2017 +0200 dmloader: Move struct definitions to the files they are used in. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/container.c | 15 ++++++++++++++ dlls/dmloader/dmloader_private.h | 42 ---------------------------------------- dlls/dmloader/loader.c | 19 ++++++++++++++++++ 3 files changed, 34 insertions(+), 42 deletions(-) diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c index ab43c6b..c14a5bd 100644 --- a/dlls/dmloader/container.c +++ b/dlls/dmloader/container.c @@ -28,6 +28,21 @@ WINE_DECLARE_DEBUG_CHANNEL(dmdump); #define DMUS_MAX_NAME_SIZE DMUS_MAX_NAME*sizeof(WCHAR) #define DMUS_MAX_FILENAME_SIZE DMUS_MAX_FILENAME*sizeof(WCHAR) +typedef struct riff_chunk { + FOURCC fccID; + DWORD dwSize; +} WINE_CHUNK; + +/* contained object entry */ +typedef struct container_entry { + struct list entry; + DMUS_OBJECTDESC Desc; + BOOL bIsRIFF; + DWORD dwFlags; /* DMUS_CONTAINED_OBJF_KEEP: keep object in loader's cache, even when container is released */ + WCHAR *wszAlias; + IDirectMusicObject *pObject; /* needed when releasing from loader's cache on container release */ +} WINE_CONTAINER_ENTRY, *LPWINE_CONTAINER_ENTRY; + /***************************************************************************** * IDirectMusicContainerImpl implementation */ diff --git a/dlls/dmloader/dmloader_private.h b/dlls/dmloader/dmloader_private.h index 5e1044d..a3922a8 100644 --- a/dlls/dmloader/dmloader_private.h +++ b/dlls/dmloader/dmloader_private.h @@ -56,8 +56,6 @@ static inline void unlock_module(void) { InterlockedDecrement( &module_ref ); } typedef struct IDirectMusicLoaderCF IDirectMusicLoaderCF; typedef struct IDirectMusicContainerCF IDirectMusicContainerCF; -typedef struct IDirectMusicLoaderImpl IDirectMusicLoaderImpl; - typedef struct IDirectMusicLoaderFileStream IDirectMusicLoaderFileStream; typedef struct IDirectMusicLoaderResourceStream IDirectMusicLoaderResourceStream; typedef struct IDirectMusicLoaderGenericStream IDirectMusicLoaderGenericStream; @@ -71,14 +69,6 @@ extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderFileStream (LPVOID *ppobj) D extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderResourceStream (LPVOID *ppobj) DECLSPEC_HIDDEN; extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderGenericStream (LPVOID *ppobj) DECLSPEC_HIDDEN; -/* cache/alias entry */ -typedef struct _WINE_LOADER_ENTRY { - struct list entry; /* for listing elements */ - DMUS_OBJECTDESC Desc; - LPDIRECTMUSICOBJECT pObject; /* pointer to object */ - BOOL bInvalidDefaultDLS; /* my workaround for enabling caching of "faulty" default dls collection */ -} WINE_LOADER_ENTRY, *LPWINE_LOADER_ENTRY; - /* cache options, search paths for specific types of objects */ typedef struct _WINE_LOADER_OPTION { struct list entry; /* for listing elements */ @@ -87,29 +77,6 @@ typedef struct _WINE_LOADER_OPTION { } WINE_LOADER_OPTION, *LPWINE_LOADER_OPTION; /***************************************************************************** - * IDirectMusicLoaderImpl implementation structure - */ -struct IDirectMusicLoaderImpl { - IDirectMusicLoader8 IDirectMusicLoader8_iface; - LONG ref; - unsigned int cache_class; - /* simple cache (linked list) */ - struct list *pObjects; - /* settings for certain object classes */ - struct list *pClassSettings; -}; - -/* contained object entry */ -typedef struct _WINE_CONTAINER_ENTRY { - struct list entry; /* for listing elements */ - DMUS_OBJECTDESC Desc; - BOOL bIsRIFF; - DWORD dwFlags; /* DMUS_CONTAINED_OBJF_KEEP: keep object in loader's cache, even when container is released */ - WCHAR* wszAlias; - LPDIRECTMUSICOBJECT pObject; /* needed when releasing from loader's cache on container release */ -} WINE_CONTAINER_ENTRY, *LPWINE_CONTAINER_ENTRY; - -/***************************************************************************** * IDirectMusicLoaderFileStream implementation structure */ struct IDirectMusicLoaderFileStream { @@ -167,15 +134,6 @@ struct IDirectMusicLoaderGenericStream { /* Custom: */ extern HRESULT WINAPI IDirectMusicLoaderGenericStream_Attach (LPSTREAM iface, LPSTREAM pStream, LPDIRECTMUSICLOADER8 pLoader) DECLSPEC_HIDDEN; -/***************************************************************************** - * Misc. - */ -/* for simpler reading */ -typedef struct _WINE_CHUNK { - FOURCC fccID; /* FOURCC ID of the chunk */ - DWORD dwSize; /* size of the chunk */ -} WINE_CHUNK, *LPWINE_CHUNK; - #include "debug.h" #endif /* __WINE_DMLOADER_PRIVATE_H */ diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 005fd77..0f4753b 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -37,6 +37,25 @@ static const GUID *classes[] = { &CLSID_DirectSoundWave }; +/* cache/alias entry */ +typedef struct cache_entry { + struct list entry; + DMUS_OBJECTDESC Desc; + IDirectMusicObject *pObject; + BOOL bInvalidDefaultDLS; /* workaround for enabling caching of "faulty" default dls collection */ +} WINE_LOADER_ENTRY, *LPWINE_LOADER_ENTRY; + +typedef struct IDirectMusicLoaderImpl { + IDirectMusicLoader8 IDirectMusicLoader8_iface; + LONG ref; + unsigned int cache_class; + /* simple cache */ + struct list *pObjects; + /* settings for certain object classes */ + struct list *pClassSettings; +} IDirectMusicLoaderImpl; + + static inline IDirectMusicLoaderImpl* impl_from_IDirectMusicLoader8(IDirectMusicLoader8 *iface) { return CONTAINING_RECORD(iface, IDirectMusicLoaderImpl, IDirectMusicLoader8_iface);

1 0

Michael Stefaniuc : dmloader: Simplify the search path handling.
by Alexandre Julliard 25 Jul '17

25 Jul '17

Module: wine Branch: master Commit: fd4cdf5df4d3e31602a1127963b5e44e088eee2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd4cdf5df4d3e31602a112796… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jul 25 20:57:23 2017 +0200 dmloader: Simplify the search path handling. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/dmloader_private.h | 7 --- dlls/dmloader/loader.c | 113 ++++++++++++--------------------------- dlls/dmloader/tests/loader.c | 6 +-- 3 files changed, 36 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fd4cdf5df4d3e31602a11…

1 0

Michael Stefaniuc : dmloader: Remove some commented out debugging code.
by Alexandre Julliard 25 Jul '17

25 Jul '17

Module: wine Branch: master Commit: c2aa725356065f7a4860b654fe7cfa3efd302cfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2aa725356065f7a4860b654f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jul 25 20:57:24 2017 +0200 dmloader: Remove some commented out debugging code. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/loader.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 581b781..52c2524 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -421,17 +421,6 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_GetObject(IDirectMusicLoader8 *ifac TRACE(": filled in cache entry\n"); } else TRACE(": caching disabled\n"); -#if 0 - /* for debug purposes (e.g. to check if all files are cached) */ - TRACE("*** Loader's cache ***\n"); - int i = 0; - LIST_FOR_EACH (pEntry, This->pObjects) { - i++; - pObjectEntry = LIST_ENTRY(pEntry, WINE_LOADER_ENTRY, entry); - TRACE(": entry nr. %i:\n%s\n - bInvalidDefaultDLS = %i\n - pObject = %p\n", i, debugstr_DMUS_OBJECTDESC(&pObjectEntry->Desc), pObjectEntry->bInvalidDefaultDLS, pObjectEntry->pObject); - } -#endif - result = IDirectMusicObject_QueryInterface (pObject, riid, ppv); if (!bCache) IDirectMusicObject_Release (pObject); /* since loader's reference is not needed */ /* if there was trouble with loading, and if no other error occurred,

1 0

Michael Stefaniuc : dmloader: Simplify the cache list handling.
by Alexandre Julliard 25 Jul '17

25 Jul '17

Module: wine Branch: master Commit: 3531e50c936de9387c108d0281789cad1cba0c46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3531e50c936de9387c108d028… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jul 25 20:57:25 2017 +0200 dmloader: Simplify the cache list handling. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/loader.c | 69 +++++++++++++++++++------------------------------- 1 file changed, 26 insertions(+), 43 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 52c2524..bed8cd0 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -50,8 +50,7 @@ typedef struct IDirectMusicLoaderImpl { LONG ref; WCHAR *search_paths[ARRAY_SIZE(classes)]; unsigned int cache_class; - /* simple cache */ - struct list *pObjects; + struct list cache; } IDirectMusicLoaderImpl; @@ -190,9 +189,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_GetObject(IDirectMusicLoader8 *ifac IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); HRESULT result = S_OK; HRESULT ret = S_OK; /* used at the end of function, to determine whether everything went OK */ - - struct list *pEntry; - LPWINE_LOADER_ENTRY pObjectEntry = NULL; + struct cache_entry *pExistingEntry, *pObjectEntry = NULL; LPSTREAM pStream; IPersistStream* pPersistStream = NULL; @@ -215,8 +212,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_GetObject(IDirectMusicLoader8 *ifac /* OK, first we iterate through the list of objects we know about; these are either loaded (GetObject, LoadObjectFromFile) or set via SetObject; */ TRACE(": looking if we have object in the cache or if it can be found via alias\n"); - LIST_FOR_EACH(pEntry, This->pObjects) { - LPWINE_LOADER_ENTRY pExistingEntry = LIST_ENTRY(pEntry, WINE_LOADER_ENTRY, entry); + LIST_FOR_EACH_ENTRY(pExistingEntry, &This->cache, struct cache_entry, entry) { if ((pDesc->dwValidData & DMUS_OBJ_OBJECT) && (pExistingEntry->Desc.dwValidData & DMUS_OBJ_OBJECT) && IsEqualGUID (&pDesc->guidObject, &pExistingEntry->Desc.guidObject)) { @@ -412,7 +408,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_GetObject(IDirectMusicLoader8 *ifac DMUSIC_CopyDescriptor (&pObjectEntry->Desc, &GotDesc); pObjectEntry->pObject = pObject; pObjectEntry->bInvalidDefaultDLS = FALSE; - list_add_head (This->pObjects, &pObjectEntry->entry); + list_add_head(&This->cache, &pObjectEntry->entry); } else { DMUSIC_CopyDescriptor (&pObjectEntry->Desc, &GotDesc); pObjectEntry->pObject = pObject; @@ -437,7 +433,6 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetObject(IDirectMusicLoader8 *ifac LPSTREAM pStream; LPDIRECTMUSICOBJECT pObject; DMUS_OBJECTDESC Desc; - struct list *pEntry; LPWINE_LOADER_ENTRY pObjectEntry, pNewEntry; HRESULT hr; @@ -540,8 +535,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetObject(IDirectMusicLoader8 *ifac /* sometimes it happens that twisted programs call SetObject for same object twice... in such cases, native loader returns S_OK and does nothing... a sound plan */ - LIST_FOR_EACH (pEntry, This->pObjects) { - pObjectEntry = LIST_ENTRY (pEntry, WINE_LOADER_ENTRY, entry); + LIST_FOR_EACH_ENTRY(pObjectEntry, &This->cache, struct cache_entry, entry) { if (!memcmp (&pObjectEntry->Desc, pDesc, sizeof(DMUS_OBJECTDESC))) { TRACE(": exactly same entry already exists\n"); return S_OK; @@ -556,7 +550,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetObject(IDirectMusicLoader8 *ifac /* use this function instead of pure memcpy due to streams (memcpy just copies pointer), which is basically used further by app that called SetDescriptor... better safety than exception */ DMUSIC_CopyDescriptor (&pNewEntry->Desc, pDesc); - list_add_head (This->pObjects, &pNewEntry->entry); + list_add_head(&This->cache, &pNewEntry->entry); return S_OK; } @@ -660,7 +654,6 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_CacheObject(IDirectMusicLoader8 *if IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); DMUS_OBJECTDESC Desc; HRESULT result = DMUS_E_LOADER_OBJECTNOTFOUND; - struct list *pEntry; LPWINE_LOADER_ENTRY pObjectEntry = NULL; TRACE("(%p, %p)\n", This, pObject); @@ -671,8 +664,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_CacheObject(IDirectMusicLoader8 *if /* now iterate through the list and check if we have an alias (without object), corresponding to the descriptor of the input object */ - LIST_FOR_EACH(pEntry, This->pObjects) { - pObjectEntry = LIST_ENTRY(pEntry, WINE_LOADER_ENTRY, entry); + LIST_FOR_EACH_ENTRY(pObjectEntry, &This->cache, struct cache_entry, entry) { if ((Desc.dwValidData & DMUS_OBJ_OBJECT) && (pObjectEntry->Desc.dwValidData & DMUS_OBJ_OBJECT) && IsEqualGUID (&Desc.guidObject, &pObjectEntry->Desc.guidObject)) { @@ -740,7 +732,6 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_ReleaseObject(IDirectMusicLoader8 * { IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); DMUS_OBJECTDESC Desc; - struct list *pEntry; LPWINE_LOADER_ENTRY pObjectEntry = NULL; HRESULT result = S_FALSE; @@ -754,8 +745,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_ReleaseObject(IDirectMusicLoader8 * /* iterate through the list of objects we know about; check only those with DMUS_OBJ_LOADED */ TRACE(": looking for the object in cache\n"); - LIST_FOR_EACH(pEntry, This->pObjects) { - pObjectEntry = LIST_ENTRY(pEntry, WINE_LOADER_ENTRY, entry); + LIST_FOR_EACH_ENTRY(pObjectEntry, &This->cache, struct cache_entry, entry) { if ((Desc.dwValidData & DMUS_OBJ_OBJECT) && (pObjectEntry->Desc.dwValidData & (DMUS_OBJ_OBJECT | DMUS_OBJ_LOADED)) && IsEqualGUID (&Desc.guidObject, &pObjectEntry->Desc.guidObject)) { @@ -804,24 +794,22 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_ReleaseObject(IDirectMusicLoader8 * return result; } -static HRESULT WINAPI IDirectMusicLoaderImpl_ClearCache(IDirectMusicLoader8 *iface, REFGUID rguidClass) +static HRESULT WINAPI IDirectMusicLoaderImpl_ClearCache(IDirectMusicLoader8 *iface, REFGUID class) { - IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); - struct list *pEntry; - LPWINE_LOADER_ENTRY pObjectEntry; - TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidClass)); - - LIST_FOR_EACH (pEntry, This->pObjects) { - pObjectEntry = LIST_ENTRY (pEntry, WINE_LOADER_ENTRY, entry); - - if ((IsEqualGUID (rguidClass, &GUID_DirectMusicAllTypes) || IsEqualGUID (rguidClass, &pObjectEntry->Desc.guidClass)) && - (pObjectEntry->Desc.dwValidData & DMUS_OBJ_LOADED)) { - /* basically, wrap to ReleaseObject for each object found */ - IDirectMusicLoader8_ReleaseObject (iface, pObjectEntry->pObject); - } - } - - return S_OK; + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); + struct cache_entry *obj; + + TRACE("(%p, %s)\n", This, debugstr_dmguid(class)); + + LIST_FOR_EACH_ENTRY(obj, &This->cache, struct cache_entry, entry) { + if ((IsEqualGUID(class, &GUID_DirectMusicAllTypes) || IsEqualGUID(class, &obj->Desc.guidClass)) && + (obj->Desc.dwValidData & DMUS_OBJ_LOADED)) { + /* basically, wrap to ReleaseObject for each object found */ + IDirectMusicLoader8_ReleaseObject(iface, obj->pObject); + } + } + + return S_OK; } static HRESULT WINAPI IDirectMusicLoaderImpl_EnableCache(IDirectMusicLoader8 *iface, REFGUID class, @@ -856,15 +844,12 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_EnumObject(IDirectMusicLoader8 *ifa { IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); DWORD dwCount = 0; - struct list *pEntry; LPWINE_LOADER_ENTRY pObjectEntry; TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(rguidClass), dwIndex, pDesc); DM_STRUCT_INIT(pDesc); - LIST_FOR_EACH (pEntry, This->pObjects) { - pObjectEntry = LIST_ENTRY (pEntry, WINE_LOADER_ENTRY, entry); - + LIST_FOR_EACH_ENTRY(pObjectEntry, &This->cache, struct cache_entry, entry) { if (IsEqualGUID (rguidClass, &GUID_DirectMusicAllTypes) || IsEqualGUID (rguidClass, &pObjectEntry->Desc.guidClass)) { if (dwCount == dwIndex) { *pDesc = pObjectEntry->Desc; @@ -992,9 +977,7 @@ HRESULT WINAPI create_dmloader(REFIID lpcGUID, void **ppobj) } obj->IDirectMusicLoader8_iface.lpVtbl = &DirectMusicLoader_Loader_Vtbl; obj->ref = 0; /* Will be inited with QueryInterface */ - /* init cache/alias list */ - obj->pObjects = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(struct list)); - list_init (obj->pObjects); + list_init(&obj->cache); /* Caching is enabled by default for all classes */ obj->cache_class = ~0; @@ -1010,7 +993,7 @@ HRESULT WINAPI create_dmloader(REFIID lpcGUID, void **ppobj) collection, loader treats it as "invalid" and returns DMUS_E_LOADER_NOFILENAME for all requests for it; basically, we check if out input guidObject was overwritten */ - pEntry = list_head (obj->pObjects); + pEntry = list_head(&obj->cache); pDefaultDLSEntry = LIST_ENTRY (pEntry, WINE_LOADER_ENTRY, entry); if (!IsEqualGUID(&Desc.guidObject, &GUID_DefaultGMCollection)) { pDefaultDLSEntry->bInvalidDefaultDLS = TRUE;

1 0

Michael Stefaniuc : dmloader: Don't leak memory in the cache.
by Alexandre Julliard 25 Jul '17

25 Jul '17

Module: wine Branch: master Commit: ad0dbe3e02fab0e8586a2363c2b887761917f7f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad0dbe3e02fab0e8586a2363c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jul 25 20:57:26 2017 +0200 dmloader: Don't leak memory in the cache. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index bed8cd0..1f73697 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -172,9 +172,7 @@ static ULONG WINAPI IDirectMusicLoaderImpl_Release(IDirectMusicLoader8 *iface) if (!ref) { unsigned int i; - /* Firstly, release the cache */ IDirectMusicLoader8_ClearCache(iface, &GUID_DirectMusicAllTypes); - /* FIXME: Release all allocated entries */ for (i = 0; i < ARRAY_SIZE(classes); i++) HeapFree(GetProcessHeap(), 0, This->search_paths[i]); HeapFree(GetProcessHeap(), 0, This); @@ -806,6 +804,8 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_ClearCache(IDirectMusicLoader8 *ifa (obj->Desc.dwValidData & DMUS_OBJ_LOADED)) { /* basically, wrap to ReleaseObject for each object found */ IDirectMusicLoader8_ReleaseObject(iface, obj->pObject); + list_remove(&obj->entry); + HeapFree(GetProcessHeap(), 0, obj); } }

1 0