Commit 0761c363 authored by Paul Gofman's avatar Paul Gofman Committed by Alexandre Julliard

include: Fix ID3DXLoadUserData definition.

parent 969c8afa
...@@ -183,23 +183,25 @@ DECLARE_INTERFACE(ID3DXAllocateHierarchy) ...@@ -183,23 +183,25 @@ DECLARE_INTERFACE(ID3DXAllocateHierarchy)
#define INTERFACE ID3DXLoadUserData #define INTERFACE ID3DXLoadUserData
DECLARE_INTERFACE(ID3DXLoadUserData) DECLARE_INTERFACE(ID3DXLoadUserData)
{ {
STDMETHOD(LoadTopLevelData)(ID3DXFileData *child_data) PURE; /* MS DirectX SDK headers define these methods without 'this' parameter. */
STDMETHOD(LoadFrameChildData)(D3DXFRAME *frame, ID3DXFileData *child_data) PURE; STDMETHOD(LoadTopLevelData)(THIS_ ID3DXFileData *child_data) PURE;
STDMETHOD(LoadMeshChildData)(D3DXMESHCONTAINER *mesh_container, ID3DXFileData *child_data) PURE; STDMETHOD(LoadFrameChildData)(THIS_ D3DXFRAME *frame, ID3DXFileData *child_data) PURE;
STDMETHOD(LoadMeshChildData)(THIS_ D3DXMESHCONTAINER *mesh_container, ID3DXFileData *child_data) PURE;
}; };
#undef INTERFACE #undef INTERFACE
#define INTERFACE ID3DXSaveUserData #define INTERFACE ID3DXSaveUserData
DECLARE_INTERFACE(ID3DXSaveUserData) DECLARE_INTERFACE(ID3DXSaveUserData)
{ {
STDMETHOD(AddFrameChildData)(const D3DXFRAME *frame, /* MS DirectX SDK headers define these methods without 'this' parameter. */
STDMETHOD(AddFrameChildData)(THIS_ const D3DXFRAME *frame,
ID3DXFileSaveObject *save_obj, ID3DXFileSaveData *frame_data) PURE; ID3DXFileSaveObject *save_obj, ID3DXFileSaveData *frame_data) PURE;
STDMETHOD(AddMeshChildData)(const D3DXMESHCONTAINER *mesh_container, STDMETHOD(AddMeshChildData)(THIS_ const D3DXMESHCONTAINER *mesh_container,
ID3DXFileSaveObject *save_obj, ID3DXFileSaveData *mesh_data) PURE; ID3DXFileSaveObject *save_obj, ID3DXFileSaveData *mesh_data) PURE;
STDMETHOD(AddTopLevelDataObjectsPre)(ID3DXFileSaveObject *save_obj) PURE; STDMETHOD(AddTopLevelDataObjectsPre)(THIS_ ID3DXFileSaveObject *save_obj) PURE;
STDMETHOD(AddTopLevelDataObjectsPost)(ID3DXFileSaveObject *save_obj) PURE; STDMETHOD(AddTopLevelDataObjectsPost)(THIS_ ID3DXFileSaveObject *save_obj) PURE;
STDMETHOD(RegisterTemplates)(ID3DXFile *file) PURE; STDMETHOD(RegisterTemplates)(THIS_ ID3DXFile *file) PURE;
STDMETHOD(SaveTemplates)(ID3DXFileSaveObject *save_obj) PURE; STDMETHOD(SaveTemplates)(THIS_ ID3DXFileSaveObject *save_obj) PURE;
}; };
#undef INTERFACE #undef INTERFACE
......
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