Jacek Caban : ieframe: Improved debug traces in IShellBrowser:: QueryInterface.
Alexandre Julliard
julliard at winehq.org
Tue Nov 15 13:17:32 CST 2011
Module: wine
Branch: master
Commit: 3548504c8d6f4f78610fe79512d44d2c20066907
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3548504c8d6f4f78610fe79512d44d2c20066907
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue Nov 15 13:29:00 2011 +0100
ieframe: Improved debug traces in IShellBrowser::QueryInterface.
---
dlls/ieframe/shellbrowser.c | 41 ++++++++++++++++++++++-------------------
1 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c
index 79ee378..65e1cea 100644
--- a/dlls/ieframe/shellbrowser.c
+++ b/dlls/ieframe/shellbrowser.c
@@ -32,30 +32,33 @@ static inline ShellBrowser *impl_from_IShellBrowser(IShellBrowser *iface)
return CONTAINING_RECORD(iface, ShellBrowser, IShellBrowser_iface);
}
-static HRESULT WINAPI ShellBrowser_QueryInterface(
- IShellBrowser* iface,
- REFIID riid,
- void **ppvObject)
+static HRESULT WINAPI ShellBrowser_QueryInterface(IShellBrowser* iface, REFIID riid, void **ppv)
{
ShellBrowser *This = impl_from_IShellBrowser(iface);
- *ppvObject = NULL;
-
- if(IsEqualGUID(&IID_IShellBrowser, riid) || IsEqualGUID(&IID_IOleWindow, riid)
- || IsEqualGUID(&IID_IUnknown, riid))
- *ppvObject = &This->IShellBrowser_iface;
- else if(IsEqualGUID(&IID_IBrowserService, riid))
- *ppvObject = &This->IBrowserService_iface;
- else if(IsEqualGUID(&IID_IDocObjectService, riid))
- *ppvObject = &This->IDocObjectService_iface;
-
- if(*ppvObject) {
- TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject);
- IUnknown_AddRef((IUnknown*)*ppvObject);
- return S_OK;
+
+ if(IsEqualGUID(&IID_IUnknown, riid)) {
+ TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv);
+ *ppv = &This->IShellBrowser_iface;
+ }else if(IsEqualGUID(&IID_IOleWindow, riid)) {
+ TRACE("(%p)->(IID_IOleWindow %p)\n", This, ppv);
+ *ppv = &This->IShellBrowser_iface;
+ }else if(IsEqualGUID(&IID_IShellBrowser, riid)) {
+ TRACE("(%p)->(IID_IShellBrowser %p)\n", This, ppv);
+ *ppv = &This->IShellBrowser_iface;
+ }else if(IsEqualGUID(&IID_IBrowserService, riid)) {
+ TRACE("(%p)->(IID_IBrowserService %p)\n", This, ppv);
+ *ppv = &This->IBrowserService_iface;
+ }else if(IsEqualGUID(&IID_IDocObjectService, riid)) {
+ TRACE("(%p)->(IID_IDocObjectService %p)\n", This, ppv);
+ *ppv = &This->IDocObjectService_iface;
+ }else {
+ FIXME("%p %s %p\n", This, debugstr_guid(riid), ppv);
+ *ppv = NULL;
+ return E_NOINTERFACE;
}
- FIXME("%p %s %p\n", This, debugstr_guid(riid), ppvObject);
- return E_NOINTERFACE;
+ IUnknown_AddRef((IUnknown*)*ppv);
+ return S_OK;
}
static ULONG WINAPI ShellBrowser_AddRef(
More information about the wine-cvs
mailing list