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

mshtml: Use debugmsg_mshtml_guid in a few more places.

This commit is contained in:
Jacek Caban 2014-05-09 13:08:48 +02:00 committed by Alexandre Julliard
parent 38483f1efe
commit 018af15b9d
6 changed files with 42 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
dlls/mshtml/conpoint.c
View File

@ -31,23 +31,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
static const char *debugstr_cp_guid(REFIID riid)
{
#define X(x) \
if(IsEqualGUID(riid, &x)) \
return #x
X(IID_IPropertyNotifySink);
X(DIID_HTMLDocumentEvents);
X(DIID_HTMLDocumentEvents2);
X(DIID_HTMLTableEvents);
X(DIID_HTMLTextContainerEvents);
#undef X
return debugstr_guid(riid);
}
typedef struct {
IEnumConnections IEnumConnections_iface;
@ -66,14 +49,14 @@ static HRESULT WINAPI EnumConnections_QueryInterface(IEnumConnections *iface, RE
{
EnumConnections *This = impl_from_IEnumConnections(iface);
TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv);
if(IsEqualGUID(riid, &IID_IUnknown)) {
TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv);
*ppv = &This->IEnumConnections_iface;
}else if(IsEqualGUID(riid, &IID_IEnumConnections)) {
TRACE("(%p)->(IID_IEnumConnections %p)\n", This, ppv);
*ppv = &This->IEnumConnections_iface;
}else {
WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv);
WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv);
*ppv = NULL;
return E_NOINTERFACE;
}
@ -172,23 +155,20 @@ static HRESULT WINAPI ConnectionPoint_QueryInterface(IConnectionPoint *iface,
{
ConnectionPoint *This = impl_from_IConnectionPoint(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->IConnectionPoint_iface;
}else if(IsEqualGUID(&IID_IConnectionPoint, riid)) {
TRACE("(%p)->(IID_IConnectionPoint %p)\n", This, ppv);
*ppv = &This->IConnectionPoint_iface;
}else {
*ppv = NULL;
WARN("Unsupported interface %s\n", debugstr_mshtml_guid(riid));
return E_NOINTERFACE;
}
if(*ppv) {
IUnknown_AddRef((IUnknown*)*ppv);
return S_OK;
}
WARN("Unsupported interface %s\n", debugstr_guid(riid));
return E_NOINTERFACE;
IUnknown_AddRef((IUnknown*)*ppv);
return S_OK;
}
static ULONG WINAPI ConnectionPoint_AddRef(IConnectionPoint *iface)
@ -425,7 +405,7 @@ static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPo
ConnectionPointContainer *This = impl_from_IConnectionPointContainer(iface);
ConnectionPoint *cp;
TRACE("(%p)->(%s %p)\n", This, debugstr_cp_guid(riid), ppCP);
TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppCP);
if(This->forward_container)
return IConnectionPointContainer_FindConnectionPoint(&This->forward_container->IConnectionPointContainer_iface,
@ -433,7 +413,7 @@ static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPo
cp = get_cp(This, riid, TRUE);
if(!cp) {
FIXME("unsupported riid %s\n", debugstr_cp_guid(riid));
FIXME("unsupported riid %s\n", debugstr_mshtml_guid(riid));
*ppCP = NULL;
return CONNECT_E_NOCONNECTION;
}

4
dlls/mshtml/dispex.c
View File

@ -144,7 +144,7 @@ static HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo)
hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti);
if(FAILED(hres)) {
ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres);
ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_mshtml_guid(tid_ids[tid]), hres);
return hres;
}
@ -631,7 +631,7 @@ static HRESULT typeinfo_invoke(DispatchEx *This, func_info_t *func, WORD flags,
hres = IUnknown_QueryInterface(This->outer, tid_ids[func->tid], (void**)&unk);
if(FAILED(hres)) {
ERR("Could not get iface %s: %08x\n", debugstr_guid(tid_ids[func->tid]), hres);
ERR("Could not get iface %s: %08x\n", debugstr_mshtml_guid(tid_ids[func->tid]), hres);
return E_FAIL;
}

2
dlls/mshtml/ifacewrap.c
View File

@ -54,7 +54,7 @@ static HRESULT WINAPI wrapper_QueryInterface(IUnknown *iface, REFIID riid, void
{
iface_wrapper_t *This = impl_from_IUnknown(iface);
TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv);
TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv);
return IUnknown_QueryInterface(This->ref_unk, riid, ppv);
}

15
dlls/mshtml/ipwindow.c
View File

