dmime: Move a struct definition to the .c file that uses it.

Michael Stefaniuc mstefani at redhat.de
Mon Jun 9 06:27:04 CDT 2014


---
 dlls/dmime/dmime_private.h | 17 -----------------
 dlls/dmime/segment.c       | 11 +++++++++++
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h
index 01cd528..35b51a2 100644
--- a/dlls/dmime/dmime_private.h
+++ b/dlls/dmime/dmime_private.h
@@ -46,7 +46,6 @@
 /*****************************************************************************
  * Interfaces
  */
-typedef struct IDirectMusicSegment8Impl IDirectMusicSegment8Impl;
 typedef struct IDirectMusicGraphImpl IDirectMusicGraphImpl;
 typedef struct IDirectMusicAudioPathImpl IDirectMusicAudioPathImpl;
 
@@ -122,22 +121,6 @@ typedef struct DMUSIC_PRIVATE_PCHANNEL_ {
 } DMUSIC_PRIVATE_PCHANNEL, *LPDMUSIC_PRIVATE_PCHANNEL;
 
 /*****************************************************************************
- * IDirectMusicSegment8Impl implementation structure
- */
-struct IDirectMusicSegment8Impl {
-  IDirectMusicSegment8 IDirectMusicSegment8_iface;
-  const IDirectMusicObjectVtbl *ObjectVtbl;
-  const IPersistStreamVtbl *PersistStreamVtbl;
-  LONG           ref;
-
-  /* IDirectMusicSegment8Impl fields */
-  LPDMUS_OBJECTDESC      pDesc;
-  DMUS_IO_SEGMENT_HEADER header;
-  IDirectMusicGraph*     pGraph; 
-  struct list Tracks;
-};
-
-/*****************************************************************************
  * IDirectMusicAudioPathImpl implementation structure
  */
 struct IDirectMusicAudioPathImpl {
diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c
index 1bdf163..d17b341 100644
--- a/dlls/dmime/segment.c
+++ b/dlls/dmime/segment.c
@@ -26,6 +26,17 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile);
 /*****************************************************************************
  * IDirectMusicSegmentImpl implementation
  */
+typedef struct IDirectMusicSegment8Impl {
+    IDirectMusicSegment8 IDirectMusicSegment8_iface;
+    const IDirectMusicObjectVtbl *ObjectVtbl;
+    const IPersistStreamVtbl *PersistStreamVtbl;
+    LONG ref;
+    DMUS_OBJECTDESC *pDesc;
+    DMUS_IO_SEGMENT_HEADER header;
+    IDirectMusicGraph *pGraph;
+    struct list Tracks;
+} IDirectMusicSegment8Impl;
+
 static inline IDirectMusicSegment8Impl *impl_from_IDirectMusicSegment8(IDirectMusicSegment8 *iface)
 {
   return CONTAINING_RECORD(iface, IDirectMusicSegment8Impl, IDirectMusicSegment8_iface);
-- 
1.8.3.1



More information about the wine-patches mailing list