From 21f5ef2808f77e381c2f3ec8bc6a481c1a872b98 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Wed, 28 Mar 2012 14:27:20 +0200 Subject: [PATCH] mshtml: Improved more VARIANT debug traces. --- dlls/mshtml/editor.c | 10 +++++----- dlls/mshtml/htmlelem3.c | 2 +- dlls/mshtml/htmlevent.c | 4 ++-- dlls/mshtml/htmlform.c | 2 +- dlls/mshtml/htmlinput.c | 4 ++-- dlls/mshtml/htmlnode.c | 8 +++----- dlls/mshtml/htmloption.c | 8 ++++---- dlls/mshtml/htmlscript.c | 2 +- dlls/mshtml/htmlstylesheet.c | 4 ++-- dlls/mshtml/olecmd.c | 8 ++++---- dlls/mshtml/oleobj.c | 8 ++++---- dlls/mshtml/persist.c | 4 ++-- 12 files changed, 31 insertions(+), 33 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 129040a6d1..2ffefd26ea 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -541,7 +541,7 @@ static HRESULT exec_fontname(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, char *stra; if(V_VT(in) != VT_BSTR) { - FIXME("Unsupported vt=%d\n", V_VT(out)); + FIXME("Unsupported fontname %s\n", debugstr_variant(out)); return E_INVALIDARG; } @@ -602,7 +602,7 @@ static HRESULT exec_forecolor(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, nsICommandParams_Release(nsparam); }else { - FIXME("unsupported in vt=%d\n", V_VT(in)); + FIXME("unsupported forecolor %s\n", debugstr_variant(in)); } update_doc(This, UPDATE_UI); @@ -641,7 +641,7 @@ static HRESULT exec_fontsize(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, set_font_size(This, V_BSTR(in)); break; default: - FIXME("unsupported vt %d\n", V_VT(in)); + FIXME("unsupported fontsize %s\n", debugstr_variant(in)); } update_doc(This, UPDATE_UI); @@ -839,7 +839,7 @@ static HRESULT exec_composesettings(HTMLDocument *This, DWORD cmdexecopt, VARIAN WCHAR *ptr; if(out || !in || V_VT(in) != VT_BSTR) { - WARN("invalid arg\n"); + WARN("invalid arg %s\n", debugstr_variant(in)); return E_INVALIDARG; } @@ -948,7 +948,7 @@ static HRESULT exec_setdirty(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, if(V_VT(in) == VT_BOOL) set_dirty(This, V_BOOL(in)); else - FIXME("unsupported vt=%d\n", V_VT(in)); + FIXME("unsupported arg %s\n", debugstr_variant(in)); return S_OK; } diff --git a/dlls/mshtml/htmlelem3.c b/dlls/mshtml/htmlelem3.c index 392b4e47c1..805e8aa162 100644 --- a/dlls/mshtml/htmlelem3.c +++ b/dlls/mshtml/htmlelem3.c @@ -249,7 +249,7 @@ static HRESULT WINAPI HTMLElement3_get_disabled(IHTMLElement3 *iface, VARIANT_BO return hres; if(V_VT(var) != VT_BOOL) { - FIXME("vt %d\n", V_VT(var)); + FIXME("value is %s\n", debugstr_variant(var)); return E_NOTIMPL; } diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 290ca71557..cf2d808dac 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -439,7 +439,7 @@ static HRESULT WINAPI HTMLEventObj_put_returnValue(IHTMLEventObj *iface, VARIANT TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); if(V_VT(&v) != VT_BOOL) { - FIXME("unsupported vt %d\n", V_VT(&v)); + FIXME("unsupported value %s\n", debugstr_variant(&v)); return DISP_E_BADVARTYPE; } @@ -1242,7 +1242,7 @@ HRESULT set_event_handler(event_target_t **event_target, nsIDOMNode *nsnode, HTM return set_event_handler_disp(event_target, nsnode, doc, eid, V_DISPATCH(var)); default: - FIXME("not supported vt=%d\n", V_VT(var)); + FIXME("not handler %s\n", debugstr_variant(var)); /* fall through */ case VT_EMPTY: return E_NOTIMPL; diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 8905208153..5041345cea 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -347,7 +347,7 @@ static HRESULT WINAPI HTMLFormElement_get_onsubmit(IHTMLFormElement *iface, VARI static HRESULT WINAPI HTMLFormElement_put_onreset(IHTMLFormElement *iface, VARIANT v) { HTMLFormElement *This = impl_from_IHTMLFormElement(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 41fefb3cbb..6abdd42885 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -910,14 +910,14 @@ static HRESULT WINAPI HTMLInputTextElement_get_name(IHTMLInputTextElement *iface static HRESULT WINAPI HTMLInputTextElement_put_status(IHTMLInputTextElement *iface, VARIANT v) { HTMLInputElement *This = impl_from_IHTMLInputTextElement(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLInputTextElement_get_status(IHTMLInputTextElement *iface, VARIANT *p) { HTMLInputElement *This = impl_from_IHTMLInputTextElement(iface); - TRACE("(%p)->(v)\n", This); + TRACE("(%p)->(%p)\n", This, p); return E_NOTIMPL; } diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index a2786e65fb..ed20c3ffce 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -524,7 +524,7 @@ static HRESULT WINAPI HTMLDOMNode_insertBefore(IHTMLDOMNode *iface, IHTMLDOMNode break; } default: - FIXME("unimplemented vt %d\n", V_VT(&refChild)); + FIXME("unimplemented refChild %s\n", debugstr_variant(&refChild)); return E_NOTIMPL; } @@ -727,14 +727,12 @@ static HRESULT WINAPI HTMLDOMNode_put_nodeValue(IHTMLDOMNode *iface, VARIANT v) { HTMLDOMNode *This = impl_from_IHTMLDOMNode(iface); - TRACE("(%p)->()\n", This); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); switch(V_VT(&v)) { case VT_BSTR: { nsAString val_str; - TRACE("bstr %s\n", debugstr_w(V_BSTR(&v))); - nsAString_InitDepend(&val_str, V_BSTR(&v)); nsIDOMNode_SetNodeValue(This->nsnode, &val_str); nsAString_Finish(&val_str); @@ -743,7 +741,7 @@ static HRESULT WINAPI HTMLDOMNode_put_nodeValue(IHTMLDOMNode *iface, VARIANT v) } default: - FIXME("unsupported vt %d\n", V_VT(&v)); + FIXME("unsupported value %s\n", debugstr_variant(&v)); } return E_NOTIMPL; diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index 0fb685bf54..5a250d7b6c 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -510,17 +510,17 @@ static HRESULT WINAPI HTMLOptionElementFactory_create(IHTMLOptionElementFactory if(V_VT(&text) == VT_BSTR) IHTMLOptionElement_put_text(*optelem, V_BSTR(&text)); else if(V_VT(&text) != VT_EMPTY) - FIXME("Unsupported text vt=%d\n", V_VT(&text)); + FIXME("Unsupported text %s\n", debugstr_variant(&text)); if(V_VT(&value) == VT_BSTR) IHTMLOptionElement_put_value(*optelem, V_BSTR(&value)); else if(V_VT(&value) != VT_EMPTY) - FIXME("Unsupported value vt=%d\n", V_VT(&value)); + FIXME("Unsupported value %s\n", debugstr_variant(&value)); if(V_VT(&defaultselected) != VT_EMPTY) - FIXME("Unsupported defaultselected vt=%d\n", V_VT(&defaultselected)); + FIXME("Unsupported defaultselected %s\n", debugstr_variant(&defaultselected)); if(V_VT(&selected) != VT_EMPTY) - FIXME("Unsupported selected vt=%d\n", V_VT(&selected)); + FIXME("Unsupported selected %s\n", debugstr_variant(&selected)); return S_OK; } diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index e98cbb0187..cb5cbedc44 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -209,7 +209,7 @@ static HRESULT WINAPI HTMLScriptElement_get_readyState(IHTMLScriptElement *iface static HRESULT WINAPI HTMLScriptElement_put_onerror(IHTMLScriptElement *iface, VARIANT v) { HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); - FIXME("(%p)->(v(%d))\n", This, V_VT(&v)); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 3fa6c278d6..3b855e5a50 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -318,7 +318,7 @@ static HRESULT WINAPI HTMLStyleSheetsCollection_item(IHTMLStyleSheetsCollection { HTMLStyleSheetsCollection *This = impl_from_IHTMLStyleSheetsCollection(iface); - TRACE("(%p)->(%p %p)\n", This, pvarIndex, pvarResult); + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(pvarIndex), pvarResult); switch(V_VT(pvarIndex)) { case VT_I4: { @@ -345,7 +345,7 @@ static HRESULT WINAPI HTMLStyleSheetsCollection_item(IHTMLStyleSheetsCollection return E_NOTIMPL; default: - WARN("Invalid vt=%d\n", V_VT(pvarIndex)); + WARN("Invalid index %s\n", debugstr_variant(pvarIndex)); } return E_INVALIDARG; diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index b0e40e0252..893284325e 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -221,7 +221,7 @@ static HRESULT exec_print(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, nsIPrintSettings *settings; nsresult nsres; - TRACE("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut); + TRACE("(%p)->(%d %s %p)\n", This, nCmdexecopt, debugstr_variant(pvaIn), pvaOut); if(pvaOut) FIXME("unsupported pvaOut\n"); @@ -263,7 +263,7 @@ static HRESULT exec_print(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, case VT_NULL: break; default: - WARN("V_VT(opts) = %d\n", V_VT(opts)); + WARN("opts = %s\n", debugstr_variant(opts)); } } @@ -276,7 +276,7 @@ static HRESULT exec_print(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, case VT_NULL: break; default: - WARN("V_VT(opts) = %d\n", V_VT(opts+1)); + WARN("opts[1] = %s\n", debugstr_variant(opts+1)); } } @@ -287,7 +287,7 @@ static HRESULT exec_print(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, break; } default: - FIXME("unsupported vt %x\n", V_VT(pvaIn)); + FIXME("unsupported arg %s\n", debugstr_variant(pvaIn)); } } diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 261eda3b0c..7db44400a0 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -351,7 +351,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite hres = get_client_disp_property(This->doc_obj->client, DISPID_AMBIENT_SILENT, &silent); if(SUCCEEDED(hres)) { if(V_VT(&silent) != VT_BOOL) - WARN("V_VT(silent) = %d\n", V_VT(&silent)); + WARN("silent = %s\n", debugstr_variant(&silent)); else if(V_BOOL(&silent)) FIXME("silent == true\n"); } @@ -801,7 +801,7 @@ static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DIS This->doc_obj->usermode = EDITMODE; } }else { - FIXME("V_VT(res)=%d\n", V_VT(&res)); + FIXME("usermode=%s\n", debugstr_variant(&res)); } return S_OK; case DISPID_AMBIENT_DLCONTROL: @@ -820,7 +820,7 @@ static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DIS hres = E_FAIL; } }else { - FIXME("V_VT(res)=%d\n", V_VT(&res)); + FIXME("offlineconnected=%s\n", debugstr_variant(&res)); } return S_OK; case DISPID_AMBIENT_SILENT: @@ -836,7 +836,7 @@ static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DIS hres = E_FAIL; } }else { - FIXME("V_VT(res)=%d\n", V_VT(&res)); + FIXME("silent=%s\n", debugstr_variant(&res)); } return S_OK; case DISPID_AMBIENT_USERAGENT: diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 667a2f60de..4c04ff2ba6 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -289,7 +289,7 @@ void prepare_for_binding(HTMLDocument *This, IMoniker *mon, BOOL navigated_bindi hres = get_client_disp_property(This->doc_obj->client, DISPID_AMBIENT_SILENT, &silent); if(SUCCEEDED(hres)) { if(V_VT(&silent) != VT_BOOL) - WARN("V_VT(silent) = %d\n", V_VT(&silent)); + WARN("silent = %s\n", debugstr_variant(&silent)); else if(V_BOOL(&silent)) FIXME("silent == true\n"); } @@ -298,7 +298,7 @@ void prepare_for_binding(HTMLDocument *This, IMoniker *mon, BOOL navigated_bindi DISPID_AMBIENT_OFFLINEIFNOTCONNECTED, &offline); if(SUCCEEDED(hres)) { if(V_VT(&offline) != VT_BOOL) - WARN("V_VT(offline) = %d\n", V_VT(&offline)); + WARN("offline = %s\n", debugstr_variant(&offline)); else if(V_BOOL(&offline)) FIXME("offline == true\n"); }