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

Rosanne DiMesio : Fix flat comment mode
by Jeremy Newman July 26, 2017

July 26, 2017

Module: appdb Branch: master Commit: b5db619580757b3a93471701f020e6a8dca35c9e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b5db619580757b3a93471701… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Jul 26 08:46:59 2017 -0500 Fix flat comment mode Fixes bug 12927 and makes flat the default mode. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/comment.php | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/include/comment.php b/include/comment.php index 3fb8b94..789dd19 100644 --- a/include/comment.php +++ b/include/comment.php @@ -673,17 +673,24 @@ class Comment { /** * display flat comments */ - public static function display_comments_flat($versionId) + public static function do_display_comments_flat($hResult) { - $hResult = Comment::grab_comments($versionId); - if ($hResult) + while($oRow = query_fetch_object($hResult)) { - while($oRow = query_fetch_object($hResult)) + Comment::view_app_comment($oRow); + $hResult2 = Comment::grab_comments($oRow->versionId, $oRow->commentId); + if($hResult && query_num_rows($hResult2)) { - Comment::view_app_comment($oRow); + Comment::do_display_comments_flat($hResult2); } } } + + public static function display_comments_flat($versionId, $threadId) + { + $hResult = Comment::grab_comments($versionId, $threadId); + Comment::do_display_comments_flat($hResult); + } public static function view_app_comments($versionId, $threadId = 0) { @@ -731,9 +738,9 @@ class Comment { //hide or display depending on pref if ($_SESSION['current']->isLoggedIn()) - $mode = $_SESSION['current']->getPref("comments:mode", "threaded"); + $mode = $_SESSION['current']->getPref("comments:mode", "flat"); else - $mode = "threaded"; /* default non-logged in users to threaded comment display mode */ + $mode = "flat"; /* default non-logged in users to flat comment display mode */ if ( isset($aClean['sMode']) && $aClean['sMode']=="nested") $mode = "nested"; @@ -741,7 +748,7 @@ class Comment { switch ($mode) { case "flat": - Comment::display_comments_flat($versionId); + Comment::display_comments_flat($versionId, $threadId); break; case "nested": Comment::display_comments_nested($versionId, $threadId);

1 0

Michael Stefaniuc : dmloader: Get rid of two gratuitous typedefs.
by Alexandre Julliard July 25, 2017

July 25, 2017

Module: wine Branch: master Commit: 4a70f67ffcc57e82c22cc349da01d3aa5db84c71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a70f67ffcc57e82c22cc349d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jul 25 20:57:27 2017 +0200 dmloader: Get rid of two gratuitous typedefs. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/loader.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 1f73697..4b76f32 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -38,12 +38,12 @@ static const GUID *classes[] = { }; /* cache/alias entry */ -typedef struct cache_entry { +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; @@ -401,7 +401,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_GetObject(IDirectMusicLoader8 *ifac bCache = is_cache_enabled(This, &pDesc->guidClass); if (bCache) { if (!pObjectEntry) { - pObjectEntry = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(WINE_LOADER_ENTRY)); + pObjectEntry = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(*pObjectEntry)); DM_STRUCT_INIT(&pObjectEntry->Desc); DMUSIC_CopyDescriptor (&pObjectEntry->Desc, &GotDesc); pObjectEntry->pObject = pObject; @@ -431,7 +431,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetObject(IDirectMusicLoader8 *ifac LPSTREAM pStream; LPDIRECTMUSICOBJECT pObject; DMUS_OBJECTDESC Desc; - LPWINE_LOADER_ENTRY pObjectEntry, pNewEntry; + struct cache_entry *pObjectEntry, *pNewEntry; HRESULT hr; TRACE("(%p)->(%p)\n", This, pDesc); @@ -544,7 +544,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetObject(IDirectMusicLoader8 *ifac TRACE(": adding alias entry with following info:\n"); if (TRACE_ON(dmloader)) dump_DMUS_OBJECTDESC(pDesc); - pNewEntry = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(WINE_LOADER_ENTRY)); + pNewEntry = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(*pNewEntry)); /* 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); @@ -652,7 +652,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_CacheObject(IDirectMusicLoader8 *if IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); DMUS_OBJECTDESC Desc; HRESULT result = DMUS_E_LOADER_OBJECTNOTFOUND; - LPWINE_LOADER_ENTRY pObjectEntry = NULL; + struct cache_entry *pObjectEntry; TRACE("(%p, %p)\n", This, pObject); @@ -730,7 +730,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_ReleaseObject(IDirectMusicLoader8 * { IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); DMUS_OBJECTDESC Desc; - LPWINE_LOADER_ENTRY pObjectEntry = NULL; + struct cache_entry *pObjectEntry; HRESULT result = S_FALSE; TRACE("(%p, %p)\n", This, pObject); @@ -844,7 +844,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_EnumObject(IDirectMusicLoader8 *ifa { IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); DWORD dwCount = 0; - LPWINE_LOADER_ENTRY pObjectEntry; + struct cache_entry *pObjectEntry; TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(rguidClass), dwIndex, pDesc); DM_STRUCT_INIT(pDesc); @@ -966,7 +966,7 @@ HRESULT WINAPI create_dmloader(REFIID lpcGUID, void **ppobj) { IDirectMusicLoaderImpl *obj; DMUS_OBJECTDESC Desc; - LPWINE_LOADER_ENTRY pDefaultDLSEntry; + struct cache_entry *dls; struct list *pEntry; TRACE("(%s, %p)\n", debugstr_dmguid(lpcGUID), ppobj); @@ -994,9 +994,9 @@ HRESULT WINAPI create_dmloader(REFIID lpcGUID, void **ppobj) DMUS_E_LOADER_NOFILENAME for all requests for it; basically, we check if out input guidObject was overwritten */ pEntry = list_head(&obj->cache); - pDefaultDLSEntry = LIST_ENTRY (pEntry, WINE_LOADER_ENTRY, entry); + dls = LIST_ENTRY(pEntry, struct cache_entry, entry); if (!IsEqualGUID(&Desc.guidObject, &GUID_DefaultGMCollection)) { - pDefaultDLSEntry->bInvalidDefaultDLS = TRUE; + dls->bInvalidDefaultDLS = TRUE; } lock_module();

1 0

Michael Stefaniuc : dmloader: Don't leak memory in the cache.
by Alexandre Julliard July 25, 2017

July 25, 2017

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

Michael Stefaniuc : dmloader: Handle NULL and empty path strings in SetSearchDirectory().
by Alexandre Julliard July 25, 2017

July 25, 2017

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

Piotr Caban : include: Define IElementTraversal interface.
by Alexandre Julliard July 25, 2017

July 25, 2017

Module: wine Branch: master Commit: c267c5d91b4827e0b72eb06a79f0cf24b2bce38f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c267c5d91b4827e0b72eb06a7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 25 17:56:51 2017 +0200 include: Define IElementTraversal interface. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 7 +++++++ include/mshtml.idl | 23 +++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 947e1b8..d509b18 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -1661,6 +1661,13 @@ #define DISPID_IHTMLELEMENT6_ONWAITING DISPID_EVPROP_WAITING #define DISPID_IHTMLELEMENT6_IE9_HASATTRIBUTES DISPID_IE9_ELEMENT+29 +/* IElementTraversal */ +#define DISPID_IELEMENTTRAVERSAL_FIRSTELEMENTCHILD DISPID_IE9_ELEMENT+22 +#define DISPID_IELEMENTTRAVERSAL_LASTELEMENTCHILD DISPID_IE9_ELEMENT+23 +#define DISPID_IELEMENTTRAVERSAL_PREVIOUSELEMENTSIBLING DISPID_IE9_ELEMENT+24 +#define DISPID_IELEMENTTRAVERSAL_NEXTELEMENTSIBLING DISPID_IE9_ELEMENT+25 +#define DISPID_IELEMENTTRAVERSAL_CHILDELEMENTCOUNT DISPID_IE9_ELEMENT+26 + /* IHTMLGenericElement */ #define DISPID_IHTMLGENERICELEMENT_RECORDSET DISPID_GENERIC+1 #define DISPID_IHTMLGENERICELEMENT_NAMEDRECORDSET DISPID_GENERIC+2 diff --git a/include/mshtml.idl b/include/mshtml.idl index 10aa69d..4e48b5d 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -6617,6 +6617,29 @@ interface IHTMLElement6 : IDispatch VARIANT_BOOL ie9_hasAttributes() /***************************************************************************** + * IElementTraversal interface + */ +[ + odl, + oleautomation, + dual, + uuid(30510736-98b5-11cf-bb82-00aa00bdce0b) +] +interface IElementTraversal : IDispatch +{ + [propget, id(DISPID_IELEMENTTRAVERSAL_FIRSTELEMENTCHILD)] + HRESULT firstElementChild([retval, out] IHTMLElement **p); + [propget, id(DISPID_IELEMENTTRAVERSAL_LASTELEMENTCHILD)] + HRESULT lastElementChild([retval, out] IHTMLElement **p); + [propget, id(DISPID_IELEMENTTRAVERSAL_PREVIOUSELEMENTSIBLING)] + HRESULT previousElementSibling([retval, out] IHTMLElement **p); + [propget, id(DISPID_IELEMENTTRAVERSAL_NEXTELEMENTSIBLING)] + HRESULT nextElementSibling([retval, out] IHTMLElement **p); + [propget, id(DISPID_IELEMENTTRAVERSAL_CHILDELEMENTCOUNT)] + HRESULT childElementCount([retval, out] long *p); +} + +/***************************************************************************** * IElementSelector interface */ [

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard July 25, 2017

July 25, 2017

Module: wine Branch: master Commit: 3b14f71eb1ffbf4b5c045c7b63c23e8177592146 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b14f71eb1ffbf4b5c045c7b6… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Jul 25 15:17:12 2017 +0200 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 309 +++++++++++++++++++++++---------------------------------------- 1 file changed, 110 insertions(+), 199 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b14f71eb1ffbf4b5c045…

1 0

Jacek Caban : mshtml: Set referrer in load_nsuri.
by Alexandre Julliard July 25, 2017

July 25, 2017

Module: wine Branch: master Commit: b9f0ac40b97d9621bc8d1e418aa9dbe525d2000b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9f0ac40b97d9621bc8d1e418… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 25 15:30:55 2017 +0200 mshtml: Set referrer in load_nsuri. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 1857aee..bc1dae9 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -303,6 +303,16 @@ HRESULT load_nsuri(HTMLOuterWindow *window, nsWineURI *uri, nsIInputStream *post assert(nsres == NS_OK); } + if(window->uri_nofrag) { + nsWineURI *referrer_uri; + nsres = create_nsuri(window->uri_nofrag, window, window->doc_obj ? window->doc_obj->nscontainer : NULL, NULL, &referrer_uri); + if(NS_SUCCEEDED(nsres)) { + nsres = nsIDocShellLoadInfo_SetReferrer(load_info, (nsIURI*)&referrer_uri->nsIFileURL_iface); + assert(nsres == NS_OK); + nsIFileURL_Release(&referrer_uri->nsIFileURL_iface); + } + } + uri->channel_bsc = channelbsc; doc = window->base.inner_window->doc; doc->skip_mutation_notif = TRUE;

1 0

Michael Stefaniuc : dmloader: Simplify the cache list handling.
by Alexandre Julliard July 25, 2017

July 25, 2017

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: Move struct definitions to the files they are used in.
by Alexandre Julliard July 25, 2017

July 25, 2017

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: Use a bitfield to store the per class cache enable info.
by Alexandre Julliard July 25, 2017

July 25, 2017

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