Henri Verbeet : d3dx9: Avoid LPD3DXFILEENUMOBJECT.

[Alexandre Julliard]

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

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

d3dx9: Avoid LPD3DXFILEENUMOBJECT.

---

include/d3dx9xof.h |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/d3dx9xof.h b/include/d3dx9xof.h
index f110a1f..9789ffd 100644
--- a/include/d3dx9xof.h
+++ b/include/d3dx9xof.h
@@ -76,10 +76,11 @@ DECLARE_INTERFACE_IID_(ID3DXFile,IUnknown,"cef08cf9-7b4f-4429-9624-2a690a933201"
     STDMETHOD_(ULONG,AddRef)(THIS) PURE;
     STDMETHOD_(ULONG,Release)(THIS) PURE;
     /*** ID3DXFile methods ***/
-    STDMETHOD(CreateEnumObject)(THIS_ LPCVOID, D3DXF_FILELOADOPTIONS, LPD3DXFILEENUMOBJECT*) PURE;
+    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(RegisterTemplates)(THIS_ LPCVOID, SIZE_T) PURE;
-    STDMETHOD(RegisterEnumTemplates)(THIS_ LPD3DXFILEENUMOBJECT) PURE;
+    STDMETHOD(RegisterEnumTemplates)(THIS_ struct ID3DXFileEnumObject *enum_obj) PURE;
 };
 #undef INTERFACE

@@ -139,7 +140,7 @@ DECLARE_INTERFACE_IID_(ID3DXFileData,IUnknown,"cef08cfd-7b4f-4429-9624-2a690a933
     STDMETHOD_(ULONG,AddRef)(THIS) PURE;
     STDMETHOD_(ULONG,Release)(THIS) PURE;
     /*** ID3DXFileData methods ***/
-    STDMETHOD(GetEnum)(THIS_ LPD3DXFILEENUMOBJECT*) PURE;
+    STDMETHOD(GetEnum)(THIS_ ID3DXFileEnumObject **enum_obj) PURE;
     STDMETHOD(GetName)(THIS_ LPSTR, SIZE_T*) PURE;
     STDMETHOD(GetId)(THIS_ LPGUID) PURE;
     STDMETHOD(Lock)(THIS_ SIZE_T*, LPCVOID*) PURE;