dmstyle: Move struct definitions to the files that need them.

dlls/dmstyle/auditiontrack.c

@@ -28,6 +28,14 @@ static ULONG WINAPI IDirectMusicAuditionTrack_IPersistStream_AddRef (LPPERSISTST
 /*****************************************************************************
  * IDirectMusicAuditionTrack implementation
  */
+typedef struct IDirectMusicAuditionTrack {
+    const IUnknownVtbl *UnknownVtbl;
+    const IDirectMusicTrack8Vtbl *TrackVtbl;
+    const IPersistStreamVtbl *PersistStreamVtbl;
+    LONG ref;
+    DMUS_OBJECTDESC *pDesc;
+} IDirectMusicAuditionTrack;
+
 /* IDirectMusicAuditionTrack IUnknown part: */
 static HRESULT WINAPI IDirectMusicAuditionTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) {
 	ICOM_THIS_MULTI(IDirectMusicAuditionTrack, UnknownVtbl, iface);

dlls/dmstyle/chordtrack.c

@@ -30,6 +30,15 @@ static ULONG WINAPI IDirectMusicChordTrack_IPersistStream_AddRef (LPPERSISTSTREA
 /*****************************************************************************
  * IDirectMusicChordTrack implementation
  */
+typedef struct IDirectMusicChordTrack {
+    const IUnknownVtbl *UnknownVtbl;
+    const IDirectMusicTrack8Vtbl *TrackVtbl;
+    const IPersistStreamVtbl *PersistStreamVtbl;
+    LONG ref;
+    DMUS_OBJECTDESC *pDesc;
+    DWORD dwScale;
+}  IDirectMusicChordTrack;
+
 /* IDirectMusicChordTrack IUnknown part: */
 static HRESULT WINAPI IDirectMusicChordTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) {
 	ICOM_THIS_MULTI(IDirectMusicChordTrack, UnknownVtbl, iface);

dlls/dmstyle/commandtrack.c

@@ -29,6 +29,15 @@ static ULONG WINAPI IDirectMusicCommandTrack_IPersistStream_AddRef (LPPERSISTSTR
 /*****************************************************************************
  * IDirectMusicCommandTrack implementation
  */
+typedef struct IDirectMusicCommandTrack {
+    const IUnknownVtbl *UnknownVtbl;
+    const IDirectMusicTrack8Vtbl *TrackVtbl;
+    const IPersistStreamVtbl *PersistStreamVtbl;
+    LONG ref;
+    DMUS_OBJECTDESC *pDesc;
+    struct list Commands;
+} IDirectMusicCommandTrack;
+
 /* IDirectMusicCommandTrack IUnknown part: */
 static HRESULT WINAPI IDirectMusicCommandTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) {
 	ICOM_THIS_MULTI(IDirectMusicCommandTrack, UnknownVtbl, iface);

dlls/dmstyle/dmstyle_private.h

@@ -45,13 +45,7 @@
 /*****************************************************************************
  * Interfaces
  */
-typedef struct IDirectMusicAuditionTrack IDirectMusicAuditionTrack;
-typedef struct IDirectMusicChordTrack IDirectMusicChordTrack;
-typedef struct IDirectMusicCommandTrack IDirectMusicCommandTrack;
 typedef struct IDirectMusicMelodyFormulationTrack IDirectMusicMelodyFormulationTrack;
-typedef struct IDirectMusicMotifTrack IDirectMusicMotifTrack;
-typedef struct IDirectMusicMuteTrack IDirectMusicMuteTrack;
-typedef struct IDirectMusicStyleTrack IDirectMusicStyleTrack;
 	
 /*****************************************************************************
  * ClassFactory
@@ -97,35 +91,6 @@ typedef struct _DMUS_PRIVATE_STYLE_ITEM {
 } DMUS_PRIVATE_STYLE_ITEM, *LPDMUS_PRIVATE_STYLE_ITEM;
 
 
-/*****************************************************************************
- * IDirectMusicAuditionTrack implementation structure
- */
-struct IDirectMusicAuditionTrack {
-  /* IUnknown fields */
-  const IUnknownVtbl *UnknownVtbl;
-  const IDirectMusicTrack8Vtbl *TrackVtbl;
-  const IPersistStreamVtbl *PersistStreamVtbl;
-  LONG           ref;
-
-  /* IDirectMusicAuditionTrack fields */
-  LPDMUS_OBJECTDESC pDesc;
-};
-
-/*****************************************************************************
- * IDirectMusicChordTrack implementation structure
- */
-struct IDirectMusicChordTrack {
-  /* IUnknown fields */
-  const IUnknownVtbl *UnknownVtbl;
-  const IDirectMusicTrack8Vtbl *TrackVtbl;
-  const IPersistStreamVtbl *PersistStreamVtbl;
-  LONG           ref;
-
-  /* IDirectMusicChordTrack fields */
-  LPDMUS_OBJECTDESC pDesc;
-  DWORD dwScale;
-};
-
 typedef struct _DMUS_PRIVATE_COMMAND {
 	struct list entry; /* for listing elements */
 	DMUS_IO_COMMAND pCommand;
@@ -133,22 +98,6 @@ typedef struct _DMUS_PRIVATE_COMMAND {
 } DMUS_PRIVATE_COMMAND, *LPDMUS_PRIVATE_COMMAND;
 
 /*****************************************************************************
- * IDirectMusicCommandTrack implementation structure
- */
-struct IDirectMusicCommandTrack {
-  /* IUnknown fields */
-  const IUnknownVtbl *UnknownVtbl;
-  const IDirectMusicTrack8Vtbl *TrackVtbl;
-  const IPersistStreamVtbl *PersistStreamVtbl;
-  LONG           ref;
-
-  /* IDirectMusicCommandTrack fields */
-  LPDMUS_OBJECTDESC pDesc;
-  /* track data */
-  struct list Commands;
-};
-
-/*****************************************************************************
  * IDirectMusicMelodyFormulationTrack implementation structure
  */
 struct IDirectMusicMelodyFormulationTrack {
@@ -170,50 +119,6 @@ extern ULONG WINAPI   IDirectMusicMelodyFormulationTrack_IDirectMusicTrack_AddRe
 /* IPersistStream: */
 extern ULONG WINAPI   IDirectMusicMelodyFormulationTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) DECLSPEC_HIDDEN;
 
-/*****************************************************************************
- * IDirectMusicMotifTrack implementation structure
- */
-struct IDirectMusicMotifTrack {
-  /* IUnknown fields */
-  const IUnknownVtbl *UnknownVtbl;
-  const IDirectMusicTrack8Vtbl *TrackVtbl;
-  const IPersistStreamVtbl *PersistStreamVtbl;
-  LONG           ref;
-
-  /* IDirectMusicMotifTrack fields */
-  LPDMUS_OBJECTDESC pDesc;
-};
-
-/*****************************************************************************
- * IDirectMusicMuteTrack implementation structure
- */
-struct IDirectMusicMuteTrack {
-  /* IUnknown fields */
-  const IUnknownVtbl *UnknownVtbl;
-  const IDirectMusicTrack8Vtbl *TrackVtbl;
-  const IPersistStreamVtbl *PersistStreamVtbl;
-  LONG           ref;
-
-  /* IDirectMusicMuteTrack fields */
-  LPDMUS_OBJECTDESC pDesc;
-};
-
-/*****************************************************************************
- * IDirectMusicStyleTrack implementation structure
- */
-struct IDirectMusicStyleTrack {
-  /* IUnknown fields */
-  const IUnknownVtbl *UnknownVtbl;
-  const IDirectMusicTrack8Vtbl *TrackVtbl;
-  const IPersistStreamVtbl *PersistStreamVtbl;
-  LONG           ref;
-
-  /* IDirectMusicStyleTrack fields */
-  LPDMUS_OBJECTDESC pDesc;
-  
-  struct list Items;
-};
-
 /**********************************************************************
  * Dll lifetime tracking declaration for dmstyle.dll
  */

dlls/dmstyle/motiftrack.c

@@ -28,6 +28,14 @@ static ULONG WINAPI IDirectMusicMotifTrack_IPersistStream_AddRef (LPPERSISTSTREA
 /*****************************************************************************
  * IDirectMusicMotifTrack implementation
  */
+typedef struct IDirectMusicMotifTrack {
+    const IUnknownVtbl *UnknownVtbl;
+    const IDirectMusicTrack8Vtbl *TrackVtbl;
+    const IPersistStreamVtbl *PersistStreamVtbl;
+    LONG ref;
+    DMUS_OBJECTDESC *pDesc;
+} IDirectMusicMotifTrack;
+
 /* IDirectMusicMotifTrack IUnknown part: */
 static HRESULT WINAPI IDirectMusicMotifTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) {
 	ICOM_THIS_MULTI(IDirectMusicMotifTrack, UnknownVtbl, iface);

dlls/dmstyle/mutetrack.c

@@ -28,6 +28,14 @@ static ULONG WINAPI IDirectMusicMuteTrack_IPersistStream_AddRef (LPPERSISTSTREAM
 /*****************************************************************************
  * IDirectMusicMuteTrack implementation
  */
+typedef struct IDirectMusicMuteTrack {
+    const IUnknownVtbl *UnknownVtbl;
+    const IDirectMusicTrack8Vtbl *TrackVtbl;
+    const IPersistStreamVtbl *PersistStreamVtbl;
+    LONG ref;
+    DMUS_OBJECTDESC *pDesc;
+} IDirectMusicMuteTrack;
+
 /* IDirectMusicMuteTrack IUnknown part: */
 static HRESULT WINAPI IDirectMusicMuteTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) {
 	ICOM_THIS_MULTI(IDirectMusicMuteTrack, UnknownVtbl, iface);

dlls/dmstyle/styletrack.c

@@ -29,6 +29,15 @@ static ULONG WINAPI IDirectMusicStyleTrack_IPersistStream_AddRef (LPPERSISTSTREA
 /*****************************************************************************
  * IDirectMusicStyleTrack implementation
  */
+typedef struct IDirectMusicStyleTrack {
+    const IUnknownVtbl *UnknownVtbl;
+    const IDirectMusicTrack8Vtbl *TrackVtbl;
+    const IPersistStreamVtbl *PersistStreamVtbl;
+    LONG ref;
+    DMUS_OBJECTDESC *pDesc;
+    struct list Items;
+} IDirectMusicStyleTrack;
+
 /* IDirectMusicStyleTrack IUnknown part: */
 static HRESULT WINAPI IDirectMusicStyleTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) {
 	ICOM_THIS_MULTI(IDirectMusicStyleTrack, UnknownVtbl, iface);