From 9dba65092145a0a10cf9a2e9e84a567febe9accc Mon Sep 17 00:00:00 2001
From: Christian Costa <titan.costa@wanadoo.fr>
Date: Tue, 12 Jan 2010 09:54:36 +0100
Subject: [PATCH] d3dxof: Simplify declaration of VTable members.

---
 dlls/d3dxof/d3dxof.c         | 12 ++++++------
 dlls/d3dxof/d3dxof_private.h | 14 +++++++-------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c
index 67e4f61fd52..b1df5585fc5 100644
--- a/dlls/d3dxof/d3dxof.c
+++ b/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;
diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h
index ffa27d2752c..8f3b53e47f3 100644
--- a/dlls/d3dxof/d3dxof_private.h
+++ b/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;