msxml3: Fix end prefix iteration for SAXXMLReader40.

This commit is contained in:
Nikolay Sivov 2012-04-16 02:29:18 +04:00 committed by Alexandre Julliard
parent ad1d7450d9
commit f9c3a51fd8
2 changed files with 3 additions and 4 deletions

View File

@ -377,7 +377,7 @@ static inline BOOL sax_callback_failed(saxlocator *This, HRESULT hr)
/* index value -1 means it tries to loop for a first time */
static inline BOOL iterate_endprefix_index(saxlocator *This, const element_entry *element, int *i)
{
if (This->saxreader->version >= MSXML6)
if (This->saxreader->version >= MSXML4)
{
if (*i == -1) *i = 0; else ++*i;
return *i < element->ns_count;

View File

@ -1844,9 +1844,8 @@ static void test_saxreader(void)
hr = ISAXXMLReader_parse(reader, var);
EXPECT_HR(hr, S_OK);
if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader40))
ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "content test attributes", TRUE);
else if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader60))
if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader40) ||
IsEqualGUID(table->clsid, &CLSID_SAXXMLReader60))
ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "content test attributes", FALSE);
else
ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "content test attributes", TRUE);