Henri Verbeet : d3dx9: Avoid LPD3DXFILESAVEOBJECT.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ff04207e29ff4636898b462a0924facdd97ca9ef
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ff04207e29ff4636898b462a09...

Author: Henri Verbeet 
Date:   Thu Nov 22 21:13:34 2012 +0100

d3dx9: Avoid LPD3DXFILESAVEOBJECT.

---

include/d3dx9anim.h |    6 +++---
 include/d3dx9xof.h  |    5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h
index 9a25ec8..c8378e2 100644
--- a/include/d3dx9anim.h
+++ b/include/d3dx9anim.h
@@ -196,10 +196,10 @@ DECLARE_INTERFACE(ID3DXSaveUserData)
             ID3DXFileSaveObject *save_obj, ID3DXFileSaveData *frame_data) PURE;
     STDMETHOD(AddMeshChildData)(const D3DXMESHCONTAINER *mesh_container,
             ID3DXFileSaveObject *save_obj, ID3DXFileSaveData *mesh_data) PURE;
-    STDMETHOD(AddTopLevelDataObjectsPre)(LPD3DXFILESAVEOBJECT save_obj) PURE;
-    STDMETHOD(AddTopLevelDataObjectsPost)(LPD3DXFILESAVEOBJECT save_obj) PURE;
+    STDMETHOD(AddTopLevelDataObjectsPre)(ID3DXFileSaveObject *save_obj) PURE;
+    STDMETHOD(AddTopLevelDataObjectsPost)(ID3DXFileSaveObject *save_obj) PURE;
     STDMETHOD(RegisterTemplates)(LPD3DXFILE xfile) PURE;
-    STDMETHOD(SaveTemplates)(LPD3DXFILESAVEOBJECT save_obj) PURE;
+    STDMETHOD(SaveTemplates)(ID3DXFileSaveObject *save_obj) PURE;
 };
 #undef INTERFACE

diff --git a/include/d3dx9xof.h b/include/d3dx9xof.h
index 8e08cca..593fca5 100644
--- a/include/d3dx9xof.h
+++ b/include/d3dx9xof.h
@@ -78,7 +78,8 @@ DECLARE_INTERFACE_IID_(ID3DXFile,IUnknown,"cef08cf9-7b4f-4429-9624-2a690a933201"
     /*** ID3DXFile methods ***/
     STDMETHOD(CreateEnumObject)(THIS_ const void *src, D3DXF_FILELOADOPTIONS type,
             struct ID3DXFileEnumObject **enum_obj) PURE;
-    STDMETHOD(CreateSaveObject)(THIS_ LPCVOID, D3DXF_FILESAVEOPTIONS, D3DXF_FILEFORMAT, LPD3DXFILESAVEOBJECT*) PURE;
+    STDMETHOD(CreateSaveObject)(THIS_ const void *data, D3DXF_FILESAVEOPTIONS flags,
+            D3DXF_FILEFORMAT format, struct ID3DXFileSaveObject **save_obj) PURE;
     STDMETHOD(RegisterTemplates)(THIS_ LPCVOID, SIZE_T) PURE;
     STDMETHOD(RegisterEnumTemplates)(THIS_ struct ID3DXFileEnumObject *enum_obj) PURE;
 };
@@ -107,7 +108,7 @@ DECLARE_INTERFACE_IID_(ID3DXFileSaveData,IUnknown,"cef08cfb-7b4f-4429-9624-2a690
     STDMETHOD_(ULONG,AddRef)(THIS) PURE;
     STDMETHOD_(ULONG,Release)(THIS) PURE;
     /*** ID3DXFileSaveObject methods ***/
-    STDMETHOD(GetSave)(THIS_ LPD3DXFILESAVEOBJECT*) PURE;
+    STDMETHOD(GetSave)(THIS_ ID3DXFileSaveObject **save_obj) PURE;
     STDMETHOD(GetName)(THIS_ LPSTR, SIZE_T*) PURE;
     STDMETHOD(GetId)(THIS_ LPGUID) PURE;
     STDMETHOD(GetType)(THIS_ GUID*) PURE;