msxml3: Use helper to consistently dump variant parameters.
diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c
index b7abe84..9705cb8 100644
--- a/dlls/msxml3/attribute.c
+++ b/dlls/msxml3/attribute.c
@@ -205,7 +205,7 @@
{
domattr *This = impl_from_IXMLDOMAttribute( iface );
- TRACE("(%p)->(v%d)\n", This, V_VT(&value));
+ TRACE("(%p)->(%s)\n", This, debugstr_variant(&value));
return node_put_value_escaped(&This->node, &value);
}
@@ -306,7 +306,7 @@
{
domattr *This = impl_from_IXMLDOMAttribute( iface );
- FIXME("(%p)->(%p x%d %p) needs test\n", This, newNode, V_VT(&refChild), outOldNode);
+ FIXME("(%p)->(%p %s %p) needs test\n", This, newNode, debugstr_variant(&refChild), outOldNode);
return node_insert_before(&This->node, newNode, &refChild, outOldNode);
}
@@ -563,7 +563,7 @@
{
domattr *This = impl_from_IXMLDOMAttribute( iface );
- TRACE("(%p)->(v%d)\n", This, V_VT(&value));
+ TRACE("(%p)->(%s)\n", This, debugstr_variant(&value));
return node_put_value(&This->node, &value);
}
diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c
index 6369638..eb10d6f 100644
--- a/dlls/msxml3/cdata.c
+++ b/dlls/msxml3/cdata.c
@@ -216,7 +216,7 @@
{
domcdata *This = impl_from_IXMLDOMCDATASection( iface );
- TRACE("(%p)->(v%d)\n", This, V_VT(&value));
+ TRACE("(%p)->(%s)\n", This, debugstr_variant(&value));
return node_put_value(&This->node, &value);
}
@@ -317,7 +317,7 @@
{
domcdata *This = impl_from_IXMLDOMCDATASection( iface );
- FIXME("(%p)->(%p x%d %p) needs test\n", This, newNode, V_VT(&refChild), outOldNode);
+ FIXME("(%p)->(%p %s %p) needs test\n", This, newNode, debugstr_variant(&refChild), outOldNode);
return node_insert_before(&This->node, newNode, &refChild, outOldNode);
}
diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c
index ed7b53e..3b24c14 100644
--- a/dlls/msxml3/comment.c
+++ b/dlls/msxml3/comment.c
@@ -209,7 +209,7 @@
{
domcomment *This = impl_from_IXMLDOMComment( iface );
- TRACE("(%p)->(v%d)\n", This, V_VT(&value));
+ TRACE("(%p)->(%s)\n", This, debugstr_variant(&value));
return node_put_value(&This->node, &value);
}
@@ -310,7 +310,7 @@
{
domcomment *This = impl_from_IXMLDOMComment( iface );
- FIXME("(%p)->(%p x%d %p) needs test\n", This, newNode, V_VT(&refChild), outOldNode);
+ FIXME("(%p)->(%p %s %p) needs test\n", This, newNode, debugstr_variant(&refChild), outOldNode);
return node_insert_before(&This->node, newNode, &refChild, outOldNode);
}
diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c
index dad702f..5abf8b3 100644
--- a/dlls/msxml3/docfrag.c
+++ b/dlls/msxml3/docfrag.c
@@ -212,7 +212,7 @@
VARIANT value)
{
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
- TRACE("(%p)->(v%d)\n", This, V_VT(&value));
+ TRACE("(%p)->(%s)\n", This, debugstr_variant(&value));
return E_FAIL;
}
@@ -312,7 +312,7 @@
{
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
- TRACE("(%p)->(%p x%d %p)\n", This, newNode, V_VT(&refChild), outOldNode);
+ TRACE("(%p)->(%p %s %p)\n", This, newNode, debugstr_variant(&refChild), outOldNode);
/* TODO: test */
return node_insert_before(&This->node, newNode, &refChild, outOldNode);
diff --git a/dlls/msxml3/doctype.c b/dlls/msxml3/doctype.c
index b695731..b7c4151 100644
--- a/dlls/msxml3/doctype.c
+++ b/dlls/msxml3/doctype.c
@@ -207,7 +207,7 @@
VARIANT value)
{
domdoctype *This = impl_from_IXMLDOMDocumentType( iface );
- FIXME("(%p): stub\n", This);
+ FIXME("(%p)->(%s): stub\n", This, debugstr_variant(&value));
return E_NOTIMPL;
}
@@ -293,7 +293,7 @@
{
domdoctype *This = impl_from_IXMLDOMDocumentType( iface );
- FIXME("(%p)->(%p x%d %p): stub\n", This, newNode, V_VT(&refChild), outOldNode);
+ FIXME("(%p)->(%p %s %p): stub\n", This, newNode, debugstr_variant(&refChild), outOldNode);
return E_NOTIMPL;
}
@@ -415,7 +415,7 @@
VARIANT value)
{
domdoctype *This = impl_from_IXMLDOMDocumentType( iface );
- FIXME("(%p): stub\n", This);
+ FIXME("(%p)->(%s): stub\n", This, debugstr_variant(&value));
return E_NOTIMPL;
}
@@ -514,7 +514,7 @@
IXMLDOMNode* domNode, VARIANT var1)
{
domdoctype *This = impl_from_IXMLDOMDocumentType( iface );
- FIXME("(%p)->(%p): stub\n", This, domNode);
+ FIXME("(%p)->(%p %s): stub\n", This, domNode, debugstr_variant(&var1));
return E_NOTIMPL;
}
diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c
index 5392c5d..c4c130d 100644
--- a/dlls/msxml3/element.c
+++ b/dlls/msxml3/element.c
@@ -224,7 +224,7 @@
VARIANT value)
{
domelem *This = impl_from_IXMLDOMElement( iface );
- TRACE("(%p)->(v%d)\n", This, V_VT(&value));
+ TRACE("(%p)->(%s)\n", This, debugstr_variant(&value));
return E_FAIL;
}
@@ -325,7 +325,7 @@
{
domelem *This = impl_from_IXMLDOMElement( iface );
- TRACE("(%p)->(%p x%d %p)\n", This, newNode, V_VT(&refChild), outOldNode);
+ TRACE("(%p)->(%p %s %p)\n", This, newNode, debugstr_variant(&refChild), outOldNode);
return node_insert_before(&This->node, newNode, &refChild, outOldNode);
}
@@ -692,7 +692,7 @@
VARIANT type;
HRESULT hr;
- TRACE("(%p)\n", This);
+ TRACE("(%p)->(%s)\n", This, debugstr_variant(&value));
/* for untyped node coerce to BSTR and set */
if (IXMLDOMElement_get_dataType(iface, &type) == S_FALSE)
@@ -1071,7 +1071,7 @@
HRESULT hr;
VARIANT var;
- TRACE("(%p)->(%s var)\n", This, debugstr_w(name));
+ TRACE("(%p)->(%s %s)\n", This, debugstr_w(name), debugstr_variant(&value));
element = get_element( This );
if ( !element )
diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c
index de1beb2..9af5aa9 100644
--- a/dlls/msxml3/entityref.c
+++ b/dlls/msxml3/entityref.c
@@ -208,7 +208,7 @@
VARIANT value)
{
entityref *This = impl_from_IXMLDOMEntityReference( iface );
- TRACE("(%p)->(v%d)\n", This, V_VT(&value));
+ TRACE("(%p)->(%s)\n", This, debugstr_variant(&value));
return E_FAIL;
}
@@ -308,7 +308,7 @@
{
entityref *This = impl_from_IXMLDOMEntityReference( iface );
- FIXME("(%p)->(%p x%d %p) needs test\n", This, newNode, V_VT(&refChild), outOldNode);
+ FIXME("(%p)->(%p %s %p) needs test\n", This, newNode, debugstr_variant(&refChild), outOldNode);
return node_insert_before(&This->node, newNode, &refChild, outOldNode);
}
diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c
index 12eaa08..b935a8f 100644
--- a/dlls/msxml3/httprequest.c
+++ b/dlls/msxml3/httprequest.c
@@ -650,7 +650,8 @@
HRESULT hr;
VARIANT str;
- TRACE("(%p)->(%s %s)\n", This, debugstr_w(method), debugstr_w(url));
+ TRACE("(%p)->(%s %s %s)\n", This, debugstr_w(method), debugstr_w(url),
+ debugstr_variant(&async));
if (!method || !url) return E_INVALIDARG;
@@ -766,7 +767,7 @@
BindStatusCallback *bsc = NULL;
HRESULT hr;
- TRACE("(%p)\n", This);
+ TRACE("(%p)->(%s)\n", This, debugstr_variant(&body));
if (This->state != READYSTATE_LOADING) return E_FAIL;
diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c
index c9e897b..37dc130 100644
--- a/dlls/msxml3/main.c
+++ b/dlls/msxml3/main.c
@@ -265,6 +265,8 @@
return wine_dbg_sprintf("{VT_DISPATCH: %p}", V_DISPATCH(v));
case VT_BOOL:
return wine_dbg_sprintf("{VT_BOOL: %x}", V_BOOL(v));
+ case VT_UNKNOWN:
+ return wine_dbg_sprintf("{VT_UNKNOWN: %p}", V_UNKNOWN(v));
case VT_UINT:
return wine_dbg_sprintf("{VT_UINT: %u}", V_UINT(v));
default:
diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c
index edec320..5a1bdba 100644
--- a/dlls/msxml3/pi.c
+++ b/dlls/msxml3/pi.c
@@ -208,7 +208,7 @@
BSTR sTarget;
HRESULT hr;
- TRACE("(%p)->(v%d)\n", This, V_VT(&value));
+ TRACE("(%p)->(%s)\n", This, debugstr_variant(&value));
/* Cannot set data to a PI node whose target is 'xml' */
hr = dom_pi_get_nodeName(iface, &sTarget);
@@ -324,7 +324,7 @@
{
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
- FIXME("(%p)->(%p x%d %p) needs test\n", This, newNode, V_VT(&refChild), outOldNode);
+ FIXME("(%p)->(%p %s %p) needs test\n", This, newNode, debugstr_variant(&refChild), outOldNode);
return node_insert_before(&This->node, newNode, &refChild, outOldNode);
}
diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c
index 0d98f6a..b928bbb 100644
--- a/dlls/msxml3/saxreader.c
+++ b/dlls/msxml3/saxreader.c
@@ -1992,7 +1992,7 @@
{
HRESULT hr;
- TRACE("(%p)\n", This);
+ TRACE("(%p)->(%s)\n", This, debugstr_variant(&varInput));
hr = S_OK;
switch(V_VT(&varInput))
@@ -2155,7 +2155,7 @@
'x','m','l','d','e','c','l','-','v','e','r','s','i','o','n',0
};
- TRACE("(%p)->(%s)\n", This, debugstr_w(pProp));
+ TRACE("(%p)->(%s %s)\n", This, debugstr_w(pProp), debugstr_variant(&value));
if(!memcmp(pProp, wszDeclarationHandler, sizeof(wszDeclarationHandler)))
{
diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c
index f195804..2c20061 100644
--- a/dlls/msxml3/schema.c
+++ b/dlls/msxml3/schema.c
@@ -1057,7 +1057,7 @@
{
schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface);
xmlChar* name = uri ? xmlChar_from_wchar(uri) : xmlChar_from_wchar(emptyW);
- TRACE("(%p)->(%s, var(vt %x))\n", This, debugstr_w(uri), V_VT(&var));
+ TRACE("(%p)->(%s %s)\n", This, debugstr_w(uri), debugstr_variant(&var));
switch (V_VT(&var))
{
diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c
index df29fc2..cecd67a 100644
--- a/dlls/msxml3/stylesheet.c
+++ b/dlls/msxml3/stylesheet.c
@@ -570,7 +570,8 @@
{
xslprocessor *This = impl_from_IXSLProcessor( iface );
- FIXME("(%p)->(%s %s): stub\n", This, wine_dbgstr_w(p), wine_dbgstr_w(uri));
+ FIXME("(%p)->(%s %s %s): stub\n", This, wine_dbgstr_w(p), debugstr_variant(&var),
+ wine_dbgstr_w(uri));
return E_NOTIMPL;
}
diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c
index e85e50c..55fd235 100644
--- a/dlls/msxml3/text.c
+++ b/dlls/msxml3/text.c
@@ -222,7 +222,7 @@
{
domtext *This = impl_from_IXMLDOMText( iface );
- TRACE("(%p)->(v%d)\n", This, V_VT(&value));
+ TRACE("(%p)->(%s)\n", This, debugstr_variant(&value));
return node_put_value(&This->node, &value);
}
@@ -323,7 +323,7 @@
{
domtext *This = impl_from_IXMLDOMText( iface );
- FIXME("(%p)->(%p x%d %p) needs test\n", This, newNode, V_VT(&refChild), outOldNode);
+ FIXME("(%p)->(%p %s %p) needs test\n", This, newNode, debugstr_variant(&refChild), outOldNode);
return node_insert_before(&This->node, newNode, &refChild, outOldNode);
}
@@ -462,19 +462,19 @@
static HRESULT WINAPI domtext_put_nodeTypedValue(
IXMLDOMText *iface,
- VARIANT var1)
+ VARIANT value)
{
domtext *This = impl_from_IXMLDOMText( iface );
IXMLDOMNode* parent = NULL;
HRESULT hr;
- TRACE("(%p)->(VARIANT)\n", This);
+ TRACE("(%p)->(%s)\n", This, debugstr_variant(&value));
hr = domtext_get_parentNode(iface, &parent);
if (hr == S_OK)
{
- hr = IXMLDOMNode_put_nodeTypedValue(parent, var1);
+ hr = IXMLDOMNode_put_nodeTypedValue(parent, value);
IXMLDOMNode_Release(parent);
}
else
diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c
index 9165346..dc24d15 100644
--- a/dlls/msxml3/xmldoc.c
+++ b/dlls/msxml3/xmldoc.c
@@ -503,7 +503,8 @@
xmlNodePtr node;
static const xmlChar empty[] = "\0";
- TRACE("(%p, %p)\n", iface, ppElem);
+ TRACE("(%p)->(%s %s %p)\n", iface, debugstr_variant(&vType),
+ debugstr_variant(&var1), ppElem);
if (!ppElem)
return E_INVALIDARG;
diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c
index a15b311..606bab3 100644
--- a/dlls/msxml3/xmlelem.c
+++ b/dlls/msxml3/xmlelem.c
@@ -60,7 +60,7 @@
{
xmlelem *This = impl_from_IXMLElement(iface);
- TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject);
+ TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject);
if (IsEqualGUID(riid, &IID_IUnknown) ||
IsEqualGUID(riid, &IID_IXMLElement))
@@ -177,7 +177,7 @@
{
xmlelem *This = impl_from_IXMLElement(iface);
- TRACE("(%p, %p)\n", iface, p);
+ TRACE("(%p)->(%p)\n", This, p);
if (!p)
return E_INVALIDARG;
@@ -192,7 +192,9 @@
static HRESULT WINAPI xmlelem_put_tagName(IXMLElement *iface, BSTR p)
{
- FIXME("(%p, %p): stub\n", iface, p);
+ xmlelem *This = impl_from_IXMLElement(iface);
+
+ FIXME("(%p)->(%s): stub\n", This, debugstr_w(p));
if (!p)
return E_INVALIDARG;
@@ -204,7 +206,7 @@
{
xmlelem *This = impl_from_IXMLElement(iface);
- TRACE("(%p, %p)\n", iface, parent);
+ TRACE("(%p)->(%p)\n", This, parent);
if (!parent)
return E_INVALIDARG;
@@ -224,7 +226,7 @@
xmlChar *name, *value;
xmlAttrPtr attr;
- TRACE("(%p, %s)\n", iface, debugstr_w(strPropertyName));
+ TRACE("(%p)->(%s %s)\n", This, debugstr_w(strPropertyName), debugstr_variant(&PropertyValue));
if (!strPropertyName || V_VT(&PropertyValue) != VT_BSTR)
return E_INVALIDARG;
@@ -245,7 +247,7 @@
xmlelem *This = impl_from_IXMLElement(iface);
xmlChar *val = NULL;
- TRACE("(%p, %s, %p)\n", iface, debugstr_w(name), value);
+ TRACE("(%p)->(%s, %p)\n", This, debugstr_w(name), value);
if (!value)
return E_INVALIDARG;
@@ -308,7 +310,7 @@
int res;
HRESULT hr = S_FALSE;
- TRACE("(%p, %s)\n", iface, debugstr_w(strPropertyName));
+ TRACE("(%p)->(%s)\n", This, debugstr_w(strPropertyName));
if (!strPropertyName)
return E_INVALIDARG;
@@ -332,7 +334,7 @@
{
xmlelem *This = impl_from_IXMLElement(iface);
- TRACE("(%p, %p)\n", iface, p);
+ TRACE("(%p)->(%p)\n", This, p);
if (!p)
return E_INVALIDARG;
@@ -367,7 +369,7 @@
{
xmlelem *This = impl_from_IXMLElement(iface);
- TRACE("(%p, %p)\n", This, p);
+ TRACE("(%p)->(%p)\n", This, p);
if (!p)
return E_INVALIDARG;
@@ -382,7 +384,7 @@
xmlelem *This = impl_from_IXMLElement(iface);
xmlChar *content;
- TRACE("(%p, %p)\n", iface, p);
+ TRACE("(%p)->(%p)\n", This, p);
if (!p)
return E_INVALIDARG;
@@ -400,7 +402,7 @@
xmlelem *This = impl_from_IXMLElement(iface);
xmlChar *content;
- TRACE("(%p, %s)\n", iface, debugstr_w(p));
+ TRACE("(%p)->(%s)\n", This, debugstr_w(p));
/* FIXME: test which types can be used */
if (This->node->type == XML_ELEMENT_NODE)
@@ -421,7 +423,7 @@
xmlelem *childElem = impl_from_IXMLElement(pChildElem);
xmlNodePtr child;
- TRACE("(%p, %p, %d, %d)\n", iface, pChildElem, lIndex, lreserved);
+ TRACE("(%p)->(%p %d %d)\n", This, pChildElem, lIndex, lreserved);
if (lIndex == 0)
child = xmlAddChild(This->node, childElem->node);
@@ -439,7 +441,7 @@
xmlelem *This = impl_from_IXMLElement(iface);
xmlelem *childElem = impl_from_IXMLElement(pChildElem);
- TRACE("(%p, %p)\n", This, childElem);
+ TRACE("(%p)->(%p)\n", This, childElem);
if (!pChildElem)
return E_INVALIDARG;
@@ -546,7 +548,7 @@
{
xmlelem_collection *This = impl_from_IXMLElementCollection(iface);
- TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject);
+ TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject);
if (IsEqualGUID(riid, &IID_IUnknown) ||
IsEqualGUID(riid, &IID_IXMLElementCollection))
@@ -571,7 +573,7 @@
static ULONG WINAPI xmlelem_collection_AddRef(IXMLElementCollection *iface)
{
xmlelem_collection *This = impl_from_IXMLElementCollection(iface);
- TRACE("%p\n", This);
+ TRACE("(%p)\n", This);
return InterlockedIncrement(&This->ref);
}
@@ -580,7 +582,7 @@
xmlelem_collection *This = impl_from_IXMLElementCollection(iface);
LONG ref;
- TRACE("%p\n", This);
+ TRACE("(%p)\n", This);
ref = InterlockedDecrement(&This->ref);
if (ref == 0)
@@ -623,7 +625,8 @@
static HRESULT WINAPI xmlelem_collection_put_length(IXMLElementCollection *iface, LONG v)
{
- TRACE("(%p, %d)\n", iface, v);
+ xmlelem_collection *This = impl_from_IXMLElementCollection(iface);
+ TRACE("(%p)->(%d)\n", This, v);
return E_FAIL;
}
@@ -631,7 +634,7 @@
{
xmlelem_collection *This = impl_from_IXMLElementCollection(iface);
- TRACE("(%p, %p)\n", iface, p);
+ TRACE("(%p)->(%p)\n", This, p);
if (!p)
return E_INVALIDARG;
@@ -644,7 +647,7 @@
{
xmlelem_collection *This = impl_from_IXMLElementCollection(iface);
- TRACE("(%p, %p)\n", iface, ppUnk);
+ TRACE("(%p)->(%p)\n", This, ppUnk);
if (!ppUnk)
return E_INVALIDARG;
@@ -661,7 +664,7 @@
xmlNodePtr ptr = This->node->children;
int index, i;
- TRACE("(%p, %p)\n", iface, ppDisp);
+ TRACE("(%p)->(%s %s %p)\n", This, debugstr_variant(&var1), debugstr_variant(&var2), ppDisp);
if (!ppDisp)
return E_INVALIDARG;
@@ -727,7 +730,7 @@
xmlelem_collection *This = impl_from_IEnumVARIANT(iface);
xmlNodePtr ptr = This->current;
- TRACE("(%p, %d, %p, %p)\n", iface, celt, rgVar, fetched);
+ TRACE("(%p)->(%d %p %p)\n", This, celt, rgVar, fetched);
if (!rgVar)
return E_INVALIDARG;
@@ -752,7 +755,8 @@
static HRESULT WINAPI xmlelem_collection_IEnumVARIANT_Skip(
IEnumVARIANT *iface, ULONG celt)
{
- FIXME("(%p, %d): stub\n", iface, celt);
+ xmlelem_collection *This = impl_from_IEnumVARIANT(iface);
+ FIXME("(%p)->(%d): stub\n", This, celt);
return E_NOTIMPL;
}
@@ -760,6 +764,7 @@
IEnumVARIANT *iface)
{
xmlelem_collection *This = impl_from_IEnumVARIANT(iface);
+ TRACE("(%p)\n", This);
This->current = This->node->children;
return S_OK;
}
@@ -767,7 +772,8 @@
static HRESULT WINAPI xmlelem_collection_IEnumVARIANT_Clone(
IEnumVARIANT *iface, IEnumVARIANT **ppEnum)
{
- FIXME("(%p, %p): stub\n", iface, ppEnum);
+ xmlelem_collection *This = impl_from_IEnumVARIANT(iface);
+ FIXME("(%p)->(%p): stub\n", This, ppEnum);
return E_NOTIMPL;
}
