Michael Stefaniuc : dmusic: Move a struct to the .c file it is used.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 176b7aa8423ada08261d26ca6343ce6687984c2c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=176b7aa8423ada08261d26ca63...

Author: Michael Stefaniuc 
Date:   Thu May 15 23:55:43 2014 +0200

dmusic: Move a struct to the .c file it is used.

---

dlls/dmusic/collection.c     |   25 ++++++++++++++++++++++---
 dlls/dmusic/dmusic_private.h |   25 -------------------------
 2 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c
index 90a7918..acbc2a5 100644
--- a/dlls/dmusic/collection.c
+++ b/dlls/dmusic/collection.c
@@ -23,6 +23,28 @@
 WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
 WINE_DECLARE_DEBUG_CHANNEL(dmfile);

+/*****************************************************************************
+ * IDirectMusicCollectionImpl implementation
+ */
+typedef struct IDirectMusicCollectionImpl {
+    IDirectMusicCollection IDirectMusicCollection_iface;
+    IDirectMusicObject IDirectMusicObject_iface;
+    IPersistStream IPersistStream_iface;
+    LONG ref;
+    /* IDirectMusicCollectionImpl fields */
+    IStream *pStm; /* stream from which we load collection and later instruments */
+    LARGE_INTEGER liCollectionPosition; /* offset in a stream where collection was loaded from */
+    LARGE_INTEGER liWavePoolTablePosition; /* offset in a stream where wave pool table can be found */
+    DMUS_OBJECTDESC *pDesc;
+    CHAR *szCopyright; /* FIXME: should probably placed somewhere else */
+    DLSHEADER *pHeader;
+    /* pool table */
+    POOLTABLE *pPoolTable;
+    POOLCUE *pPoolCues;
+    /* instruments */
+    struct list Instruments;
+} IDirectMusicCollectionImpl;
+
 static inline IDirectMusicCollectionImpl *impl_from_IDirectMusicCollection(IDirectMusicCollection *iface)
 {
     return CONTAINING_RECORD(iface, IDirectMusicCollectionImpl, IDirectMusicCollection_iface);
@@ -38,9 +60,6 @@ static inline IDirectMusicCollectionImpl *impl_from_IPersistStream(IPersistStrea
     return CONTAINING_RECORD(iface, IDirectMusicCollectionImpl, IPersistStream_iface);
 }

-/*****************************************************************************
- * IDirectMusicCollectionImpl implementation
- */
 /* IDirectMusicCollectionImpl IUnknown part: */
 static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_QueryInterface(LPDIRECTMUSICCOLLECTION iface, REFIID riid, LPVOID *ret_iface)
 {
diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h
index badc2df..6a87bee 100644
--- a/dlls/dmusic/dmusic_private.h
+++ b/dlls/dmusic/dmusic_private.h
@@ -51,7 +51,6 @@ typedef struct IDirectMusicDownloadedInstrumentImpl IDirectMusicDownloadedInstru
 typedef struct IDirectMusicDownloadImpl IDirectMusicDownloadImpl;
 typedef struct IReferenceClockImpl IReferenceClockImpl;

-typedef struct IDirectMusicCollectionImpl IDirectMusicCollectionImpl;
 typedef struct IDirectMusicInstrumentImpl IDirectMusicInstrumentImpl;

typedef struct SynthPortImpl SynthPortImpl;
@@ -210,30 +209,6 @@ typedef struct _DMUS_PRIVATE_POOLCUE {
 } DMUS_PRIVATE_POOLCUE, *LPDMUS_PRIVATE_POOLCUE;

/*****************************************************************************
- * IDirectMusicCollectionImpl implementation structure
- */
-struct IDirectMusicCollectionImpl {
-    /* IUnknown fields */
-    IDirectMusicCollection IDirectMusicCollection_iface;
-    IDirectMusicObject IDirectMusicObject_iface;
-    IPersistStream IPersistStream_iface;
-    LONG ref;
-
-    /* IDirectMusicCollectionImpl fields */
-    IStream *pStm; /* stream from which we load collection and later instruments */
-    LARGE_INTEGER liCollectionPosition; /* offset in a stream where collection was loaded from */
-    LARGE_INTEGER liWavePoolTablePosition; /* offset in a stream where wave pool table can be found */
-    LPDMUS_OBJECTDESC pDesc;
-    CHAR* szCopyright; /* FIXME: should probably placed somewhere else */
-    LPDLSHEADER pHeader;
-    /* pool table */
-    LPPOOLTABLE pPoolTable;
-    LPPOOLCUE pPoolCues;
-    /* instruments */
-    struct list Instruments;
-};
-
-/*****************************************************************************
  * IDirectMusicInstrumentImpl implementation structure
  */
 struct IDirectMusicInstrumentImpl {