dmband: Move struct definitions to the .c files that uses them.
Michael Stefaniuc
mstefani at redhat.de
Mon Jun 9 06:28:01 CDT 2014
---
dlls/dmband/band.c | 9 +++++++++
dlls/dmband/bandtrack.c | 11 ++++++++++-
dlls/dmband/dmband_private.h | 40 ----------------------------------------
3 files changed, 19 insertions(+), 41 deletions(-)
diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c
index 97e7c30..0ab7df7 100644
--- a/dlls/dmband/band.c
+++ b/dlls/dmband/band.c
@@ -26,6 +26,15 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile);
/*****************************************************************************
* IDirectMusicBandImpl implementation
*/
+typedef struct IDirectMusicBandImpl {
+ IDirectMusicBand IDirectMusicBand_iface;
+ const IDirectMusicObjectVtbl *ObjectVtbl;
+ const IPersistStreamVtbl *PersistStreamVtbl;
+ LONG ref;
+ DMUS_OBJECTDESC *pDesc;
+ struct list Instruments;
+} IDirectMusicBandImpl;
+
static inline IDirectMusicBandImpl *impl_from_IDirectMusicBand(IDirectMusicBand *iface)
{
return CONTAINING_RECORD(iface, IDirectMusicBandImpl, IDirectMusicBand_iface);
diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c
index 459c158..14e368d 100644
--- a/dlls/dmband/bandtrack.c
+++ b/dlls/dmband/bandtrack.c
@@ -25,7 +25,16 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile);
/*****************************************************************************
* IDirectMusicBandTrack implementation
*/
-/* IDirectMusicBandTrack IUnknown part: */
+typedef struct IDirectMusicBandTrack {
+ const IUnknownVtbl *UnknownVtbl;
+ const IDirectMusicTrack8Vtbl *TrackVtbl;
+ const IPersistStreamVtbl *PersistStreamVtbl;
+ LONG ref;
+ DMUS_OBJECTDESC *pDesc;
+ DMUS_IO_BAND_TRACK_HEADER header;
+ struct list Bands;
+} IDirectMusicBandTrack;
+
static HRESULT WINAPI IDirectMusicBandTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS_MULTI(IDirectMusicBandTrack, UnknownVtbl, iface);
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
diff --git a/dlls/dmband/dmband_private.h b/dlls/dmband/dmband_private.h
index 6be6ae8..4c8fa0b 100644
--- a/dlls/dmband/dmband_private.h
+++ b/dlls/dmband/dmband_private.h
@@ -43,13 +43,6 @@
#include "dmusics.h"
/*****************************************************************************
- * Interfaces
- */
-typedef struct IDirectMusicBandImpl IDirectMusicBandImpl;
-
-typedef struct IDirectMusicBandTrack IDirectMusicBandTrack;
-
-/*****************************************************************************
* ClassFactory
*/
extern HRESULT WINAPI create_dmband(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
@@ -82,39 +75,6 @@ typedef struct _DMUS_PRIVATE_BAND {
} DMUS_PRIVATE_BAND, *LPDMUS_PRIVATE_BAND;
-/*****************************************************************************
- * IDirectMusicBandImpl implementation structure
- */
-struct IDirectMusicBandImpl {
- IDirectMusicBand IDirectMusicBand_iface;
- const IDirectMusicObjectVtbl *ObjectVtbl;
- const IPersistStreamVtbl *PersistStreamVtbl;
- LONG ref;
-
- /* IDirectMusicBandImpl fields */
- LPDMUS_OBJECTDESC pDesc;
- /* data */
- struct list Instruments;
-};
-
-/*****************************************************************************
- * IDirectMusicBandTrack implementation structure
- */
-struct IDirectMusicBandTrack {
- /* IUnknown fields */
- const IUnknownVtbl *UnknownVtbl;
- const IDirectMusicTrack8Vtbl *TrackVtbl;
- const IPersistStreamVtbl *PersistStreamVtbl;
- LONG ref;
-
- /* IDirectMusicBandTrack fields */
- LPDMUS_OBJECTDESC pDesc;
- DMUS_IO_BAND_TRACK_HEADER header;
-
- /* data */
- struct list Bands;
-};
-
/**********************************************************************
* Dll lifetime tracking declaration for dmband.dll
*/
--
1.8.3.1
More information about the wine-patches
mailing list