ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shell32: Use regular helper to trace IID, downgrade QI failures to warnings. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2017-09-24 20:38:44 +03:00 committed by Alexandre Julliard
parent 4ef3ffd69d
commit 709db66f8d
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dlls/shell32/shelldispatch.c
View File

@ -195,9 +195,7 @@ static HRESULT WINAPI FolderItemVerbImpl_QueryInterface(FolderItemVerb *iface,
{ {
FolderItemVerbImpl *This = impl_from_FolderItemVerb(iface); FolderItemVerbImpl *This = impl_from_FolderItemVerb(iface);
TRACE("(%p,%s,%p)\n", iface, shdebugstr_guid(riid), ppv); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv);
*ppv = NULL;
if (IsEqualIID(&IID_IUnknown, riid) || if (IsEqualIID(&IID_IUnknown, riid) ||
IsEqualIID(&IID_IDispatch, riid) || IsEqualIID(&IID_IDispatch, riid) ||
@ -205,7 +203,7 @@ static HRESULT WINAPI FolderItemVerbImpl_QueryInterface(FolderItemVerb *iface,
*ppv = &This->FolderItemVerb_iface; *ppv = &This->FolderItemVerb_iface;
else else
{ {
FIXME("not implemented for %s\n", shdebugstr_guid(riid)); WARN("not implemented for %s\n", debugstr_guid(riid));
*ppv = NULL; *ppv = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
} }
@ -367,9 +365,7 @@ static HRESULT WINAPI FolderItemVerbsImpl_QueryInterface(FolderItemVerbs *iface,
{ {
FolderItemVerbsImpl *This = impl_from_FolderItemVerbs(iface); FolderItemVerbsImpl *This = impl_from_FolderItemVerbs(iface);
TRACE("(%p,%s,%p)\n", iface, shdebugstr_guid(riid), ppv); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv);
*ppv = NULL;
if (IsEqualIID(&IID_IUnknown, riid) || if (IsEqualIID(&IID_IUnknown, riid) ||
IsEqualIID(&IID_IDispatch, riid) || IsEqualIID(&IID_IDispatch, riid) ||
@ -377,7 +373,7 @@ static HRESULT WINAPI FolderItemVerbsImpl_QueryInterface(FolderItemVerbs *iface,
*ppv = &This->FolderItemVerbs_iface; *ppv = &This->FolderItemVerbs_iface;
else else
{ {
FIXME("not implemented for %s\n", shdebugstr_guid(riid)); WARN("not implemented for %s\n", debugstr_guid(riid));
*ppv = NULL; *ppv = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
} }
@ -623,7 +619,7 @@ static HRESULT WINAPI FolderItemImpl_QueryInterface(FolderItem2 *iface,
{ {
FolderItemImpl *This = impl_from_FolderItem(iface); FolderItemImpl *This = impl_from_FolderItem(iface);
TRACE("(%p,%s,%p)\n", iface, shdebugstr_guid(riid), ppv); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv);
if (!ppv) return E_INVALIDARG; if (!ppv) return E_INVALIDARG;
@ -634,7 +630,7 @@ static HRESULT WINAPI FolderItemImpl_QueryInterface(FolderItem2 *iface,
*ppv = &This->FolderItem2_iface; *ppv = &This->FolderItem2_iface;
else else
{ {
FIXME("not implemented for %s\n", shdebugstr_guid(riid)); WARN("not implemented for %s\n", debugstr_guid(riid));
*ppv = NULL; *ppv = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
} }
@ -985,7 +981,7 @@ static HRESULT WINAPI FolderItemsImpl_QueryInterface(FolderItems3 *iface,
{ {
FolderItemsImpl *This = impl_from_FolderItems(iface); FolderItemsImpl *This = impl_from_FolderItems(iface);
TRACE("(%p,%s,%p)\n", iface, shdebugstr_guid(riid), ppv); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv);
if (!ppv) return E_INVALIDARG; if (!ppv) return E_INVALIDARG;
@ -997,7 +993,7 @@ static HRESULT WINAPI FolderItemsImpl_QueryInterface(FolderItems3 *iface,
*ppv = &This->FolderItems3_iface; *ppv = &This->FolderItems3_iface;
else else
{ {
FIXME("not implemented for %s\n", shdebugstr_guid(riid)); WARN("not implemented for %s\n", debugstr_guid(riid));
*ppv = NULL; *ppv = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
} }
@ -1314,7 +1310,7 @@ static HRESULT WINAPI FolderImpl_QueryInterface(Folder3 *iface, REFIID riid,
{ {
FolderImpl *This = impl_from_Folder(iface); FolderImpl *This = impl_from_Folder(iface);
TRACE("(%p,%s,%p)\n", iface, shdebugstr_guid(riid), ppv); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv);
if (!ppv) return E_INVALIDARG; if (!ppv) return E_INVALIDARG;
@ -1326,7 +1322,7 @@ static HRESULT WINAPI FolderImpl_QueryInterface(Folder3 *iface, REFIID riid,
*ppv = &This->Folder3_iface; *ppv = &This->Folder3_iface;
else else
{ {
FIXME("not implemented for %s\n", shdebugstr_guid(riid)); WARN("not implemented for %s\n", debugstr_guid(riid));
*ppv = NULL; *ppv = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
} }
@ -1668,7 +1664,7 @@ static HRESULT WINAPI ShellDispatch_QueryInterface(IShellDispatch6 *iface,
{ {
ShellDispatch *This = impl_from_IShellDispatch6(iface); ShellDispatch *This = impl_from_IShellDispatch6(iface);
TRACE("(%p,%s,%p)\n", iface, shdebugstr_guid(riid), ppv); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv);
if (!ppv) return E_INVALIDARG; if (!ppv) return E_INVALIDARG;
@ -1683,7 +1679,7 @@ static HRESULT WINAPI ShellDispatch_QueryInterface(IShellDispatch6 *iface,
*ppv = &This->IShellDispatch6_iface; *ppv = &This->IShellDispatch6_iface;
else else
{ {
FIXME("not implemented for %s\n", shdebugstr_guid(riid)); WARN("not implemented for %s\n", debugstr_guid(riid));
*ppv = NULL; *ppv = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
} }