Skip to content

W
wine-cw
Commit 7ecfb2e5 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

d3dx9: Avoid LPD3DXFILE.

parent ff04207e
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
include/d3dx9anim.h
View file @ 7ecfb2e5
...@@ -198,7 +198,7 @@ DECLARE_INTERFACE(ID3DXSaveUserData) ...@@ -198,7 +198,7 @@ DECLARE_INTERFACE(ID3DXSaveUserData)
ID3DXFileSaveObject *save_obj, ID3DXFileSaveData *mesh_data) PURE; ID3DXFileSaveObject *save_obj, ID3DXFileSaveData *mesh_data) PURE;
STDMETHOD(AddTopLevelDataObjectsPre)(ID3DXFileSaveObject *save_obj) PURE; STDMETHOD(AddTopLevelDataObjectsPre)(ID3DXFileSaveObject *save_obj) PURE;
STDMETHOD(AddTopLevelDataObjectsPost)(ID3DXFileSaveObject *save_obj) PURE; STDMETHOD(AddTopLevelDataObjectsPost)(ID3DXFileSaveObject *save_obj) PURE;
STDMETHOD(RegisterTemplates)(LPD3DXFILE xfile) PURE; STDMETHOD(RegisterTemplates)(ID3DXFile *file) PURE;
STDMETHOD(SaveTemplates)(ID3DXFileSaveObject *save_obj) PURE; STDMETHOD(SaveTemplates)(ID3DXFileSaveObject *save_obj) PURE;
}; };
#undef INTERFACE #undef INTERFACE
......
include/d3dx9xof.h
View file @ 7ecfb2e5
...@@ -66,7 +66,7 @@ typedef interface ID3DXFileSaveData *LPD3DXFILESAVEDATA, **LPLPD3DXFILESAVEDATA; ...@@ -66,7 +66,7 @@ typedef interface ID3DXFileSaveData *LPD3DXFILESAVEDATA, **LPLPD3DXFILESAVEDATA;
typedef interface ID3DXFileEnumObject *LPD3DXFILEENUMOBJECT, **LPLPD3DXFILEENUMOBJECT; typedef interface ID3DXFileEnumObject *LPD3DXFILEENUMOBJECT, **LPLPD3DXFILEENUMOBJECT;
typedef interface ID3DXFileData *LPD3DXFILEDATA, **LPLPD3DXFILEDATA; typedef interface ID3DXFileData *LPD3DXFILEDATA, **LPLPD3DXFILEDATA;
STDAPI D3DXFileCreate(LPD3DXFILE*); STDAPI D3DXFileCreate(struct ID3DXFile **file);
#define INTERFACE ID3DXFile #define INTERFACE ID3DXFile
DECLARE_INTERFACE_IID_(ID3DXFile,IUnknown,"cef08cf9-7b4f-4429-9624-2a690a933201") DECLARE_INTERFACE_IID_(ID3DXFile,IUnknown,"cef08cf9-7b4f-4429-9624-2a690a933201")
...@@ -93,7 +93,7 @@ DECLARE_INTERFACE_IID_(ID3DXFileSaveObject,IUnknown,"cef08cfa-7b4f-4429-9624-2a6 ...@@ -93,7 +93,7 @@ DECLARE_INTERFACE_IID_(ID3DXFileSaveObject,IUnknown,"cef08cfa-7b4f-4429-9624-2a6
STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,AddRef)(THIS) PURE;
STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE;
/*** ID3DXFileSaveObject methods ***/ /*** ID3DXFileSaveObject methods ***/
STDMETHOD(GetFile)(THIS_ LPD3DXFILE*) PURE; STDMETHOD(GetFile)(THIS_ ID3DXFile **file) PURE;
STDMETHOD(AddDataObject)(THIS_ REFGUID template_guid, const char *name, const GUID *guid, STDMETHOD(AddDataObject)(THIS_ REFGUID template_guid, const char *name, const GUID *guid,
SIZE_T data_size, const void *data, struct ID3DXFileSaveData **obj) PURE; SIZE_T data_size, const void *data, struct ID3DXFileSaveData **obj) PURE;
STDMETHOD(Save)(THIS) PURE; STDMETHOD(Save)(THIS) PURE;
...@@ -127,7 +127,7 @@ DECLARE_INTERFACE_IID_(ID3DXFileEnumObject,IUnknown,"cef08cfc-7b4f-4429-9624-2a6 ...@@ -127,7 +127,7 @@ DECLARE_INTERFACE_IID_(ID3DXFileEnumObject,IUnknown,"cef08cfc-7b4f-4429-9624-2a6
STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,AddRef)(THIS) PURE;
STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE;
/*** ID3DXFileEnumObject methods ***/ /*** ID3DXFileEnumObject methods ***/
STDMETHOD(GetFile)(THIS_ LPD3DXFILE*) PURE; STDMETHOD(GetFile)(THIS_ ID3DXFile **file) PURE;
STDMETHOD(GetChildren)(THIS_ SIZE_T*) PURE; STDMETHOD(GetChildren)(THIS_ SIZE_T*) PURE;
STDMETHOD(GetChild)(THIS_ SIZE_T id, struct ID3DXFileData **child) PURE; STDMETHOD(GetChild)(THIS_ SIZE_T id, struct ID3DXFileData **child) PURE;
STDMETHOD(GetDataObjectById)(THIS_ REFGUID guid, struct ID3DXFileData **obj) PURE; STDMETHOD(GetDataObjectById)(THIS_ REFGUID guid, struct ID3DXFileData **obj) PURE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment