Rémi Bernon : dmime: Rewrite segment IDirectMusicSegment_GetTrackGroup.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d045eae8b7383fdccfd870bad4c70892b2518e50
URL:    https://gitlab.winehq.org/wine/wine/-/commit/d045eae8b7383fdccfd870bad4c7089...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Fri Sep 15 11:11:52 2023 +0200

dmime: Rewrite segment IDirectMusicSegment_GetTrackGroup.

---

 dlls/dmime/segment.c | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c
index fc219554588..367e526d659 100644
--- a/dlls/dmime/segment.c
+++ b/dlls/dmime/segment.c
@@ -231,25 +231,22 @@ static HRESULT WINAPI segment_GetTrack(IDirectMusicSegment8 *iface, REFGUID type
   return DMUS_E_NOT_FOUND;
 }
 
-static HRESULT WINAPI segment_GetTrackGroup(IDirectMusicSegment8 *iface, IDirectMusicTrack *pTrack, DWORD *pdwGroupBits)
+static HRESULT WINAPI segment_GetTrackGroup(IDirectMusicSegment8 *iface, IDirectMusicTrack *track, DWORD *ret_group)
 {
   struct segment *This = impl_from_IDirectMusicSegment8(iface);
-  struct list* pEntry = NULL;
-  struct track_entry *pIt = NULL;
+  struct track_entry *entry;
 
-  TRACE("(%p, %p, %p)\n", This, pTrack, pdwGroupBits);
+  TRACE("(%p, %p, %p)\n", This, track, ret_group);
 
-  if (NULL == pdwGroupBits) {
-    return E_POINTER;
-  }
+  if (!ret_group) return E_POINTER;
 
-  LIST_FOR_EACH (pEntry, &This->tracks) {
-    pIt = LIST_ENTRY(pEntry, struct track_entry, entry);
-    TRACE(" - %p -> %#lx, %p\n", pIt, pIt->dwGroupBits, pIt->pTrack);
-    if (NULL != pIt && pIt->pTrack == pTrack) {
-      *pdwGroupBits = pIt->dwGroupBits;
-      return S_OK;
-    }
+  LIST_FOR_EACH_ENTRY(entry, &This->tracks, struct track_entry, entry)
+  {
+      if (entry->pTrack == track)
+      {
+          *ret_group = entry->dwGroupBits;
+          return S_OK;
+      }
   }
 
   return DMUS_E_NOT_FOUND;