d3dxof: Simplify declaration of VTable members.

This commit is contained in:
Christian Costa 2010-01-12 09:54:36 +01:00 committed by Alexandre Julliard
parent 3ad04c18c0
commit 9dba650921
2 changed files with 13 additions and 13 deletions

View File

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

View File

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