Nikolay Sivov : msxml3: Apostrophe is never escaped by writer.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 610320864b189ca26cf430198aad903cc2be46b8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=610320864b189ca26cf430198a...

Author: Nikolay Sivov 
Date:   Tue Aug 20 12:49:54 2013 +0400

msxml3: Apostrophe is never escaped by writer.

---

dlls/msxml3/tests/saxreader.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c
index a6c399d..d9c3c4e 100644
--- a/dlls/msxml3/tests/saxreader.c
+++ b/dlls/msxml3/tests/saxreader.c
@@ -1553,8 +1553,8 @@ static HRESULT WINAPI isaxattributes_getValue(ISAXAttributes* iface, int index,
 {
     static const WCHAR attrvaluesW[][10] = {{'a','1','j','u','n','k',0},
                                             {'a','2','j','u','n','k',0},
-                                            {'<','&','"','>',0}};
-    static const int attrvalueslen[] = {2, 2, 4};
+                                            {'<','&','"','>',''',0}};
+    static const int attrvalueslen[] = {2, 2, 5};

ok(index >= 0 && index <= 2, "invalid index received %d\n", index);

@@ -3331,9 +3331,9 @@ struct writer_startendelement_t {
     ISAXAttributes *attr;
 };

-static const char startelement_xml[] = "<uri:local a:attr1="a1" attr2="a2" attr3="&lt;&amp;&quot;&gt;">";
-static const char startendelement_xml[] = "<uri:local a:attr1="a1" attr2="a2" attr3="&lt;&amp;&quot;&gt;"/>";
-static const char startendelement_noescape_xml[] = "<uri:local a:attr1="a1" attr2="a2" attr3="<&">"/>";
+static const char startelement_xml[] = "<uri:local a:attr1="a1" attr2="a2" attr3="&lt;&amp;&quot;&gt;'">";
+static const char startendelement_xml[] = "<uri:local a:attr1="a1" attr2="a2" attr3="&lt;&amp;&quot;&gt;'"/>";
+static const char startendelement_noescape_xml[] = "<uri:local a:attr1="a1" attr2="a2" attr3="<&">'"/>";

static const struct writer_startendelement_t writer_startendelement[] = {
     /* 0 */
@@ -3751,10 +3751,10 @@ struct writer_characters_t {
 };

static const struct writer_characters_t writer_characters[] = {
-    { &CLSID_MXXMLWriter,   "< > & "", "&lt; &gt; &amp; "" },
-    { &CLSID_MXXMLWriter30, "< > & "", "&lt; &gt; &amp; "" },
-    { &CLSID_MXXMLWriter40, "< > & "", "&lt; &gt; &amp; "" },
-    { &CLSID_MXXMLWriter60, "< > & "", "&lt; &gt; &amp; "" },
+    { &CLSID_MXXMLWriter,   "< > & " '", "&lt; &gt; &amp; " '" },
+    { &CLSID_MXXMLWriter30, "< > & " '", "&lt; &gt; &amp; " '" },
+    { &CLSID_MXXMLWriter40, "< > & " '", "&lt; &gt; &amp; " '" },
+    { &CLSID_MXXMLWriter60, "< > & " '", "&lt; &gt; &amp; " '" },
     { NULL }
 };