Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
a62bed3b
Commit
a62bed3b
authored
Feb 27, 2018
by
Nikolay Sivov
Committed by
Alexandre Julliard
Feb 27, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msxml3/saxreader: Allow setting default value for schema-validation feature.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
585e12fa
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
6 deletions
+29
-6
saxreader.c
dlls/msxml3/saxreader.c
+10
-3
saxreader.c
dlls/msxml3/tests/saxreader.c
+19
-3
No files found.
dlls/msxml3/saxreader.c
View file @
a62bed3b
...
...
@@ -104,6 +104,10 @@ static const WCHAR ExhaustiveErrorsW[] = {
'e'
,
'x'
,
'h'
,
'a'
,
'u'
,
's'
,
't'
,
'i'
,
'v'
,
'e'
,
'-'
,
'e'
,
'r'
,
'r'
,
'o'
,
'r'
,
's'
,
0
};
static
const
WCHAR
SchemaValidationW
[]
=
{
's'
,
'c'
,
'h'
,
'e'
,
'm'
,
'a'
,
'-'
,
'v'
,
'a'
,
'l'
,
'i'
,
'd'
,
'a'
,
't'
,
'i'
,
'o'
,
'n'
,
0
};
struct
saxreader_feature_pair
{
saxreader_feature
feature
;
...
...
@@ -117,7 +121,8 @@ static const struct saxreader_feature_pair saxreader_feature_map[] = {
{
LexicalHandlerParEntities
,
FeatureLexicalHandlerParEntitiesW
},
{
NamespacePrefixes
,
FeatureNamespacePrefixesW
},
{
Namespaces
,
FeatureNamespacesW
},
{
ProhibitDTD
,
FeatureProhibitDTDW
}
{
ProhibitDTD
,
FeatureProhibitDTDW
},
{
SchemaValidation
,
SchemaValidationW
},
};
static
saxreader_feature
get_saxreader_feature
(
const
WCHAR
*
name
)
...
...
@@ -3222,12 +3227,13 @@ static HRESULT WINAPI isaxxmlreader_getFeature(
feature
=
get_saxreader_feature
(
feature_name
);
if
(
This
->
version
<
MSXML4
&&
feature
==
ExhaustiveErrors
)
if
(
This
->
version
<
MSXML4
&&
(
feature
==
ExhaustiveErrors
||
feature
==
SchemaValidation
)
)
return
E_INVALIDARG
;
if
(
feature
==
Namespaces
||
feature
==
NamespacePrefixes
||
feature
==
ExhaustiveErrors
)
feature
==
ExhaustiveErrors
||
feature
==
SchemaValidation
)
return
get_feature_value
(
This
,
feature
,
value
);
FIXME
(
"(%p)->(%s %p) stub
\n
"
,
This
,
debugstr_w
(
feature_name
),
value
);
...
...
@@ -3248,6 +3254,7 @@ static HRESULT WINAPI isaxxmlreader_putFeature(
/* accepted cases */
if
((
feature
==
ExhaustiveErrors
&&
value
==
VARIANT_FALSE
)
||
(
feature
==
SchemaValidation
&&
value
==
VARIANT_FALSE
)
||
feature
==
Namespaces
||
feature
==
NamespacePrefixes
)
{
...
...
dlls/msxml3/tests/saxreader.c
View file @
a62bed3b
...
...
@@ -2789,19 +2789,35 @@ static void test_saxreader_features(void)
continue
;
}
value
=
VARIANT_TRUE
;
hr
=
ISAXXMLReader_getFeature
(
reader
,
_bstr_
(
"exhaustive-errors"
),
&
value
);
if
(
IsEqualGUID
(
entry
->
guid
,
&
CLSID_SAXXMLReader40
)
||
IsEqualGUID
(
entry
->
guid
,
&
CLSID_SAXXMLReader60
))
{
value
=
VARIANT_TRUE
;
hr
=
ISAXXMLReader_getFeature
(
reader
,
_bstr_
(
"exhaustive-errors"
),
&
value
);
ok
(
hr
==
S_OK
,
"Failed to get feature value, hr %#x.
\n
"
,
hr
);
ok
(
value
==
VARIANT_FALSE
,
"Unexpected default feature value.
\n
"
);
hr
=
ISAXXMLReader_putFeature
(
reader
,
_bstr_
(
"exhaustive-errors"
),
VARIANT_FALSE
);
ok
(
hr
==
S_OK
,
"Failed to put feature value, hr %#x.
\n
"
,
hr
);
value
=
VARIANT_TRUE
;
hr
=
ISAXXMLReader_getFeature
(
reader
,
_bstr_
(
"schema-validation"
),
&
value
);
ok
(
hr
==
S_OK
,
"Failed to get feature value, hr %#x.
\n
"
,
hr
);
ok
(
value
==
VARIANT_FALSE
,
"Unexpected default feature value.
\n
"
);
hr
=
ISAXXMLReader_putFeature
(
reader
,
_bstr_
(
"exhaustive-errors"
),
VARIANT_FALSE
);
ok
(
hr
==
S_OK
,
"Failed to put feature value, hr %#x.
\n
"
,
hr
);
}
else
ok
(
hr
==
E_INVALIDARG
,
"Unexpected return value %#x.
\n
"
,
hr
);
{
value
=
123
;
hr
=
ISAXXMLReader_getFeature
(
reader
,
_bstr_
(
"exhaustive-errors"
),
&
value
);
ok
(
hr
==
E_INVALIDARG
,
"Failed to get feature value, hr %#x.
\n
"
,
hr
);
ok
(
value
==
123
,
"Unexpected value %d.
\n
"
,
value
);
value
=
123
;
hr
=
ISAXXMLReader_getFeature
(
reader
,
_bstr_
(
"schema-validation"
),
&
value
);
ok
(
hr
==
E_INVALIDARG
,
"Failed to get feature value, hr %#x.
\n
"
,
hr
);
ok
(
value
==
123
,
"Unexpected value %d.
\n
"
,
value
);
}
name
=
feature_names
;
while
(
*
name
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment