[PATCH 5/5] dmime: Get rid of the DMUS_PRIVATE_SEGMENT_ITEM typedef
Michael Stefaniuc
mstefani at winehq.org
Thu Sep 24 15:03:58 CDT 2020
Also move the struct to its only user.
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
dlls/dmime/dmime_private.h | 7 -------
dlls/dmime/segtriggertrack.c | 23 +++++++++++++++--------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h
index 69067fca558..c2221a15fd2 100644
--- a/dlls/dmime/dmime_private.h
+++ b/dlls/dmime/dmime_private.h
@@ -86,13 +86,6 @@ typedef struct _DMUS_PRIVATE_TEMPO_ITEM {
DMUS_IO_TEMPO_ITEM item;
} DMUS_PRIVATE_TEMPO_ITEM, *LPDMUS_PRIVATE_TEMPO_ITEM;
-typedef struct _DMUS_PRIVATE_SEGMENT_ITEM {
- struct list entry; /* for listing elements */
- DMUS_IO_SEGMENT_ITEM_HEADER header;
- IDirectMusicObject* pObject;
- WCHAR wszName[DMUS_MAX_NAME];
-} DMUS_PRIVATE_SEGMENT_ITEM, *LPDMUS_PRIVATE_SEGMENT_ITEM;
-
typedef struct _DMUS_PRIVATE_GRAPH_TOOL {
struct list entry; /* for listing elements */
DWORD dwIndex;
diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c
index ec1da7e1ed4..9a7602f58db 100644
--- a/dlls/dmime/segtriggertrack.c
+++ b/dlls/dmime/segtriggertrack.c
@@ -28,6 +28,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime);
/*****************************************************************************
* IDirectMusicSegTriggerTrack implementation
*/
+struct segment_item {
+ struct list entry;
+ DMUS_IO_SEGMENT_ITEM_HEADER header;
+ IDirectMusicObject *dmobj;
+ WCHAR name[DMUS_MAX_NAME];
+};
+
typedef struct IDirectMusicSegTriggerTrack {
IDirectMusicTrack8 IDirectMusicTrack8_iface;
struct dmobject dmobj;/* IPersistStream only */
@@ -83,14 +90,14 @@ static ULONG WINAPI segment_track_Release(IDirectMusicTrack8 *iface)
if (!ref) {
struct list *cursor, *cursor2;
- DMUS_PRIVATE_SEGMENT_ITEM *item;
+ struct segment_item *item;
LIST_FOR_EACH_SAFE(cursor, cursor2, &This->Items) {
- item = LIST_ENTRY(cursor, DMUS_PRIVATE_SEGMENT_ITEM, entry);
+ item = LIST_ENTRY(cursor, struct segment_item, entry);
list_remove(cursor);
- if (item->pObject)
- IDirectMusicObject_Release(item->pObject);
+ if (item->dmobj)
+ IDirectMusicObject_Release(item->dmobj);
heap_free(item);
}
@@ -262,7 +269,7 @@ static HRESULT parse_segment_item(IDirectMusicSegTriggerTrack *This, IStream *st
const struct chunk_entry *lseg)
{
struct chunk_entry chunk = {.parent = lseg};
- DMUS_PRIVATE_SEGMENT_ITEM *item;
+ struct segment_item *item;
HRESULT hr;
/* First chunk is a header */
@@ -286,7 +293,7 @@ static HRESULT parse_segment_item(IDirectMusicSegTriggerTrack *This, IStream *st
hr = DMUS_E_INVALID_SEGMENTTRIGGERTRACK;
goto error;
}
- if (FAILED(hr = dmobj_parsereference(stream, &chunk, &item->pObject)))
+ if (FAILED(hr = dmobj_parsereference(stream, &chunk, &item->dmobj)))
goto error;
/* Optional third chunk if the reference is a motif */
@@ -294,10 +301,10 @@ static HRESULT parse_segment_item(IDirectMusicSegTriggerTrack *This, IStream *st
if (FAILED(hr = stream_next_chunk(stream, &chunk)))
goto error;
if (chunk.id == DMUS_FOURCC_SEGMENTITEMNAME_CHUNK)
- if (FAILED(hr = stream_chunk_get_wstr(stream, &chunk, item->wszName, DMUS_MAX_NAME)))
+ if (FAILED(hr = stream_chunk_get_wstr(stream, &chunk, item->name, DMUS_MAX_NAME)))
goto error;
- TRACE("Found motif name: %s\n", debugstr_w(item->wszName));
+ TRACE("Found motif name: %s\n", debugstr_w(item->name));
}
list_add_tail(&This->Items, &item->entry);
--
2.26.2
More information about the wine-devel
mailing list