Make more of the OLE interface vtables const.
diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c
index 65ad5e6..908d7b8 100644
--- a/dlls/dmscript/dmscript_main.c
+++ b/dlls/dmscript/dmscript_main.c
@@ -24,7 +24,7 @@
LONG DMSCRIPT_refCount = 0;
typedef struct {
- IClassFactoryVtbl *lpVtbl;
+ const IClassFactoryVtbl *lpVtbl;
} IClassFactoryImpl;
/******************************************************************
@@ -69,7 +69,7 @@
return S_OK;
}
-static IClassFactoryVtbl ScriptAutoImplSegmentCF_Vtbl = {
+static const IClassFactoryVtbl ScriptAutoImplSegmentCF_Vtbl = {
ScriptAutoImplSegmentCF_QueryInterface,
ScriptAutoImplSegmentCF_AddRef,
ScriptAutoImplSegmentCF_Release,
@@ -118,7 +118,7 @@
return S_OK;
}
-static IClassFactoryVtbl ScriptTrackCF_Vtbl = {
+static const IClassFactoryVtbl ScriptTrackCF_Vtbl = {
ScriptTrackCF_QueryInterface,
ScriptTrackCF_AddRef,
ScriptTrackCF_Release,
@@ -170,7 +170,7 @@
return S_OK;
}
-static IClassFactoryVtbl AudioVBScriptCF_Vtbl = {
+static const IClassFactoryVtbl AudioVBScriptCF_Vtbl = {
AudioVBScriptCF_QueryInterface,
AudioVBScriptCF_AddRef,
AudioVBScriptCF_Release,
@@ -220,7 +220,7 @@
return S_OK;
}
-static IClassFactoryVtbl ScriptCF_Vtbl = {
+static const IClassFactoryVtbl ScriptCF_Vtbl = {
ScriptCF_QueryInterface,
ScriptCF_AddRef,
ScriptCF_Release,
@@ -272,7 +272,7 @@
return S_OK;
}
-static IClassFactoryVtbl ScriptAutoImplPerformanceCF_Vtbl = {
+static const IClassFactoryVtbl ScriptAutoImplPerformanceCF_Vtbl = {
ScriptAutoImplPerformanceCF_QueryInterface,
ScriptAutoImplPerformanceCF_AddRef,
ScriptAutoImplPerformanceCF_Release,
@@ -324,7 +324,7 @@
return S_OK;
}
-static IClassFactoryVtbl ScriptSourceCodeLoaderCF_Vtbl = {
+static const IClassFactoryVtbl ScriptSourceCodeLoaderCF_Vtbl = {
ScriptSourceCodeLoaderCF_QueryInterface,
ScriptSourceCodeLoaderCF_AddRef,
ScriptSourceCodeLoaderCF_Release,
@@ -376,7 +376,7 @@
return S_OK;
}
-static IClassFactoryVtbl ScriptAutoImplSegmentStateCF_Vtbl = {
+static const IClassFactoryVtbl ScriptAutoImplSegmentStateCF_Vtbl = {
ScriptAutoImplSegmentStateCF_QueryInterface,
ScriptAutoImplSegmentStateCF_AddRef,
ScriptAutoImplSegmentStateCF_Release,
@@ -428,7 +428,7 @@
return S_OK;
}
-static IClassFactoryVtbl ScriptAutoImplAudioPathConfigCF_Vtbl = {
+static const IClassFactoryVtbl ScriptAutoImplAudioPathConfigCF_Vtbl = {
ScriptAutoImplAudioPathConfigCF_QueryInterface,
ScriptAutoImplAudioPathConfigCF_AddRef,
ScriptAutoImplAudioPathConfigCF_Release,
@@ -480,7 +480,7 @@
return S_OK;
}
-static IClassFactoryVtbl ScriptAutoImplAudioPathCF_Vtbl = {
+static const IClassFactoryVtbl ScriptAutoImplAudioPathCF_Vtbl = {
ScriptAutoImplAudioPathCF_QueryInterface,
ScriptAutoImplAudioPathCF_AddRef,
ScriptAutoImplAudioPathCF_Release,
@@ -532,7 +532,7 @@
return S_OK;
}
-static IClassFactoryVtbl ScriptAutoImplSongCF_Vtbl = {
+static const IClassFactoryVtbl ScriptAutoImplSongCF_Vtbl = {
ScriptAutoImplSongCF_QueryInterface,
ScriptAutoImplSongCF_AddRef,
ScriptAutoImplSongCF_Release,
diff --git a/dlls/dmscript/dmscript_private.h b/dlls/dmscript/dmscript_private.h
index debe519..ce81fb6 100644
--- a/dlls/dmscript/dmscript_private.h
+++ b/dlls/dmscript/dmscript_private.h
@@ -50,18 +50,6 @@
typedef struct IDirectMusicScriptTrack IDirectMusicScriptTrack;
/*****************************************************************************
- * Predeclare the interface implementation structures
- */
-extern IUnknownVtbl DirectMusicScript_Unknown_Vtbl;
-extern IDirectMusicScriptVtbl DirectMusicScript_Script_Vtbl;
-extern IDirectMusicObjectVtbl DirectMusicScript_Object_Vtbl;
-extern IPersistStreamVtbl DirectMusicScript_PersistStream_Vtbl;
-
-extern IUnknownVtbl DirectMusicScriptTrack_Unknown_Vtbl;
-extern IDirectMusicTrack8Vtbl DirectMusicScriptTrack_Track_Vtbl;
-extern IPersistStreamVtbl DirectMusicScriptTrack_PersistStream_Vtbl;
-
-/*****************************************************************************
* ClassFactory
*/
extern HRESULT WINAPI DMUSIC_CreateDirectMusicScriptImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter);
@@ -73,10 +61,10 @@
*/
struct IDirectMusicScriptImpl {
/* IUnknown fields */
- IUnknownVtbl *UnknownVtbl;
- IDirectMusicScriptVtbl *ScriptVtbl;
- IDirectMusicObjectVtbl *ObjectVtbl;
- IPersistStreamVtbl *PersistStreamVtbl;
+ const IUnknownVtbl *UnknownVtbl;
+ const IDirectMusicScriptVtbl *ScriptVtbl;
+ const IDirectMusicObjectVtbl *ObjectVtbl;
+ const IPersistStreamVtbl *PersistStreamVtbl;
DWORD ref;
/* IDirectMusicScriptImpl fields */
@@ -91,46 +79,21 @@
/* IUnknown: */
extern HRESULT WINAPI IDirectMusicScriptImpl_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj);
extern ULONG WINAPI IDirectMusicScriptImpl_IUnknown_AddRef (LPUNKNOWN iface);
-extern ULONG WINAPI IDirectMusicScriptImpl_IUnknown_Release (LPUNKNOWN iface);
/* IDirectMusicScript: */
-extern HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_QueryInterface (LPDIRECTMUSICSCRIPT iface, REFIID riid, LPVOID *ppobj);
extern ULONG WINAPI IDirectMusicScriptImpl_IDirectMusicScript_AddRef (LPDIRECTMUSICSCRIPT iface);
-extern ULONG WINAPI IDirectMusicScriptImpl_IDirectMusicScript_Release (LPDIRECTMUSICSCRIPT iface);
-extern HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_Init (LPDIRECTMUSICSCRIPT iface, IDirectMusicPerformance* pPerformance, DMUS_SCRIPT_ERRORINFO* pErrorInfo);
-extern HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_CallRoutine (LPDIRECTMUSICSCRIPT iface, WCHAR* pwszRoutineName, DMUS_SCRIPT_ERRORINFO* pErrorInfo);
-extern HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_SetVariableVariant (LPDIRECTMUSICSCRIPT iface, WCHAR* pwszVariableName, VARIANT varValue, BOOL fSetRef, DMUS_SCRIPT_ERRORINFO* pErrorInfo);
-extern HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_GetVariableVariant (LPDIRECTMUSICSCRIPT iface, WCHAR* pwszVariableName, VARIANT* pvarValue, DMUS_SCRIPT_ERRORINFO* pErrorInfo);
-extern HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_SetVariableNumber (LPDIRECTMUSICSCRIPT iface, WCHAR* pwszVariableName, LONG lValue, DMUS_SCRIPT_ERRORINFO* pErrorInfo);
-extern HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_GetVariableNumber (LPDIRECTMUSICSCRIPT iface, WCHAR* pwszVariableName, LONG* plValue, DMUS_SCRIPT_ERRORINFO* pErrorInfo);
-extern HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_SetVariableObject (LPDIRECTMUSICSCRIPT iface, WCHAR* pwszVariableName, IUnknown* punkValue, DMUS_SCRIPT_ERRORINFO* pErrorInfo);
-extern HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_GetVariableObject (LPDIRECTMUSICSCRIPT iface, WCHAR* pwszVariableName, REFIID riid, LPVOID* ppv, DMUS_SCRIPT_ERRORINFO* pErrorInfo);
-extern HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_EnumRoutine (LPDIRECTMUSICSCRIPT iface, DWORD dwIndex, WCHAR* pwszName);
-extern HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_EnumVariable (LPDIRECTMUSICSCRIPT iface, DWORD dwIndex, WCHAR* pwszName);
/* IDirectMusicObject: */
-extern HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicObject_QueryInterface (LPDIRECTMUSICOBJECT iface, REFIID riid, LPVOID *ppobj);
extern ULONG WINAPI IDirectMusicScriptImpl_IDirectMusicObject_AddRef (LPDIRECTMUSICOBJECT iface);
-extern ULONG WINAPI IDirectMusicScriptImpl_IDirectMusicObject_Release (LPDIRECTMUSICOBJECT iface);
-extern HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicObject_GetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc);
-extern HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicObject_SetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc);
-extern HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicObject_ParseDescriptor (LPDIRECTMUSICOBJECT iface, LPSTREAM pStream, LPDMUS_OBJECTDESC pDesc);
/* IPersistStream: */
-extern HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, void** ppvObject);
extern ULONG WINAPI IDirectMusicScriptImpl_IPersistStream_AddRef (LPPERSISTSTREAM iface);
-extern ULONG WINAPI IDirectMusicScriptImpl_IPersistStream_Release (LPPERSISTSTREAM iface);
-extern HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID);
-extern HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_IsDirty (LPPERSISTSTREAM iface);
-extern HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_Load (LPPERSISTSTREAM iface, IStream* pStm);
-extern HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_Save (LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty);
-extern HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_GetSizeMax (LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize);
/*****************************************************************************
* IDirectMusicScriptTrack implementation structure
*/
struct IDirectMusicScriptTrack {
/* IUnknown fields */
- IUnknownVtbl *UnknownVtbl;
- IDirectMusicTrack8Vtbl *TrackVtbl;
- IPersistStreamVtbl *PersistStreamVtbl;
+ const IUnknownVtbl *UnknownVtbl;
+ const IDirectMusicTrack8Vtbl *TrackVtbl;
+ const IPersistStreamVtbl *PersistStreamVtbl;
DWORD ref;
/* IDirectMusicScriptTrack fields */
@@ -140,35 +103,10 @@
/* IUnknown: */
extern HRESULT WINAPI IDirectMusicScriptTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj);
extern ULONG WINAPI IDirectMusicScriptTrack_IUnknown_AddRef (LPUNKNOWN iface);
-extern ULONG WINAPI IDirectMusicScriptTrack_IUnknown_Release (LPUNKNOWN iface);
/* IDirectMusicTrack(8): */
-extern HRESULT WINAPI IDirectMusicScriptTrack_IDirectMusicTrack_QueryInterface (LPDIRECTMUSICTRACK8 iface, REFIID riid, LPVOID *ppobj);
extern ULONG WINAPI IDirectMusicScriptTrack_IDirectMusicTrack_AddRef (LPDIRECTMUSICTRACK8 iface);
-extern ULONG WINAPI IDirectMusicScriptTrack_IDirectMusicTrack_Release (LPDIRECTMUSICTRACK8 iface);
-extern HRESULT WINAPI IDirectMusicScriptTrack_IDirectMusicTrack_Init (LPDIRECTMUSICTRACK8 iface, IDirectMusicSegment* pSegment);
-extern HRESULT WINAPI IDirectMusicScriptTrack_IDirectMusicTrack_InitPlay (LPDIRECTMUSICTRACK8 iface, IDirectMusicSegmentState* pSegmentState, IDirectMusicPerformance* pPerformance, void** ppStateData, DWORD dwVirtualTrackID, DWORD dwFlags);
-extern HRESULT WINAPI IDirectMusicScriptTrack_IDirectMusicTrack_EndPlay (LPDIRECTMUSICTRACK8 iface, void* pStateData);
-extern HRESULT WINAPI IDirectMusicScriptTrack_IDirectMusicTrack_Play (LPDIRECTMUSICTRACK8 iface, void* pStateData, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD dwFlags, IDirectMusicPerformance* pPerf, IDirectMusicSegmentState* pSegSt, DWORD dwVirtualID);
-extern HRESULT WINAPI IDirectMusicScriptTrack_IDirectMusicTrack_GetParam (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME* pmtNext, void* pParam);
-extern HRESULT WINAPI IDirectMusicScriptTrack_IDirectMusicTrack_SetParam (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, MUSIC_TIME mtTime, void* pParam);
-extern HRESULT WINAPI IDirectMusicScriptTrack_IDirectMusicTrack_IsParamSupported (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType);
-extern HRESULT WINAPI IDirectMusicScriptTrack_IDirectMusicTrack_AddNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType);
-extern HRESULT WINAPI IDirectMusicScriptTrack_IDirectMusicTrack_RemoveNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType);
-extern HRESULT WINAPI IDirectMusicScriptTrack_IDirectMusicTrack_Clone (LPDIRECTMUSICTRACK8 iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack** ppTrack);
-extern HRESULT WINAPI IDirectMusicScriptTrack_IDirectMusicTrack_PlayEx (LPDIRECTMUSICTRACK8 iface, void* pStateData, REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD dwFlags, IDirectMusicPerformance* pPerf, IDirectMusicSegmentState* pSegSt, DWORD dwVirtualID);
-extern HRESULT WINAPI IDirectMusicScriptTrack_IDirectMusicTrack_GetParamEx (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, REFERENCE_TIME* prtNext, void* pParam, void* pStateData, DWORD dwFlags);
-extern HRESULT WINAPI IDirectMusicScriptTrack_IDirectMusicTrack_SetParamEx (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, void* pParam, void* pStateData, DWORD dwFlags);
-extern HRESULT WINAPI IDirectMusicScriptTrack_IDirectMusicTrack_Compose (LPDIRECTMUSICTRACK8 iface, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack);
-extern HRESULT WINAPI IDirectMusicScriptTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK8 iface, IDirectMusicTrack* pNewTrack, MUSIC_TIME mtJoin, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack);
/* IPersistStream: */
-extern HRESULT WINAPI IDirectMusicScriptTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, void** ppvObject);
extern ULONG WINAPI IDirectMusicScriptTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface);
-extern ULONG WINAPI IDirectMusicScriptTrack_IPersistStream_Release (LPPERSISTSTREAM iface);
-extern HRESULT WINAPI IDirectMusicScriptTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID);
-extern HRESULT WINAPI IDirectMusicScriptTrack_IPersistStream_IsDirty (LPPERSISTSTREAM iface);
-extern HRESULT WINAPI IDirectMusicScriptTrack_IPersistStream_Load (LPPERSISTSTREAM iface, IStream* pStm);
-extern HRESULT WINAPI IDirectMusicScriptTrack_IPersistStream_Save (LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty);
-extern HRESULT WINAPI IDirectMusicScriptTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize);
/**********************************************************************
* Dll lifetime tracking declaration for dmscript.dll
diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c
index 58a3502..19b074f 100644
--- a/dlls/dmscript/script.c
+++ b/dlls/dmscript/script.c
@@ -91,7 +91,7 @@
return ref;
}
-IUnknownVtbl DirectMusicScript_Unknown_Vtbl = {
+static const IUnknownVtbl DirectMusicScript_Unknown_Vtbl = {
IDirectMusicScriptImpl_IUnknown_QueryInterface,
IDirectMusicScriptImpl_IUnknown_AddRef,
IDirectMusicScriptImpl_IUnknown_Release
@@ -176,7 +176,7 @@
return S_OK;
}
-IDirectMusicScriptVtbl DirectMusicScript_Script_Vtbl = {
+static const IDirectMusicScriptVtbl DirectMusicScript_Script_Vtbl = {
IDirectMusicScriptImpl_IDirectMusicScript_QueryInterface,
IDirectMusicScriptImpl_IDirectMusicScript_AddRef,
IDirectMusicScriptImpl_IDirectMusicScript_Release,
@@ -398,7 +398,7 @@
return S_OK;
}
-IDirectMusicObjectVtbl DirectMusicScript_Object_Vtbl = {
+static const IDirectMusicObjectVtbl DirectMusicScript_Object_Vtbl = {
IDirectMusicScriptImpl_IDirectMusicObject_QueryInterface,
IDirectMusicScriptImpl_IDirectMusicObject_AddRef,
IDirectMusicScriptImpl_IDirectMusicObject_Release,
@@ -672,7 +672,7 @@
return E_NOTIMPL;
}
-IPersistStreamVtbl DirectMusicScript_PersistStream_Vtbl = {
+static const IPersistStreamVtbl DirectMusicScript_PersistStream_Vtbl = {
IDirectMusicScriptImpl_IPersistStream_QueryInterface,
IDirectMusicScriptImpl_IPersistStream_AddRef,
IDirectMusicScriptImpl_IPersistStream_Release,
diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c
index 25af7eb..11905d6 100644
--- a/dlls/dmscript/scripttrack.c
+++ b/dlls/dmscript/scripttrack.c
@@ -75,7 +75,7 @@
return ref;
}
-IUnknownVtbl DirectMusicScriptTrack_Unknown_Vtbl = {
+static const IUnknownVtbl DirectMusicScriptTrack_Unknown_Vtbl = {
IDirectMusicScriptTrack_IUnknown_QueryInterface,
IDirectMusicScriptTrack_IUnknown_AddRef,
IDirectMusicScriptTrack_IUnknown_Release
@@ -194,7 +194,7 @@
return S_OK;
}
-IDirectMusicTrack8Vtbl DirectMusicScriptTrack_Track_Vtbl = {
+static const IDirectMusicTrack8Vtbl DirectMusicScriptTrack_Track_Vtbl = {
IDirectMusicScriptTrack_IDirectMusicTrack_QueryInterface,
IDirectMusicScriptTrack_IDirectMusicTrack_AddRef,
IDirectMusicScriptTrack_IDirectMusicTrack_Release,
@@ -252,7 +252,7 @@
return E_NOTIMPL;
}
-IPersistStreamVtbl DirectMusicScriptTrack_PersistStream_Vtbl = {
+static const IPersistStreamVtbl DirectMusicScriptTrack_PersistStream_Vtbl = {
IDirectMusicScriptTrack_IPersistStream_QueryInterface,
IDirectMusicScriptTrack_IPersistStream_AddRef,
IDirectMusicScriptTrack_IPersistStream_Release,
