forked from Mirrors/wine-wine
mshtml: Use debugstr_mshtml_guid in omnavigator.c.
parent
b83825509e
commit
9d911d6ffe
|
@ -195,25 +195,22 @@ static HRESULT WINAPI OmHistory_QueryInterface(IOmHistory *iface, REFIID riid, v
|
||||||
{
|
{
|
||||||
OmHistory *This = impl_from_IOmHistory(iface);
|
OmHistory *This = impl_from_IOmHistory(iface);
|
||||||
|
|
||||||
*ppv = NULL;
|
TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv);
|
||||||
|
|
||||||
if(IsEqualGUID(&IID_IUnknown, riid)) {
|
if(IsEqualGUID(&IID_IUnknown, riid)) {
|
||||||
TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv);
|
|
||||||
*ppv = &This->IOmHistory_iface;
|
*ppv = &This->IOmHistory_iface;
|
||||||
}else if(IsEqualGUID(&IID_IOmHistory, riid)) {
|
}else if(IsEqualGUID(&IID_IOmHistory, riid)) {
|
||||||
TRACE("(%p)->(IID_IOmHistory %p)\n", This, ppv);
|
|
||||||
*ppv = &This->IOmHistory_iface;
|
*ppv = &This->IOmHistory_iface;
|
||||||
}else if(dispex_query_interface(&This->dispex, riid, ppv)) {
|
}else if(dispex_query_interface(&This->dispex, riid, ppv)) {
|
||||||
return *ppv ? S_OK : E_NOINTERFACE;
|
return *ppv ? S_OK : E_NOINTERFACE;
|
||||||
|
}else {
|
||||||
|
WARN("Unsupported interface %s\n", debugstr_mshtml_guid(riid));
|
||||||
|
*ppv = NULL;
|
||||||
|
return E_NOINTERFACE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(*ppv) {
|
IUnknown_AddRef((IUnknown*)*ppv);
|
||||||
IUnknown_AddRef((IUnknown*)*ppv);
|
return S_OK;
|
||||||
return S_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv);
|
|
||||||
return E_NOINTERFACE;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static ULONG WINAPI OmHistory_AddRef(IOmHistory *iface)
|
static ULONG WINAPI OmHistory_AddRef(IOmHistory *iface)
|
||||||
|
@ -373,17 +370,17 @@ static HRESULT WINAPI HTMLPluginsCollection_QueryInterface(IHTMLPluginsCollectio
|
||||||
{
|
{
|
||||||
HTMLPluginsCollection *This = impl_from_IHTMLPluginsCollection(iface);
|
HTMLPluginsCollection *This = impl_from_IHTMLPluginsCollection(iface);
|
||||||
|
|
||||||
|
TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv);
|
||||||
|
|
||||||
if(IsEqualGUID(&IID_IUnknown, riid)) {
|
if(IsEqualGUID(&IID_IUnknown, riid)) {
|
||||||
TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv);
|
|
||||||
*ppv = &This->IHTMLPluginsCollection_iface;
|
*ppv = &This->IHTMLPluginsCollection_iface;
|
||||||
}else if(IsEqualGUID(&IID_IHTMLPluginsCollection, riid)) {
|
}else if(IsEqualGUID(&IID_IHTMLPluginsCollection, riid)) {
|
||||||
TRACE("(%p)->(IID_IHTMLPluginCollection %p)\n", This, ppv);
|
|
||||||
*ppv = &This->IHTMLPluginsCollection_iface;
|
*ppv = &This->IHTMLPluginsCollection_iface;
|
||||||
}else if(dispex_query_interface(&This->dispex, riid, ppv)) {
|
}else if(dispex_query_interface(&This->dispex, riid, ppv)) {
|
||||||
return *ppv ? S_OK : E_NOINTERFACE;
|
return *ppv ? S_OK : E_NOINTERFACE;
|
||||||
}else {
|
}else {
|
||||||
*ppv = NULL;
|
*ppv = NULL;
|
||||||
WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv);
|
WARN("Unsupported interface %s\n", debugstr_mshtml_guid(riid));
|
||||||
return E_NOINTERFACE;
|
return E_NOINTERFACE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -526,17 +523,17 @@ static HRESULT WINAPI HTMLMimeTypesCollection_QueryInterface(IHTMLMimeTypesColle
|
||||||
{
|
{
|
||||||
HTMLMimeTypesCollection *This = impl_from_IHTMLMimeTypesCollection(iface);
|
HTMLMimeTypesCollection *This = impl_from_IHTMLMimeTypesCollection(iface);
|
||||||
|
|
||||||
|
TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv);
|
||||||
|
|
||||||
if(IsEqualGUID(&IID_IUnknown, riid)) {
|
if(IsEqualGUID(&IID_IUnknown, riid)) {
|
||||||
TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv);
|
|
||||||
*ppv = &This->IHTMLMimeTypesCollection_iface;
|
*ppv = &This->IHTMLMimeTypesCollection_iface;
|
||||||
}else if(IsEqualGUID(&IID_IHTMLMimeTypesCollection, riid)) {
|
}else if(IsEqualGUID(&IID_IHTMLMimeTypesCollection, riid)) {
|
||||||
TRACE("(%p)->(IID_IHTMLMimeTypesCollection %p)\n", This, ppv);
|
|
||||||
*ppv = &This->IHTMLMimeTypesCollection_iface;
|
*ppv = &This->IHTMLMimeTypesCollection_iface;
|
||||||
}else if(dispex_query_interface(&This->dispex, riid, ppv)) {
|
}else if(dispex_query_interface(&This->dispex, riid, ppv)) {
|
||||||
return *ppv ? S_OK : E_NOINTERFACE;
|
return *ppv ? S_OK : E_NOINTERFACE;
|
||||||
}else {
|
}else {
|
||||||
|
WARN("Unsupported interface %s\n", debugstr_mshtml_guid(riid));
|
||||||
*ppv = NULL;
|
*ppv = NULL;
|
||||||
WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv);
|
|
||||||
return E_NOINTERFACE;
|
return E_NOINTERFACE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -662,25 +659,22 @@ static HRESULT WINAPI OmNavigator_QueryInterface(IOmNavigator *iface, REFIID rii
|
||||||
{
|
{
|
||||||
OmNavigator *This = impl_from_IOmNavigator(iface);
|
OmNavigator *This = impl_from_IOmNavigator(iface);
|
||||||
|
|
||||||
*ppv = NULL;
|
TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv);
|
||||||
|
|
||||||
if(IsEqualGUID(&IID_IUnknown, riid)) {
|
if(IsEqualGUID(&IID_IUnknown, riid)) {
|
||||||
TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv);
|
|
||||||
*ppv = &This->IOmNavigator_iface;
|
*ppv = &This->IOmNavigator_iface;
|
||||||
}else if(IsEqualGUID(&IID_IOmNavigator, riid)) {
|
}else if(IsEqualGUID(&IID_IOmNavigator, riid)) {
|
||||||
TRACE("(%p)->(IID_IOmNavigator %p)\n", This, ppv);
|
|
||||||
*ppv = &This->IOmNavigator_iface;
|
*ppv = &This->IOmNavigator_iface;
|
||||||
}else if(dispex_query_interface(&This->dispex, riid, ppv)) {
|
}else if(dispex_query_interface(&This->dispex, riid, ppv)) {
|
||||||
return *ppv ? S_OK : E_NOINTERFACE;
|
return *ppv ? S_OK : E_NOINTERFACE;
|
||||||
|
}else {
|
||||||
|
WARN("Unsupported interface %s\n", debugstr_mshtml_guid(riid));
|
||||||
|
*ppv = NULL;
|
||||||
|
return E_NOINTERFACE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(*ppv) {
|
IUnknown_AddRef((IUnknown*)*ppv);
|
||||||
IUnknown_AddRef((IUnknown*)*ppv);
|
return S_OK;
|
||||||
return S_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv);
|
|
||||||
return E_NOINTERFACE;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static ULONG WINAPI OmNavigator_AddRef(IOmNavigator *iface)
|
static ULONG WINAPI OmNavigator_AddRef(IOmNavigator *iface)
|
||||||
|
|
Loading…
Reference in New Issue