Skip to content

Commit 696e8c1

Browse files
rbernonjulliard
rbernon
authored and
julliard
committed
dmband: Get rid of the IDirectMusicBandTrack typedef.
1 parent d3c5fe8 commit 696e8c1

File tree

1 file changed

+49
-52
lines changed

1 file changed

+49
-52
lines changed

‎dlls/dmband/bandtrack.c

Lines changed: 49 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,24 @@
2222
WINE_DEFAULT_DEBUG_CHANNEL(dmband);
2323
WINE_DECLARE_DEBUG_CHANNEL(dmfile);
2424

25-
/*****************************************************************************
26-
* IDirectMusicBandTrack implementation
27-
*/
28-
typedef struct IDirectMusicBandTrack {
25+
struct band_track
26+
{
2927
IDirectMusicTrack8 IDirectMusicTrack8_iface;
3028
struct dmobject dmobj; /* IPersistStream only */
3129
LONG ref;
3230
DMUS_IO_BAND_TRACK_HEADER header;
3331
struct list Bands;
34-
} IDirectMusicBandTrack;
32+
};
3533

36-
/* IDirectMusicBandTrack IDirectMusicTrack8 part: */
37-
static inline IDirectMusicBandTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface)
34+
static inline struct band_track *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface)
3835
{
39-
return CONTAINING_RECORD(iface, IDirectMusicBandTrack, IDirectMusicTrack8_iface);
36+
return CONTAINING_RECORD(iface, struct band_track, IDirectMusicTrack8_iface);
4037
}
4138

4239
static HRESULT WINAPI band_track_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid,
4340
void **ret_iface)
4441
{
45-
IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
42+
struct band_track *This = impl_from_IDirectMusicTrack8(iface);
4643

4744
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ret_iface);
4845

