Nikolay Sivov : msxml3: Use debugstr_* functions instead of wine_* prefixed for consistency.
Module: wine Branch: master Commit: ae5c984b12f8810c866c08084d9f0b66326c31d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae5c984b12f8810c866c08084d...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Fri Jan 20 04:00:47 2012 +0300
msxml3: Use debugstr_* functions instead of wine_* prefixed for consistency.
---
dlls/msxml3/domdoc.c | 10 +++++----- dlls/msxml3/schema.c | 10 +++++----- dlls/msxml3/selection.c | 2 +- dlls/msxml3/stylesheet.c | 8 ++++---- dlls/msxml3/xslpattern.l | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 8943507..72f9a31 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2828,7 +2828,7 @@ static HRESULT WINAPI domdoc_setProperty( { hr = E_FAIL; 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; }
@@ -2849,7 +2849,7 @@ static HRESULT WINAPI domdoc_setProperty( { hr = E_FAIL; 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; }
@@ -2876,7 +2876,7 @@ static HRESULT WINAPI domdoc_setProperty( else { 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);
ns_entry = NULL; @@ -2906,7 +2906,7 @@ static HRESULT WINAPI domdoc_setProperty( return S_OK; }
- FIXME("Unknown property %s\n", wine_dbgstr_w(p)); + FIXME("Unknown property %s\n", debugstr_w(p)); return E_FAIL; }
@@ -2966,7 +2966,7 @@ static HRESULT WINAPI domdoc_getProperty( return S_OK; }
- FIXME("Unknown property %s\n", wine_dbgstr_w(p)); + FIXME("Unknown property %s\n", debugstr_w(p)); return E_FAIL; }
diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 2312f6d..2c97639 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -589,7 +589,7 @@ HRESULT dt_validate(XDR_DT dt, xmlChar const* content) xmlNsPtr ns; 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) { @@ -688,7 +688,7 @@ static xmlParserInputPtr external_entity_loader(const char *URL, const char *ID, { 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(datatypes_rsrc != NULL); @@ -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); 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); return NULL; } @@ -1142,7 +1142,7 @@ static HRESULT WINAPI schema_cache_get(IXMLDOMSchemaCollection2* iface, BSTR uri cache_entry* entry; 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;
@@ -1165,7 +1165,7 @@ static HRESULT WINAPI schema_cache_remove(IXMLDOMSchemaCollection2* iface, BSTR { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); 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); heap_free(name); diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index 8871817..ba173f9 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -749,7 +749,7 @@ HRESULT create_selection(xmlNodePtr node, xmlChar* query, IXMLDOMNodeList **out) xmlXPathContextPtr ctxt = xmlXPathNewContext(node->doc); 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; if (!This || !ctxt || !query) diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c index 5ee71af..9106b40 100644 --- a/dlls/msxml3/stylesheet.c +++ b/dlls/msxml3/stylesheet.c @@ -418,7 +418,7 @@ static HRESULT WINAPI xslprocessor_setStartMode( { 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; }
@@ -557,8 +557,8 @@ static HRESULT WINAPI xslprocessor_addParameter( { xslprocessor *This = impl_from_IXSLProcessor( iface );
- FIXME("(%p)->(%s %s %s): stub\n", This, wine_dbgstr_w(p), debugstr_variant(&var), - wine_dbgstr_w(uri)); + FIXME("(%p)->(%s %s %s): stub\n", This, debugstr_w(p), debugstr_variant(&var), + debugstr_w(uri)); return E_NOTIMPL; }
@@ -569,7 +569,7 @@ static HRESULT WINAPI xslprocessor_addObject( { 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; }
diff --git a/dlls/msxml3/xslpattern.l b/dlls/msxml3/xslpattern.l index caea1be..eb84e40 100644 --- a/dlls/msxml3/xslpattern.l +++ b/dlls/msxml3/xslpattern.l @@ -155,7 +155,7 @@ ANY (.) xmlChar* XSLPattern_to_XPath(xmlXPathContextPtr ctxt, xmlChar const* xslpat_str) { 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)); p.ctx = ctxt; p.in = xslpat_str; @@ -166,7 +166,7 @@ xmlChar* XSLPattern_to_XPath(xmlXPathContextPtr ctxt, xmlChar const* xslpat_str)
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);
if (p.err)
-
Alexandre Julliard