Christian Costa : d3dxof: Create FileEnumObject using its constructor.

Alexandre Julliard julliard at winehq.org
Tue Aug 19 08:47:02 CDT 2008


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

Author: Christian Costa <titan.costa at wanadoo.fr>
Date:   Tue Aug 19 00:28:03 2008 +0200

d3dxof: Create FileEnumObject using its constructor.

---

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

diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c
index 9c438c5..c141c42 100644
--- a/dlls/d3dxof/d3dxof.c
+++ b/dlls/d3dxof/d3dxof.c
@@ -159,7 +159,8 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV
 
 {
   IDirectXFileImpl *This = (IDirectXFileImpl *)iface;
-  IDirectXFileEnumObjectImpl* object; 
+  IDirectXFileEnumObjectImpl* object;
+  HRESULT hr;
 
   FIXME("(%p/%p)->(%p,%x,%p) stub!\n", This, iface, pvSource, dwLoadOptions, ppEnumObj);
 
@@ -180,13 +181,12 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV
     FIXME("Source type %d is not handled yet\n", dwLoadOptions);
   }
 
-  object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectXFileEnumObjectImpl));
-
-  object->lpVtbl.lpVtbl = &IDirectXFileEnumObject_Vtbl;
-  object->ref = 1;
+  hr = IDirectXFileEnumObjectImpl_Create(&object);
+  if (!SUCCEEDED(hr))
+    return hr;
 
   *ppEnumObj = (LPDIRECTXFILEENUMOBJECT)object;
-    
+
   return DXFILE_OK;
 }
 




More information about the wine-cvs mailing list