Adam Martinson : msxml3: Fix a few error messages.
Alexandre Julliard
julliard at winehq.org
Thu Nov 25 11:18:53 CST 2010
Module: wine
Branch: master
Commit: 54d949fbe8da397552d256995f601933300c5a04
URL: http://source.winehq.org/git/wine.git/?a=commit;h=54d949fbe8da397552d256995f601933300c5a04
Author: Adam Martinson <amartinson at codeweavers.com>
Date: Wed Nov 24 13:53:17 2010 -0600
msxml3: Fix a few error messages.
---
dlls/msxml3/domdoc.c | 12 +++++++++---
dlls/msxml3/schema.c | 2 ++
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c
index 45a495d..e06b03d 100644
--- a/dlls/msxml3/domdoc.c
+++ b/dlls/msxml3/domdoc.c
@@ -2656,9 +2656,15 @@ static HRESULT WINAPI domdoc_validateNode(
{
++validated;
/* TODO: get a real error code here */
- TRACE("schema validation failed\n");
- if (hr != S_OK)
+ if (hr == S_OK)
+ {
+ TRACE("schema validation succeeded\n");
+ }
+ else
+ {
+ ERR("schema validation failed\n");
err_code = E_XML_INVALID;
+ }
}
else
{
@@ -2669,7 +2675,7 @@ static HRESULT WINAPI domdoc_validateNode(
if (!validated)
{
- TRACE("no DTD or schema found\n");
+ ERR("no DTD or schema found\n");
err_code = E_XML_NODTD;
hr = S_FALSE;
}
diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c
index 17439a5..fd56aeb 100644
--- a/dlls/msxml3/schema.c
+++ b/dlls/msxml3/schema.c
@@ -1356,6 +1356,8 @@ HRESULT SchemaCache_validate_tree(IXMLDOMSchemaCollection2* iface, xmlNodePtr tr
* do we try to load from that? */
if (schema)
return Schema_validate_tree(schema, tree);
+ else
+ WARN("no schema found for xmlns=%s\n", get_node_nsURI(tree));
return E_FAIL;
}
More information about the wine-cvs
mailing list