[1/4] msxml3: Fix end prefix iteration for SAXXMLReader40

[Nikolay Sivov]

Fix end prefix iteration for SAXXMLReader40
-------------- next part --------------
>From bc7cf8948c805331919f7d10161d1c0178e756fc Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <nsivov at codeweavers.com>
Date: Mon, 16 Apr 2012 02:29:18 +0400
Subject: [PATCH 1/3] Fix end prefix iteration for SAXXMLReader40

---
 dlls/msxml3/saxreader.c       |    2 +-
 dlls/msxml3/tests/saxreader.c |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c
index bcc038b..e15f3e6 100644
--- a/dlls/msxml3/saxreader.c
+++ b/dlls/msxml3/saxreader.c
@@ -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;
diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c
index bf2cd61..4e2bd11 100644
--- a/dlls/msxml3/tests/saxreader.c
+++ b/dlls/msxml3/tests/saxreader.c
@@ -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);
-- 
1.5.6.5