ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dmime: Move struct definitions to the files that need them.

This commit is contained in:
Michael Stefaniuc 2015-06-26 00:12:30 +02:00 committed by Alexandre Julliard
parent cabbb922e6
commit 619c697da0
10 changed files with 78 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
dlls/dmime/dmime_private.h
View File

@ -49,16 +49,6 @@
typedef struct IDirectMusicGraphImpl IDirectMusicGraphImpl; typedef struct IDirectMusicGraphImpl IDirectMusicGraphImpl;
typedef struct IDirectMusicAudioPathImpl IDirectMusicAudioPathImpl; typedef struct IDirectMusicAudioPathImpl IDirectMusicAudioPathImpl;
typedef struct IDirectMusicLyricsTrack IDirectMusicLyricsTrack;
typedef struct IDirectMusicMarkerTrack IDirectMusicMarkerTrack;
typedef struct IDirectMusicParamControlTrack IDirectMusicParamControlTrack;
typedef struct IDirectMusicSegTriggerTrack IDirectMusicSegTriggerTrack;
typedef struct IDirectMusicSeqTrack IDirectMusicSeqTrack;
typedef struct IDirectMusicSysExTrack IDirectMusicSysExTrack;
typedef struct IDirectMusicTempoTrack IDirectMusicTempoTrack;
typedef struct IDirectMusicTimeSigTrack IDirectMusicTimeSigTrack;
typedef struct IDirectMusicWaveTrack IDirectMusicWaveTrack;
/***************************************************************************** /*****************************************************************************
* ClassFactory * ClassFactory
*/ */
@ -123,137 +113,6 @@ typedef struct DMUSIC_PRIVATE_PCHANNEL_ {
IDirectMusicPort *port; /* ... at this port */ IDirectMusicPort *port; /* ... at this port */
} DMUSIC_PRIVATE_PCHANNEL, *LPDMUSIC_PRIVATE_PCHANNEL; } DMUSIC_PRIVATE_PCHANNEL, *LPDMUSIC_PRIVATE_PCHANNEL;
/*****************************************************************************
* IDirectMusicLyricsTrack implementation structure
*/
struct IDirectMusicLyricsTrack
{
/* IUnknown fields */
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
LONG ref;
/* IDirectMusicLyricsTrack fields */
LPDMUS_OBJECTDESC pDesc;
};
/*****************************************************************************
* IDirectMusicMarkerTrack implementation structure
*/
struct IDirectMusicMarkerTrack {
/* IUnknown fields */
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
LONG ref;
/* IDirectMusicMarkerTrack fields */
LPDMUS_OBJECTDESC pDesc;
};
/*****************************************************************************
* IDirectMusicParamControlTrack implementation structure
*/
struct IDirectMusicParamControlTrack {
/* IUnknown fields */
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
LONG ref;
/* IDirectMusicParamControlTrack fields */
LPDMUS_OBJECTDESC pDesc;
};
/*****************************************************************************
* IDirectMusicSegTriggerTrack implementation structure
*/
struct IDirectMusicSegTriggerTrack {
/* IUnknown fields */
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
LONG ref;
/* IDirectMusicSegTriggerTrack fields */
LPDMUS_OBJECTDESC pDesc;
struct list Items;
};
/*****************************************************************************
* IDirectMusicSeqTrack implementation structure
*/
struct IDirectMusicSeqTrack {
/* IUnknown fields */
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
LONG ref;
/* IDirectMusicSeqTrack fields */
LPDMUS_OBJECTDESC pDesc;
};
/*****************************************************************************
* IDirectMusicSysExTrack implementation structure
*/
struct IDirectMusicSysExTrack {
/* IUnknown fields */
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
LONG ref;
/* IDirectMusicSysExTrack fields */
LPDMUS_OBJECTDESC pDesc;
};
/*****************************************************************************
* IDirectMusicTempoTrack implementation structure
*/
struct IDirectMusicTempoTrack {
/* IUnknown fields */
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
LONG ref;
/* IDirectMusicTempoTrack fields */
LPDMUS_OBJECTDESC pDesc;
BOOL enabled;
struct list Items;
};
/*****************************************************************************
* IDirectMusicTimeSigTrack implementation structure
*/
struct IDirectMusicTimeSigTrack {
/* IUnknown fields */
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
LONG ref;
/* IDirectMusicTimeSigTrack fields */
LPDMUS_OBJECTDESC pDesc;
};
/*****************************************************************************
* IDirectMusicWaveTrack implementation structure
*/
struct IDirectMusicWaveTrack {
/* IUnknown fields */
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
LONG ref;
/* IDirectMusicWaveTrack fields */
LPDMUS_OBJECTDESC pDesc;
};
/********************************************************************** /**********************************************************************
* Dll lifetime tracking declaration for dmime.dll * Dll lifetime tracking declaration for dmime.dll
*/ */

