Skip to content

W
wine-winehq
Commit c6b2529f authored by Christian Costa's avatar Christian Costa Committed by Alexandre Julliard
Browse files
Options

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

parent 1b1f8aa8
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
dlls/d3dxof/d3dxof.c
View file @ c6b2529f
...@@ -156,7 +156,6 @@ static ULONG WINAPI IDirectXFileImpl_Release(IDirectXFile* iface) ...@@ -156,7 +156,6 @@ static ULONG WINAPI IDirectXFileImpl_Release(IDirectXFile* iface)
/*** IDirectXFile methods ***/ /*** IDirectXFile methods ***/
static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPVOID pvSource, DXFILELOADOPTIONS dwLoadOptions, LPDIRECTXFILEENUMOBJECT* ppEnumObj) static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPVOID pvSource, DXFILELOADOPTIONS dwLoadOptions, LPDIRECTXFILEENUMOBJECT* ppEnumObj)
{ {
IDirectXFileImpl *This = (IDirectXFileImpl *)iface; IDirectXFileImpl *This = (IDirectXFileImpl *)iface;
IDirectXFileEnumObjectImpl* object; IDirectXFileEnumObjectImpl* object;
...@@ -1126,17 +1125,17 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE ...@@ -1126,17 +1125,17 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE
{ {
IDirectXFileEnumObjectImpl *This = (IDirectXFileEnumObjectImpl *)iface; IDirectXFileEnumObjectImpl *This = (IDirectXFileEnumObjectImpl *)iface;
IDirectXFileDataImpl* object; IDirectXFileDataImpl* object;
HRESULT hr;
FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppDataObj); FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppDataObj);
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectXFileDataImpl)); hr = IDirectXFileDataImpl_Create(&object);
if (!SUCCEEDED(hr))
object->lpVtbl.lpVtbl = &IDirectXFileData_Vtbl; return hr;
object->ref = 1;
*ppDataObj = (LPDIRECTXFILEDATA)object; *ppDataObj = (LPDIRECTXFILEDATA)object;
return DXFILEERR_BADVALUE; return DXFILE_OK;
} }
static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetDataObjectById(IDirectXFileEnumObject* iface, REFGUID rguid, LPDIRECTXFILEDATA* ppDataObj) static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetDataObjectById(IDirectXFileEnumObject* iface, REFGUID rguid, LPDIRECTXFILEDATA* ppDataObj)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment