[PATCH 5/5] d3dx9_36: Implement ID3DXFileDataImpl_GetType. (try 2)
Christian Costa
titan.costa at gmail.com
Mon Oct 22 16:57:36 CDT 2012
---
dlls/d3dx9_36/xfile.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c
index 3ade434..9ad1bbb 100644
--- a/dlls/d3dx9_36/xfile.c
+++ b/dlls/d3dx9_36/xfile.c
@@ -152,11 +152,21 @@ static HRESULT WINAPI ID3DXFileDataImpl_Unlock(ID3DXFileData *iface)
}
-static HRESULT WINAPI ID3DXFileDataImpl_GetType(ID3DXFileData *iface, GUID* guid)
+static HRESULT WINAPI ID3DXFileDataImpl_GetType(ID3DXFileData *iface, GUID *guid)
{
- FIXME("(%p)->(%p): stub\n", iface, guid);
+ ID3DXFileDataImpl *This = impl_from_ID3DXFileData(iface);
+ const GUID *dxfile_guid;
+ HRESULT ret;
- return E_NOTIMPL;
+ TRACE("(%p)->(%p)\n", iface, guid);
+
+ ret = IDirectXFileData_GetType(This->dxfile_object, &dxfile_guid);
+ if (ret != S_OK)
+ return ret;
+
+ *guid = *dxfile_guid;
+
+ return S_OK;
}
@@ -203,7 +213,7 @@ static const ID3DXFileDataVtbl ID3DXFileData_Vtbl =
static HRESULT WINAPI ID3DXFileDataImpl_Create(IDirectXFileObject *dxfile_object, ID3DXFileData **ret_iface)
{
- ID3DXFileDataImpl* object;
+ ID3DXFileDataImpl *object;
TRACE("(%p)\n", ret_iface);
More information about the wine-patches
mailing list