Module: wine Branch: master Commit: fc8dfe60ea517d63f8ea01584b26bda1fe36f0da URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc8dfe60ea517d63f8ea01584b...
Author: Christian Costa titan.costa@gmail.com Date: Mon Jan 14 10:21:03 2013 +0100
d3dx9_36: Implement ID3DXFileDataImpl_GetId.
---
dlls/d3dx9_36/xfile.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index 63d85b6..234e071 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -160,9 +160,19 @@ static HRESULT WINAPI ID3DXFileDataImpl_GetName(ID3DXFileData *iface, char *name
static HRESULT WINAPI ID3DXFileDataImpl_GetId(ID3DXFileData *iface, GUID *guid) { - FIXME("(%p)->(%p): stub\n", iface, guid); + ID3DXFileDataImpl *This = impl_from_ID3DXFileData(iface); + HRESULT ret;
- return E_NOTIMPL; + TRACE("(%p)->(%p)\n", iface, guid); + + if (!guid) + return E_POINTER; + + ret = IDirectXFileData_GetId(This->dxfile_data, guid); + if (ret != DXFILE_OK) + return error_dxfile_to_d3dxfile(ret); + + return S_OK; }