@@ -64,7 +61,7 @@ static HRESULT WINAPI band_track_QueryInterface(IDirectMusicTrack8 *iface, REFII
6461

6562
static ULONG WINAPI band_track_AddRef(IDirectMusicTrack8 *iface)
6663
{
67-
IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
64+
struct band_track *This = impl_from_IDirectMusicTrack8(iface);
6865
LONG ref = InterlockedIncrement(&This->ref);
6966

7067
TRACE("(%p) ref=%ld\n", This, ref);
@@ -74,7 +71,7 @@ static ULONG WINAPI band_track_AddRef(IDirectMusicTrack8 *iface)
7471

7572
static ULONG WINAPI band_track_Release(IDirectMusicTrack8 *iface)
7673
{
77-
IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
74+
struct band_track *This = impl_from_IDirectMusicTrack8(iface);
7875
LONG ref = InterlockedDecrement(&This->ref);
7976

8077
TRACE("(%p) ref=%ld\n", This, ref);
@@ -86,16 +83,16 @@ static ULONG WINAPI band_track_Release(IDirectMusicTrack8 *iface)
8683

8784
static HRESULT WINAPI band_track_Init(IDirectMusicTrack8 *iface, IDirectMusicSegment *pSegment)
8885
{
89-
IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
90-
FIXME("(%p, %p): stub\n", This, pSegment);
91-
return S_OK;
86+
struct band_track *This = impl_from_IDirectMusicTrack8(iface);
87+
FIXME("(%p, %p): stub\n", This, pSegment);
88+
return S_OK;
9289
}
9390

9491
static HRESULT WINAPI band_track_InitPlay(IDirectMusicTrack8 *iface,
9592
IDirectMusicSegmentState *segment_state, IDirectMusicPerformance *performance,
9693
void **state_data, DWORD virtual_track8id, DWORD flags)
9794
{
98-
IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
95+
struct band_track *This = impl_from_IDirectMusicTrack8(iface);
9996

10097
FIXME("(%p, %p, %p, %p, %ld, %lx): stub\n", This, segment_state, performance, state_data, virtual_track8id, flags);
10198

@@ -104,17 +101,17 @@ static HRESULT WINAPI band_track_InitPlay(IDirectMusicTrack8 *iface,
104101

105102
static HRESULT WINAPI band_track_EndPlay(IDirectMusicTrack8 *iface, void *pStateData)
106103
{
107-
IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
108-
FIXME("(%p, %p): stub\n", This, pStateData);
109-
return S_OK;
104+
struct band_track *This = impl_from_IDirectMusicTrack8(iface);
105+
FIXME("(%p, %p): stub\n", This, pStateData);
106+
return S_OK;
110107
}
111108

112109
static HRESULT WINAPI band_track_Play(IDirectMusicTrack8 *iface, void *state_data,
113110
MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD flags,
114111
IDirectMusicPerformance *performance, IDirectMusicSegmentState *segment_state,
115112
DWORD virtual_id)
116113
{
117-
IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
114+
struct band_track *This = impl_from_IDirectMusicTrack8(iface);
118115

119116
FIXME("(%p, %p, %ld, %ld, %ld, %lx, %p, %p, %ld): semi-stub\n", This, state_data, mtStart, mtEnd, mtOffset, flags, performance, segment_state, virtual_id);
120117

@@ -131,7 +128,7 @@ static HRESULT WINAPI band_track_Play(IDirectMusicTrack8 *iface, void *state_dat
131128
static HRESULT WINAPI band_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time,
132129
MUSIC_TIME *next, void *param)
133130
{
134-
IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
131+
struct band_track *This = impl_from_IDirectMusicTrack8(iface);
135132

136133
TRACE("(%p, %s, %ld, %p, %p)\n", This, debugstr_dmguid(type), time, next, param);
137134

@@ -148,7 +145,7 @@ static HRESULT WINAPI band_track_GetParam(IDirectMusicTrack8 *iface, REFGUID typ
148145
static HRESULT WINAPI band_track_SetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time,
149146
void *param)
150147
{
151-
IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
148+
struct band_track *This = impl_from_IDirectMusicTrack8(iface);
152149

153150
TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(type), time, param);
154151

@@ -183,7 +180,7 @@ static HRESULT WINAPI band_track_SetParam(IDirectMusicTrack8 *iface, REFGUID typ
183180

184181
static HRESULT WINAPI band_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType)
185182
{
186-
IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
183+
struct band_track *This = impl_from_IDirectMusicTrack8(iface);
187184

188185
TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType));
189186

@@ -211,7 +208,7 @@ static HRESULT WINAPI band_track_IsParamSupported(IDirectMusicTrack8 *iface, REF
211208

212209
static HRESULT WINAPI band_track_AddNotificationType(IDirectMusicTrack8 *iface, REFGUID notiftype)
213210
{
214-
IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
211+
struct band_track *This = impl_from_IDirectMusicTrack8(iface);
215212

216213
TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype));
217214
return E_NOTIMPL;
@@ -220,7 +217,7 @@ static HRESULT WINAPI band_track_AddNotificationType(IDirectMusicTrack8 *iface,
220217
static HRESULT WINAPI band_track_RemoveNotificationType(IDirectMusicTrack8 *iface,
221218
REFGUID notiftype)
222219
{
223-
IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
220+
struct band_track *This = impl_from_IDirectMusicTrack8(iface);
224221

225222
TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype));
226223
return E_NOTIMPL;
@@ -229,17 +226,17 @@ static HRESULT WINAPI band_track_RemoveNotificationType(IDirectMusicTrack8 *ifac
229226
static HRESULT WINAPI band_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart,
230227
MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack)
231228
{
232-
IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
233-
FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack);
234-
return S_OK;
229+
struct band_track *This = impl_from_IDirectMusicTrack8(iface);
230+
FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack);
231+
return S_OK;
235232
}
236233

237234
static HRESULT WINAPI band_track_PlayEx(IDirectMusicTrack8 *iface, void *state_data,
238235
REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD flags,
239236
IDirectMusicPerformance *performance, IDirectMusicSegmentState *segment_state,
240237
DWORD virtual_id)
241238
{
242-
IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
239+
struct band_track *This = impl_from_IDirectMusicTrack8(iface);
243240

244241
FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %lx, %p, %p, %ld): stub\n", This, state_data, wine_dbgstr_longlong(rtStart),
245242
wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), flags, performance, segment_state, virtual_id);
@@ -251,7 +248,7 @@ static HRESULT WINAPI band_track_GetParamEx(IDirectMusicTrack8 *iface,
251248
REFGUID rguidType, REFERENCE_TIME rtTime, REFERENCE_TIME *rtNext, void *param,
252249
void *state_data, DWORD flags)
253250
{
254-
IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
251+
struct band_track *This = impl_from_IDirectMusicTrack8(iface);
255252

256253
FIXME("(%p, %s, 0x%s, %p, %p, %p, %lx): stub\n", This, debugstr_dmguid(rguidType),
257254
wine_dbgstr_longlong(rtTime), rtNext, param, state_data, flags);
@@ -262,7 +259,7 @@ static HRESULT WINAPI band_track_GetParamEx(IDirectMusicTrack8 *iface,
262259
static HRESULT WINAPI band_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID rguidType,
263260
REFERENCE_TIME rtTime, void *param, void *state_data, DWORD flags)
264261
{
265-
IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
262+
struct band_track *This = impl_from_IDirectMusicTrack8(iface);
266263

267264
FIXME("(%p, %s, 0x%s, %p, %p, %lx): stub\n", This, debugstr_dmguid(rguidType),
268265
wine_dbgstr_longlong(rtTime), param, state_data, flags);
@@ -273,7 +270,7 @@ static HRESULT WINAPI band_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID r
273270
static HRESULT WINAPI band_track_Compose(IDirectMusicTrack8 *iface, IUnknown *context,
274271
DWORD trackgroup, IDirectMusicTrack **track)
275272
{
276-
IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
273+
struct band_track *This = impl_from_IDirectMusicTrack8(iface);
277274

278275
TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track);
279276
return E_NOTIMPL;
@@ -283,12 +280,13 @@ static HRESULT WINAPI band_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTra
283280
MUSIC_TIME mtJoin, IUnknown *pContext, DWORD dwTrackGroup,
284281
IDirectMusicTrack **ppResultTrack)
285282
{
286-
IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
287-
FIXME("(%p, %p, %ld, %p, %ld, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack);
288-
return S_OK;
283+
struct band_track *This = impl_from_IDirectMusicTrack8(iface);
284+
FIXME("(%p, %p, %ld, %p, %ld, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack);
285+
return S_OK;
289286
}
290287

291-
static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = {
288+
static const IDirectMusicTrack8Vtbl band_track_vtbl =
289+
{
292290
band_track_QueryInterface,
293291
band_track_AddRef,
294292
band_track_Release,
@@ -306,11 +304,10 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = {
306304
band_track_GetParamEx,
307305
band_track_SetParamEx,
308306
band_track_Compose,
309-
band_track_Join
307+
band_track_Join,
310308
};
311309

312-
/* IDirectMusicBandTrack IPersistStream part: */
313-
static HRESULT load_band(IDirectMusicBandTrack *This, IStream *pClonedStream,
310+
static HRESULT load_band(struct band_track *This, IStream *pClonedStream,
314311
IDirectMusicBand **ppBand, DMUS_PRIVATE_BAND_ITEM_HEADER *pHeader)
315312
{
316313
HRESULT hr = E_FAIL;
@@ -352,7 +349,7 @@ static HRESULT load_band(IDirectMusicBandTrack *This, IStream *pClonedStream,
352349
return S_OK;
353350
}
354351

355-
static HRESULT parse_bands_list(IDirectMusicBandTrack *This, DMUS_PRIVATE_CHUNK *pChunk,
352+
static HRESULT parse_bands_list(struct band_track *This, DMUS_PRIVATE_CHUNK *pChunk,
356353
IStream *pStm)
357354
{
358355
HRESULT hr = E_FAIL;
@@ -475,7 +472,7 @@ static HRESULT parse_bands_list(IDirectMusicBandTrack *This, DMUS_PRIVATE_CHUNK
475472
return S_OK;
476473
}
477474

478-
static HRESULT parse_bandtrack_form(IDirectMusicBandTrack *This, DMUS_PRIVATE_CHUNK *pChunk,
475+
static HRESULT parse_bandtrack_form(struct band_track *This, DMUS_PRIVATE_CHUNK *pChunk,
479476
IStream *pStm)
480477
{
481478
HRESULT hr = E_FAIL;
@@ -566,14 +563,14 @@ static HRESULT parse_bandtrack_form(IDirectMusicBandTrack *This, DMUS_PRIVATE_CH
566563
return S_OK;
567564
}
568565

569-
static inline IDirectMusicBandTrack *impl_from_IPersistStream(IPersistStream *iface)
566+
static inline struct band_track *impl_from_IPersistStream(IPersistStream *iface)
570567
{
571-
return CONTAINING_RECORD(iface, IDirectMusicBandTrack, dmobj.IPersistStream_iface);
568+
return CONTAINING_RECORD(iface, struct band_track, dmobj.IPersistStream_iface);
572569
}
573570

574-
static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm)
571+
static HRESULT WINAPI band_track_persist_stream_Load(IPersistStream *iface, IStream *pStm)
575572
{
576-
IDirectMusicBandTrack *This = impl_from_IPersistStream(iface);
573+
struct band_track *This = impl_from_IPersistStream(iface);
577574
DMUS_PRIVATE_CHUNK Chunk;
578575
LARGE_INTEGER liMove;
579576
HRESULT hr;
@@ -614,30 +611,30 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
614611
return S_OK;
615612
}
616613

617-
static const IPersistStreamVtbl persiststream_vtbl = {
614+
static const IPersistStreamVtbl band_track_persist_stream_vtbl =
615+
{
618616
dmobj_IPersistStream_QueryInterface,
619617
dmobj_IPersistStream_AddRef,
620618
dmobj_IPersistStream_Release,
621619
dmobj_IPersistStream_GetClassID,
622620
unimpl_IPersistStream_IsDirty,
623-
IPersistStreamImpl_Load,
621+
band_track_persist_stream_Load,
624622
unimpl_IPersistStream_Save,
625-
unimpl_IPersistStream_GetSizeMax
623+
unimpl_IPersistStream_GetSizeMax,
626624
};
627625

628626
/* for ClassFactory */
629627
HRESULT create_dmbandtrack(REFIID lpcGUID, void **ppobj)
630628
{
631-
IDirectMusicBandTrack *track;
629+
struct band_track *track;
632630
HRESULT hr;
633631

634632
*ppobj = NULL;
635633
if (!(track = calloc(1, sizeof(*track)))) return E_OUTOFMEMORY;
636-
track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl;
634+
track->IDirectMusicTrack8_iface.lpVtbl = &band_track_vtbl;
637635
track->ref = 1;
638-
dmobject_init(&track->dmobj, &CLSID_DirectMusicBandTrack,
639-
(IUnknown *)&track->IDirectMusicTrack8_iface);
640-
track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl;
636+
dmobject_init(&track->dmobj, &CLSID_DirectMusicBandTrack, (IUnknown *)&track->IDirectMusicTrack8_iface);
637+
track->dmobj.IPersistStream_iface.lpVtbl = &band_track_persist_stream_vtbl;
641638
list_init (&track->Bands);
642639

643640
hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj);

0 commit comments

Comments
 (0)