Make more of the OLE interface vtables const.

dlls/devenum/createdevenum.c

@@ -171,7 +171,7 @@ HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator(
 /**********************************************************************
  * ICreateDevEnum_Vtbl
  */
-static ICreateDevEnumVtbl ICreateDevEnum_Vtbl =
+static const ICreateDevEnumVtbl ICreateDevEnum_Vtbl =
 {
     DEVENUM_ICreateDevEnum_QueryInterface,
     DEVENUM_ICreateDevEnum_AddRef,

dlls/devenum/devenum_private.h

@@ -53,22 +53,22 @@ static inline void DEVENUM_UnlockModule(void) { InterlockedDecrement(&dll_refs);
  */
 typedef struct
 {
-    IClassFactoryVtbl *lpVtbl;
+    const IClassFactoryVtbl *lpVtbl;
 } ClassFactoryImpl;
 
 typedef struct
 {
-    ICreateDevEnumVtbl *lpVtbl;
+    const ICreateDevEnumVtbl *lpVtbl;
 } CreateDevEnumImpl;
 
 typedef struct
 {
-    IParseDisplayNameVtbl *lpVtbl;
+    const IParseDisplayNameVtbl *lpVtbl;
 } ParseDisplayNameImpl;
 
 typedef struct
 {
-    IEnumMonikerVtbl *lpVtbl;
+    const IEnumMonikerVtbl *lpVtbl;
     DWORD ref;
     DWORD index;
     HKEY hkey;
@@ -76,8 +76,7 @@ typedef struct
 
 typedef struct
 {
-    IMonikerVtbl *lpVtbl;
-
+    const IMonikerVtbl *lpVtbl;
     ULONG ref;
     HKEY hkey;
 } MediaCatMoniker;

dlls/devenum/factory.c

@@ -126,7 +126,7 @@ static HRESULT WINAPI DEVENUM_IClassFactory_LockServer(
 /**********************************************************************
  * IClassFactory_Vtbl
  */
-static IClassFactoryVtbl IClassFactory_Vtbl =
+static const IClassFactoryVtbl IClassFactory_Vtbl =
 {
     DEVENUM_IClassFactory_QueryInterface,
     DEVENUM_IClassFactory_AddRef,

dlls/devenum/mediacatenum.c

@@ -40,7 +40,7 @@ static ULONG WINAPI DEVENUM_IPropertyBag_AddRef(LPPROPERTYBAG iface);
 
 typedef struct
 {
-    IPropertyBagVtbl *lpVtbl;
+    const IPropertyBagVtbl *lpVtbl;
     DWORD ref;
     HKEY hkey;
 } RegPropBagImpl;
@@ -262,7 +262,7 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_Write(
     return res;
 }
 
-static IPropertyBagVtbl IPropertyBag_Vtbl =
+static const IPropertyBagVtbl IPropertyBag_Vtbl =
 {
     DEVENUM_IPropertyBag_QueryInterface,
     DEVENUM_IPropertyBag_AddRef,
@@ -655,7 +655,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_IsSystemMoniker(
     return S_FALSE;
 }
 
-static IMonikerVtbl IMoniker_Vtbl =
+static const IMonikerVtbl IMoniker_Vtbl =
 {
     DEVENUM_IMediaCatMoniker_QueryInterface,
     DEVENUM_IMediaCatMoniker_AddRef,
@@ -833,7 +833,7 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Clone(LPENUMMONIKER iface, IEnumMonik
 /**********************************************************************
  * IEnumMoniker_Vtbl
  */
-static IEnumMonikerVtbl IEnumMoniker_Vtbl =
+static const IEnumMonikerVtbl IEnumMoniker_Vtbl =
 {
     DEVENUM_IEnumMoniker_QueryInterface,
     DEVENUM_IEnumMoniker_AddRef,

dlls/devenum/parsedisplayname.c

@@ -157,7 +157,7 @@ static HRESULT WINAPI DEVENUM_IParseDisplayName_ParseDisplayName(
 /**********************************************************************
  * IParseDisplayName_Vtbl
  */
-static IParseDisplayNameVtbl IParseDisplayName_Vtbl =
+static const IParseDisplayNameVtbl IParseDisplayName_Vtbl =
 {
     DEVENUM_IParseDisplayName_QueryInterface,
     DEVENUM_IParseDisplayName_AddRef,

dlls/dinput/device_private.h

@@ -30,7 +30,7 @@
 typedef struct IDirectInputDevice2AImpl IDirectInputDevice2AImpl;
 struct IDirectInputDevice2AImpl
 {
-        IDirectInputDevice2AVtbl       *lpVtbl;
+        const IDirectInputDevice2AVtbl *lpVtbl;
         DWORD                           ref;
         GUID                            guid;
 };

dlls/dinput/dinput_main.c

@@ -46,10 +46,10 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(dinput);
 
-static IDirectInput7AVtbl ddi7avt;
-static IDirectInput7WVtbl ddi7wvt;
-static IDirectInput8AVtbl ddi8avt;
-static IDirectInput8WVtbl ddi8wvt;
+static const IDirectInput7AVtbl ddi7avt;
+static const IDirectInput7WVtbl ddi7wvt;
+static const IDirectInput8AVtbl ddi8avt;
+static const IDirectInput8WVtbl ddi8wvt;
 
 static const struct dinput_device *dinput_devices[] =
 {
@@ -535,7 +535,7 @@ static HRESULT WINAPI IDirectInput8WImpl_ConfigureDevices(
 # define XCAST(fun)	(void*)
 #endif
 
-static IDirectInput7AVtbl ddi7avt = {
+static const IDirectInput7AVtbl ddi7avt = {
 	XCAST(QueryInterface)IDirectInputAImpl_QueryInterface,
 	XCAST(AddRef)IDirectInputAImpl_AddRef,
 	XCAST(Release)IDirectInputAImpl_Release,
@@ -555,7 +555,7 @@ static IDirectInput7AVtbl ddi7avt = {
 # define XCAST(fun)	(void*)
 #endif
 
-static IDirectInput7WVtbl ddi7wvt = {
+static const IDirectInput7WVtbl ddi7wvt = {
 	XCAST(QueryInterface)IDirectInputWImpl_QueryInterface,
 	XCAST(AddRef)IDirectInputAImpl_AddRef,
 	XCAST(Release)IDirectInputAImpl_Release,
@@ -575,7 +575,7 @@ static IDirectInput7WVtbl ddi7wvt = {
 # define XCAST(fun)	(void*)
 #endif
 
-static IDirectInput8AVtbl ddi8avt = {
+static const IDirectInput8AVtbl ddi8avt = {
 	XCAST(QueryInterface)IDirectInput8AImpl_QueryInterface,
 	XCAST(AddRef)IDirectInputAImpl_AddRef,
 	XCAST(Release)IDirectInputAImpl_Release,
@@ -595,7 +595,7 @@ static IDirectInput8AVtbl ddi8avt = {
 #else
 # define XCAST(fun)	(void*)
 #endif
-static IDirectInput8WVtbl ddi8wvt = {
+static const IDirectInput8WVtbl ddi8wvt = {
 	XCAST(QueryInterface)IDirectInput8WImpl_QueryInterface,
 	XCAST(AddRef)IDirectInputAImpl_AddRef,
 	XCAST(Release)IDirectInputAImpl_Release,
@@ -616,7 +616,7 @@ static IDirectInput8WVtbl ddi8wvt = {
 typedef struct
 {
     /* IUnknown fields */
-    IClassFactoryVtbl          *lpVtbl;
+    const IClassFactoryVtbl    *lpVtbl;
     DWORD                       ref;
 } IClassFactoryImpl;
 
@@ -666,7 +666,7 @@ static HRESULT WINAPI DICF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
 	return S_OK;
 }
 
-static IClassFactoryVtbl DICF_Vtbl = {
+static const IClassFactoryVtbl DICF_Vtbl = {
 	DICF_QueryInterface,
 	DICF_AddRef,
 	DICF_Release,

dlls/dinput/dinput_private.h

@@ -29,7 +29,7 @@
 typedef struct IDirectInputImpl IDirectInputImpl;
 struct IDirectInputImpl
 {
-   LPVOID lpVtbl;
+   const void *lpVtbl;
    DWORD  ref;
 
    /* Used to have an unique sequence number for all the events */

dlls/dinput/joystick_linux.c

@@ -84,11 +84,11 @@ typedef struct {
 } POV;
 
 typedef struct JoystickImpl JoystickImpl;
-static IDirectInputDevice8AVtbl JoystickAvt;
-static IDirectInputDevice8WVtbl JoystickWvt;
+static const IDirectInputDevice8AVtbl JoystickAvt;
+static const IDirectInputDevice8WVtbl JoystickWvt;
 struct JoystickImpl
 {
-        LPVOID                          lpVtbl;
+        const void                     *lpVtbl;
         DWORD                           ref;
         GUID                            guid;
 	char				dev[32];
@@ -437,7 +437,7 @@ void calculate_ids(JoystickImpl* device)
     }
 }
 
-static HRESULT alloc_device(REFGUID rguid, LPVOID jvt, IDirectInputImpl *dinput, LPDIRECTINPUTDEVICEA* pdev)
+static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *dinput, LPDIRECTINPUTDEVICEA* pdev)
 {
     DWORD i;
     JoystickImpl* newDevice;
@@ -1640,7 +1640,7 @@ HRESULT WINAPI JoystickWImpl_GetDeviceInfo(
     return DI_OK;
 }
 
-static IDirectInputDevice8AVtbl JoystickAvt =
+static const IDirectInputDevice8AVtbl JoystickAvt =
 {
 	IDirectInputDevice2AImpl_QueryInterface,
 	IDirectInputDevice2AImpl_AddRef,
@@ -1682,7 +1682,7 @@ static IDirectInputDevice8AVtbl JoystickAvt =
 # define XCAST(fun)	(void*)
 #endif
 
-static IDirectInputDevice8WVtbl SysJoystickWvt =
+static const IDirectInputDevice8WVtbl SysJoystickWvt =
 {
 	IDirectInputDevice2WImpl_QueryInterface,
 	XCAST(AddRef)IDirectInputDevice2AImpl_AddRef,

dlls/dinput/joystick_linuxinput.c

@@ -66,11 +66,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput);
 #define WINE_JOYSTICK_BUTTON_BASE 8
 
 typedef struct JoystickImpl JoystickImpl;
-static IDirectInputDevice8AVtbl JoystickAvt;
-static IDirectInputDevice8WVtbl JoystickWvt;
+static const IDirectInputDevice8AVtbl JoystickAvt;
+static const IDirectInputDevice8WVtbl JoystickWvt;
 struct JoystickImpl
 {
-        LPVOID                          lpVtbl;
+        const void                     *lpVtbl;
         DWORD                           ref;
         GUID                            guid;
 
@@ -240,7 +240,7 @@ static BOOL joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTAN
   return TRUE;
 }
 
-static JoystickImpl *alloc_device(REFGUID rguid, LPVOID jvt, IDirectInputImpl *dinput)
+static JoystickImpl *alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *dinput)
 {
   JoystickImpl* newDevice;
   int i;
@@ -1008,7 +1008,7 @@ static HRESULT WINAPI JoystickAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface,
   return DI_OK;
 }
 
-static IDirectInputDevice8AVtbl JoystickAvt =
+static const IDirectInputDevice8AVtbl JoystickAvt =
 {
 	IDirectInputDevice2AImpl_QueryInterface,
 	IDirectInputDevice2AImpl_AddRef,
@@ -1050,7 +1050,7 @@ static IDirectInputDevice8AVtbl JoystickAvt =
 # define XCAST(fun)	(void*)
 #endif
 
-static IDirectInputDevice8WVtbl JoystickWvt =
+static const IDirectInputDevice8WVtbl JoystickWvt =
 {
 	IDirectInputDevice2WImpl_QueryInterface,
 	XCAST(AddRef)IDirectInputDevice2AImpl_AddRef,

dlls/dinput/keyboard.c

@@ -40,13 +40,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput);
 
 #define WINE_DINPUT_KEYBOARD_MAX_KEYS 256
 
-static IDirectInputDevice8AVtbl SysKeyboardAvt;
-static IDirectInputDevice8WVtbl SysKeyboardWvt;
+static const IDirectInputDevice8AVtbl SysKeyboardAvt;
+static const IDirectInputDevice8WVtbl SysKeyboardWvt;
 
 typedef struct SysKeyboardImpl SysKeyboardImpl;
 struct SysKeyboardImpl
 {
-        LPVOID                          lpVtbl;
+        const void                     *lpVtbl;
         DWORD                           ref;
         GUID                            guid;
 
@@ -238,7 +238,7 @@ static BOOL keyboarddev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEI
   return FALSE;
 }
 
-static SysKeyboardImpl *alloc_device(REFGUID rguid, LPVOID kvt, IDirectInputImpl *dinput)
+static SysKeyboardImpl *alloc_device(REFGUID rguid, const void *kvt, IDirectInputImpl *dinput)
 {
     SysKeyboardImpl* newDevice;
     DWORD kbd_users;
@@ -747,7 +747,7 @@ static HRESULT WINAPI SysKeyboardWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W iface
     return DI_OK;
 }
 
-static IDirectInputDevice8AVtbl SysKeyboardAvt =
+static const IDirectInputDevice8AVtbl SysKeyboardAvt =
 {
 	IDirectInputDevice2AImpl_QueryInterface,
 	IDirectInputDevice2AImpl_AddRef,
@@ -789,7 +789,7 @@ static IDirectInputDevice8AVtbl SysKeyboardAvt =
 # define XCAST(fun)	(void*)
 #endif
 
-static IDirectInputDevice8WVtbl SysKeyboardWvt =
+static const IDirectInputDevice8WVtbl SysKeyboardWvt =
 {
 	IDirectInputDevice2WImpl_QueryInterface,
 	XCAST(AddRef)IDirectInputDevice2AImpl_AddRef,

dlls/dinput/mouse.c

@@ -95,8 +95,8 @@ static const DIDATAFORMAT Wine_InternalMouseFormat = {
     (LPDIOBJECTDATAFORMAT) Wine_InternalMouseObjectFormat
 };
 
-static IDirectInputDevice8AVtbl SysMouseAvt;
-static IDirectInputDevice8WVtbl SysMouseWvt;
+static const IDirectInputDevice8AVtbl SysMouseAvt;
+static const IDirectInputDevice8WVtbl SysMouseWvt;
 
 typedef struct SysMouseImpl SysMouseImpl;
 
@@ -108,7 +108,7 @@ typedef enum {
 
 struct SysMouseImpl
 {
-    LPVOID                          lpVtbl;
+    const void                     *lpVtbl;
     DWORD                           ref;
     GUID                            guid;
     
@@ -239,7 +239,7 @@ static BOOL mousedev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINST
     return FALSE;
 }
 
-static SysMouseImpl *alloc_device(REFGUID rguid, LPVOID mvt, IDirectInputImpl *dinput)
+static SysMouseImpl *alloc_device(REFGUID rguid, const void *mvt, IDirectInputImpl *dinput)
 {
     int offset_array[WINE_INTERNALMOUSE_NUM_OBJS] = {
 	FIELD_OFFSET(Wine_InternalMouseData, lX),
@@ -1092,7 +1092,7 @@ static HRESULT WINAPI SysMouseWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W iface, L
 }
 
 
-static IDirectInputDevice8AVtbl SysMouseAvt =
+static const IDirectInputDevice8AVtbl SysMouseAvt =
 {
     IDirectInputDevice2AImpl_QueryInterface,
     IDirectInputDevice2AImpl_AddRef,
@@ -1134,7 +1134,7 @@ static IDirectInputDevice8AVtbl SysMouseAvt =
 # define XCAST(fun)	(void*)
 #endif
 
-static IDirectInputDevice8WVtbl SysMouseWvt =
+static const IDirectInputDevice8WVtbl SysMouseWvt =
 {
     IDirectInputDevice2WImpl_QueryInterface,
     XCAST(AddRef)IDirectInputDevice2AImpl_AddRef,

dlls/dmband/band.c

@@ -22,7 +22,7 @@
 WINE_DEFAULT_DEBUG_CHANNEL(dmband);
 WINE_DECLARE_DEBUG_CHANNEL(dmfile);
 
-const GUID IID_IDirectMusicBandPRIVATE = {0xda54db81,0x837d,0x11d1,{0x86,0xbc,0x00,0xc0,0x4f,0xbf,0x8f,0xef}};
+static const GUID IID_IDirectMusicBandPRIVATE = {0xda54db81,0x837d,0x11d1,{0x86,0xbc,0x00,0xc0,0x4f,0xbf,0x8f,0xef}};
 
 /*****************************************************************************
  * IDirectMusicBandImpl implementation
@@ -80,7 +80,7 @@ ULONG WINAPI IDirectMusicBandImpl_IUnknown_Release (LPUNKNOWN iface) {
 	return ref;
 }
 
-IUnknownVtbl DirectMusicBand_Unknown_Vtbl = {
+static const IUnknownVtbl DirectMusicBand_Unknown_Vtbl = {
 	IDirectMusicBandImpl_IUnknown_QueryInterface,
 	IDirectMusicBandImpl_IUnknown_AddRef,
 	IDirectMusicBandImpl_IUnknown_Release
@@ -120,7 +120,7 @@ HRESULT WINAPI IDirectMusicBandImpl_IDirectMusicBand_Unload (LPDIRECTMUSICBAND i
 	return S_OK;
 }
 
-IDirectMusicBandVtbl DirectMusicBand_Band_Vtbl = {
+static const IDirectMusicBandVtbl DirectMusicBand_Band_Vtbl = {
 	IDirectMusicBandImpl_IDirectMusicBand_QueryInterface,
 	IDirectMusicBandImpl_IDirectMusicBand_AddRef,
 	IDirectMusicBandImpl_IDirectMusicBand_Release,
@@ -334,7 +334,7 @@ HRESULT WINAPI IDirectMusicBandImpl_IDirectMusicObject_ParseDescriptor (LPDIRECT
 	return S_OK;
 }
 
-IDirectMusicObjectVtbl DirectMusicBand_Object_Vtbl = {
+static const IDirectMusicObjectVtbl DirectMusicBand_Object_Vtbl = {
   IDirectMusicBandImpl_IDirectMusicObject_QueryInterface,
   IDirectMusicBandImpl_IDirectMusicObject_AddRef,
   IDirectMusicBandImpl_IDirectMusicObject_Release,
@@ -674,7 +674,7 @@ HRESULT WINAPI IDirectMusicBandImpl_IPersistStream_GetSizeMax (LPPERSISTSTREAM i
   return E_NOTIMPL;
 }
 
-IPersistStreamVtbl DirectMusicBand_PersistStream_Vtbl = {
+static const IPersistStreamVtbl DirectMusicBand_PersistStream_Vtbl = {
   IDirectMusicBandImpl_IPersistStream_QueryInterface,
   IDirectMusicBandImpl_IPersistStream_AddRef,
   IDirectMusicBandImpl_IPersistStream_Release,

dlls/dmband/bandtrack.c

@@ -75,7 +75,7 @@ ULONG WINAPI IDirectMusicBandTrack_IUnknown_Release (LPUNKNOWN iface) {
   return ref;
 }
 
-IUnknownVtbl DirectMusicBandTrack_Unknown_Vtbl = {
+static const IUnknownVtbl DirectMusicBandTrack_Unknown_Vtbl = {
   IDirectMusicBandTrack_IUnknown_QueryInterface,
   IDirectMusicBandTrack_IUnknown_AddRef,
   IDirectMusicBandTrack_IUnknown_Release
@@ -212,7 +212,7 @@ HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK8
   return S_OK;
 }
 
-IDirectMusicTrack8Vtbl DirectMusicBandTrack_DirectMusicTrack_Vtbl = {
+static const IDirectMusicTrack8Vtbl DirectMusicBandTrack_DirectMusicTrack_Vtbl = {
   IDirectMusicBandTrack_IDirectMusicTrack_QueryInterface,
   IDirectMusicBandTrack_IDirectMusicTrack_AddRef,
   IDirectMusicBandTrack_IDirectMusicTrack_Release,
@@ -575,7 +575,7 @@ HRESULT WINAPI IDirectMusicBandTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM
   return E_NOTIMPL;
 }
 
-IPersistStreamVtbl DirectMusicBandTrack_PerststStream_Vtbl = {
+static const IPersistStreamVtbl DirectMusicBandTrack_PerststStream_Vtbl = {
   IDirectMusicBandTrack_IPersistStream_QueryInterface,
   IDirectMusicBandTrack_IPersistStream_AddRef,
   IDirectMusicBandTrack_IPersistStream_Release,

dlls/dmband/dmband_main.c

@@ -24,7 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmband);
 LONG DMBAND_refCount = 0;
 
 typedef struct {
-    IClassFactoryVtbl          *lpVtbl;
+    const IClassFactoryVtbl *lpVtbl;
 } IClassFactoryImpl;
 
 /******************************************************************
@@ -68,7 +68,7 @@ static HRESULT WINAPI BandCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
 	return S_OK;
 }
 
-static IClassFactoryVtbl BandCF_Vtbl = {
+static const IClassFactoryVtbl BandCF_Vtbl = {
 	BandCF_QueryInterface,
 	BandCF_AddRef,
 	BandCF_Release,
@@ -120,7 +120,7 @@ static HRESULT WINAPI BandTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
 	return S_OK;
 }
 
-static IClassFactoryVtbl BandTrackCF_Vtbl = {
+static const IClassFactoryVtbl BandTrackCF_Vtbl = {
 	BandTrackCF_QueryInterface,
 	BandTrackCF_AddRef,
 	BandTrackCF_Release,

dlls/dmband/dmband_private.h

@@ -50,18 +50,6 @@ typedef struct IDirectMusicBandImpl IDirectMusicBandImpl;
 typedef struct IDirectMusicBandTrack IDirectMusicBandTrack;
 	
 /*****************************************************************************
- * Predeclare the interface implementation structures
- */
-extern IUnknownVtbl           DirectMusicBand_Uknown_Vtbl;
-extern IDirectMusicBandVtbl   DirectMusicBand_Band_Vtbl;
-extern IDirectMusicObjectVtbl DirectMusicBand_Object_Vtbl;
-extern IPersistStreamVtbl     DirectMusicBand_PeristStream_Vtbl;
-
-extern IUnknownVtbl           DirectMusicBandTrack_Unknown_Vtbl;
-extern IDirectMusicTrack8Vtbl DirectMusicBandTrack_DirectMusicTrack_Vtbl;
-extern IPersistStreamVtbl     DirectMusicBandTrack_PersistStream_Vtbl;
-
-/*****************************************************************************
  * ClassFactory
  */
 extern HRESULT WINAPI DMUSIC_CreateDirectMusicBandImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter);
@@ -100,10 +88,10 @@ typedef struct _DMUS_PRIVATE_BAND {
  */
 struct IDirectMusicBandImpl {
   /* IUnknown fields */
-  IUnknownVtbl *UnknownVtbl;
-  IDirectMusicBandVtbl *BandVtbl;
-  IDirectMusicObjectVtbl *ObjectVtbl;
-  IPersistStreamVtbl *PersistStreamVtbl;
+  const IUnknownVtbl *UnknownVtbl;
+  const IDirectMusicBandVtbl *BandVtbl;
+  const IDirectMusicObjectVtbl *ObjectVtbl;
+  const IPersistStreamVtbl *PersistStreamVtbl;
   DWORD          ref;
 
   /* IDirectMusicBandImpl fields */
@@ -113,42 +101,22 @@ struct IDirectMusicBandImpl {
 };
 
 /* IUnknown: */
-extern HRESULT WINAPI IDirectMusicBandImpl_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj);
 extern ULONG WINAPI   IDirectMusicBandImpl_IUnknown_AddRef (LPUNKNOWN iface);
-extern ULONG WINAPI   IDirectMusicBandImpl_IUnknown_Release (LPUNKNOWN iface);
 /* IDirectMusicBand: */
-extern HRESULT WINAPI IDirectMusicBandImpl_IDirectMusicBand_QueryInterface (LPDIRECTMUSICBAND iface, REFIID riid, LPVOID *ppobj);
 extern ULONG WINAPI   IDirectMusicBandImpl_IDirectMusicBand_AddRef (LPDIRECTMUSICBAND iface);
-extern ULONG WINAPI   IDirectMusicBandImpl_IDirectMusicBand_Release (LPDIRECTMUSICBAND iface);
-extern HRESULT WINAPI IDirectMusicBandImpl_IDirectMusicBand_CreateSegment (LPDIRECTMUSICBAND iface, IDirectMusicSegment** ppSegment);
-extern HRESULT WINAPI IDirectMusicBandImpl_IDirectMusicBand_Download (LPDIRECTMUSICBAND iface, IDirectMusicPerformance* pPerformance);
-extern HRESULT WINAPI IDirectMusicBandImpl_IDirectMusicBand_Unload (LPDIRECTMUSICBAND iface, IDirectMusicPerformance* pPerformance);
 /* IDirectMusicObject: */
-extern HRESULT WINAPI IDirectMusicBandImpl_IDirectMusicObject_QueryInterface (LPDIRECTMUSICOBJECT iface, REFIID riid, LPVOID *ppobj);
 extern ULONG WINAPI   IDirectMusicBandImpl_IDirectMusicObject_AddRef (LPDIRECTMUSICOBJECT iface);
-extern ULONG WINAPI   IDirectMusicBandImpl_IDirectMusicObject_Release (LPDIRECTMUSICOBJECT iface);
-extern HRESULT WINAPI IDirectMusicBandImpl_IDirectMusicObject_GetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc);
-extern HRESULT WINAPI IDirectMusicBandImpl_IDirectMusicObject_SetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc);
-extern HRESULT WINAPI IDirectMusicBandImpl_IDirectMusicObject_ParseDescriptor (LPDIRECTMUSICOBJECT iface, LPSTREAM pStream, LPDMUS_OBJECTDESC pDesc);
 /* IPersistStream: */
-extern HRESULT WINAPI IDirectMusicBandImpl_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, void** ppvObject);
 extern ULONG WINAPI   IDirectMusicBandImpl_IPersistStream_AddRef (LPPERSISTSTREAM iface);
-extern ULONG WINAPI   IDirectMusicBandImpl_IPersistStream_Release (LPPERSISTSTREAM iface);
-extern HRESULT WINAPI IDirectMusicBandImpl_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID);
-extern HRESULT WINAPI IDirectMusicBandImpl_IPersistStream_IsDirty (LPPERSISTSTREAM iface);
-extern HRESULT WINAPI IDirectMusicBandImpl_IPersistStream_Load (LPPERSISTSTREAM iface, IStream* pStm);
-extern HRESULT WINAPI IDirectMusicBandImpl_IPersistStream_Save (LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty);
-extern HRESULT WINAPI IDirectMusicBandImpl_IPersistStream_GetSizeMax (LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize);
-
 
 /*****************************************************************************
  * IDirectMusicBandTrack implementation structure
  */
 struct IDirectMusicBandTrack {
   /* IUnknown fields */
-  IUnknownVtbl *UnknownVtbl;
-  IDirectMusicTrack8Vtbl *TrackVtbl;
-  IPersistStreamVtbl *PersistStreamVtbl;
+  const IUnknownVtbl *UnknownVtbl;
+  const IDirectMusicTrack8Vtbl *TrackVtbl;
+  const IPersistStreamVtbl *PersistStreamVtbl;
   DWORD          ref;
 
   /* IDirectMusicBandTrack fields */
@@ -160,37 +128,11 @@ struct IDirectMusicBandTrack {
 };
 
 /* IUnknown: */
-extern HRESULT WINAPI IDirectMusicBandTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj);
 extern ULONG WINAPI   IDirectMusicBandTrack_IUnknown_AddRef (LPUNKNOWN iface);
-extern ULONG WINAPI   IDirectMusicBandTrack_IUnknown_Release (LPUNKNOWN iface);
 /* IDirectMusicTrack(8): */
-extern HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_QueryInterface (LPDIRECTMUSICTRACK8 iface, REFIID riid, LPVOID *ppobj);
 extern ULONG WINAPI   IDirectMusicBandTrack_IDirectMusicTrack_AddRef (LPDIRECTMUSICTRACK8 iface);
-extern ULONG WINAPI   IDirectMusicBandTrack_IDirectMusicTrack_Release (LPDIRECTMUSICTRACK8 iface);
-extern HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_Init (LPDIRECTMUSICTRACK8 iface, IDirectMusicSegment* pSegment);
-extern HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_InitPlay (LPDIRECTMUSICTRACK8 iface, IDirectMusicSegmentState* pSegmentState, IDirectMusicPerformance* pPerformance, void** ppStateData, DWORD dwVirtualTrackID, DWORD dwFlags);
-extern HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_EndPlay (LPDIRECTMUSICTRACK8 iface, void* pStateData);
-extern HRESULT WINAPI IDirectMusicBandTrack_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 IDirectMusicBandTrack_IDirectMusicTrack_GetParam (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME* pmtNext, void* pParam);
-extern HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_SetParam (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, MUSIC_TIME mtTime, void* pParam);
-extern HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_IsParamSupported (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType);
-extern HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_AddNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType);
-extern HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_RemoveNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType);
-extern HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_Clone (LPDIRECTMUSICTRACK8 iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack** ppTrack);
-extern HRESULT WINAPI IDirectMusicBandTrack_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 IDirectMusicBandTrack_IDirectMusicTrack_GetParamEx (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, REFERENCE_TIME* prtNext, void* pParam, void* pStateData, DWORD dwFlags);
-extern HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_SetParamEx (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, void* pParam, void* pStateData, DWORD dwFlags);
-extern HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_Compose (LPDIRECTMUSICTRACK8 iface, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack);
-extern HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK8 iface, IDirectMusicTrack* pNewTrack, MUSIC_TIME mtJoin, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack);
 /* IPersistStream: */
-extern HRESULT WINAPI IDirectMusicBandTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, void** ppvObject);
 extern ULONG WINAPI   IDirectMusicBandTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface);
-extern ULONG WINAPI   IDirectMusicBandTrack_IPersistStream_Release (LPPERSISTSTREAM iface);
-extern HRESULT WINAPI IDirectMusicBandTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID);
-extern HRESULT WINAPI IDirectMusicBandTrack_IPersistStream_IsDirty (LPPERSISTSTREAM iface);
-extern HRESULT WINAPI IDirectMusicBandTrack_IPersistStream_Load (LPPERSISTSTREAM iface, IStream* pStm);
-extern HRESULT WINAPI IDirectMusicBandTrack_IPersistStream_Save (LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty);
-extern HRESULT WINAPI IDirectMusicBandTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize);
 
 /**********************************************************************
  * Dll lifetime tracking declaration for dmband.dll

dlls/dmcompos/chordmap.c

@@ -78,7 +78,7 @@ ULONG WINAPI IDirectMusicChordMapImpl_IUnknown_Release (LPUNKNOWN iface) {
 	return ref;
 }
 
-IUnknownVtbl DirectMusicChordMap_Unknown_Vtbl = {
+static const IUnknownVtbl DirectMusicChordMap_Unknown_Vtbl = {
 	IDirectMusicChordMapImpl_IUnknown_QueryInterface,
 	IDirectMusicChordMapImpl_IUnknown_AddRef,
 	IDirectMusicChordMapImpl_IUnknown_Release
@@ -106,7 +106,7 @@ HRESULT WINAPI IDirectMusicChordMapImpl_IDirectMusicChordMap_GetScale (LPDIRECTM
 	return S_OK;
 }
 
-IDirectMusicChordMapVtbl DirectMusicChordMap_ChordMap_Vtbl = {
+static const IDirectMusicChordMapVtbl DirectMusicChordMap_ChordMap_Vtbl = {
 	IDirectMusicChordMapImpl_IDirectMusicChordMap_QueryInterface,
 	IDirectMusicChordMapImpl_IDirectMusicChordMap_AddRef,
 	IDirectMusicChordMapImpl_IDirectMusicChordMap_Release,
@@ -318,7 +318,7 @@ HRESULT WINAPI IDirectMusicChordMapImpl_IDirectMusicObject_ParseDescriptor (LPDI
 	return S_OK;
 }
 
-IDirectMusicObjectVtbl DirectMusicChordMap_Object_Vtbl = {
+static const IDirectMusicObjectVtbl DirectMusicChordMap_Object_Vtbl = {
 	IDirectMusicChordMapImpl_IDirectMusicObject_QueryInterface,
 	IDirectMusicChordMapImpl_IDirectMusicObject_AddRef,
 	IDirectMusicChordMapImpl_IDirectMusicObject_Release,
@@ -507,7 +507,7 @@ HRESULT WINAPI IDirectMusicChordMapImpl_IPersistStream_GetSizeMax (LPPERSISTSTRE
 	return E_NOTIMPL;
 }
 
-IPersistStreamVtbl DirectMusicChordMap_PersistStream_Vtbl = {
+static const IPersistStreamVtbl DirectMusicChordMap_PersistStream_Vtbl = {
 	IDirectMusicChordMapImpl_IPersistStream_QueryInterface,
 	IDirectMusicChordMapImpl_IPersistStream_AddRef,
 	IDirectMusicChordMapImpl_IPersistStream_Release,

dlls/dmcompos/chordmaptrack.c

@@ -75,7 +75,7 @@ ULONG WINAPI IDirectMusicChordMapTrack_IUnknown_Release (LPUNKNOWN iface) {
 	return ref;
 }
 
-IUnknownVtbl DirectMusicChordMapTrack_Unknown_Vtbl = {
+static const IUnknownVtbl DirectMusicChordMapTrack_Unknown_Vtbl = {
 	IDirectMusicChordMapTrack_IUnknown_QueryInterface,
 	IDirectMusicChordMapTrack_IUnknown_AddRef,
 	IDirectMusicChordMapTrack_IUnknown_Release
@@ -192,7 +192,7 @@ HRESULT WINAPI IDirectMusicChordMapTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTR
 	return S_OK;
 }
 
-IDirectMusicTrack8Vtbl DirectMusicChordMapTrack_Track_Vtbl = {
+static const IDirectMusicTrack8Vtbl DirectMusicChordMapTrack_Track_Vtbl = {
 	IDirectMusicChordMapTrack_IDirectMusicTrack_QueryInterface,
 	IDirectMusicChordMapTrack_IDirectMusicTrack_AddRef,
 	IDirectMusicChordMapTrack_IDirectMusicTrack_Release,
@@ -251,7 +251,7 @@ HRESULT WINAPI IDirectMusicChordMapTrack_IPersistStream_GetSizeMax (LPPERSISTSTR
 	return E_NOTIMPL;
 }
 
-IPersistStreamVtbl DirectMusicChordMapTrack_PersistStream_Vtbl = {
+static const IPersistStreamVtbl DirectMusicChordMapTrack_PersistStream_Vtbl = {
 	IDirectMusicChordMapTrack_IPersistStream_QueryInterface,
 	IDirectMusicChordMapTrack_IPersistStream_AddRef,
 	IDirectMusicChordMapTrack_IPersistStream_Release,

dlls/dmcompos/composer.c

@@ -99,7 +99,7 @@ HRESULT WINAPI IDirectMusicComposerImpl_ChangeChordMap (LPDIRECTMUSICCOMPOSER if
 	return S_OK;
 }
 
-IDirectMusicComposerVtbl DirectMusicComposer_Vtbl = {
+static const IDirectMusicComposerVtbl DirectMusicComposer_Vtbl = {
 	IDirectMusicComposerImpl_QueryInterface,
 	IDirectMusicComposerImpl_AddRef,
 	IDirectMusicComposerImpl_Release,

dlls/dmcompos/dmcompos_main.c

@@ -24,7 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmcompos);
 LONG DMCOMPOS_refCount = 0;
 
 typedef struct {
-    IClassFactoryVtbl          *lpVtbl;
+    const IClassFactoryVtbl *lpVtbl;
 } IClassFactoryImpl;
 
 /******************************************************************
@@ -67,7 +67,7 @@ static HRESULT WINAPI ChordMapCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
 	return S_OK;
 }
 
-static IClassFactoryVtbl ChordMapCF_Vtbl = {
+static const IClassFactoryVtbl ChordMapCF_Vtbl = {
 	ChordMapCF_QueryInterface,
 	ChordMapCF_AddRef,
 	ChordMapCF_Release,
@@ -117,7 +117,7 @@ static HRESULT WINAPI ComposerCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
 	return S_OK;
 }
 
-static IClassFactoryVtbl ComposerCF_Vtbl = {
+static const IClassFactoryVtbl ComposerCF_Vtbl = {
 	ComposerCF_QueryInterface,
 	ComposerCF_AddRef,
 	ComposerCF_Release,
@@ -167,7 +167,7 @@ static HRESULT WINAPI ChordMapTrackCF_LockServer(LPCLASSFACTORY iface,BOOL doloc
 	return S_OK;
 }
 
-static IClassFactoryVtbl ChordMapTrackCF_Vtbl = {
+static const IClassFactoryVtbl ChordMapTrackCF_Vtbl = {
 	ChordMapTrackCF_QueryInterface,
 	ChordMapTrackCF_AddRef,
 	ChordMapTrackCF_Release,
@@ -219,7 +219,7 @@ static HRESULT WINAPI TemplateCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
 	return S_OK;
 }
 
-static IClassFactoryVtbl TemplateCF_Vtbl = {
+static const IClassFactoryVtbl TemplateCF_Vtbl = {
 	TemplateCF_QueryInterface,
 	TemplateCF_AddRef,
 	TemplateCF_Release,
@@ -269,7 +269,7 @@ static HRESULT WINAPI SignPostTrackCF_LockServer(LPCLASSFACTORY iface,BOOL doloc
 	return S_OK;
 }
 
-static IClassFactoryVtbl SignPostTrackCF_Vtbl = {
+static const IClassFactoryVtbl SignPostTrackCF_Vtbl = {
 	SignPostTrackCF_QueryInterface,
 	SignPostTrackCF_AddRef,
 	SignPostTrackCF_Release,

dlls/dmcompos/signposttrack.c

@@ -75,7 +75,7 @@ ULONG WINAPI IDirectMusicSignPostTrack_IUnknown_Release (LPUNKNOWN iface) {
 	return ref;
 }
 
-IUnknownVtbl DirectMusicSignPostTrack_Unknown_Vtbl = {
+static const IUnknownVtbl DirectMusicSignPostTrack_Unknown_Vtbl = {
 	IDirectMusicSignPostTrack_IUnknown_QueryInterface,
 	IDirectMusicSignPostTrack_IUnknown_AddRef,
 	IDirectMusicSignPostTrack_IUnknown_Release
@@ -189,7 +189,7 @@ HRESULT WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTR
 	return S_OK;
 }
 
-IDirectMusicTrack8Vtbl DirectMusicSignPostTrack_Track_Vtbl = {
+static const IDirectMusicTrack8Vtbl DirectMusicSignPostTrack_Track_Vtbl = {
 	IDirectMusicSignPostTrack_IDirectMusicTrack_QueryInterface,
 	IDirectMusicSignPostTrack_IDirectMusicTrack_AddRef,
 	IDirectMusicSignPostTrack_IDirectMusicTrack_Release,
@@ -248,7 +248,7 @@ HRESULT WINAPI IDirectMusicSignPostTrack_IPersistStream_GetSizeMax (LPPERSISTSTR
 	return E_NOTIMPL;
 }
 
-IPersistStreamVtbl DirectMusicSignPostTrack_PersistStream_Vtbl =
+static const IPersistStreamVtbl DirectMusicSignPostTrack_PersistStream_Vtbl =
 {
 	IDirectMusicSignPostTrack_IPersistStream_QueryInterface,
 	IDirectMusicSignPostTrack_IPersistStream_AddRef,

dlls/dmime/audiopath.c

@@ -80,7 +80,7 @@ ULONG WINAPI IDirectMusicAudioPathImpl_IUnknown_Release (LPUNKNOWN iface) {
   return ref;
 }
 
-IUnknownVtbl DirectMusicAudioPath_Unknown_Vtbl = {
+static const IUnknownVtbl DirectMusicAudioPath_Unknown_Vtbl = {
 	IDirectMusicAudioPathImpl_IUnknown_QueryInterface,
 	IDirectMusicAudioPathImpl_IUnknown_AddRef,
 	IDirectMusicAudioPathImpl_IUnknown_Release
@@ -218,7 +218,7 @@ HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicAudioPath_ConvertPChannel (
   return S_OK;
 }
 
-IDirectMusicAudioPathVtbl DirectMusicAudioPath_AudioPath_Vtbl = {
+static const IDirectMusicAudioPathVtbl DirectMusicAudioPath_AudioPath_Vtbl = {
   IDirectMusicAudioPathImpl_IDirectMusicAudioPath_QueryInterface,
   IDirectMusicAudioPathImpl_IDirectMusicAudioPath_AddRef,
   IDirectMusicAudioPathImpl_IDirectMusicAudioPath_Release,
@@ -434,7 +434,7 @@ HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicObject_ParseDescriptor (LPD
 	return S_OK;
 }
 
-IDirectMusicObjectVtbl DirectMusicAudioPath_Object_Vtbl = {
+static const IDirectMusicObjectVtbl DirectMusicAudioPath_Object_Vtbl = {
 	IDirectMusicAudioPathImpl_IDirectMusicObject_QueryInterface,
 	IDirectMusicAudioPathImpl_IDirectMusicObject_AddRef,
 	IDirectMusicAudioPathImpl_IDirectMusicObject_Release,

dlls/dmime/dmime_main.c

@@ -26,7 +26,7 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile);
 LONG DMIME_refCount = 0;
 
 typedef struct {
-    IClassFactoryVtbl          *lpVtbl;
+    const IClassFactoryVtbl *lpVtbl;
 } IClassFactoryImpl;
 
 /******************************************************************
@@ -69,7 +69,7 @@ static HRESULT WINAPI PerformanceCF_LockServer(LPCLASSFACTORY iface,BOOL dolock)
 	return S_OK;
 }
 
-static IClassFactoryVtbl PerformanceCF_Vtbl = {
+static const IClassFactoryVtbl PerformanceCF_Vtbl = {
 	PerformanceCF_QueryInterface,
 	PerformanceCF_AddRef,
 	PerformanceCF_Release,
@@ -119,7 +119,7 @@ static HRESULT WINAPI SegmentCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
 	return S_OK;
 }
 
-static IClassFactoryVtbl SegmentCF_Vtbl = {
+static const IClassFactoryVtbl SegmentCF_Vtbl = {
 	SegmentCF_QueryInterface,
 	SegmentCF_AddRef,
 	SegmentCF_Release,
@@ -169,7 +169,7 @@ static HRESULT WINAPI SegmentStateCF_LockServer(LPCLASSFACTORY iface,BOOL dolock
 	return S_OK;
 }
 
-static IClassFactoryVtbl SegmentStateCF_Vtbl = {
+static const IClassFactoryVtbl SegmentStateCF_Vtbl = {
 	SegmentStateCF_QueryInterface,
 	SegmentStateCF_AddRef,
 	SegmentStateCF_Release,
@@ -219,7 +219,7 @@ static HRESULT WINAPI GraphCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
 	return S_OK;
 }
 
-static IClassFactoryVtbl GraphCF_Vtbl = {
+static const IClassFactoryVtbl GraphCF_Vtbl = {
 	GraphCF_QueryInterface,
 	GraphCF_AddRef,
 	GraphCF_Release,
@@ -269,7 +269,7 @@ static HRESULT WINAPI TempoTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock)
 	return S_OK;
 }
 
-static IClassFactoryVtbl TempoTrackCF_Vtbl = {
+static const IClassFactoryVtbl TempoTrackCF_Vtbl = {
 	TempoTrackCF_QueryInterface,
 	TempoTrackCF_AddRef,
 	TempoTrackCF_Release,
@@ -319,7 +319,7 @@ static HRESULT WINAPI SeqTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
 	return S_OK;
 }
 
-static IClassFactoryVtbl SeqTrackCF_Vtbl = {
+static const IClassFactoryVtbl SeqTrackCF_Vtbl = {
 	SeqTrackCF_QueryInterface,
 	SeqTrackCF_AddRef,
 	SeqTrackCF_Release,
@@ -368,7 +368,7 @@ static HRESULT WINAPI SysExTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock)
 	return S_OK;
 }
 
-static IClassFactoryVtbl SysExTrackCF_Vtbl = {
+static const IClassFactoryVtbl SysExTrackCF_Vtbl = {
 	SysExTrackCF_QueryInterface,
 	SysExTrackCF_AddRef,
 	SysExTrackCF_Release,
@@ -418,7 +418,7 @@ static HRESULT WINAPI TimeSigTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock
 	return S_OK;
 }
 
-static IClassFactoryVtbl TimeSigTrackCF_Vtbl = {
+static const IClassFactoryVtbl TimeSigTrackCF_Vtbl = {
 	TimeSigTrackCF_QueryInterface,
 	TimeSigTrackCF_AddRef,
 	TimeSigTrackCF_Release,
@@ -468,7 +468,7 @@ static HRESULT WINAPI ParamControlTrackCF_LockServer(LPCLASSFACTORY iface,BOOL d
 	return S_OK;
 }
 
-static IClassFactoryVtbl ParamControlTrackCF_Vtbl = {
+static const IClassFactoryVtbl ParamControlTrackCF_Vtbl = {
 	ParamControlTrackCF_QueryInterface,
 	ParamControlTrackCF_AddRef,
 	ParamControlTrackCF_Release,
@@ -518,7 +518,7 @@ static HRESULT WINAPI MarkerTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock)
 	return S_OK;
 }
 
-static IClassFactoryVtbl MarkerTrackCF_Vtbl = {
+static const IClassFactoryVtbl MarkerTrackCF_Vtbl = {
 	MarkerTrackCF_QueryInterface,
 	MarkerTrackCF_AddRef,
 	MarkerTrackCF_Release,
@@ -568,7 +568,7 @@ static HRESULT WINAPI LyricsTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock)
 	return S_OK;
 }
 
-static IClassFactoryVtbl LyricsTrackCF_Vtbl = {
+static const IClassFactoryVtbl LyricsTrackCF_Vtbl = {
 	LyricsTrackCF_QueryInterface,
 	LyricsTrackCF_AddRef,
 	LyricsTrackCF_Release,
@@ -619,7 +619,7 @@ static HRESULT WINAPI SegTriggerTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dol
 	return S_OK;
 }
 
-static IClassFactoryVtbl SegTriggerTrackCF_Vtbl = {
+static const IClassFactoryVtbl SegTriggerTrackCF_Vtbl = {
 	SegTriggerTrackCF_QueryInterface,
 	SegTriggerTrackCF_AddRef,
 	SegTriggerTrackCF_Release,
@@ -669,7 +669,7 @@ static HRESULT WINAPI AudioPathCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
 	return S_OK;
 }
 
-static IClassFactoryVtbl AudioPathCF_Vtbl = {
+static const IClassFactoryVtbl AudioPathCF_Vtbl = {
 	AudioPathCF_QueryInterface,
 	AudioPathCF_AddRef,
 	AudioPathCF_Release,
@@ -719,7 +719,7 @@ static HRESULT WINAPI WaveTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
 	return S_OK;
 }
 
-static IClassFactoryVtbl WaveTrackCF_Vtbl = {
+static const IClassFactoryVtbl WaveTrackCF_Vtbl = {
 	WaveTrackCF_QueryInterface,
 	WaveTrackCF_AddRef,
 	WaveTrackCF_Release,

dlls/dmime/graph.c

@@ -77,7 +77,7 @@ ULONG WINAPI IDirectMusicGraphImpl_IUnknown_Release (LPUNKNOWN iface) {
 	return ref;
 }
 
-IUnknownVtbl DirectMusicGraph_Unknown_Vtbl = {
+static const IUnknownVtbl DirectMusicGraph_Unknown_Vtbl = {
 	IDirectMusicGraphImpl_IUnknown_QueryInterface,
 	IDirectMusicGraphImpl_IUnknown_AddRef,
 	IDirectMusicGraphImpl_IUnknown_Release
@@ -183,7 +183,7 @@ HRESULT WINAPI IDirectMusicGraphImpl_IDirectMusicGraph_RemoveTool (LPDIRECTMUSIC
   return S_OK;
 }
 
-IDirectMusicGraphVtbl DirectMusicGraph_Graph_Vtbl = {
+static const IDirectMusicGraphVtbl DirectMusicGraph_Graph_Vtbl = {
   IDirectMusicGraphImpl_IDirectMusicGraph_QueryInterface,
   IDirectMusicGraphImpl_IDirectMusicGraph_AddRef,
   IDirectMusicGraphImpl_IDirectMusicGraph_Release,
@@ -400,7 +400,7 @@ HRESULT WINAPI IDirectMusicGraphImpl_IDirectMusicObject_ParseDescriptor (LPDIREC
 	return S_OK;
 }
 
-IDirectMusicObjectVtbl DirectMusicGraph_Object_Vtbl = {
+static const IDirectMusicObjectVtbl DirectMusicGraph_Object_Vtbl = {
 	IDirectMusicGraphImpl_IDirectMusicObject_QueryInterface,
 	IDirectMusicGraphImpl_IDirectMusicObject_AddRef,
 	IDirectMusicGraphImpl_IDirectMusicObject_Release,
@@ -587,7 +587,7 @@ HRESULT WINAPI IDirectMusicGraphImpl_IPersistStream_GetSizeMax (LPPERSISTSTREAM
 	return E_NOTIMPL;
 }
 
-IPersistStreamVtbl DirectMusicGraph_PersistStream_Vtbl = {
+static const IPersistStreamVtbl DirectMusicGraph_PersistStream_Vtbl = {
 	IDirectMusicGraphImpl_IPersistStream_QueryInterface,
 	IDirectMusicGraphImpl_IPersistStream_AddRef,
 	IDirectMusicGraphImpl_IPersistStream_Release,

dlls/dmime/lyricstrack.c

@@ -74,7 +74,7 @@ ULONG WINAPI IDirectMusicLyricsTrack_IUnknown_Release (LPUNKNOWN iface) {
 	return ref;
 }
 
-IUnknownVtbl DirectMusicLyricsTrack_Unknown_Vtbl = {
+static const IUnknownVtbl DirectMusicLyricsTrack_Unknown_Vtbl = {
 	IDirectMusicLyricsTrack_IUnknown_QueryInterface,
 	IDirectMusicLyricsTrack_IUnknown_AddRef,
 	IDirectMusicLyricsTrack_IUnknown_Release
@@ -193,7 +193,7 @@ HRESULT WINAPI IDirectMusicLyricsTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRAC
 	return S_OK;
 }
 
-IDirectMusicTrack8Vtbl DirectMusicLyricsTrack_Track_Vtbl = {
+static const IDirectMusicTrack8Vtbl DirectMusicLyricsTrack_Track_Vtbl = {
 	IDirectMusicLyricsTrack_IDirectMusicTrack_QueryInterface,
 	IDirectMusicLyricsTrack_IDirectMusicTrack_AddRef,
 	IDirectMusicLyricsTrack_IDirectMusicTrack_Release,
@@ -251,7 +251,7 @@ HRESULT WINAPI IDirectMusicLyricsTrack_IPersistStream_GetSizeMax (LPPERSISTSTREA
 	return E_NOTIMPL;
 }
 
-IPersistStreamVtbl DirectMusicLyricsTrack_PersistStream_Vtbl = {
+static const IPersistStreamVtbl DirectMusicLyricsTrack_PersistStream_Vtbl = {
 	IDirectMusicLyricsTrack_IPersistStream_QueryInterface,
 	IDirectMusicLyricsTrack_IPersistStream_AddRef,
 	IDirectMusicLyricsTrack_IPersistStream_Release,

dlls/dmime/markertrack.c

@@ -74,7 +74,7 @@ ULONG WINAPI IDirectMusicMarkerTrack_IUnknown_Release (LPUNKNOWN iface) {
 	return ref;
 }
 
-IUnknownVtbl DirectMusicMarkerTrack_Unknown_Vtbl = {
+static const IUnknownVtbl DirectMusicMarkerTrack_Unknown_Vtbl = {
 	IDirectMusicMarkerTrack_IUnknown_QueryInterface,
 	IDirectMusicMarkerTrack_IUnknown_AddRef,
 	IDirectMusicMarkerTrack_IUnknown_Release
@@ -193,7 +193,7 @@ HRESULT WINAPI IDirectMusicMarkerTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRAC
 	return S_OK;
 }
 
-IDirectMusicTrack8Vtbl DirectMusicMarkerTrack_Track_Vtbl = {
+static const IDirectMusicTrack8Vtbl DirectMusicMarkerTrack_Track_Vtbl = {
 	IDirectMusicMarkerTrack_IDirectMusicTrack_QueryInterface,
 	IDirectMusicMarkerTrack_IDirectMusicTrack_AddRef,
 	IDirectMusicMarkerTrack_IDirectMusicTrack_Release,
@@ -251,7 +251,7 @@ HRESULT WINAPI IDirectMusicMarkerTrack_IPersistStream_GetSizeMax (LPPERSISTSTREA
 	return E_NOTIMPL;
 }
 
-IPersistStreamVtbl DirectMusicMarkerTrack_PersistStream_Vtbl = {
+static const IPersistStreamVtbl DirectMusicMarkerTrack_PersistStream_Vtbl = {
 	IDirectMusicMarkerTrack_IPersistStream_QueryInterface,
 	IDirectMusicMarkerTrack_IPersistStream_AddRef,
 	IDirectMusicMarkerTrack_IPersistStream_Release,

dlls/dmime/paramcontroltrack.c

@@ -74,7 +74,7 @@ ULONG WINAPI IDirectMusicParamControlTrack_IUnknown_Release (LPUNKNOWN iface) {
 	return ref;
 }
 
-IUnknownVtbl DirectMusicParamControlTrack_Unknown_Vtbl = {
+static const IUnknownVtbl DirectMusicParamControlTrack_Unknown_Vtbl = {
 	IDirectMusicParamControlTrack_IUnknown_QueryInterface,
 	IDirectMusicParamControlTrack_IUnknown_AddRef,
 	IDirectMusicParamControlTrack_IUnknown_Release
@@ -193,7 +193,7 @@ HRESULT WINAPI IDirectMusicParamControlTrack_IDirectMusicTrack_Join (LPDIRECTMUS
 	return S_OK;
 }
 
-IDirectMusicTrack8Vtbl DirectMusicParamControlTrack_Track_Vtbl = {
+static const IDirectMusicTrack8Vtbl DirectMusicParamControlTrack_Track_Vtbl = {
 	IDirectMusicParamControlTrack_IDirectMusicTrack_QueryInterface,
 	IDirectMusicParamControlTrack_IDirectMusicTrack_AddRef,
 	IDirectMusicParamControlTrack_IDirectMusicTrack_Release,
@@ -251,7 +251,7 @@ HRESULT WINAPI IDirectMusicParamControlTrack_IPersistStream_GetSizeMax (LPPERSIS
 	return E_NOTIMPL;
 }
 
-IPersistStreamVtbl DirectMusicParamControlTrack_PersistStream_Vtbl = {
+static const IPersistStreamVtbl DirectMusicParamControlTrack_PersistStream_Vtbl = {
 	IDirectMusicParamControlTrack_IPersistStream_QueryInterface,
 	IDirectMusicParamControlTrack_IPersistStream_AddRef,
 	IDirectMusicParamControlTrack_IPersistStream_Release,

dlls/dmime/patterntrack.c

@@ -81,7 +81,7 @@ HRESULT WINAPI IDirectMusicPatternTrackImpl_SetPatternByName (LPDIRECTMUSICPATTE
 	return S_OK;
 }
 
-IDirectMusicPatternTrackVtbl DirectMusicPatternTrack_Vtbl = {
+static const IDirectMusicPatternTrackVtbl DirectMusicPatternTrack_Vtbl = {
 	IDirectMusicPatternTrackImpl_QueryInterface,
 	IDirectMusicPatternTrackImpl_AddRef,
 	IDirectMusicPatternTrackImpl_Release,

dlls/dmime/performance.c

@@ -927,7 +927,7 @@ HRESULT WINAPI IDirectMusicPerformance8Impl_GetParamEx (LPDIRECTMUSICPERFORMANCE
 	return S_OK;
 }
 
-IDirectMusicPerformance8Vtbl DirectMusicPerformance8_Vtbl = {
+static const IDirectMusicPerformance8Vtbl DirectMusicPerformance8_Vtbl = {
 	IDirectMusicPerformance8Impl_QueryInterface,
 	IDirectMusicPerformance8Impl_AddRef,
 	IDirectMusicPerformance8Impl_Release,

dlls/dmime/segment.c

@@ -80,7 +80,7 @@ ULONG WINAPI IDirectMusicSegment8Impl_IUnknown_Release (LPUNKNOWN iface) {
 	return ref;
 }
 
-IUnknownVtbl DirectMusicSegment8_Unknown_Vtbl = {
+static const IUnknownVtbl DirectMusicSegment8_Unknown_Vtbl = {
   IDirectMusicSegment8Impl_IUnknown_QueryInterface,
   IDirectMusicSegment8Impl_IUnknown_AddRef,
   IDirectMusicSegment8Impl_IUnknown_Release
@@ -480,7 +480,7 @@ HRESULT WINAPI IDirectMusicSegment8Impl_IDirectMusicSegment8_Unload (LPDIRECTMUS
 	return S_OK;
 }
 
-IDirectMusicSegment8Vtbl DirectMusicSegment8_Segment_Vtbl = {
+static const IDirectMusicSegment8Vtbl DirectMusicSegment8_Segment_Vtbl = {
 	IDirectMusicSegment8Impl_IDirectMusicSegment8_QueryInterface,
 	IDirectMusicSegment8Impl_IDirectMusicSegment8_AddRef,
 	IDirectMusicSegment8Impl_IDirectMusicSegment8_Release,
@@ -743,7 +743,7 @@ HRESULT WINAPI IDirectMusicSegment8Impl_IDirectMusicObject_ParseDescriptor (LPDI
 	return S_OK;
 }
 
-IDirectMusicObjectVtbl DirectMusicSegment8_Object_Vtbl = {
+static const IDirectMusicObjectVtbl DirectMusicSegment8_Object_Vtbl = {
   IDirectMusicSegment8Impl_IDirectMusicObject_QueryInterface,
   IDirectMusicSegment8Impl_IDirectMusicObject_AddRef,
   IDirectMusicSegment8Impl_IDirectMusicObject_Release,
@@ -1275,7 +1275,7 @@ HRESULT WINAPI IDirectMusicSegment8Impl_IPersistStream_GetSizeMax (LPPERSISTSTRE
   return E_NOTIMPL;
 }
 
-IPersistStreamVtbl DirectMusicSegment8_PersistStream_Vtbl = {
+static const IPersistStreamVtbl DirectMusicSegment8_PersistStream_Vtbl = {
   IDirectMusicSegment8Impl_IPersistStream_QueryInterface,
   IDirectMusicSegment8Impl_IPersistStream_AddRef,
   IDirectMusicSegment8Impl_IPersistStream_Release,

dlls/dmime/segmentstate.c

@@ -106,7 +106,7 @@ HRESULT WINAPI IDirectMusicSegmentState8Impl_GetObjectInPath (LPDIRECTMUSICSEGME
 	return S_OK;
 }
 
-IDirectMusicSegmentState8Vtbl DirectMusicSegmentState8_Vtbl = {
+static const IDirectMusicSegmentState8Vtbl DirectMusicSegmentState8_Vtbl = {
 	IDirectMusicSegmentState8Impl_QueryInterface,
 	IDirectMusicSegmentState8Impl_AddRef,
 	IDirectMusicSegmentState8Impl_Release,

dlls/dmime/segtriggertrack.c

@@ -75,7 +75,7 @@ ULONG WINAPI IDirectMusicSegTriggerTrack_IUnknown_Release (LPUNKNOWN iface) {
 	return ref;
 }
 
-IUnknownVtbl DirectMusicSegTriggerTrack_Unknown_Vtbl = {
+static const IUnknownVtbl DirectMusicSegTriggerTrack_Unknown_Vtbl = {
 	IDirectMusicSegTriggerTrack_IUnknown_QueryInterface,
 	IDirectMusicSegTriggerTrack_IUnknown_AddRef,
 	IDirectMusicSegTriggerTrack_IUnknown_Release
@@ -194,7 +194,7 @@ HRESULT WINAPI IDirectMusicSegTriggerTrack_IDirectMusicTrack_Join (LPDIRECTMUSIC
 	return S_OK;
 }
 
-IDirectMusicTrack8Vtbl DirectMusicSegTriggerTrack_Track_Vtbl = {
+static const IDirectMusicTrack8Vtbl DirectMusicSegTriggerTrack_Track_Vtbl = {
 	IDirectMusicSegTriggerTrack_IDirectMusicTrack_QueryInterface,
 	IDirectMusicSegTriggerTrack_IDirectMusicTrack_AddRef,
 	IDirectMusicSegTriggerTrack_IDirectMusicTrack_Release,
@@ -498,7 +498,7 @@ HRESULT WINAPI IDirectMusicSegTriggerTrack_IPersistStream_GetSizeMax (LPPERSISTS
   return E_NOTIMPL;
 }
 
-IPersistStreamVtbl DirectMusicSegTriggerTrack_PersistStream_Vtbl = {
+static const IPersistStreamVtbl DirectMusicSegTriggerTrack_PersistStream_Vtbl = {
   IDirectMusicSegTriggerTrack_IPersistStream_QueryInterface,
   IDirectMusicSegTriggerTrack_IPersistStream_AddRef,
   IDirectMusicSegTriggerTrack_IPersistStream_Release,

dlls/dmime/seqtrack.c

@@ -74,7 +74,7 @@ ULONG WINAPI IDirectMusicSeqTrack_IUnknown_Release (LPUNKNOWN iface) {
 	return ref;
 }
 
-IUnknownVtbl DirectMusicSeqTrack_Unknown_Vtbl = {
+static const IUnknownVtbl DirectMusicSeqTrack_Unknown_Vtbl = {
 	IDirectMusicSeqTrack_IUnknown_QueryInterface,
 	IDirectMusicSeqTrack_IUnknown_AddRef,
 	IDirectMusicSeqTrack_IUnknown_Release
@@ -193,7 +193,7 @@ HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK8
 	return S_OK;
 }
 
-IDirectMusicTrack8Vtbl DirectMusicSeqTrack_Track_Vtbl = {
+static const IDirectMusicTrack8Vtbl DirectMusicSeqTrack_Track_Vtbl = {
 	IDirectMusicSeqTrack_IDirectMusicTrack_QueryInterface,
 	IDirectMusicSeqTrack_IDirectMusicTrack_AddRef,
 	IDirectMusicSeqTrack_IDirectMusicTrack_Release,
@@ -251,7 +251,7 @@ HRESULT WINAPI IDirectMusicSeqTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM i
 	return E_NOTIMPL;
 }
 
-IPersistStreamVtbl DirectMusicSeqTrack_PersistStream_Vtbl = {
+static const IPersistStreamVtbl DirectMusicSeqTrack_PersistStream_Vtbl = {
 	IDirectMusicSeqTrack_IPersistStream_QueryInterface,
 	IDirectMusicSeqTrack_IPersistStream_AddRef,
 	IDirectMusicSeqTrack_IPersistStream_Release,

dlls/dmime/sysextrack.c

@@ -74,7 +74,7 @@ ULONG WINAPI IDirectMusicSysExTrack_IUnknown_Release (LPUNKNOWN iface) {
 	return ref;
 }
 
-IUnknownVtbl DirectMusicSysExTrack_Unknown_Vtbl = {
+static const IUnknownVtbl DirectMusicSysExTrack_Unknown_Vtbl = {
 	IDirectMusicSysExTrack_IUnknown_QueryInterface,
 	IDirectMusicSysExTrack_IUnknown_AddRef,
 	IDirectMusicSysExTrack_IUnknown_Release
@@ -193,7 +193,7 @@ HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK
 	return S_OK;
 }
 
-IDirectMusicTrack8Vtbl DirectMusicSysExTrack_Track_Vtbl = {
+static const IDirectMusicTrack8Vtbl DirectMusicSysExTrack_Track_Vtbl = {
 	IDirectMusicSysExTrack_IDirectMusicTrack_QueryInterface,
 	IDirectMusicSysExTrack_IDirectMusicTrack_AddRef,
 	IDirectMusicSysExTrack_IDirectMusicTrack_Release,
@@ -251,7 +251,7 @@ HRESULT WINAPI IDirectMusicSysExTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM
 	return E_NOTIMPL;
 }
 
-IPersistStreamVtbl DirectMusicSysExTrack_PersistStream_Vtbl = {
+static const IPersistStreamVtbl DirectMusicSysExTrack_PersistStream_Vtbl = {
 	IDirectMusicSysExTrack_IPersistStream_QueryInterface,
 	IDirectMusicSysExTrack_IPersistStream_AddRef,
 	IDirectMusicSysExTrack_IPersistStream_Release,

dlls/dmime/tempotrack.c

@@ -75,7 +75,7 @@ ULONG WINAPI IDirectMusicTempoTrack_IUnknown_Release (LPUNKNOWN iface) {
   return ref;
 }
 
-IUnknownVtbl DirectMusicTempoTrack_Unknown_Vtbl = {
+static const IUnknownVtbl DirectMusicTempoTrack_Unknown_Vtbl = {
   IDirectMusicTempoTrack_IUnknown_QueryInterface,
   IDirectMusicTempoTrack_IUnknown_AddRef,
   IDirectMusicTempoTrack_IUnknown_Release
@@ -267,7 +267,7 @@ HRESULT WINAPI IDirectMusicTempoTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK
   return S_OK;
 }
 
-IDirectMusicTrack8Vtbl DirectMusicTempoTrack_Track_Vtbl = {
+static const IDirectMusicTrack8Vtbl DirectMusicTempoTrack_Track_Vtbl = {
   IDirectMusicTempoTrack_IDirectMusicTrack_QueryInterface,
   IDirectMusicTempoTrack_IDirectMusicTrack_AddRef,
   IDirectMusicTempoTrack_IDirectMusicTrack_Release,
@@ -385,7 +385,7 @@ HRESULT WINAPI IDirectMusicTempoTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM
   return E_NOTIMPL;
 }
 
-IPersistStreamVtbl DirectMusicTempoTrack_PersistStream_Vtbl = {
+static const IPersistStreamVtbl DirectMusicTempoTrack_PersistStream_Vtbl = {
   IDirectMusicTempoTrack_IPersistStream_QueryInterface,
   IDirectMusicTempoTrack_IPersistStream_AddRef,
   IDirectMusicTempoTrack_IPersistStream_Release,

dlls/dmime/timesigtrack.c

@@ -74,7 +74,7 @@ ULONG WINAPI IDirectMusicTimeSigTrack_IUnknown_Release (LPUNKNOWN iface) {
 	return ref;
 }
 
-IUnknownVtbl DirectMusicTimeSigTrack_Unknown_Vtbl = {
+static const IUnknownVtbl DirectMusicTimeSigTrack_Unknown_Vtbl = {
 	IDirectMusicTimeSigTrack_IUnknown_QueryInterface,
 	IDirectMusicTimeSigTrack_IUnknown_AddRef,
 	IDirectMusicTimeSigTrack_IUnknown_Release
@@ -198,7 +198,7 @@ HRESULT WINAPI IDirectMusicTimeSigTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRA
 	return S_OK;
 }
 
-IDirectMusicTrack8Vtbl DirectMusicTimeSigTrack_Track_Vtbl = {
+static const IDirectMusicTrack8Vtbl DirectMusicTimeSigTrack_Track_Vtbl = {
 	IDirectMusicTimeSigTrack_IDirectMusicTrack_QueryInterface,
 	IDirectMusicTimeSigTrack_IDirectMusicTrack_AddRef,
 	IDirectMusicTimeSigTrack_IDirectMusicTrack_Release,
@@ -256,7 +256,7 @@ HRESULT WINAPI IDirectMusicTimeSigTrack_IPersistStream_GetSizeMax (LPPERSISTSTRE
 	return E_NOTIMPL;
 }
 
-IPersistStreamVtbl DirectMusicTimeSigTrack_PersistStream_Vtbl = {
+static const IPersistStreamVtbl DirectMusicTimeSigTrack_PersistStream_Vtbl = {
 	IDirectMusicTimeSigTrack_IPersistStream_QueryInterface,
 	IDirectMusicTimeSigTrack_IPersistStream_AddRef,
 	IDirectMusicTimeSigTrack_IPersistStream_Release,

dlls/dmime/tool.c

@@ -105,7 +105,7 @@ HRESULT WINAPI IDirectMusicTool8Impl_Clone (LPDIRECTMUSICTOOL8 iface, IDirectMus
 	return S_OK;
 }
 
-IDirectMusicTool8Vtbl DirectMusicTool8_Vtbl = {
+static const IDirectMusicTool8Vtbl DirectMusicTool8_Vtbl = {
 	IDirectMusicTool8Impl_QueryInterface,
 	IDirectMusicTool8Impl_AddRef,
 	IDirectMusicTool8Impl_Release,

dlls/dmime/wavetrack.c

@@ -74,7 +74,7 @@ ULONG WINAPI IDirectMusicWaveTrack_IUnknown_Release (LPUNKNOWN iface) {
 	return ref;
 }
 
-IUnknownVtbl DirectMusicWaveTrack_Unknown_Vtbl = {
+static const IUnknownVtbl DirectMusicWaveTrack_Unknown_Vtbl = {
 	IDirectMusicWaveTrack_IUnknown_QueryInterface,
 	IDirectMusicWaveTrack_IUnknown_AddRef,
 	IDirectMusicWaveTrack_IUnknown_Release
@@ -199,7 +199,7 @@ HRESULT WINAPI IDirectMusicWaveTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK8
 	return S_OK;
 }
 
-IDirectMusicTrack8Vtbl DirectMusicWaveTrack_Track_Vtbl = {
+static const IDirectMusicTrack8Vtbl DirectMusicWaveTrack_Track_Vtbl = {
 	IDirectMusicWaveTrack_IDirectMusicTrack_QueryInterface,
 	IDirectMusicWaveTrack_IDirectMusicTrack_AddRef,
 	IDirectMusicWaveTrack_IDirectMusicTrack_Release,
@@ -257,7 +257,7 @@ HRESULT WINAPI IDirectMusicWaveTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM
 	return E_NOTIMPL;
 }
 
-IPersistStreamVtbl DirectMusicWaveTrack_PersistStream_Vtbl = {
+static const IPersistStreamVtbl DirectMusicWaveTrack_PersistStream_Vtbl = {
 	IDirectMusicWaveTrack_IPersistStream_QueryInterface,
 	IDirectMusicWaveTrack_IPersistStream_AddRef,
 	IDirectMusicWaveTrack_IPersistStream_Release,

dlls/dmloader/classfactory.c

@@ -82,7 +82,7 @@ HRESULT WINAPI IDirectMusicLoaderCF_LockServer (LPCLASSFACTORY iface, BOOL doloc
 	return S_OK;
 }
 
-IClassFactoryVtbl DirectMusicLoaderCF_Vtbl = {
+static const IClassFactoryVtbl DirectMusicLoaderCF_Vtbl = {
 	IDirectMusicLoaderCF_QueryInterface,
 	IDirectMusicLoaderCF_AddRef,
 	IDirectMusicLoaderCF_Release,
@@ -169,7 +169,7 @@ HRESULT WINAPI IDirectMusicContainerCF_LockServer (LPCLASSFACTORY iface, BOOL do
 	return S_OK;
 }
 
-IClassFactoryVtbl DirectMusicContainerCF_Vtbl = {
+static const IClassFactoryVtbl DirectMusicContainerCF_Vtbl = {
 	IDirectMusicContainerCF_QueryInterface,
 	IDirectMusicContainerCF_AddRef,
 	IDirectMusicContainerCF_Release,

dlls/dmloader/container.c

@@ -127,7 +127,7 @@ HRESULT WINAPI IDirectMusicContainerImpl_IDirectMusicContainer_EnumObject (LPDIR
 	return S_FALSE;
 }
 
-IDirectMusicContainerVtbl DirectMusicContainer_Container_Vtbl = {
+static const IDirectMusicContainerVtbl DirectMusicContainer_Container_Vtbl = {
 	IDirectMusicContainerImpl_IDirectMusicContainer_QueryInterface,
 	IDirectMusicContainerImpl_IDirectMusicContainer_AddRef,
 	IDirectMusicContainerImpl_IDirectMusicContainer_Release,
@@ -397,7 +397,7 @@ HRESULT WINAPI IDirectMusicContainerImpl_IDirectMusicObject_ParseDescriptor (LPD
 	return S_OK;	
 }
 
-IDirectMusicObjectVtbl DirectMusicContainer_Object_Vtbl = {
+static const IDirectMusicObjectVtbl DirectMusicContainer_Object_Vtbl = {
 	IDirectMusicContainerImpl_IDirectMusicObject_QueryInterface,
 	IDirectMusicContainerImpl_IDirectMusicObject_AddRef,
 	IDirectMusicContainerImpl_IDirectMusicObject_Release,
@@ -868,7 +868,7 @@ HRESULT WINAPI IDirectMusicContainerImpl_IPersistStream_GetSizeMax (LPPERSISTSTR
 	return E_NOTIMPL;
 }
 
-IPersistStreamVtbl DirectMusicContainer_PersistStream_Vtbl = {
+static const IPersistStreamVtbl DirectMusicContainer_PersistStream_Vtbl = {
 	IDirectMusicContainerImpl_IPersistStream_QueryInterface,
 	IDirectMusicContainerImpl_IPersistStream_AddRef,
 	IDirectMusicContainerImpl_IPersistStream_Release,

dlls/dmloader/loader.c

@@ -736,7 +736,7 @@ HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_LoadObjectFromFile (LPD
 	return IDirectMusicLoaderImpl_IDirectMusicLoader_GetObject (iface, &ObjDesc, iidInterfaceID, ppObject);
 }
 
-IDirectMusicLoader8Vtbl DirectMusicLoader_Loader_Vtbl = {
+static const IDirectMusicLoader8Vtbl DirectMusicLoader_Loader_Vtbl = {
 	IDirectMusicLoaderImpl_IDirectMusicLoader_QueryInterface,
 	IDirectMusicLoaderImpl_IDirectMusicLoader_AddRef,
 	IDirectMusicLoaderImpl_IDirectMusicLoader_Release,

dlls/dmloader/loaderstream.c

@@ -230,7 +230,7 @@ HRESULT WINAPI IDirectMusicLoaderFileStream_IStream_Stat (LPSTREAM iface, STATST
     return E_NOTIMPL;
 }
 
-IStreamVtbl DirectMusicLoaderFileStream_Stream_Vtbl = {
+static const IStreamVtbl DirectMusicLoaderFileStream_Stream_Vtbl = {
 	IDirectMusicLoaderFileStream_IStream_QueryInterface,
 	IDirectMusicLoaderFileStream_IStream_AddRef,
 	IDirectMusicLoaderFileStream_IStream_Release,
@@ -273,7 +273,7 @@ HRESULT WINAPI IDirectMusicLoaderFileStream_IDirectMusicGetLoader_GetLoader (LPD
 	return S_OK;
 }
 
-IDirectMusicGetLoaderVtbl DirectMusicLoaderFileStream_GetLoader_Vtbl = {
+static const IDirectMusicGetLoaderVtbl DirectMusicLoaderFileStream_GetLoader_Vtbl = {
 	IDirectMusicLoaderFileStream_IDirectMusicGetLoader_QueryInterface,
 	IDirectMusicLoaderFileStream_IDirectMusicGetLoader_AddRef,
 	IDirectMusicLoaderFileStream_IDirectMusicGetLoader_Release,
@@ -496,7 +496,7 @@ HRESULT WINAPI IDirectMusicLoaderResourceStream_IStream_Stat (LPSTREAM iface, ST
     return E_NOTIMPL;
 }
 
-IStreamVtbl DirectMusicLoaderResourceStream_Stream_Vtbl = {
+static const IStreamVtbl DirectMusicLoaderResourceStream_Stream_Vtbl = {
 	IDirectMusicLoaderResourceStream_IStream_QueryInterface,
 	IDirectMusicLoaderResourceStream_IStream_AddRef,
 	IDirectMusicLoaderResourceStream_IStream_Release,
@@ -539,7 +539,7 @@ HRESULT WINAPI IDirectMusicLoaderResourceStream_IDirectMusicGetLoader_GetLoader
 	return S_OK;
 }
 
-IDirectMusicGetLoaderVtbl DirectMusicLoaderResourceStream_GetLoader_Vtbl = {
+static const IDirectMusicGetLoaderVtbl DirectMusicLoaderResourceStream_GetLoader_Vtbl = {
 	IDirectMusicLoaderResourceStream_IDirectMusicGetLoader_QueryInterface,
 	IDirectMusicLoaderResourceStream_IDirectMusicGetLoader_AddRef,
 	IDirectMusicLoaderResourceStream_IDirectMusicGetLoader_Release,
@@ -754,7 +754,7 @@ HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_Stat (LPSTREAM iface, STA
 	return IStream_Stat (This->pStream, pstatstg, grfStatFlag);
 }
 
-IStreamVtbl DirectMusicLoaderGenericStream_Stream_Vtbl = {
+static const IStreamVtbl DirectMusicLoaderGenericStream_Stream_Vtbl = {
 	IDirectMusicLoaderGenericStream_IStream_QueryInterface,
 	IDirectMusicLoaderGenericStream_IStream_AddRef,
 	IDirectMusicLoaderGenericStream_IStream_Release,
@@ -797,7 +797,7 @@ HRESULT WINAPI IDirectMusicLoaderGenericStream_IDirectMusicGetLoader_GetLoader (
 	return S_OK;
 }
 
-IDirectMusicGetLoaderVtbl DirectMusicLoaderGenericStream_GetLoader_Vtbl = {
+static const IDirectMusicGetLoaderVtbl DirectMusicLoaderGenericStream_GetLoader_Vtbl = {
 	IDirectMusicLoaderGenericStream_IDirectMusicGetLoader_QueryInterface,
 	IDirectMusicLoaderGenericStream_IDirectMusicGetLoader_AddRef,
 	IDirectMusicLoaderGenericStream_IDirectMusicGetLoader_Release,

dlls/dmscript/dmscript_main.c

@@ -24,7 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmscript);
 LONG DMSCRIPT_refCount = 0;
 
 typedef struct {
-    IClassFactoryVtbl          *lpVtbl;
+    const IClassFactoryVtbl *lpVtbl;
 } IClassFactoryImpl;
 
 /******************************************************************
@@ -69,7 +69,7 @@ static HRESULT WINAPI ScriptAutoImplSegmentCF_LockServer(LPCLASSFACTORY iface,BO
 	return S_OK;
 }
 
-static IClassFactoryVtbl ScriptAutoImplSegmentCF_Vtbl = {
+static const IClassFactoryVtbl ScriptAutoImplSegmentCF_Vtbl = {
 	ScriptAutoImplSegmentCF_QueryInterface,
 	ScriptAutoImplSegmentCF_AddRef,
 	ScriptAutoImplSegmentCF_Release,
@@ -118,7 +118,7 @@ static HRESULT WINAPI ScriptTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock)
 	return S_OK;
 }
 
-static IClassFactoryVtbl ScriptTrackCF_Vtbl = {
+static const IClassFactoryVtbl ScriptTrackCF_Vtbl = {
 	ScriptTrackCF_QueryInterface,
 	ScriptTrackCF_AddRef,
 	ScriptTrackCF_Release,
@@ -170,7 +170,7 @@ static HRESULT WINAPI AudioVBScriptCF_LockServer(LPCLASSFACTORY iface,BOOL doloc
 	return S_OK;
 }
 
-static IClassFactoryVtbl AudioVBScriptCF_Vtbl = {
+static const IClassFactoryVtbl AudioVBScriptCF_Vtbl = {
 	AudioVBScriptCF_QueryInterface,
 	AudioVBScriptCF_AddRef,
 	AudioVBScriptCF_Release,
@@ -220,7 +220,7 @@ static HRESULT WINAPI ScriptCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
 	return S_OK;
 }
 
-static IClassFactoryVtbl ScriptCF_Vtbl = {
+static const IClassFactoryVtbl ScriptCF_Vtbl = {
 	ScriptCF_QueryInterface,
 	ScriptCF_AddRef,
 	ScriptCF_Release,
@@ -272,7 +272,7 @@ static HRESULT WINAPI ScriptAutoImplPerformanceCF_LockServer(LPCLASSFACTORY ifac
 	return S_OK;
 }
 
-static IClassFactoryVtbl ScriptAutoImplPerformanceCF_Vtbl = {
+static const IClassFactoryVtbl ScriptAutoImplPerformanceCF_Vtbl = {
 	ScriptAutoImplPerformanceCF_QueryInterface,
 	ScriptAutoImplPerformanceCF_AddRef,
 	ScriptAutoImplPerformanceCF_Release,
@@ -324,7 +324,7 @@ static HRESULT WINAPI ScriptSourceCodeLoaderCF_LockServer(LPCLASSFACTORY iface,B
 	return S_OK;
 }
 
-static IClassFactoryVtbl ScriptSourceCodeLoaderCF_Vtbl = {
+static const IClassFactoryVtbl ScriptSourceCodeLoaderCF_Vtbl = {
 	ScriptSourceCodeLoaderCF_QueryInterface,
 	ScriptSourceCodeLoaderCF_AddRef,
 	ScriptSourceCodeLoaderCF_Release,
@@ -376,7 +376,7 @@ static HRESULT WINAPI ScriptAutoImplSegmentStateCF_LockServer(LPCLASSFACTORY ifa
 	return S_OK;
 }
 
-static IClassFactoryVtbl ScriptAutoImplSegmentStateCF_Vtbl = {
+static const IClassFactoryVtbl ScriptAutoImplSegmentStateCF_Vtbl = {
 	ScriptAutoImplSegmentStateCF_QueryInterface,
 	ScriptAutoImplSegmentStateCF_AddRef,
 	ScriptAutoImplSegmentStateCF_Release,
@@ -428,7 +428,7 @@ static HRESULT WINAPI ScriptAutoImplAudioPathConfigCF_LockServer(LPCLASSFACTORY
 	return S_OK;
 }
 
-static IClassFactoryVtbl ScriptAutoImplAudioPathConfigCF_Vtbl = {
+static const IClassFactoryVtbl ScriptAutoImplAudioPathConfigCF_Vtbl = {
 	ScriptAutoImplAudioPathConfigCF_QueryInterface,
 	ScriptAutoImplAudioPathConfigCF_AddRef,
 	ScriptAutoImplAudioPathConfigCF_Release,
@@ -480,7 +480,7 @@ static HRESULT WINAPI ScriptAutoImplAudioPathCF_LockServer(LPCLASSFACTORY iface,
 	return S_OK;
 }
 
-static IClassFactoryVtbl ScriptAutoImplAudioPathCF_Vtbl = {
+static const IClassFactoryVtbl ScriptAutoImplAudioPathCF_Vtbl = {
 	ScriptAutoImplAudioPathCF_QueryInterface,
 	ScriptAutoImplAudioPathCF_AddRef,
 	ScriptAutoImplAudioPathCF_Release,
@@ -532,7 +532,7 @@ static HRESULT WINAPI ScriptAutoImplSongCF_LockServer(LPCLASSFACTORY iface,BOOL
 	return S_OK;
 }
 
-static IClassFactoryVtbl ScriptAutoImplSongCF_Vtbl = {
+static const IClassFactoryVtbl ScriptAutoImplSongCF_Vtbl = {
 	ScriptAutoImplSongCF_QueryInterface,
 	ScriptAutoImplSongCF_AddRef,
 	ScriptAutoImplSongCF_Release,

dlls/dmscript/script.c

@@ -91,7 +91,7 @@ ULONG WINAPI IDirectMusicScriptImpl_IUnknown_Release (LPUNKNOWN iface) {
   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 @@ HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_EnumVariable (LPDIRECTM
   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 @@ HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicObject_ParseDescriptor (LPDIRE
 	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 @@ HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_GetSizeMax (LPPERSISTSTREAM
   return E_NOTIMPL;
 }
 
-IPersistStreamVtbl DirectMusicScript_PersistStream_Vtbl = {
+static const IPersistStreamVtbl DirectMusicScript_PersistStream_Vtbl = {
   IDirectMusicScriptImpl_IPersistStream_QueryInterface,
   IDirectMusicScriptImpl_IPersistStream_AddRef,
   IDirectMusicScriptImpl_IPersistStream_Release,

dlls/dmscript/scripttrack.c

@@ -75,7 +75,7 @@ ULONG WINAPI IDirectMusicScriptTrack_IUnknown_Release (LPUNKNOWN iface) {
 	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 @@ HRESULT WINAPI IDirectMusicScriptTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRAC
 	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 @@ HRESULT WINAPI IDirectMusicScriptTrack_IPersistStream_GetSizeMax (LPPERSISTSTREA
 	return E_NOTIMPL;
 }
 
-IPersistStreamVtbl DirectMusicScriptTrack_PersistStream_Vtbl = {
+static const IPersistStreamVtbl DirectMusicScriptTrack_PersistStream_Vtbl = {
 	IDirectMusicScriptTrack_IPersistStream_QueryInterface,
 	IDirectMusicScriptTrack_IPersistStream_AddRef,
 	IDirectMusicScriptTrack_IPersistStream_Release,

dlls/dmstyle/auditiontrack.c

@@ -75,7 +75,7 @@ ULONG WINAPI IDirectMusicAuditionTrack_IUnknown_Release (LPUNKNOWN iface) {
 	return ref;
 }
 
-IUnknownVtbl DirectMusicAuditionTrack_Unknown_Vtbl = {
+static const IUnknownVtbl DirectMusicAuditionTrack_Unknown_Vtbl = {
 	IDirectMusicAuditionTrack_IUnknown_QueryInterface,
 	IDirectMusicAuditionTrack_IUnknown_AddRef,
 	IDirectMusicAuditionTrack_IUnknown_Release
@@ -194,7 +194,7 @@ HRESULT WINAPI IDirectMusicAuditionTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTR
 	return S_OK;
 }
 
-IDirectMusicTrack8Vtbl DirectMusicAuditionTrack_Track_Vtbl = {
+static const IDirectMusicTrack8Vtbl DirectMusicAuditionTrack_Track_Vtbl = {
 	IDirectMusicAuditionTrack_IDirectMusicTrack_QueryInterface,
 	IDirectMusicAuditionTrack_IDirectMusicTrack_AddRef,
 	IDirectMusicAuditionTrack_IDirectMusicTrack_Release,
@@ -252,7 +252,7 @@ HRESULT WINAPI IDirectMusicAuditionTrack_IPersistStream_GetSizeMax (LPPERSISTSTR
 	return E_NOTIMPL;
 }
 
-IPersistStreamVtbl DirectMusicAuditionTrack_PersistStream_Vtbl = {
+static const IPersistStreamVtbl DirectMusicAuditionTrack_PersistStream_Vtbl = {
 	IDirectMusicAuditionTrack_IPersistStream_QueryInterface,
 	IDirectMusicAuditionTrack_IPersistStream_AddRef,
 	IDirectMusicAuditionTrack_IPersistStream_Release,

dlls/dmstyle/chordtrack.c

@@ -76,7 +76,7 @@ ULONG WINAPI IDirectMusicChordTrack_IUnknown_Release (LPUNKNOWN iface) {
 	return ref;
 }
 
-IUnknownVtbl DirectMusicChordTrack_Unknown_Vtbl = {
+static const IUnknownVtbl DirectMusicChordTrack_Unknown_Vtbl = {
   IDirectMusicChordTrack_IUnknown_QueryInterface,
   IDirectMusicChordTrack_IUnknown_AddRef,
   IDirectMusicChordTrack_IUnknown_Release
@@ -199,7 +199,7 @@ HRESULT WINAPI IDirectMusicChordTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK
   return S_OK;
 }
 
-IDirectMusicTrack8Vtbl DirectMusicChordTrack_Track_Vtbl = {
+static const IDirectMusicTrack8Vtbl DirectMusicChordTrack_Track_Vtbl = {
   IDirectMusicChordTrack_IDirectMusicTrack_QueryInterface,
   IDirectMusicChordTrack_IDirectMusicTrack_AddRef,
   IDirectMusicChordTrack_IDirectMusicTrack_Release,
@@ -380,7 +380,7 @@ HRESULT WINAPI IDirectMusicChordTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM
   return E_NOTIMPL;
 }
 
-IPersistStreamVtbl DirectMusicChordTrack_PersistStream_Vtbl = {
+static const IPersistStreamVtbl DirectMusicChordTrack_PersistStream_Vtbl = {
   IDirectMusicChordTrack_IPersistStream_QueryInterface,
   IDirectMusicChordTrack_IPersistStream_AddRef,
   IDirectMusicChordTrack_IPersistStream_Release,

dlls/dmstyle/commandtrack.c

@@ -75,7 +75,7 @@ ULONG WINAPI IDirectMusicCommandTrack_IUnknown_Release (LPUNKNOWN iface) {
 	return ref;
 }
 
-IUnknownVtbl DirectMusicCommandTrack_Unknown_Vtbl = {
+static const IUnknownVtbl DirectMusicCommandTrack_Unknown_Vtbl = {
 	IDirectMusicCommandTrack_IUnknown_QueryInterface,
 	IDirectMusicCommandTrack_IUnknown_AddRef,
 	IDirectMusicCommandTrack_IUnknown_Release
@@ -200,7 +200,7 @@ HRESULT WINAPI IDirectMusicCommandTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRA
 	return S_OK;
 }
 
-IDirectMusicTrack8Vtbl DirectMusicCommandTrack_Track_Vtbl = {
+static const IDirectMusicTrack8Vtbl DirectMusicCommandTrack_Track_Vtbl = {
 	IDirectMusicCommandTrack_IDirectMusicTrack_QueryInterface,
 	IDirectMusicCommandTrack_IDirectMusicTrack_AddRef,
 	IDirectMusicCommandTrack_IDirectMusicTrack_Release,
@@ -314,7 +314,7 @@ HRESULT WINAPI IDirectMusicCommandTrack_IPersistStream_GetSizeMax (LPPERSISTSTRE
 	return E_NOTIMPL;
 }
 
-IPersistStreamVtbl DirectMusicCommandTrack_PersistStream_Vtbl = {
+static const IPersistStreamVtbl DirectMusicCommandTrack_PersistStream_Vtbl = {
 	IDirectMusicCommandTrack_IPersistStream_QueryInterface,
 	IDirectMusicCommandTrack_IPersistStream_AddRef,
 	IDirectMusicCommandTrack_IPersistStream_Release,

dlls/dmstyle/dmstyle_main.c

@@ -24,7 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmstyle);
 LONG DMSTYLE_refCount = 0;
 
 typedef struct {
-    IClassFactoryVtbl          *lpVtbl;
+    const IClassFactoryVtbl *lpVtbl;
 } IClassFactoryImpl;
 
 /******************************************************************
@@ -70,7 +70,7 @@ static HRESULT WINAPI SectionCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
 	return S_OK;
 }
 
-static IClassFactoryVtbl SectionCF_Vtbl = {
+static const IClassFactoryVtbl SectionCF_Vtbl = {
 	SectionCF_QueryInterface,
 	SectionCF_AddRef,
 	SectionCF_Release,
@@ -120,7 +120,7 @@ static HRESULT WINAPI StyleCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
 	return S_OK;
 }
 
-static IClassFactoryVtbl StyleCF_Vtbl = {
+static const IClassFactoryVtbl StyleCF_Vtbl = {
 	StyleCF_QueryInterface,
 	StyleCF_AddRef,
 	StyleCF_Release,
@@ -170,7 +170,7 @@ static HRESULT WINAPI ChordTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock)
 	return S_OK;
 }
 
-static IClassFactoryVtbl ChordTrackCF_Vtbl = {
+static const IClassFactoryVtbl ChordTrackCF_Vtbl = {
 	ChordTrackCF_QueryInterface,
 	ChordTrackCF_AddRef,
 	ChordTrackCF_Release,
@@ -220,7 +220,7 @@ static HRESULT WINAPI CommandTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock
 	return S_OK;
 }
 
-static IClassFactoryVtbl CommandTrackCF_Vtbl = {
+static const IClassFactoryVtbl CommandTrackCF_Vtbl = {
 	CommandTrackCF_QueryInterface,
 	CommandTrackCF_AddRef,
 	CommandTrackCF_Release,
@@ -270,7 +270,7 @@ static HRESULT WINAPI StyleTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock)
 	return S_OK;
 }
 
-static IClassFactoryVtbl StyleTrackCF_Vtbl = {
+static const IClassFactoryVtbl StyleTrackCF_Vtbl = {
 	StyleTrackCF_QueryInterface,
 	StyleTrackCF_AddRef,
 	StyleTrackCF_Release,
@@ -320,7 +320,7 @@ static HRESULT WINAPI MotifTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock)
 	return S_OK;
 }
 
-static IClassFactoryVtbl MotifTrackCF_Vtbl = {
+static const IClassFactoryVtbl MotifTrackCF_Vtbl = {
 	MotifTrackCF_QueryInterface,
 	MotifTrackCF_AddRef,
 	MotifTrackCF_Release,
@@ -370,7 +370,7 @@ static HRESULT WINAPI AuditionTrackCF_LockServer(LPCLASSFACTORY iface,BOOL doloc
 	return S_OK;
 }
 
-static IClassFactoryVtbl AuditionTrackCF_Vtbl = {
+static const IClassFactoryVtbl AuditionTrackCF_Vtbl = {
 	AuditionTrackCF_QueryInterface,
 	AuditionTrackCF_AddRef,
 	AuditionTrackCF_Release,
@@ -420,7 +420,7 @@ static HRESULT WINAPI MuteTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
 	return S_OK;
 }
 
-static IClassFactoryVtbl MuteTrackCF_Vtbl = {
+static const IClassFactoryVtbl MuteTrackCF_Vtbl = {
 	MuteTrackCF_QueryInterface,
 	MuteTrackCF_AddRef,
 	MuteTrackCF_Release,

dlls/dmstyle/motiftrack.c

@@ -75,7 +75,7 @@ ULONG WINAPI IDirectMusicMotifTrack_IUnknown_Release (LPUNKNOWN iface) {
 	return ref;
 }
 
-IUnknownVtbl DirectMusicMotifTrack_Unknown_Vtbl = {
+static const IUnknownVtbl DirectMusicMotifTrack_Unknown_Vtbl = {
 	IDirectMusicMotifTrack_IUnknown_QueryInterface,
 	IDirectMusicMotifTrack_IUnknown_AddRef,
 	IDirectMusicMotifTrack_IUnknown_Release
@@ -200,7 +200,7 @@ HRESULT WINAPI IDirectMusicMotifTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK
 	return S_OK;
 }
 
-IDirectMusicTrack8Vtbl DirectMusicMotifTrack_Track_Vtbl = {
+static const IDirectMusicTrack8Vtbl DirectMusicMotifTrack_Track_Vtbl = {
 	IDirectMusicMotifTrack_IDirectMusicTrack_QueryInterface,
 	IDirectMusicMotifTrack_IDirectMusicTrack_AddRef,
 	IDirectMusicMotifTrack_IDirectMusicTrack_Release,
@@ -258,7 +258,7 @@ HRESULT WINAPI IDirectMusicMotifTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM
 	return E_NOTIMPL;
 }
 
-IPersistStreamVtbl DirectMusicMotifTrack_PersistStream_Vtbl = {
+static const IPersistStreamVtbl DirectMusicMotifTrack_PersistStream_Vtbl = {
 	IDirectMusicMotifTrack_IPersistStream_QueryInterface,
 	IDirectMusicMotifTrack_IPersistStream_AddRef,
 	IDirectMusicMotifTrack_IPersistStream_Release,

dlls/dmstyle/mutetrack.c

@@ -75,7 +75,7 @@ ULONG WINAPI IDirectMusicMuteTrack_IUnknown_Release (LPUNKNOWN iface) {
 	return ref;
 }
 
-IUnknownVtbl DirectMusicMuteTrack_Unknown_Vtbl = {
+static const IUnknownVtbl DirectMusicMuteTrack_Unknown_Vtbl = {
 	IDirectMusicMuteTrack_IUnknown_QueryInterface,
 	IDirectMusicMuteTrack_IUnknown_AddRef,
 	IDirectMusicMuteTrack_IUnknown_Release
@@ -197,7 +197,7 @@ HRESULT WINAPI IDirectMusicMuteTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK8
 	return S_OK;
 }
 
-IDirectMusicTrack8Vtbl DirectMusicMuteTrack_Track_Vtbl = {
+static const IDirectMusicTrack8Vtbl DirectMusicMuteTrack_Track_Vtbl = {
 	IDirectMusicMuteTrack_IDirectMusicTrack_QueryInterface,
 	IDirectMusicMuteTrack_IDirectMusicTrack_AddRef,
 	IDirectMusicMuteTrack_IDirectMusicTrack_Release,
@@ -255,7 +255,7 @@ HRESULT WINAPI IDirectMusicMuteTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM
 	return E_NOTIMPL;
 }
 
-IPersistStreamVtbl DirectMusicMuteTrack_PersistStream_Vtbl = {
+static const IPersistStreamVtbl DirectMusicMuteTrack_PersistStream_Vtbl = {
 	IDirectMusicMuteTrack_IPersistStream_QueryInterface,
 	IDirectMusicMuteTrack_IPersistStream_AddRef,
 	IDirectMusicMuteTrack_IPersistStream_Release,

dlls/dmstyle/style.c

@@ -83,7 +83,7 @@ ULONG WINAPI IDirectMusicStyle8Impl_IUnknown_Release (LPUNKNOWN iface) {
 	return ref;
 }
 
-IUnknownVtbl DirectMusicStyle8_Unknown_Vtbl = {
+static const IUnknownVtbl DirectMusicStyle8_Unknown_Vtbl = {
 	IDirectMusicStyle8Impl_IUnknown_QueryInterface,
 	IDirectMusicStyle8Impl_IUnknown_AddRef,
 	IDirectMusicStyle8Impl_IUnknown_Release
@@ -178,7 +178,7 @@ HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_EnumPattern (LPDIRECTMU
 	return S_OK;
 }
 
-IDirectMusicStyle8Vtbl DirectMusicStyle8_Style_Vtbl = {
+static const IDirectMusicStyle8Vtbl DirectMusicStyle8_Style_Vtbl = {
 	IDirectMusicStyle8Impl_IDirectMusicStyle8_QueryInterface,
 	IDirectMusicStyle8Impl_IDirectMusicStyle8_AddRef,
 	IDirectMusicStyle8Impl_IDirectMusicStyle8_Release,
@@ -402,7 +402,7 @@ HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicObject_ParseDescriptor (LPDIRE
 	return S_OK;
 }
 
-IDirectMusicObjectVtbl DirectMusicStyle8_Object_Vtbl = {
+static const IDirectMusicObjectVtbl DirectMusicStyle8_Object_Vtbl = {
   IDirectMusicStyle8Impl_IDirectMusicObject_QueryInterface,
   IDirectMusicStyle8Impl_IDirectMusicObject_AddRef,
   IDirectMusicStyle8Impl_IDirectMusicObject_Release,
@@ -1065,7 +1065,7 @@ HRESULT WINAPI IDirectMusicStyle8Impl_IPersistStream_GetSizeMax (LPPERSISTSTREAM
 
 }
 
-IPersistStreamVtbl DirectMusicStyle8_PersistStream_Vtbl = {
+static const IPersistStreamVtbl DirectMusicStyle8_PersistStream_Vtbl = {
   IDirectMusicStyle8Impl_IPersistStream_QueryInterface,
   IDirectMusicStyle8Impl_IPersistStream_AddRef,
   IDirectMusicStyle8Impl_IPersistStream_Release,

dlls/dmstyle/styletrack.c

@@ -75,7 +75,7 @@ ULONG WINAPI IDirectMusicStyleTrack_IUnknown_Release (LPUNKNOWN iface) {
 	return ref;
 }
 
-IUnknownVtbl DirectMusicStyleTrack_Unknown_Vtbl = {
+static const IUnknownVtbl DirectMusicStyleTrack_Unknown_Vtbl = {
 	IDirectMusicStyleTrack_IUnknown_QueryInterface,
 	IDirectMusicStyleTrack_IUnknown_AddRef,
 	IDirectMusicStyleTrack_IUnknown_Release
@@ -201,7 +201,7 @@ HRESULT WINAPI IDirectMusicStyleTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK
 	return S_OK;
 }
 
-IDirectMusicTrack8Vtbl DirectMusicStyleTrack_Track_Vtbl = {
+static const IDirectMusicTrack8Vtbl DirectMusicStyleTrack_Track_Vtbl = {
 	IDirectMusicStyleTrack_IDirectMusicTrack_QueryInterface,
 	IDirectMusicStyleTrack_IDirectMusicTrack_AddRef,
 	IDirectMusicStyleTrack_IDirectMusicTrack_Release,
@@ -443,7 +443,7 @@ HRESULT WINAPI IDirectMusicStyleTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM
   return E_NOTIMPL;
 }
 
-IPersistStreamVtbl DirectMusicStyleTrack_PersistStream_Vtbl = {
+static const IPersistStreamVtbl DirectMusicStyleTrack_PersistStream_Vtbl = {
   IDirectMusicStyleTrack_IPersistStream_QueryInterface,
   IDirectMusicStyleTrack_IPersistStream_AddRef,
   IDirectMusicStyleTrack_IPersistStream_Release,