@ -50,20 +50,18 @@ static HRESULT WINAPI InPlaceFrame_QueryInterface(IOleInPlaceFrame *iface,
{
InPlaceFrame *This = impl_from_IOleInPlaceFrame(iface);
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->IOleInPlaceFrame_iface;
}else if(IsEqualGUID(&IID_IOleWindow, riid)) {
TRACE("(%p)->(IID_IOleWindow %p)\n", This, ppv);
*ppv = &This->IOleInPlaceFrame_iface;
}else if(IsEqualGUID(&IID_IOleInPlaceUIWindow, riid)) {
TRACE("(%p)->(IID_IOleInPlaceUIWindow %p)\n", This, ppv);
*ppv = &This->IOleInPlaceFrame_iface;
}else if(IsEqualGUID(&IID_IOleInPlaceFrame, riid)) {
TRACE("(%p)->(IID_IOleInPlaceFrame %p)\n", This, ppv);
*ppv = &This->IOleInPlaceFrame_iface;
}else {
WARN("Unsopported interface %s\n", debugstr_guid(riid));
WARN("Unsopported interface %s\n", debugstr_mshtml_guid(riid));
*ppv = NULL;
return E_NOINTERFACE;
}
@ -234,17 +232,16 @@ static HRESULT WINAPI InPlaceUIWindow_QueryInterface(IOleInPlaceUIWindow *iface,
{
InPlaceUIWindow *This = impl_from_IOleInPlaceUIWindow(iface);
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->IOleInPlaceUIWindow_iface;
}else if(IsEqualGUID(&IID_IOleWindow, riid)) {
TRACE("(%p)->(IID_IOleWindow %p)\n", This, ppv);
*ppv = &This->IOleInPlaceUIWindow_iface;
}else if(IsEqualGUID(&IID_IOleInPlaceUIWindow, riid)) {
TRACE("(%p)->(IID_IOleInPlaceUIWindow %p)\n", This, ppv);
*ppv = &This->IOleInPlaceUIWindow_iface;
}else {
WARN("Unsopported interface %s\n", debugstr_guid(riid));
WARN("Unsopported interface %s\n", debugstr_mshtml_guid(riid));
*ppv = NULL;
return E_NOINTERFACE;
}

23
dlls/mshtml/loadopts.c
View File

@ -61,26 +61,22 @@ static HRESULT WINAPI HtmlLoadOptions_QueryInterface(IHtmlLoadOptions *iface,
{
HTMLLoadOptions *This = impl_from_IHtmlLoadOptions(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->IHtmlLoadOptions_iface;
}else if(IsEqualGUID(&IID_IOptionArray, riid)) {
TRACE("(%p)->(IID_IOptionArray %p)\n", This, ppv);
*ppv = &This->IHtmlLoadOptions_iface;
}else if(IsEqualGUID(&IID_IHtmlLoadOptions, riid)) {
TRACE("(%p)->(IID_IHtmlLoadOptions %p)\n", This, ppv);
*ppv = &This->IHtmlLoadOptions_iface;
}else {
*ppv = NULL;
WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv);
return E_NOINTERFACE;
}
if(*ppv) {
IHtmlLoadOptions_AddRef(&This->IHtmlLoadOptions_iface);
return S_OK;
}
WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv);
return E_NOINTERFACE;
IUnknown_AddRef((IUnknown*)*ppv);
return S_OK;
}
static ULONG WINAPI HtmlLoadOptions_AddRef(IHtmlLoadOptions *iface)
@ -196,9 +192,11 @@ HRESULT HTMLLoadOptions_Create(IUnknown *pUnkOuter, REFIID riid, void** ppv)
HTMLLoadOptions *ret;
HRESULT hres;
TRACE("(%p %s %p)\n", pUnkOuter, debugstr_guid(riid), ppv);
TRACE("(%p %s %p)\n", pUnkOuter, debugstr_mshtml_guid(riid), ppv);
ret = heap_alloc(sizeof(HTMLLoadOptions));
if(!ret)
return E_OUTOFMEMORY;
ret->IHtmlLoadOptions_iface.lpVtbl = &HtmlLoadOptionsVtbl;
ret->ref = 1;
@ -206,6 +204,5 @@ HRESULT HTMLLoadOptions_Create(IUnknown *pUnkOuter, REFIID riid, void** ppv)
hres = IHtmlLoadOptions_QueryInterface(&ret->IHtmlLoadOptions_iface, riid, ppv);
IHtmlLoadOptions_Release(&ret->IHtmlLoadOptions_iface);
return hres;
}

11
dlls/mshtml/main.c
View File

@ -536,10 +536,16 @@ const char *debugstr_mshtml_guid(const GUID *iid)
{
#define X(x) if(IsEqualGUID(iid, &x)) return #x
X(DIID_DispHTMLDocument);
X(DIID_HTMLDocumentEvents);
X(DIID_HTMLDocumentEvents2);
X(DIID_HTMLTableEvents);
X(DIID_HTMLTextContainerEvents);
X(IID_IConnectionPoint);
X(IID_IConnectionPointContainer);
X(IID_ICustomDoc);
X(IID_IDispatch);
X(IID_IDispatchEx);
X(IID_IEnumConnections);
X(IID_IEnumVARIANT);
X(IID_IHlinkTarget);
X(IID_IHTMLAttributeCollection);
@ -569,6 +575,7 @@ const char *debugstr_mshtml_guid(const GUID *iid)
X(IID_IHTMLFiltersCollection);
X(IID_IHTMLImageElementFactory);
X(IID_IHTMLRect);
X(IID_IHtmlLoadOptions);
X(IID_IInternetHostSecurityManager);
X(IID_IMonikerProp);
X(IID_IObjectSafety);
@ -579,15 +586,19 @@ const char *debugstr_mshtml_guid(const GUID *iid)
X(IID_IOleDocument);
X(IID_IOleDocumentView);
X(IID_IOleInPlaceActiveObject);
X(IID_IOleInPlaceFrame);
X(IID_IOleInPlaceObject);
X(IID_IOleInPlaceObjectWindowless);
X(IID_IOleInPlaceUIWindow);
X(IID_IOleObject);
X(IID_IOleWindow);
X(IID_IOptionArray);
X(IID_IPersist);
X(IID_IPersistFile);
X(IID_IPersistHistory);
X(IID_IPersistMoniker);
X(IID_IPersistStreamInit);
X(IID_IPropertyNotifySink);
X(IID_IProvideClassInfo);
X(IID_IServiceProvider);
X(IID_ISupportErrorInfo);