Henri Verbeet : wined3d: Cleanup IWineD3DBaseSwapChainImpl_QueryInterface() .
Alexandre Julliard
julliard at winehq.org
Tue Dec 22 09:58:58 CST 2009
Module: wine
Branch: master
Commit: d9fefdb9173d318a702a2e822339ac643aa878bc
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9fefdb9173d318a702a2e822339ac643aa878bc
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Mon Dec 21 23:17:25 2009 +0100
wined3d: Cleanup IWineD3DBaseSwapChainImpl_QueryInterface().
---
dlls/wined3d/swapchain_base.c | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/dlls/wined3d/swapchain_base.c b/dlls/wined3d/swapchain_base.c
index 9b51e93..3c8055e 100644
--- a/dlls/wined3d/swapchain_base.c
+++ b/dlls/wined3d/swapchain_base.c
@@ -27,23 +27,23 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3d);
/* IDirect3DSwapChain IUnknown parts follow: */
-HRESULT WINAPI IWineD3DBaseSwapChainImpl_QueryInterface(IWineD3DSwapChain *iface, REFIID riid, LPVOID *ppobj)
+HRESULT WINAPI IWineD3DBaseSwapChainImpl_QueryInterface(IWineD3DSwapChain *iface, REFIID riid, void **object)
{
- IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
- TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), ppobj);
- if (IsEqualGUID(riid, &IID_IUnknown)
- || IsEqualGUID(riid, &IID_IWineD3DBase)
- || IsEqualGUID(riid, &IID_IWineD3DSwapChain)){
- IWineD3DSwapChain_AddRef(iface);
- if(ppobj == NULL){
- ERR("Query interface called but now data allocated\n");
- return E_NOINTERFACE;
- }
- *ppobj = This;
- return WINED3D_OK;
- }
- *ppobj = NULL;
- return E_NOINTERFACE;
+ TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object);
+
+ if (IsEqualGUID(riid, &IID_IWineD3DSwapChain)
+ || IsEqualGUID(riid, &IID_IWineD3DBase)
+ || IsEqualGUID(riid, &IID_IUnknown))
+ {
+ IUnknown_AddRef(iface);
+ *object = iface;
+ return S_OK;
+ }
+
+ WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));
+
+ *object = NULL;
+ return E_NOINTERFACE;
}
ULONG WINAPI IWineD3DBaseSwapChainImpl_AddRef(IWineD3DSwapChain *iface) {
More information about the wine-cvs
mailing list