8
dlls/dmime/lyricstrack.c
View File

@ -24,6 +24,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime);
/***************************************************************************** /*****************************************************************************
* IDirectMusicLyricsTrack implementation * IDirectMusicLyricsTrack implementation
*/ */
typedef struct IDirectMusicLyricsTrack {
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
LONG ref;
DMUS_OBJECTDESC *pDesc;
} IDirectMusicLyricsTrack;
/* IDirectMusicLyricsTrack IUnknown part: */ /* IDirectMusicLyricsTrack IUnknown part: */
static HRESULT WINAPI IDirectMusicLyricsTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { static HRESULT WINAPI IDirectMusicLyricsTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS_MULTI(IDirectMusicLyricsTrack, UnknownVtbl, iface); ICOM_THIS_MULTI(IDirectMusicLyricsTrack, UnknownVtbl, iface);

8
dlls/dmime/markertrack.c
View File

@ -24,6 +24,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime);
/***************************************************************************** /*****************************************************************************
* IDirectMusicMarkerTrack implementation * IDirectMusicMarkerTrack implementation
*/ */
typedef struct IDirectMusicMarkerTrack {
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
LONG ref;
DMUS_OBJECTDESC *pDesc;
} IDirectMusicMarkerTrack;
/* IDirectMusicMarkerTrack IUnknown part: */ /* IDirectMusicMarkerTrack IUnknown part: */
static HRESULT WINAPI IDirectMusicMarkerTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { static HRESULT WINAPI IDirectMusicMarkerTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS_MULTI(IDirectMusicMarkerTrack, UnknownVtbl, iface); ICOM_THIS_MULTI(IDirectMusicMarkerTrack, UnknownVtbl, iface);

8
dlls/dmime/paramcontroltrack.c
View File

@ -24,6 +24,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime);
/***************************************************************************** /*****************************************************************************
* IDirectMusicParamControlTrack implementation * IDirectMusicParamControlTrack implementation
*/ */
typedef struct IDirectMusicParamControlTrack {
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
LONG ref;
DMUS_OBJECTDESC *pDesc;
} IDirectMusicParamControlTrack;
/* IDirectMusicParamControlTrack IUnknown part: */ /* IDirectMusicParamControlTrack IUnknown part: */
static HRESULT WINAPI IDirectMusicParamControlTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { static HRESULT WINAPI IDirectMusicParamControlTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS_MULTI(IDirectMusicParamControlTrack, UnknownVtbl, iface); ICOM_THIS_MULTI(IDirectMusicParamControlTrack, UnknownVtbl, iface);

9
dlls/dmime/segtriggertrack.c
View File

@ -26,6 +26,15 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile);
/***************************************************************************** /*****************************************************************************
* IDirectMusicSegTriggerTrack implementation * IDirectMusicSegTriggerTrack implementation
*/ */
typedef struct IDirectMusicSegTriggerTrack {
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
LONG ref;
DMUS_OBJECTDESC *pDesc;
struct list Items;
} IDirectMusicSegTriggerTrack;
/* IDirectMusicSegTriggerTrack IUnknown part: */ /* IDirectMusicSegTriggerTrack IUnknown part: */
static HRESULT WINAPI IDirectMusicSegTriggerTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { static HRESULT WINAPI IDirectMusicSegTriggerTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS_MULTI(IDirectMusicSegTriggerTrack, UnknownVtbl, iface); ICOM_THIS_MULTI(IDirectMusicSegTriggerTrack, UnknownVtbl, iface);

8
dlls/dmime/seqtrack.c
View File

@ -24,6 +24,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime);
/***************************************************************************** /*****************************************************************************
* IDirectMusicSeqTrack implementation * IDirectMusicSeqTrack implementation
*/ */
typedef struct IDirectMusicSeqTrack {
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
LONG ref;
DMUS_OBJECTDESC *pDesc;
} IDirectMusicSeqTrack;
/* IDirectMusicSeqTrack IUnknown part: */ /* IDirectMusicSeqTrack IUnknown part: */
static HRESULT WINAPI IDirectMusicSeqTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { static HRESULT WINAPI IDirectMusicSeqTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS_MULTI(IDirectMusicSeqTrack, UnknownVtbl, iface); ICOM_THIS_MULTI(IDirectMusicSeqTrack, UnknownVtbl, iface);

8
dlls/dmime/sysextrack.c
View File

@ -24,6 +24,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime);
/***************************************************************************** /*****************************************************************************
* IDirectMusicSysExTrack implementation * IDirectMusicSysExTrack implementation
*/ */
typedef struct IDirectMusicSysExTrack {
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
LONG ref;
DMUS_OBJECTDESC *pDesc;
} IDirectMusicSysExTrack;
/* IDirectMusicSysExTrack IUnknown part: */ /* IDirectMusicSysExTrack IUnknown part: */
static HRESULT WINAPI IDirectMusicSysExTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { static HRESULT WINAPI IDirectMusicSysExTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS_MULTI(IDirectMusicSysExTrack, UnknownVtbl, iface); ICOM_THIS_MULTI(IDirectMusicSysExTrack, UnknownVtbl, iface);

10
dlls/dmime/tempotrack.c
View File

@ -26,6 +26,16 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile);
/***************************************************************************** /*****************************************************************************
* IDirectMusicTempoTrack implementation * IDirectMusicTempoTrack implementation
*/ */
typedef struct IDirectMusicTempoTrack {
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
LONG ref;
DMUS_OBJECTDESC *pDesc;
BOOL enabled;
struct list Items;
} IDirectMusicTempoTrack;
/* IDirectMusicTempoTrack IUnknown part: */ /* IDirectMusicTempoTrack IUnknown part: */
static HRESULT WINAPI IDirectMusicTempoTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { static HRESULT WINAPI IDirectMusicTempoTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS_MULTI(IDirectMusicTempoTrack, UnknownVtbl, iface); ICOM_THIS_MULTI(IDirectMusicTempoTrack, UnknownVtbl, iface);

8
dlls/dmime/timesigtrack.c
View File

@ -24,6 +24,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime);
/***************************************************************************** /*****************************************************************************
* IDirectMusicTimeSigTrack implementation * IDirectMusicTimeSigTrack implementation
*/ */
typedef struct IDirectMusicTimeSigTrack {
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
LONG ref;
DMUS_OBJECTDESC *pDesc;
} IDirectMusicTimeSigTrack;
/* IDirectMusicTimeSigTrack IUnknown part: */ /* IDirectMusicTimeSigTrack IUnknown part: */
static HRESULT WINAPI IDirectMusicTimeSigTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { static HRESULT WINAPI IDirectMusicTimeSigTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, UnknownVtbl, iface); ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, UnknownVtbl, iface);

11
dlls/dmime/wavetrack.c
View File

@ -24,6 +24,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime);
/***************************************************************************** /*****************************************************************************
* IDirectMusicWaveTrack implementation * IDirectMusicWaveTrack implementation
*/ */
/*****************************************************************************
* IDirectMusicChordMapTrack implementation
*/
typedef struct IDirectMusicWaveTrack {
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
LONG ref;
DMUS_OBJECTDESC *pDesc;
} IDirectMusicWaveTrack;
/* IDirectMusicWaveTrack IUnknown part: */ /* IDirectMusicWaveTrack IUnknown part: */
static HRESULT WINAPI IDirectMusicWaveTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { static HRESULT WINAPI IDirectMusicWaveTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS_MULTI(IDirectMusicWaveTrack, UnknownVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveTrack, UnknownVtbl, iface);