Henri Verbeet : wined3d: Volumes are resources in wined3d.
Alexandre Julliard
julliard at winehq.org
Tue Dec 22 09:58:57 CST 2009
Module: wine
Branch: master
Commit: 3f77683174a739129925a4a7877802d578b47c65
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f77683174a739129925a4a7877802d578b47c65
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Mon Dec 21 23:17:24 2009 +0100
wined3d: Volumes are resources in wined3d.
---
dlls/wined3d/volume.c | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c
index 7f65f2a..8e19ee9 100644
--- a/dlls/wined3d/volume.c
+++ b/dlls/wined3d/volume.c
@@ -97,18 +97,23 @@ void volume_add_dirty_box(IWineD3DVolume *iface, const WINED3DBOX *dirty_box)
/* *******************************************
IWineD3DVolume IUnknown parts follow
******************************************* */
-static HRESULT WINAPI IWineD3DVolumeImpl_QueryInterface(IWineD3DVolume *iface, REFIID riid, LPVOID *ppobj)
+static HRESULT WINAPI IWineD3DVolumeImpl_QueryInterface(IWineD3DVolume *iface, REFIID riid, void **object)
{
- IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface;
- TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppobj);
- if (IsEqualGUID(riid, &IID_IUnknown)
- || IsEqualGUID(riid, &IID_IWineD3DBase)
- || IsEqualGUID(riid, &IID_IWineD3DVolume)){
+ TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object);
+
+ if (IsEqualGUID(riid, &IID_IWineD3DVolume)
+ || IsEqualGUID(riid, &IID_IWineD3DResource)
+ || IsEqualGUID(riid, &IID_IWineD3DBase)
+ || IsEqualGUID(riid, &IID_IUnknown))
+ {
IUnknown_AddRef(iface);
- *ppobj = This;
+ *object = iface;
return S_OK;
}
- *ppobj = NULL;
+
+ WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));
+
+ *object = NULL;
return E_NOINTERFACE;
}
More information about the wine-cvs
mailing list