Henri Verbeet : d3dx9: Avoid LPD3DXFILEDATA.

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Thu Nov 22 13:45:09 2012 +0100

d3dx9: Avoid LPD3DXFILEDATA.

---

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

diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h
index 0c9d7b9..9a25ec8 100644
--- a/include/d3dx9anim.h
+++ b/include/d3dx9anim.h
@@ -183,9 +183,9 @@ DECLARE_INTERFACE(ID3DXAllocateHierarchy)
 #define INTERFACE ID3DXLoadUserData
 DECLARE_INTERFACE(ID3DXLoadUserData)
 {
-    STDMETHOD(LoadTopLevelData)(LPD3DXFILEDATA child_data) PURE;
-    STDMETHOD(LoadFrameChildData)(LPD3DXFRAME frame, LPD3DXFILEDATA child_data) PURE;
-    STDMETHOD(LoadMeshChildData)(LPD3DXMESHCONTAINER mesh_container, LPD3DXFILEDATA child_data) PURE;
+    STDMETHOD(LoadTopLevelData)(ID3DXFileData *child_data) PURE;
+    STDMETHOD(LoadFrameChildData)(D3DXFRAME *frame, ID3DXFileData *child_data) PURE;
+    STDMETHOD(LoadMeshChildData)(D3DXMESHCONTAINER *mesh_container, ID3DXFileData *child_data) PURE;
 };
 #undef INTERFACE

diff --git a/include/d3dx9xof.h b/include/d3dx9xof.h
index 123f0ac..f110a1f 100644
--- a/include/d3dx9xof.h
+++ b/include/d3dx9xof.h
@@ -125,9 +125,9 @@ DECLARE_INTERFACE_IID_(ID3DXFileEnumObject,IUnknown,"cef08cfc-7b4f-4429-9624-2a6
     /*** ID3DXFileEnumObject methods ***/
     STDMETHOD(GetFile)(THIS_ LPD3DXFILE*) PURE;
     STDMETHOD(GetChildren)(THIS_ SIZE_T*) PURE;
-    STDMETHOD(GetChild)(THIS_ SIZE_T, LPD3DXFILEDATA*) PURE;
-    STDMETHOD(GetDataObjectById)(THIS_ REFGUID, LPD3DXFILEDATA*) PURE;
-    STDMETHOD(GetDataObjectByName)(THIS_ LPCSTR, LPD3DXFILEDATA*) PURE;
+    STDMETHOD(GetChild)(THIS_ SIZE_T id, struct ID3DXFileData **child) PURE;
+    STDMETHOD(GetDataObjectById)(THIS_ REFGUID guid, struct ID3DXFileData **obj) PURE;
+    STDMETHOD(GetDataObjectByName)(THIS_ const char *name, struct ID3DXFileData **obj) PURE;
 };
 #undef INTERFACE

@@ -147,7 +147,7 @@ DECLARE_INTERFACE_IID_(ID3DXFileData,IUnknown,"cef08cfd-7b4f-4429-9624-2a690a933
     STDMETHOD(GetType)(THIS_ GUID*) PURE;
     STDMETHOD_(BOOL,IsReference)(THIS) PURE;
     STDMETHOD(GetChildren)(THIS_ SIZE_T*) PURE;
-    STDMETHOD(GetChild)(THIS_ SIZE_T, LPD3DXFILEDATA*) PURE;
+    STDMETHOD(GetChild)(THIS_ SIZE_T id, ID3DXFileData **child) PURE;
 };
 #undef INTERFACE