dmscript: Move a struct definition to the .c file that uses it.
This commit is contained in:
parent
1b8d8ef372
commit
e1fab4a837
|
@ -42,11 +42,6 @@
|
||||||
#include "dmusicf.h"
|
#include "dmusicf.h"
|
||||||
#include "dmusics.h"
|
#include "dmusics.h"
|
||||||
|
|
||||||
/*****************************************************************************
|
|
||||||
* Interfaces
|
|
||||||
*/
|
|
||||||
typedef struct IDirectMusicScriptImpl IDirectMusicScriptImpl;
|
|
||||||
|
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* ClassFactory
|
* ClassFactory
|
||||||
*/
|
*/
|
||||||
|
@ -54,24 +49,6 @@ extern HRESULT WINAPI DMUSIC_CreateDirectMusicScriptImpl (LPCGUID lpcGUID, LPVOI
|
||||||
|
|
||||||
extern HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN;
|
extern HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN;
|
||||||
|
|
||||||
/*****************************************************************************
|
|
||||||
* IDirectMusicScriptImpl implementation structure
|
|
||||||
*/
|
|
||||||
struct IDirectMusicScriptImpl {
|
|
||||||
IDirectMusicScript IDirectMusicScript_iface;
|
|
||||||
const IDirectMusicObjectVtbl *ObjectVtbl;
|
|
||||||
const IPersistStreamVtbl *PersistStreamVtbl;
|
|
||||||
LONG ref;
|
|
||||||
|
|
||||||
/* IDirectMusicScriptImpl fields */
|
|
||||||
IDirectMusicPerformance* pPerformance;
|
|
||||||
LPDMUS_OBJECTDESC pDesc;
|
|
||||||
DMUS_IO_SCRIPT_HEADER* pHeader;
|
|
||||||
DMUS_IO_VERSION* pVersion;
|
|
||||||
WCHAR* pwzLanguage;
|
|
||||||
WCHAR* pwzSource;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**********************************************************************
|
/**********************************************************************
|
||||||
* Dll lifetime tracking declaration for dmscript.dll
|
* Dll lifetime tracking declaration for dmscript.dll
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -34,6 +34,19 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile);
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* IDirectMusicScriptImpl implementation
|
* IDirectMusicScriptImpl implementation
|
||||||
*/
|
*/
|
||||||
|
typedef struct IDirectMusicScriptImpl {
|
||||||
|
IDirectMusicScript IDirectMusicScript_iface;
|
||||||
|
const IDirectMusicObjectVtbl *ObjectVtbl;
|
||||||
|
const IPersistStreamVtbl *PersistStreamVtbl;
|
||||||
|
LONG ref;
|
||||||
|
IDirectMusicPerformance *pPerformance;
|
||||||
|
DMUS_OBJECTDESC *pDesc;
|
||||||
|
DMUS_IO_SCRIPT_HEADER *pHeader;
|
||||||
|
DMUS_IO_VERSION *pVersion;
|
||||||
|
WCHAR *pwzLanguage;
|
||||||
|
WCHAR *pwzSource;
|
||||||
|
} IDirectMusicScriptImpl;
|
||||||
|
|
||||||
static inline IDirectMusicScriptImpl *impl_from_IDirectMusicScript(IDirectMusicScript *iface)
|
static inline IDirectMusicScriptImpl *impl_from_IDirectMusicScript(IDirectMusicScript *iface)
|
||||||
{
|
{
|
||||||
return CONTAINING_RECORD(iface, IDirectMusicScriptImpl, IDirectMusicScript_iface);
|
return CONTAINING_RECORD(iface, IDirectMusicScriptImpl, IDirectMusicScript_iface);
|
||||||
|
|
Loading…
Reference in New Issue