ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msxml3: Fix handling of feature values.

This commit is contained in:
Nikolay Sivov 2012-04-19 10:53:15 +04:00 committed by Alexandre Julliard
parent f27159a59f
commit 54df4811c6
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/msxml3/saxreader.c
View File

@ -288,6 +288,12 @@ static const WCHAR PropertyXMLDeclVersionW[] = {
static inline HRESULT set_feature_value(saxreader *reader, saxreader_feature feature, VARIANT_BOOL value) static inline HRESULT set_feature_value(saxreader *reader, saxreader_feature feature, VARIANT_BOOL value)
{ {
/* handling of non-VARIANT_* values is version dependent */
if ((reader->version < MSXML4) && (value != VARIANT_TRUE))
value = VARIANT_FALSE;
if ((reader->version >= MSXML4) && (value != VARIANT_FALSE))
value = VARIANT_TRUE;
if (value == VARIANT_TRUE) if (value == VARIANT_TRUE)
reader->features |= feature; reader->features |= feature;
else else

7
dlls/msxml3/tests/saxreader.c
View File

@ -2198,12 +2198,7 @@ static void test_saxreader_features(void)
value = 0xd; value = 0xd;
hr = ISAXXMLReader_getFeature(reader, _bstr_(*name), &value); hr = ISAXXMLReader_getFeature(reader, _bstr_(*name), &value);
EXPECT_HR(hr, S_OK); EXPECT_HR(hr, S_OK);
if (IsEqualGUID(entry->guid, &CLSID_SAXXMLReader40) || ok(entry->value2 == value, "%s: got wrong value %x, expected %x\n", entry->clsid, value, entry->value2);
IsEqualGUID(entry->guid, &CLSID_SAXXMLReader60))
todo_wine
ok(entry->value2 == value, "%s: got wrong value %x, expected %x\n", entry->clsid, value, entry->value2);
else
ok(entry->value2 == value, "%s: got wrong value %x, expected %x\n", entry->clsid, value, entry->value2);
hr = ISAXXMLReader_putFeature(reader, _bstr_(*name), VARIANT_FALSE); hr = ISAXXMLReader_putFeature(reader, _bstr_(*name), VARIANT_FALSE);
EXPECT_HR(hr, S_OK); EXPECT_HR(hr, S_OK);