Alistair Leslie-Hughes : msxml3: Implement put_text.

Alexandre Julliard julliard at winehq.org
Wed Jan 16 07:09:33 CST 2008


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

Author: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date:   Wed Jan 16 13:44:51 2008 +1100

msxml3: Implement put_text.

---

 dlls/msxml3/node.c         |   25 +++++++++++++++++++++++--
 dlls/msxml3/tests/domdoc.c |   12 ++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c
index 72be7a8..e354081 100644
--- a/dlls/msxml3/node.c
+++ b/dlls/msxml3/node.c
@@ -697,8 +697,29 @@ static HRESULT WINAPI xmlnode_put_text(
     IXMLDOMNode *iface,
     BSTR text)
 {
-    FIXME("\n");
-    return E_NOTIMPL;
+    xmlnode *This = impl_from_IXMLDOMNode( iface );
+    xmlChar *str = NULL;
+
+    TRACE("%p\n", This);
+
+    switch(This->node->type)
+    {
+    case XML_DOCUMENT_NODE:
+        return E_FAIL;
+    default:
+        break;
+    }
+
+    str = xmlChar_from_wchar((WCHAR*)text);
+
+    /* Escape the string. */
+    str = xmlEncodeEntitiesReentrant(This->node->doc, str);
+    str = xmlEncodeSpecialChars(This->node->doc, str);
+
+    xmlNodeSetContent(This->node, str);
+    xmlFree(str);
+
+    return S_OK;
 }
 
 static HRESULT WINAPI xmlnode_get_specified(
diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index 75adc64..1637e7c 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -142,6 +142,8 @@ static WCHAR szCommentNodeText[] = {'#','c','o','m','m','e','n','t',0 };
 static WCHAR szElement[] = {'E','l','e','T','e','s','t', 0 };
 static WCHAR szElementXML[]  = {'<','E','l','e','T','e','s','t','/','>',0 };
 static WCHAR szElementXML2[] = {'<','E','l','e','T','e','s','t',' ','A','t','t','r','=','"','"','/','>',0 };
+static WCHAR szElementXML3[] = {'<','E','l','e','T','e','s','t',' ','A','t','t','r','=','"','"','>',
+                                'T','e','s','t','i','n','g','N','o','d','e','<','/','E','l','e','T','e','s','t','>',0 };
 
 static WCHAR szAttribute[] = {'A','t','t','r',0 };
 static WCHAR szAttributeXML[] = {'A','t','t','r','=','"','"',0 };
@@ -444,6 +446,9 @@ static void test_domdoc( void )
     ok( !lstrcmpW( str, szDocument ), "incorrect nodeName\n");
     SysFreeString( str );
 
+    /* test put_text */
+    r = IXMLDOMDocument_put_text( doc, _bstr_("Should Fail") );
+    ok( r == E_FAIL, "ret %08x\n", r );
 
     /* check that there's a document element */
     element = NULL;
@@ -2030,6 +2035,13 @@ static void test_xmlTypes(void)
                     SysFreeString(str);
                 }
 
+                hr = IXMLDOMElement_put_text(pElement, _bstr_("TestingNode"));
+                ok(hr == S_OK, "ret %08x\n", hr );
+
+                hr = IXMLDOMElement_get_xml(pElement, &str);
+                ok(hr == S_OK, "ret %08x\n", hr );
+                ok( !lstrcmpW( str, szElementXML3 ), "incorrect element xml\n");
+
                 IXMLDOMElement_Release(pElement);
             }
 




More information about the wine-cvs mailing list