Michael Stefaniuc : dmime: Move a struct definition to the .c file that uses it.
Alexandre Julliard
julliard at winehq.org
Wed Jun 11 13:36:25 CDT 2014
Module: wine
Branch: master
Commit: 8b9fd8939bfc86d8046a2c69859d8ce3b69cab8a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b9fd8939bfc86d8046a2c69859d8ce3b69cab8a
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Mon Jun 9 13:27:04 2014 +0200
dmime: Move a struct definition to the .c file that uses it.
---
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);
More information about the wine-cvs
mailing list