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

This commit is contained in:
Michael Stefaniuc 2015-06-25 00:41:01 +02:00 committed by Alexandre Julliard
parent 1e421a26fb
commit bf117ec5f4
3 changed files with 16 additions and 34 deletions

View File

@ -28,6 +28,14 @@ static ULONG WINAPI IDirectMusicChordMapTrack_IPersistStream_AddRef (LPPERSISTST
/*****************************************************************************
* IDirectMusicChordMapTrack implementation
*/
typedef struct IDirectMusicChordMapTrack {
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
LONG ref;
DMUS_OBJECTDESC *pDesc;
} IDirectMusicChordMapTrack;
/* IDirectMusicChordMapTrack IUnknown part: */
static HRESULT WINAPI IDirectMusicChordMapTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS_MULTI(IDirectMusicChordMapTrack, UnknownVtbl, iface);

View File

@ -42,12 +42,6 @@
#include "dmusicf.h"
#include "dmusics.h"
/*****************************************************************************
* Interfaces
*/
typedef struct IDirectMusicChordMapTrack IDirectMusicChordMapTrack;
typedef struct IDirectMusicSignPostTrack IDirectMusicSignPostTrack;
/*****************************************************************************
* ClassFactory
*/
@ -56,34 +50,6 @@ extern HRESULT WINAPI create_dmcomposer(REFIID riid, void **ret_iface) DECLSPEC_
extern HRESULT WINAPI create_dmchordmaptrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
extern HRESULT WINAPI create_dmsignposttrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
/*****************************************************************************
* IDirectMusicChordMapTrack implementation structure
*/
struct IDirectMusicChordMapTrack {
/* IUnknown fields */
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
LONG ref;
/* IDirectMusicChordMapTrack fields */
LPDMUS_OBJECTDESC pDesc;
};
/*****************************************************************************
* IDirectMusicSignPostTrack implementation structure
*/
struct IDirectMusicSignPostTrack {
/* IUnknown fields */
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
LONG ref;
/* IDirectMusicSignPostTrack fields */
LPDMUS_OBJECTDESC pDesc;
};
/**********************************************************************
* Dll lifetime tracking declaration for dmcompos.dll
*/

View File

@ -28,6 +28,14 @@ static ULONG WINAPI IDirectMusicSignPostTrack_IPersistStream_AddRef (LPPERSISTST
/*****************************************************************************
* IDirectMusicSignPostTrack implementation
*/
typedef struct IDirectMusicSignPostTrack {
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
LONG ref;
DMUS_OBJECTDESC *pDesc;
} IDirectMusicSignPostTrack;
/* IDirectMusicSignPostTrack IUnknown part: */
static HRESULT WINAPI IDirectMusicSignPostTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS_MULTI(IDirectMusicSignPostTrack, UnknownVtbl, iface);