Jacek Caban : mshtml: Added IHTMLDOMNode::cloneNode implementation.

[Alexandre Julliard]

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

Author: Jacek Caban 
Date:   Fri Oct  2 13:54:22 2009 +0200

mshtml: Added IHTMLDOMNode::cloneNode implementation.

---

dlls/mshtml/htmlnode.c  |   18 +++++++++++++-
 dlls/mshtml/tests/dom.c |   55 +++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 62 insertions(+), 11 deletions(-)

diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c
index 8c83e56..1c7b7cb 100644
--- a/dlls/mshtml/htmlnode.c
+++ b/dlls/mshtml/htmlnode.c
@@ -536,8 +536,22 @@ static HRESULT WINAPI HTMLDOMNode_cloneNode(IHTMLDOMNode *iface, VARIANT_BOOL fD
                                             IHTMLDOMNode **clonedNode)
 {
     HTMLDOMNode *This = HTMLDOMNODE_THIS(iface);
-    FIXME("(%p)->(%x %p)\n", This, fDeep, clonedNode);
-    return E_NOTIMPL;
+    nsIDOMNode *nsnode;
+    HTMLDOMNode *node;
+    nsresult nsres;
+
+    TRACE("(%p)->(%x %p)\n", This, fDeep, clonedNode);
+
+    nsres = nsIDOMNode_CloneNode(This->nsnode, fDeep != VARIANT_FALSE, &nsnode);
+    if(NS_FAILED(nsres) || !nsnode) {
+        ERR("CloneNode failed: %08x\n", nsres);
+        return E_FAIL;
+    }
+
+    node = get_node(This->doc, nsnode, TRUE);
+    IHTMLDOMNode_AddRef(HTMLDOMNODE(node));
+    *clonedNode = HTMLDOMNODE(node);
+    return S_OK;
 }

static HRESULT WINAPI HTMLDOMNode_removeNode(IHTMLDOMNode *iface, VARIANT_BOOL fDeep,
diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index 862d281..dba424b 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -656,6 +656,22 @@ static IHTMLDocument2 *_get_owner_doc(unsigned line, IUnknown *unk)
     return doc;
 }

+#define clone_node(n,d) _clone_node(__LINE__,n,d)
+static IHTMLDOMNode *_clone_node(unsigned line, IUnknown *unk, VARIANT_BOOL deep)
+{
+    IHTMLDOMNode *node = _get_node_iface(line, unk);
+    IHTMLDOMNode *ret = NULL;
+    HRESULT hres;
+
+    hres = IHTMLDOMNode_cloneNode(node, deep, &ret);
+    IHTMLDOMNode_Release(node);
+    ok_(__FILE__,line)(hres == S_OK, "cloneNode failed: %08x\n", hres);
+    ok_(__FILE__,line)(ret != NULL, "ret == NULL\n");
+
+    return ret;
+
+}
+
 #define test_elem_tag(u,n) _test_elem_tag(__LINE__,u,n)
 static void _test_elem_tag(unsigned line, IUnknown *unk, const char *extag)
 {
@@ -1287,6 +1303,21 @@ static void _test_elem_collection(unsigned line, IUnknown *unk,
     IHTMLElementCollection_Release(col);
 }

+#define test_elem_all(c,t,l) _test_elem_all(__LINE__,c,t,l)
+static void _test_elem_all(unsigned line, IUnknown *unk, const elem_type_t *elem_types, LONG exlen)
+{
+    IHTMLElement *elem = _get_elem_iface(line, unk);
+    IDispatch *disp;
+    HRESULT hres;
+
+    hres = IHTMLElement_get_all(elem, &disp);
+    IHTMLElement_Release(elem);
+    ok_(__FILE__,line)(hres == S_OK, "get_all failed: %08x\n", hres);
+
+    _test_elem_collection(line, (IUnknown*)disp, elem_types, exlen);
+    IDispatch_Release(disp);
+}
+
 #define test_elem_getelembytag(u,t,l) _test_elem_getelembytag(__LINE__,u,t,l)
 static void _test_elem_getelembytag(unsigned line, IUnknown *unk, elem_type_t type, LONG exlen)
 {
@@ -4462,9 +4493,11 @@ static void test_table_elem(IHTMLElement *elem)
 {
     IHTMLElementCollection *col;
     IHTMLTable *table;
+    IHTMLDOMNode *node;
     HRESULT hres;

static const elem_type_t row_types[] = {ET_TR,ET_TR};
+    static const elem_type_t all_types[] = {ET_TBODY,ET_TR,ET_TR,ET_TD,ET_TD};

hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLTable, (void**)&table);
     ok(hres == S_OK, "Could not get IHTMLTable iface: %08x\n", hres);
@@ -4479,6 +4512,18 @@ static void test_table_elem(IHTMLElement *elem)
     test_elem_collection((IUnknown*)col, row_types, sizeof(row_types)/sizeof(*row_types));
     IHTMLElementCollection_Release(col);

+    test_elem_all((IUnknown*)table, all_types, sizeof(all_types)/sizeof(*all_types));
+
+    node = clone_node((IUnknown*)table, VARIANT_TRUE);
+    test_elem_tag((IUnknown*)node, "TABLE");
+    test_elem_all((IUnknown*)node, all_types, sizeof(all_types)/sizeof(*all_types));
+    IHTMLDOMNode_Release(node);
+
+    node = clone_node((IUnknown*)table, VARIANT_FALSE);
+    test_elem_tag((IUnknown*)node, "TABLE");
+    test_elem_all((IUnknown*)node, NULL, 0);
+    IHTMLDOMNode_Release(node);
+
     IHTMLTable_Release(table);
 }

@@ -4748,16 +4793,8 @@ static void test_elems(IHTMLDocument2 *doc)
     }

elem = get_doc_elem(doc);
-    ok(hres == S_OK, "get_documentElement failed: %08x\n", hres);
-    hres = IHTMLElement_get_all(elem, &disp);
+    test_elem_all((IUnknown*)elem, all_types+1, sizeof(all_types)/sizeof(all_types[0])-1);
     IHTMLElement_Release(elem);
-    ok(hres == S_OK, "get_all failed: %08x\n", hres);
-
-    hres = IDispatch_QueryInterface(disp, &IID_IHTMLElementCollection, (void**)&col);
-    IDispatch_Release(disp);
-    ok(hres == S_OK, "Could not get IHTMLElementCollection: %08x\n", hres);
-    test_elem_collection((IUnknown*)col, all_types+1, sizeof(all_types)/sizeof(all_types[0])-1);
-    IHTMLElementCollection_Release(col);

get_elem_by_id(doc, "xxx", FALSE);
     elem = get_doc_elem_by_id(doc, "xxx");