Commit ae5c984b authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard

msxml3: Use debugstr_* functions instead of wine_* prefixed for consistency.

parent ca046f9e
...@@ -2828,7 +2828,7 @@ static HRESULT WINAPI domdoc_setProperty( ...@@ -2828,7 +2828,7 @@ static HRESULT WINAPI domdoc_setProperty(
{ {
hr = E_FAIL; hr = E_FAIL;
WARN("Syntax error in xmlns string: %s\n\tat token: %s\n", WARN("Syntax error in xmlns string: %s\n\tat token: %s\n",
wine_dbgstr_w(bstr), wine_dbgstr_an((const char*)pTokBegin, pTokEnd-pTokBegin)); debugstr_w(bstr), debugstr_an((const char*)pTokBegin, pTokEnd-pTokBegin));
continue; continue;
} }
...@@ -2849,7 +2849,7 @@ static HRESULT WINAPI domdoc_setProperty( ...@@ -2849,7 +2849,7 @@ static HRESULT WINAPI domdoc_setProperty(
{ {
hr = E_FAIL; hr = E_FAIL;
WARN("Syntax error in xmlns string: %s\n\tat token: %s\n", WARN("Syntax error in xmlns string: %s\n\tat token: %s\n",
wine_dbgstr_w(bstr), wine_dbgstr_an((const char*)pTokBegin, pTokEnd-pTokBegin)); debugstr_w(bstr), debugstr_an((const char*)pTokBegin, pTokEnd-pTokBegin));
continue; continue;
} }
...@@ -2876,7 +2876,7 @@ static HRESULT WINAPI domdoc_setProperty( ...@@ -2876,7 +2876,7 @@ static HRESULT WINAPI domdoc_setProperty(
else else
{ {
WARN("Syntax error in xmlns string: %s\n\tat token: %s\n", WARN("Syntax error in xmlns string: %s\n\tat token: %s\n",
wine_dbgstr_w(bstr), wine_dbgstr_an((const char*)pTokInner, pTokEnd-pTokInner)); debugstr_w(bstr), debugstr_an((const char*)pTokInner, pTokEnd-pTokInner));
list_add_tail(pNsList, &ns_entry->entry); list_add_tail(pNsList, &ns_entry->entry);
ns_entry = NULL; ns_entry = NULL;
...@@ -2906,7 +2906,7 @@ static HRESULT WINAPI domdoc_setProperty( ...@@ -2906,7 +2906,7 @@ static HRESULT WINAPI domdoc_setProperty(
return S_OK; return S_OK;
} }
FIXME("Unknown property %s\n", wine_dbgstr_w(p)); FIXME("Unknown property %s\n", debugstr_w(p));
return E_FAIL; return E_FAIL;
} }
...@@ -2966,7 +2966,7 @@ static HRESULT WINAPI domdoc_getProperty( ...@@ -2966,7 +2966,7 @@ static HRESULT WINAPI domdoc_getProperty(
return S_OK; return S_OK;
} }
FIXME("Unknown property %s\n", wine_dbgstr_w(p)); FIXME("Unknown property %s\n", debugstr_w(p));
return E_FAIL; return E_FAIL;
} }
......
...@@ -589,7 +589,7 @@ HRESULT dt_validate(XDR_DT dt, xmlChar const* content) ...@@ -589,7 +589,7 @@ HRESULT dt_validate(XDR_DT dt, xmlChar const* content)
xmlNsPtr ns; xmlNsPtr ns;
HRESULT hr; HRESULT hr;
TRACE("(dt:%s, %s)\n", debugstr_dt(dt), wine_dbgstr_a((char const*)content)); TRACE("(dt:%s, %s)\n", debugstr_dt(dt), debugstr_a((char const*)content));
if (!datatypes_schema) if (!datatypes_schema)
{ {
...@@ -688,7 +688,7 @@ static xmlParserInputPtr external_entity_loader(const char *URL, const char *ID, ...@@ -688,7 +688,7 @@ static xmlParserInputPtr external_entity_loader(const char *URL, const char *ID,
{ {
xmlParserInputPtr input; xmlParserInputPtr input;
TRACE("(%s %s %p)\n", wine_dbgstr_a(URL), wine_dbgstr_a(ID), ctxt); TRACE("(%s %s %p)\n", debugstr_a(URL), debugstr_a(ID), ctxt);
assert(MSXML_hInstance != NULL); assert(MSXML_hInstance != NULL);
assert(datatypes_rsrc != NULL); assert(datatypes_rsrc != NULL);
...@@ -922,7 +922,7 @@ static cache_entry* cache_entry_from_url(VARIANT url, xmlChar const* nsURI, MSXM ...@@ -922,7 +922,7 @@ static cache_entry* cache_entry_from_url(VARIANT url, xmlChar const* nsURI, MSXM
ERR("IXMLDOMDocument3_load() returned 0x%08x\n", hr); ERR("IXMLDOMDocument3_load() returned 0x%08x\n", hr);
if (b != VARIANT_TRUE) if (b != VARIANT_TRUE)
{ {
FIXME("Failed to load doc at %s\n", wine_dbgstr_w(V_BSTR(&url))); FIXME("Failed to load doc at %s\n", debugstr_w(V_BSTR(&url)));
IXMLDOMDocument3_Release(domdoc); IXMLDOMDocument3_Release(domdoc);
return NULL; return NULL;
} }
...@@ -1142,7 +1142,7 @@ static HRESULT WINAPI schema_cache_get(IXMLDOMSchemaCollection2* iface, BSTR uri ...@@ -1142,7 +1142,7 @@ static HRESULT WINAPI schema_cache_get(IXMLDOMSchemaCollection2* iface, BSTR uri
cache_entry* entry; cache_entry* entry;
xmlChar* name; xmlChar* name;
TRACE("(%p)->(%s %p)\n", This, wine_dbgstr_w(uri), node); TRACE("(%p)->(%s %p)\n", This, debugstr_w(uri), node);
if (This->version == MSXML6) return E_NOTIMPL; if (This->version == MSXML6) return E_NOTIMPL;
...@@ -1165,7 +1165,7 @@ static HRESULT WINAPI schema_cache_remove(IXMLDOMSchemaCollection2* iface, BSTR ...@@ -1165,7 +1165,7 @@ static HRESULT WINAPI schema_cache_remove(IXMLDOMSchemaCollection2* iface, BSTR
{ {
schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface);
xmlChar* name = uri ? xmlchar_from_wchar(uri) : xmlchar_from_wchar(emptyW); xmlChar* name = uri ? xmlchar_from_wchar(uri) : xmlchar_from_wchar(emptyW);
TRACE("(%p)->(%s)\n", This, wine_dbgstr_w(uri)); TRACE("(%p)->(%s)\n", This, debugstr_w(uri));
xmlHashRemoveEntry(This->cache, name, cache_free); xmlHashRemoveEntry(This->cache, name, cache_free);
heap_free(name); heap_free(name);
......
...@@ -749,7 +749,7 @@ HRESULT create_selection(xmlNodePtr node, xmlChar* query, IXMLDOMNodeList **out) ...@@ -749,7 +749,7 @@ HRESULT create_selection(xmlNodePtr node, xmlChar* query, IXMLDOMNodeList **out)
xmlXPathContextPtr ctxt = xmlXPathNewContext(node->doc); xmlXPathContextPtr ctxt = xmlXPathNewContext(node->doc);
HRESULT hr; HRESULT hr;
TRACE("(%p, %s, %p)\n", node, wine_dbgstr_a((char const*)query), out); TRACE("(%p, %s, %p)\n", node, debugstr_a((char const*)query), out);
*out = NULL; *out = NULL;
if (!This || !ctxt || !query) if (!This || !ctxt || !query)
......
...@@ -418,7 +418,7 @@ static HRESULT WINAPI xslprocessor_setStartMode( ...@@ -418,7 +418,7 @@ static HRESULT WINAPI xslprocessor_setStartMode(
{ {
xslprocessor *This = impl_from_IXSLProcessor( iface ); 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): stub\n", This, debugstr_w(p), debugstr_w(uri));
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -557,8 +557,8 @@ static HRESULT WINAPI xslprocessor_addParameter( ...@@ -557,8 +557,8 @@ static HRESULT WINAPI xslprocessor_addParameter(
{ {
xslprocessor *This = impl_from_IXSLProcessor( iface ); xslprocessor *This = impl_from_IXSLProcessor( iface );
FIXME("(%p)->(%s %s %s): stub\n", This, wine_dbgstr_w(p), debugstr_variant(&var), FIXME("(%p)->(%s %s %s): stub\n", This, debugstr_w(p), debugstr_variant(&var),
wine_dbgstr_w(uri)); debugstr_w(uri));
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -569,7 +569,7 @@ static HRESULT WINAPI xslprocessor_addObject( ...@@ -569,7 +569,7 @@ static HRESULT WINAPI xslprocessor_addObject(
{ {
xslprocessor *This = impl_from_IXSLProcessor( iface ); xslprocessor *This = impl_from_IXSLProcessor( iface );
FIXME("(%p)->(%p %s): stub\n", This, obj, wine_dbgstr_w(uri)); FIXME("(%p)->(%p %s): stub\n", This, obj, debugstr_w(uri));
return E_NOTIMPL; return E_NOTIMPL;
} }
......
...@@ -155,7 +155,7 @@ ANY (.) ...@@ -155,7 +155,7 @@ ANY (.)
xmlChar* XSLPattern_to_XPath(xmlXPathContextPtr ctxt, xmlChar const* xslpat_str) xmlChar* XSLPattern_to_XPath(xmlXPathContextPtr ctxt, xmlChar const* xslpat_str)
{ {
parser_param p; parser_param p;
TRACE("(%s)\n", wine_dbgstr_a((char const*)xslpat_str)); TRACE("(%s)\n", debugstr_a((char const*)xslpat_str));
memset(&p, 0, sizeof(parser_param)); memset(&p, 0, sizeof(parser_param));
p.ctx = ctxt; p.ctx = ctxt;
p.in = xslpat_str; p.in = xslpat_str;
...@@ -166,7 +166,7 @@ xmlChar* XSLPattern_to_XPath(xmlXPathContextPtr ctxt, xmlChar const* xslpat_str) ...@@ -166,7 +166,7 @@ xmlChar* XSLPattern_to_XPath(xmlXPathContextPtr ctxt, xmlChar const* xslpat_str)
xslpattern_parse(&p, p.yyscanner); xslpattern_parse(&p, p.yyscanner);
TRACE("=> %s\n", wine_dbgstr_a((char const*)p.out)); TRACE("=> %s\n", debugstr_a((char const*)p.out));
xslpattern_lex_destroy(p.yyscanner); xslpattern_lex_destroy(p.yyscanner);
if (p.err) if (p.err)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment