mshtml: Use debugmsg_mshtml_guid in a few more places.
This commit is contained in:
parent
9a64cf7705
commit
b54a9c662a
|
@ -81,27 +81,24 @@ static HRESULT WINAPI HTMLLocation_QueryInterface(IHTMLLocation *iface, REFIID r
|
|||
{
|
||||
HTMLLocation *This = impl_from_IHTMLLocation(iface);
|
||||
|
||||
*ppv = NULL;
|
||||
TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv);
|
||||
|
||||
if(IsEqualGUID(&IID_IUnknown, riid)) {
|
||||
TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv);
|
||||
*ppv = &This->IHTMLLocation_iface;
|
||||
}else if(IsEqualGUID(&IID_IHTMLLocation, riid)) {
|
||||
TRACE("(%p)->(IID_IHTMLLocation %p)\n", This, ppv);
|
||||
*ppv = &This->IHTMLLocation_iface;
|
||||
}else if(dispex_query_interface(&This->dispex, riid, ppv)) {
|
||||
return *ppv ? S_OK : E_NOINTERFACE;
|
||||
}else {
|
||||
*ppv = NULL;
|
||||
WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv);
|
||||
return E_NOINTERFACE;
|
||||
}
|
||||
|
||||
if(*ppv) {
|
||||
IUnknown_AddRef((IUnknown*)*ppv);
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv);
|
||||
return E_NOINTERFACE;
|
||||
}
|
||||
|
||||
static ULONG WINAPI HTMLLocation_AddRef(IHTMLLocation *iface)
|
||||
{
|
||||
HTMLLocation *This = impl_from_IHTMLLocation(iface);
|
||||
|
|
|
@ -366,28 +366,24 @@ static HRESULT WINAPI HTMLOptionElementFactory_QueryInterface(IHTMLOptionElement
|
|||
{
|
||||
HTMLOptionElementFactory *This = impl_from_IHTMLOptionElementFactory(iface);
|
||||
|
||||
*ppv = NULL;
|
||||
TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv);
|
||||
|
||||
if(IsEqualGUID(&IID_IUnknown, riid)) {
|
||||
TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv);
|
||||
*ppv = &This->IHTMLOptionElementFactory_iface;
|
||||
}else if(IsEqualGUID(&IID_IDispatch, riid)) {
|
||||
TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv);
|
||||
*ppv = &This->IHTMLOptionElementFactory_iface;
|
||||
}else if(IsEqualGUID(&IID_IHTMLOptionElementFactory, riid)) {
|
||||
TRACE("(%p)->(IID_IHTMLOptionElementFactory %p)\n", This, ppv);
|
||||
*ppv = &This->IHTMLOptionElementFactory_iface;
|
||||
}else {
|
||||
*ppv = NULL;
|
||||
WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv);
|
||||
return E_NOINTERFACE;
|
||||
}
|
||||
|
||||
if(*ppv) {
|
||||
IUnknown_AddRef((IUnknown*)*ppv);
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv);
|
||||
return E_NOINTERFACE;
|
||||
}
|
||||
|
||||
static ULONG WINAPI HTMLOptionElementFactory_AddRef(IHTMLOptionElementFactory *iface)
|
||||
{
|
||||
HTMLOptionElementFactory *This = impl_from_IHTMLOptionElementFactory(iface);
|
||||
|
|
|
@ -47,27 +47,24 @@ static HRESULT WINAPI HTMLScreen_QueryInterface(IHTMLScreen *iface, REFIID riid,
|
|||
{
|
||||
HTMLScreen *This = impl_from_IHTMLScreen(iface);
|
||||
|
||||
*ppv = NULL;
|
||||
TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv);
|
||||
|
||||
if(IsEqualGUID(&IID_IUnknown, riid)) {
|
||||
TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv);
|
||||
*ppv = &This->IHTMLScreen_iface;
|
||||
}else if(IsEqualGUID(&IID_IHTMLScreen, riid)) {
|
||||
TRACE("(%p)->(IID_IHTMLScreen %p)\n", This, ppv);
|
||||
*ppv = &This->IHTMLScreen_iface;
|
||||
}else if(dispex_query_interface(&This->dispex, riid, ppv)) {
|
||||
return *ppv ? S_OK : E_NOINTERFACE;
|
||||
}else {
|
||||
*ppv = NULL;
|
||||
WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv);
|
||||
return E_NOINTERFACE;
|
||||
}
|
||||
|
||||
if(*ppv) {
|
||||
IUnknown_AddRef((IUnknown*)*ppv);
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv);
|
||||
return E_NOINTERFACE;
|
||||
}
|
||||
|
||||
static ULONG WINAPI HTMLScreen_AddRef(IHTMLScreen *iface)
|
||||
{
|
||||
HTMLScreen *This = impl_from_IHTMLScreen(iface);
|
||||
|
|
|
@ -46,27 +46,24 @@ static HRESULT WINAPI HTMLStorage_QueryInterface(IHTMLStorage *iface, REFIID rii
|
|||
{
|
||||
HTMLStorage *This = impl_from_IHTMLStorage(iface);
|
||||
|
||||
*ppv = NULL;
|
||||
TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv);
|
||||
|
||||
if(IsEqualGUID(&IID_IUnknown, riid)) {
|
||||
TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv);
|
||||
*ppv = &This->IHTMLStorage_iface;
|
||||
}else if(IsEqualGUID(&IID_IHTMLStorage, riid)) {
|
||||
TRACE("(%p)->(IID_IHTMLStorage %p)\n", This, ppv);
|
||||
*ppv = &This->IHTMLStorage_iface;
|
||||
}else if(dispex_query_interface(&This->dispex, riid, ppv)) {
|
||||
return *ppv ? S_OK : E_NOINTERFACE;
|
||||
}
|
||||
|
||||
if(*ppv) {
|
||||
IUnknown_AddRef((IUnknown*)*ppv);
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
}else {
|
||||
*ppv = NULL;
|
||||
WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv);
|
||||
return E_NOINTERFACE;
|
||||
}
|
||||
|
||||
IUnknown_AddRef((IUnknown*)*ppv);
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
static ULONG WINAPI HTMLStorage_AddRef(IHTMLStorage *iface)
|
||||
{
|
||||
HTMLStorage *This = impl_from_IHTMLStorage(iface);
|
||||
|
|
|
@ -730,42 +730,34 @@ static HRESULT WINAPI HTMLStyle_QueryInterface(IHTMLStyle *iface, REFIID riid, v
|
|||
{
|
||||
HTMLStyle *This = impl_from_IHTMLStyle(iface);
|
||||
|
||||
*ppv = NULL;
|
||||
TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv);
|
||||
|
||||
if(IsEqualGUID(&IID_IUnknown, riid)) {
|
||||
TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv);
|
||||
*ppv = &This->IHTMLStyle_iface;
|
||||
}else if(IsEqualGUID(&IID_IHTMLStyle, riid)) {
|
||||
TRACE("(%p)->(IID_IHTMLStyle %p)\n", This, ppv);
|
||||
*ppv = &This->IHTMLStyle_iface;
|
||||
}else if(IsEqualGUID(&IID_IHTMLStyle2, riid)) {
|
||||
TRACE("(%p)->(IID_IHTMLStyle2 %p)\n", This, ppv);
|
||||
*ppv = &This->IHTMLStyle2_iface;
|
||||
}else if(IsEqualGUID(&IID_IHTMLStyle3, riid)) {
|
||||
TRACE("(%p)->(IID_IHTMLStyle3 %p)\n", This, ppv);
|
||||
*ppv = &This->IHTMLStyle3_iface;
|
||||
}else if(IsEqualGUID(&IID_IHTMLStyle4, riid)) {
|
||||
TRACE("(%p)->(IID_IHTMLStyle4 %p)\n", This, ppv);
|
||||
*ppv = &This->IHTMLStyle4_iface;
|
||||
}else if(IsEqualGUID(&IID_IHTMLStyle5, riid)) {
|
||||
TRACE("(%p)->(IID_IHTMLStyle5 %p)\n", This, ppv);
|
||||
*ppv = &This->IHTMLStyle5_iface;
|
||||
}else if(IsEqualGUID(&IID_IHTMLStyle6, riid)) {
|
||||
TRACE("(%p)->(IID_IHTMLStyle6 %p)\n", This, ppv);
|
||||
*ppv = &This->IHTMLStyle6_iface;
|
||||
}else if(dispex_query_interface(&This->dispex, riid, ppv)) {
|
||||
return *ppv ? S_OK : E_NOINTERFACE;
|
||||
}else {
|
||||
*ppv = NULL;
|
||||
WARN("unsupported iface %s\n", debugstr_mshtml_guid(riid));
|
||||
return E_NOINTERFACE;
|
||||
}
|
||||
|
||||
if(*ppv) {
|
||||
IUnknown_AddRef((IUnknown*)*ppv);
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
WARN("unsupported %s\n", debugstr_guid(riid));
|
||||
return E_NOINTERFACE;
|
||||
}
|
||||
|
||||
static ULONG WINAPI HTMLStyle_AddRef(IHTMLStyle *iface)
|
||||
{
|
||||
HTMLStyle *This = impl_from_IHTMLStyle(iface);
|
||||
|
|
|
@ -574,7 +574,17 @@ const char *debugstr_mshtml_guid(const GUID *iid)
|
|||
X(IID_IHTMLEventObj);
|
||||
X(IID_IHTMLFiltersCollection);
|
||||
X(IID_IHTMLImageElementFactory);
|
||||
X(IID_IHTMLLocation);
|
||||
X(IID_IHTMLOptionElementFactory);
|
||||
X(IID_IHTMLRect);
|
||||
X(IID_IHTMLScreen);
|
||||
X(IID_IHTMLStorage);
|
||||
X(IID_IHTMLStyle);
|
||||
X(IID_IHTMLStyle2);
|
||||
X(IID_IHTMLStyle3);
|
||||
X(IID_IHTMLStyle4);
|
||||
X(IID_IHTMLStyle5);
|
||||
X(IID_IHTMLStyle6);
|
||||
X(IID_IHtmlLoadOptions);
|
||||
X(IID_IInternetHostSecurityManager);
|
||||
X(IID_IMonikerProp);
|
||||
|
|
Loading…
Reference in New Issue