Henri Verbeet : wined3d: IWineD3DPaletteImpl implements IWineD3DBase.
Alexandre Julliard
julliard at winehq.org
Mon Dec 21 09:39:51 CST 2009
Module: wine
Branch: master
Commit: 8c7d25997889a44b697ad8ecdbe246aafae72c52
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c7d25997889a44b697ad8ecdbe246aafae72c52
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Sun Dec 20 20:41:39 2009 +0100
wined3d: IWineD3DPaletteImpl implements IWineD3DBase.
---
dlls/wined3d/palette.c | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c
index c9c6182..553a08a 100644
--- a/dlls/wined3d/palette.c
+++ b/dlls/wined3d/palette.c
@@ -30,20 +30,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d);
#define SIZE_BITS (WINEDDPCAPS_1BIT | WINEDDPCAPS_2BIT | WINEDDPCAPS_4BIT | WINEDDPCAPS_8BIT)
-static HRESULT WINAPI IWineD3DPaletteImpl_QueryInterface(IWineD3DPalette *iface, REFIID refiid, void **obj) {
- IWineD3DPaletteImpl *This = (IWineD3DPaletteImpl *)iface;
- TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(refiid),obj);
+static HRESULT WINAPI IWineD3DPaletteImpl_QueryInterface(IWineD3DPalette *iface, REFIID riid, void **object)
+{
+ TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object);
- if (IsEqualGUID(refiid, &IID_IUnknown)
- || IsEqualGUID(refiid, &IID_IWineD3DPalette)) {
- *obj = iface;
- IWineD3DPalette_AddRef(iface);
+ if (IsEqualGUID(riid, &IID_IWineD3DPalette)
+ || IsEqualGUID(riid, &IID_IWineD3DBase)
+ || IsEqualGUID(riid, &IID_IUnknown))
+ {
+ IUnknown_AddRef(iface);
+ *object = iface;
return S_OK;
}
- else {
- *obj = NULL;
- return E_NOINTERFACE;
- }
+
+ WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));
+
+ *object = NULL;
+ return E_NOINTERFACE;
}
static ULONG WINAPI IWineD3DPaletteImpl_AddRef(IWineD3DPalette *iface) {
More information about the wine-cvs
mailing list