Christian Costa : d3dxof: Create FileData object using its constructor. Fix return value of CreateEnumObject.

[Alexandre Julliard]

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

Author: Christian Costa 
Date:   Tue Aug 19 00:29:09 2008 +0200

d3dxof: Create FileData object using its constructor. Fix return value of CreateEnumObject.

---

dlls/d3dxof/d3dxof.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c
index c141c42..dff299d 100644
--- a/dlls/d3dxof/d3dxof.c
+++ b/dlls/d3dxof/d3dxof.c
@@ -156,7 +156,6 @@ static ULONG WINAPI IDirectXFileImpl_Release(IDirectXFile* iface)

/*** IDirectXFile methods ***/
 static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPVOID pvSource, DXFILELOADOPTIONS dwLoadOptions, LPDIRECTXFILEENUMOBJECT* ppEnumObj)
-
 {
   IDirectXFileImpl *This = (IDirectXFileImpl *)iface;
   IDirectXFileEnumObjectImpl* object;
@@ -1126,17 +1125,17 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE
 {
   IDirectXFileEnumObjectImpl *This = (IDirectXFileEnumObjectImpl *)iface;
   IDirectXFileDataImpl* object;
+  HRESULT hr;

FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppDataObj);

-  object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectXFileDataImpl));
-
-  object->lpVtbl.lpVtbl = &IDirectXFileData_Vtbl;
-  object->ref = 1;
+  hr = IDirectXFileDataImpl_Create(&object);
+  if (!SUCCEEDED(hr))
+    return hr;

*ppDataObj = (LPDIRECTXFILEDATA)object;

-  return DXFILEERR_BADVALUE;
+  return DXFILE_OK;
 }

static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetDataObjectById(IDirectXFileEnumObject* iface, REFGUID rguid, LPDIRECTXFILEDATA* ppDataObj)