From 619c697da0a2968bfee1f9fd7ad990d05739658a Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Fri, 26 Jun 2015 00:12:30 +0200 Subject: [PATCH] dmime: Move struct definitions to the files that need them. --- dlls/dmime/dmime_private.h | 141 --------------------------------- dlls/dmime/lyricstrack.c | 8 ++ dlls/dmime/markertrack.c | 8 ++ dlls/dmime/paramcontroltrack.c | 8 ++ dlls/dmime/segtriggertrack.c | 9 +++ dlls/dmime/seqtrack.c | 8 ++ dlls/dmime/sysextrack.c | 8 ++ dlls/dmime/tempotrack.c | 10 +++ dlls/dmime/timesigtrack.c | 8 ++ dlls/dmime/wavetrack.c | 11 +++ 10 files changed, 78 insertions(+), 141 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index fa44a4dcfe1..b6e4264b97c 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -49,16 +49,6 @@ typedef struct IDirectMusicGraphImpl IDirectMusicGraphImpl; typedef struct IDirectMusicAudioPathImpl IDirectMusicAudioPathImpl; -typedef struct IDirectMusicLyricsTrack IDirectMusicLyricsTrack; -typedef struct IDirectMusicMarkerTrack IDirectMusicMarkerTrack; -typedef struct IDirectMusicParamControlTrack IDirectMusicParamControlTrack; -typedef struct IDirectMusicSegTriggerTrack IDirectMusicSegTriggerTrack; -typedef struct IDirectMusicSeqTrack IDirectMusicSeqTrack; -typedef struct IDirectMusicSysExTrack IDirectMusicSysExTrack; -typedef struct IDirectMusicTempoTrack IDirectMusicTempoTrack; -typedef struct IDirectMusicTimeSigTrack IDirectMusicTimeSigTrack; -typedef struct IDirectMusicWaveTrack IDirectMusicWaveTrack; - /***************************************************************************** * ClassFactory */ @@ -123,137 +113,6 @@ typedef struct DMUSIC_PRIVATE_PCHANNEL_ { IDirectMusicPort *port; /* ... at this port */ } DMUSIC_PRIVATE_PCHANNEL, *LPDMUSIC_PRIVATE_PCHANNEL; -/***************************************************************************** - * IDirectMusicLyricsTrack implementation structure - */ -struct IDirectMusicLyricsTrack -{ - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicLyricsTrack fields */ - LPDMUS_OBJECTDESC pDesc; -}; - -/***************************************************************************** - * IDirectMusicMarkerTrack implementation structure - */ -struct IDirectMusicMarkerTrack { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicMarkerTrack fields */ - LPDMUS_OBJECTDESC pDesc; -}; - -/***************************************************************************** - * IDirectMusicParamControlTrack implementation structure - */ -struct IDirectMusicParamControlTrack { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicParamControlTrack fields */ - LPDMUS_OBJECTDESC pDesc; -}; - -/***************************************************************************** - * IDirectMusicSegTriggerTrack implementation structure - */ -struct IDirectMusicSegTriggerTrack { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicSegTriggerTrack fields */ - LPDMUS_OBJECTDESC pDesc; - - struct list Items; -}; - -/***************************************************************************** - * IDirectMusicSeqTrack implementation structure - */ -struct IDirectMusicSeqTrack { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicSeqTrack fields */ - LPDMUS_OBJECTDESC pDesc; -}; - -/***************************************************************************** - * IDirectMusicSysExTrack implementation structure - */ -struct IDirectMusicSysExTrack { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicSysExTrack fields */ - LPDMUS_OBJECTDESC pDesc; -}; - -/***************************************************************************** - * IDirectMusicTempoTrack implementation structure - */ -struct IDirectMusicTempoTrack { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicTempoTrack fields */ - LPDMUS_OBJECTDESC pDesc; - BOOL enabled; - struct list Items; -}; - -/***************************************************************************** - * IDirectMusicTimeSigTrack implementation structure - */ -struct IDirectMusicTimeSigTrack { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicTimeSigTrack fields */ - LPDMUS_OBJECTDESC pDesc; -}; - -/***************************************************************************** - * IDirectMusicWaveTrack implementation structure - */ -struct IDirectMusicWaveTrack { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicWaveTrack fields */ - LPDMUS_OBJECTDESC pDesc; -}; - /********************************************************************** * Dll lifetime tracking declaration for dmime.dll */ diff --git a/dlls/dmime/lyricstrack.c b/dlls/dmime/lyricstrack.c index 5d8d44e8e9e..73235327c68 100644 --- a/dlls/dmime/lyricstrack.c +++ b/dlls/dmime/lyricstrack.c @@ -24,6 +24,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); /***************************************************************************** * IDirectMusicLyricsTrack implementation */ +typedef struct IDirectMusicLyricsTrack { + const IUnknownVtbl *UnknownVtbl; + const IDirectMusicTrack8Vtbl *TrackVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; +} IDirectMusicLyricsTrack; + /* IDirectMusicLyricsTrack IUnknown part: */ static HRESULT WINAPI IDirectMusicLyricsTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicLyricsTrack, UnknownVtbl, iface); diff --git a/dlls/dmime/markertrack.c b/dlls/dmime/markertrack.c index 350d6caf138..5ac10e60578 100644 --- a/dlls/dmime/markertrack.c +++ b/dlls/dmime/markertrack.c @@ -24,6 +24,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); /***************************************************************************** * IDirectMusicMarkerTrack implementation */ +typedef struct IDirectMusicMarkerTrack { + const IUnknownVtbl *UnknownVtbl; + const IDirectMusicTrack8Vtbl *TrackVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; +} IDirectMusicMarkerTrack; + /* IDirectMusicMarkerTrack IUnknown part: */ static HRESULT WINAPI IDirectMusicMarkerTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicMarkerTrack, UnknownVtbl, iface); diff --git a/dlls/dmime/paramcontroltrack.c b/dlls/dmime/paramcontroltrack.c index 25214d341b5..78e33277728 100644 --- a/dlls/dmime/paramcontroltrack.c +++ b/dlls/dmime/paramcontroltrack.c @@ -24,6 +24,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); /***************************************************************************** * IDirectMusicParamControlTrack implementation */ +typedef struct IDirectMusicParamControlTrack { + const IUnknownVtbl *UnknownVtbl; + const IDirectMusicTrack8Vtbl *TrackVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; +} IDirectMusicParamControlTrack; + /* IDirectMusicParamControlTrack IUnknown part: */ static HRESULT WINAPI IDirectMusicParamControlTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicParamControlTrack, UnknownVtbl, iface); diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index 4202bfac29f..277c26f5ce4 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -26,6 +26,15 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); /***************************************************************************** * IDirectMusicSegTriggerTrack implementation */ +typedef struct IDirectMusicSegTriggerTrack { + const IUnknownVtbl *UnknownVtbl; + const IDirectMusicTrack8Vtbl *TrackVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; + struct list Items; +} IDirectMusicSegTriggerTrack; + /* IDirectMusicSegTriggerTrack IUnknown part: */ static HRESULT WINAPI IDirectMusicSegTriggerTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicSegTriggerTrack, UnknownVtbl, iface); diff --git a/dlls/dmime/seqtrack.c b/dlls/dmime/seqtrack.c index efe01698d73..2598138456f 100644 --- a/dlls/dmime/seqtrack.c +++ b/dlls/dmime/seqtrack.c @@ -24,6 +24,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); /***************************************************************************** * IDirectMusicSeqTrack implementation */ +typedef struct IDirectMusicSeqTrack { + const IUnknownVtbl *UnknownVtbl; + const IDirectMusicTrack8Vtbl *TrackVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; +} IDirectMusicSeqTrack; + /* IDirectMusicSeqTrack IUnknown part: */ static HRESULT WINAPI IDirectMusicSeqTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicSeqTrack, UnknownVtbl, iface); diff --git a/dlls/dmime/sysextrack.c b/dlls/dmime/sysextrack.c index b5bdb148483..ce5ae125d11 100644 --- a/dlls/dmime/sysextrack.c +++ b/dlls/dmime/sysextrack.c @@ -24,6 +24,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); /***************************************************************************** * IDirectMusicSysExTrack implementation */ +typedef struct IDirectMusicSysExTrack { + const IUnknownVtbl *UnknownVtbl; + const IDirectMusicTrack8Vtbl *TrackVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; +} IDirectMusicSysExTrack; + /* IDirectMusicSysExTrack IUnknown part: */ static HRESULT WINAPI IDirectMusicSysExTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicSysExTrack, UnknownVtbl, iface); diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index 3ae4890adba..569a61eb378 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -26,6 +26,16 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); /***************************************************************************** * IDirectMusicTempoTrack implementation */ +typedef struct IDirectMusicTempoTrack { + const IUnknownVtbl *UnknownVtbl; + const IDirectMusicTrack8Vtbl *TrackVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; + BOOL enabled; + struct list Items; +} IDirectMusicTempoTrack; + /* IDirectMusicTempoTrack IUnknown part: */ static HRESULT WINAPI IDirectMusicTempoTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicTempoTrack, UnknownVtbl, iface); diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c index 9a1e302aa33..e0c3fa23ebd 100644 --- a/dlls/dmime/timesigtrack.c +++ b/dlls/dmime/timesigtrack.c @@ -24,6 +24,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); /***************************************************************************** * IDirectMusicTimeSigTrack implementation */ +typedef struct IDirectMusicTimeSigTrack { + const IUnknownVtbl *UnknownVtbl; + const IDirectMusicTrack8Vtbl *TrackVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; +} IDirectMusicTimeSigTrack; + /* IDirectMusicTimeSigTrack IUnknown part: */ static HRESULT WINAPI IDirectMusicTimeSigTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, UnknownVtbl, iface); diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index 38c42df76a5..b895c272cb1 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -24,6 +24,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); /***************************************************************************** * IDirectMusicWaveTrack implementation */ +/***************************************************************************** + * IDirectMusicChordMapTrack implementation + */ +typedef struct IDirectMusicWaveTrack { + const IUnknownVtbl *UnknownVtbl; + const IDirectMusicTrack8Vtbl *TrackVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; +} IDirectMusicWaveTrack; + /* IDirectMusicWaveTrack IUnknown part: */ static HRESULT WINAPI IDirectMusicWaveTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicWaveTrack, UnknownVtbl, iface);