marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dmband: Move struct definitions to the .c files that uses them.

oldstable
Michael Stefaniuc 2014-06-09 13:28:01 +02:00 committed by Alexandre Julliard
parent 8b9fd8939b
commit c3e753c20b
3 changed files with 19 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/dmband/band.c
View File

@ -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);

11
dlls/dmband/bandtrack.c
View File

@ -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);

40
dlls/dmband/dmband_private.h
View File

@ -42,13 +42,6 @@
#include "dmusicf.h"
#include "dmusics.h"
/*****************************************************************************
* Interfaces
*/
typedef struct IDirectMusicBandImpl IDirectMusicBandImpl;
typedef struct IDirectMusicBandTrack IDirectMusicBandTrack;
/*****************************************************************************
* ClassFactory
*/
@ -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
*/