d3dxof: Simplify declaration of VTable members.

dlls/d3dxof/d3dxof.c

@@ -71,7 +71,7 @@ HRESULT IDirectXFileImpl_Create(IUnknown* pUnkOuter, LPVOID* ppObj)
         return DXFILEERR_BADALLOC;
     }
 
-    object->lpVtbl.lpVtbl = &IDirectXFile_Vtbl;
+    object->lpVtbl = &IDirectXFile_Vtbl;
     object->ref = 1;
 
     *ppObj = object;
@@ -451,7 +451,7 @@ static HRESULT IDirectXFileBinaryImpl_Create(IDirectXFileBinaryImpl** ppObj)
         return DXFILEERR_BADALLOC;
     }
 
-    object->lpVtbl.lpVtbl = &IDirectXFileBinary_Vtbl;
+    object->lpVtbl = &IDirectXFileBinary_Vtbl;
     object->ref = 1;
 
     *ppObj = object;
@@ -579,7 +579,7 @@ static HRESULT IDirectXFileDataImpl_Create(IDirectXFileDataImpl** ppObj)
         return DXFILEERR_BADALLOC;
     }
 
-    object->lpVtbl.lpVtbl = &IDirectXFileData_Vtbl;
+    object->lpVtbl = &IDirectXFileData_Vtbl;
     object->ref = 1;
 
     *ppObj = object;
@@ -822,7 +822,7 @@ static HRESULT IDirectXFileDataReferenceImpl_Create(IDirectXFileDataReferenceImp
         return DXFILEERR_BADALLOC;
     }
     
-    object->lpVtbl.lpVtbl = &IDirectXFileDataReference_Vtbl;
+    object->lpVtbl = &IDirectXFileDataReference_Vtbl;
     object->ref = 1;
 
     *ppObj = object;
@@ -955,7 +955,7 @@ static HRESULT IDirectXFileEnumObjectImpl_Create(IDirectXFileEnumObjectImpl** pp
         return DXFILEERR_BADALLOC;
     }
     
-    object->lpVtbl.lpVtbl = &IDirectXFileEnumObject_Vtbl;
+    object->lpVtbl = &IDirectXFileEnumObject_Vtbl;
     object->ref = 1;
 
     *ppObj = object;
@@ -1148,7 +1148,7 @@ static HRESULT IDirectXFileSaveObjectImpl_Create(IDirectXFileSaveObjectImpl** pp
         return DXFILEERR_BADALLOC;
     }
 
-    object->lpVtbl.lpVtbl = &IDirectXFileSaveObject_Vtbl;
+    object->lpVtbl = &IDirectXFileSaveObject_Vtbl;
     object->ref = 1;
 
     *ppObj = object;

dlls/d3dxof/d3dxof_private.h

@@ -88,19 +88,19 @@ struct _xobject {
 typedef struct _xobject xobject;
 
 typedef struct {
-    IDirectXFile lpVtbl;
+    const IDirectXFileVtbl *lpVtbl;
     LONG ref;
     ULONG nb_xtemplates;
     xtemplate xtemplates[MAX_TEMPLATES];
 } IDirectXFileImpl;
 
 typedef struct {
-    IDirectXFileBinary lpVtbl;
+    const IDirectXFileBinaryVtbl *lpVtbl;
     LONG ref;
 } IDirectXFileBinaryImpl;
 
 typedef struct {
-    IDirectXFileData lpVtbl;
+    const IDirectXFileDataVtbl *lpVtbl;
     LONG ref;
     xobject* pobj;
     int cur_enum_object;
@@ -110,13 +110,13 @@ typedef struct {
 } IDirectXFileDataImpl;
 
 typedef struct {
-    IDirectXFileDataReference lpVtbl;
+    const IDirectXFileDataReferenceVtbl *lpVtbl;
     LONG ref;
     xobject* ptarget;
 } IDirectXFileDataReferenceImpl;
 
 typedef struct {
-    IDirectXFileObject lpVtbl;
+    const IDirectXFileObjectVtbl *lpVtbl;
     LONG ref;
 } IDirectXFileObjectImpl;
 
@@ -144,7 +144,7 @@ typedef struct {
 } parse_buffer;
 
 typedef struct {
-    IDirectXFileEnumObject lpVtbl;
+    const IDirectXFileEnumObjectVtbl *lpVtbl;
     LONG ref;
     DXFILELOADOPTIONS source;
     HANDLE hFile;
@@ -159,7 +159,7 @@ typedef struct {
 } IDirectXFileEnumObjectImpl;
 
 typedef struct {
-    IDirectXFileSaveObject lpVtbl;
+    const IDirectXFileSaveObjectVtbl *lpVtbl;
     LONG ref;
 } IDirectXFileSaveObjectImpl;