Michael Stefaniuc : dmstyle: Move a struct declaration to the file it is used in.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b58c88d14dd1943a265ead68cb83e8dd1dd9a112
URL:    https://gitlab.winehq.org/wine/wine/-/commit/b58c88d14dd1943a265ead68cb83e8d...

Author: Michael Stefaniuc <mstefani(a)winehq.org>
Date:   Wed Nov 30 00:08:26 2022 +0100

dmstyle: Move a struct declaration to the file it is used in.

And get rid of the typedef for that struct.

---

 dlls/dmstyle/dmstyle_private.h |  7 -------
 dlls/dmstyle/styletrack.c      | 32 +++++++++++++++++---------------
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h
index fbe635e4388..0d7ede7f00d 100644
--- a/dlls/dmstyle/dmstyle_private.h
+++ b/dlls/dmstyle/dmstyle_private.h
@@ -55,13 +55,6 @@ extern HRESULT create_dmstyletrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDE
 /*****************************************************************************
  * Auxiliary definitions
  */
-typedef struct _DMUS_PRIVATE_STYLE_ITEM {
-  struct list entry; /* for listing elements */
-  DWORD timestamp;
-  IDirectMusicStyle8* pObject;
-} DMUS_PRIVATE_STYLE_ITEM, *LPDMUS_PRIVATE_STYLE_ITEM;
-
-
 typedef struct _DMUS_PRIVATE_COMMAND {
 	struct list entry; /* for listing elements */
 	DMUS_IO_COMMAND pCommand;
diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c
index 822072bdb27..83b03807ddf 100644
--- a/dlls/dmstyle/styletrack.c
+++ b/dlls/dmstyle/styletrack.c
@@ -27,6 +27,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmstyle);
 /*****************************************************************************
  * IDirectMusicStyleTrack implementation
  */
+struct style_item {
+    struct list entry;
+    DWORD timestamp;
+    IDirectMusicStyle8 *dmstyle;
+};
+
 typedef struct IDirectMusicStyleTrack {
     IDirectMusicTrack8 IDirectMusicTrack8_iface;
     struct dmobject dmobj;  /* IPersistStream only */
@@ -81,14 +87,11 @@ static ULONG WINAPI style_track_Release(IDirectMusicTrack8 *iface)
     TRACE("(%p) ref=%ld\n", This, ref);
 
     if (!ref) {
-        struct list *cursor, *cursor2;
-        DMUS_PRIVATE_STYLE_ITEM *item;
-
-        LIST_FOR_EACH_SAFE(cursor, cursor2, &This->Items) {
-            item = LIST_ENTRY(cursor, DMUS_PRIVATE_STYLE_ITEM, entry);
-            list_remove(cursor);
+        struct style_item *item, *item2;
 
-            IDirectMusicStyle8_Release(item->pObject);
+        LIST_FOR_EACH_ENTRY_SAFE(item, item2, &This->Items, struct style_item, entry) {
+            list_remove(&item->entry);
+            IDirectMusicStyle8_Release(item->dmstyle);
             free(item);
         }
 
@@ -135,7 +138,7 @@ static HRESULT WINAPI style_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ty
         MUSIC_TIME time, MUSIC_TIME *next, void *param)
 {
     IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface);
-    struct list *item = NULL;
+    struct style_item *item;
 
     TRACE("(%p, %s, %ld, %p, %p):\n", This, debugstr_dmguid(type), time, next, param);
 
@@ -143,10 +146,9 @@ static HRESULT WINAPI style_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ty
         return E_POINTER;
 
     if (IsEqualGUID(&GUID_IDirectMusicStyle, type)) {
-        LIST_FOR_EACH (item, &This->Items) {
-            DMUS_PRIVATE_STYLE_ITEM *style = LIST_ENTRY(item, DMUS_PRIVATE_STYLE_ITEM, entry);
-            IDirectMusicStyle8_AddRef(style->pObject);
-            *((IDirectMusicStyle8 **)param) = style->pObject;
+        LIST_FOR_EACH_ENTRY(item, &This->Items, struct style_item, entry) {
+            IDirectMusicStyle8_AddRef(item->dmstyle);
+            *((IDirectMusicStyle8 **)param) = item->dmstyle;
 
             return S_OK;
         }
@@ -304,7 +306,7 @@ static HRESULT parse_style_ref(IDirectMusicStyleTrack *This, IStream *stream, co
 {
     struct chunk_entry chunk = {.parent = strf};
     IDirectMusicObject *dmobj;
-    DMUS_PRIVATE_STYLE_ITEM *item;
+    struct style_item *item;
     HRESULT hr;
 
     /* First chunk is a timestamp */
@@ -326,7 +328,7 @@ static HRESULT parse_style_ref(IDirectMusicStyleTrack *This, IStream *stream, co
         WARN("Failed to load reference: %#lx\n", hr);
         goto error;
     }
-    hr = IDirectMusicObject_QueryInterface(dmobj, &IID_IDirectMusicStyle8, (void **)&item->pObject);
+    hr = IDirectMusicObject_QueryInterface(dmobj, &IID_IDirectMusicStyle8, (void **)&item->dmstyle);
     if (FAILED(hr)) {
         WARN("Reference not an IDirectMusicStyle8\n");
         IDirectMusicObject_Release(dmobj);
@@ -334,7 +336,7 @@ static HRESULT parse_style_ref(IDirectMusicStyleTrack *This, IStream *stream, co
     }
 
     list_add_tail(&This->Items, &item->entry);
-    TRACE("Found reference to style %p with timestamp %lu\n", item->pObject, item->timestamp);
+    TRACE("Found reference to style %p with timestamp %lu\n", item->dmstyle, item->timestamp);
 
     return S_OK;