From bf117ec5f418b1e9caa669fb79945938f8e00cb5 Mon Sep 17 00:00:00 2001
From: Michael Stefaniuc <mstefani@redhat.de>
Date: Thu, 25 Jun 2015 00:41:01 +0200
Subject: [PATCH] dmcompos: Move struct definitions to the files that need
 them.

---
 dlls/dmcompos/chordmaptrack.c    |  8 ++++++++
 dlls/dmcompos/dmcompos_private.h | 34 --------------------------------
 dlls/dmcompos/signposttrack.c    |  8 ++++++++
 3 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/dlls/dmcompos/chordmaptrack.c b/dlls/dmcompos/chordmaptrack.c
index c282d9d1fea..6773b9d4354 100644
--- a/dlls/dmcompos/chordmaptrack.c
+++ b/dlls/dmcompos/chordmaptrack.c
@@ -28,6 +28,14 @@ static ULONG WINAPI IDirectMusicChordMapTrack_IPersistStream_AddRef (LPPERSISTST
 /*****************************************************************************
  * IDirectMusicChordMapTrack implementation
  */
+typedef struct IDirectMusicChordMapTrack {
+    const IUnknownVtbl *UnknownVtbl;
+    const IDirectMusicTrack8Vtbl *TrackVtbl;
+    const IPersistStreamVtbl *PersistStreamVtbl;
+    LONG ref;
+    DMUS_OBJECTDESC *pDesc;
+} IDirectMusicChordMapTrack;
+
 /* IDirectMusicChordMapTrack IUnknown part: */
 static HRESULT WINAPI IDirectMusicChordMapTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) {
 	ICOM_THIS_MULTI(IDirectMusicChordMapTrack, UnknownVtbl, iface);
diff --git a/dlls/dmcompos/dmcompos_private.h b/dlls/dmcompos/dmcompos_private.h
index 6a8044517fa..8e67a183274 100644
--- a/dlls/dmcompos/dmcompos_private.h
+++ b/dlls/dmcompos/dmcompos_private.h
@@ -42,12 +42,6 @@
 #include "dmusicf.h"
 #include "dmusics.h"
 
-/*****************************************************************************
- * Interfaces
- */
-typedef struct IDirectMusicChordMapTrack IDirectMusicChordMapTrack;
-typedef struct IDirectMusicSignPostTrack IDirectMusicSignPostTrack;
-	
 /*****************************************************************************
  * ClassFactory
  */
@@ -56,34 +50,6 @@ extern HRESULT WINAPI create_dmcomposer(REFIID riid, void **ret_iface) DECLSPEC_
 extern HRESULT WINAPI create_dmchordmaptrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
 extern HRESULT WINAPI create_dmsignposttrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
 
-/*****************************************************************************
- * IDirectMusicChordMapTrack implementation structure
- */
-struct IDirectMusicChordMapTrack {
-  /* IUnknown fields */
-  const IUnknownVtbl *UnknownVtbl;
-  const IDirectMusicTrack8Vtbl *TrackVtbl;
-  const IPersistStreamVtbl *PersistStreamVtbl;
-  LONG           ref;
-
-  /* IDirectMusicChordMapTrack fields */
-  LPDMUS_OBJECTDESC pDesc;
-};
-
-/*****************************************************************************
- * IDirectMusicSignPostTrack implementation structure
- */
-struct IDirectMusicSignPostTrack {
-  /* IUnknown fields */
-  const IUnknownVtbl *UnknownVtbl;
-  const IDirectMusicTrack8Vtbl *TrackVtbl;
-  const IPersistStreamVtbl *PersistStreamVtbl;
-  LONG           ref;
-
-  /* IDirectMusicSignPostTrack fields */
-  LPDMUS_OBJECTDESC pDesc;
-};
-
 /**********************************************************************
  * Dll lifetime tracking declaration for dmcompos.dll
  */
diff --git a/dlls/dmcompos/signposttrack.c b/dlls/dmcompos/signposttrack.c
index 0fe9c4bd86c..ed7b706fd7d 100644
--- a/dlls/dmcompos/signposttrack.c
+++ b/dlls/dmcompos/signposttrack.c
@@ -28,6 +28,14 @@ static ULONG WINAPI IDirectMusicSignPostTrack_IPersistStream_AddRef (LPPERSISTST
 /*****************************************************************************
  * IDirectMusicSignPostTrack implementation
  */
+typedef struct IDirectMusicSignPostTrack {
+    const IUnknownVtbl *UnknownVtbl;
+    const IDirectMusicTrack8Vtbl *TrackVtbl;
+    const IPersistStreamVtbl *PersistStreamVtbl;
+    LONG ref;
+    DMUS_OBJECTDESC *pDesc;
+} IDirectMusicSignPostTrack;
+
 /* IDirectMusicSignPostTrack IUnknown part: */
 static HRESULT WINAPI IDirectMusicSignPostTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) {
 	ICOM_THIS_MULTI(IDirectMusicSignPostTrack, UnknownVtbl, iface);