Henri Verbeet : d3dx9: Avoid LPD3DXFILE.

[Alexandre Julliard]

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

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

d3dx9: Avoid LPD3DXFILE.

---

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

diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h
index c8378e2..975f1df 100644
--- a/include/d3dx9anim.h
+++ b/include/d3dx9anim.h
@@ -198,7 +198,7 @@ DECLARE_INTERFACE(ID3DXSaveUserData)
             ID3DXFileSaveObject *save_obj, ID3DXFileSaveData *mesh_data) PURE;
     STDMETHOD(AddTopLevelDataObjectsPre)(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;
 };
 #undef INTERFACE
diff --git a/include/d3dx9xof.h b/include/d3dx9xof.h
index 593fca5..4bcb769 100644
--- a/include/d3dx9xof.h
+++ b/include/d3dx9xof.h
@@ -66,7 +66,7 @@ typedef interface ID3DXFileSaveData *LPD3DXFILESAVEDATA, **LPLPD3DXFILESAVEDATA;
 typedef interface ID3DXFileEnumObject *LPD3DXFILEENUMOBJECT, **LPLPD3DXFILEENUMOBJECT;
 typedef interface ID3DXFileData *LPD3DXFILEDATA, **LPLPD3DXFILEDATA;

-STDAPI D3DXFileCreate(LPD3DXFILE*);
+STDAPI D3DXFileCreate(struct ID3DXFile **file);

#define INTERFACE ID3DXFile
 DECLARE_INTERFACE_IID_(ID3DXFile,IUnknown,"cef08cf9-7b4f-4429-9624-2a690a933201")
@@ -93,7 +93,7 @@ DECLARE_INTERFACE_IID_(ID3DXFileSaveObject,IUnknown,"cef08cfa-7b4f-4429-9624-2a6
     STDMETHOD_(ULONG,AddRef)(THIS) PURE;
     STDMETHOD_(ULONG,Release)(THIS) PURE;
     /*** 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,
             SIZE_T data_size, const void *data, struct ID3DXFileSaveData **obj) PURE;
     STDMETHOD(Save)(THIS) PURE;
@@ -127,7 +127,7 @@ DECLARE_INTERFACE_IID_(ID3DXFileEnumObject,IUnknown,"cef08cfc-7b4f-4429-9624-2a6
     STDMETHOD_(ULONG,AddRef)(THIS) PURE;
     STDMETHOD_(ULONG,Release)(THIS) PURE;
     /*** ID3DXFileEnumObject methods ***/
-    STDMETHOD(GetFile)(THIS_ LPD3DXFILE*) PURE;
+    STDMETHOD(GetFile)(THIS_ ID3DXFile **file) PURE;
     STDMETHOD(GetChildren)(THIS_ SIZE_T*) PURE;
     STDMETHOD(GetChild)(THIS_ SIZE_T id, struct ID3DXFileData **child) PURE;
     STDMETHOD(GetDataObjectById)(THIS_ REFGUID guid, struct ID3DXFileData **obj) PURE;