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

[Alexandre Julliard]

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

Author: Jacek Caban 
Date:   Mon Jun 23 20:03:25 2008 -0500

mshtml: Added IHTMLDOMNode::hasChildNodes implementation.

---

dlls/mshtml/htmlnode.c  |   13 +++++++++++--
 dlls/mshtml/tests/dom.c |   17 +++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c
index 9b667a1..d46d75c 100644
--- a/dlls/mshtml/htmlnode.c
+++ b/dlls/mshtml/htmlnode.c
@@ -393,8 +393,17 @@ static HRESULT WINAPI HTMLDOMNode_get_parentNode(IHTMLDOMNode *iface, IHTMLDOMNo
 static HRESULT WINAPI HTMLDOMNode_hasChildNodes(IHTMLDOMNode *iface, VARIANT_BOOL *fChildren)
 {
     HTMLDOMNode *This = HTMLDOMNODE_THIS(iface);
-    FIXME("(%p)->(%p)\n", This, fChildren);
-    return E_NOTIMPL;
+    PRBool has_child = FALSE;
+    nsresult nsres;
+
+    TRACE("(%p)->(%p)\n", This, fChildren);
+
+    nsres = nsIDOMNode_HasChildNodes(This->nsnode, &has_child);
+    if(NS_FAILED(nsres))
+        ERR("HasChildNodes failed: %08x\n", nsres);
+
+    *fChildren = has_child ? VARIANT_TRUE : VARIANT_FALSE;
+    return S_OK;
 }

static HRESULT WINAPI HTMLDOMNode_get_childNodes(IHTMLDOMNode *iface, IDispatch **p)
diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index 9910ce6..9ee1f07 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -836,6 +836,20 @@ static IHTMLDOMNode *_get_first_child(unsigned line, IUnknown *unk)
     return child;
 }

+#define test_node_has_child(u,b) _test_node_has_child(__LINE__,u,b)
+static void _test_node_has_child(unsigned line, IUnknown *unk, VARIANT_BOOL exb)
+{
+    IHTMLDOMNode *node = _get_node_iface(line, unk);
+    VARIANT_BOOL b = 0xdead;
+    HRESULT hres;
+
+    hres = IHTMLDOMNode_hasChildNodes(node, &b);
+    ok_(__FILE__,line) (hres == S_OK, "hasChildNodes failed: %08x\n", hres);
+    ok_(__FILE__,line) (b == exb, "hasChildNodes=%x, expected %x\n", b, exb);
+
+    IHTMLDOMNode_Release(node);
+}
+
 #define get_node_type(n) _get_node_type(__LINE__,n)
 static long _get_node_type(unsigned line, IUnknown *unk)
 {
@@ -2095,8 +2109,10 @@ static void test_create_elems(IHTMLDocument2 *doc)

hres = IHTMLDocument2_get_body(doc, &body);
     ok(hres == S_OK, "get_body failed: %08x\n", hres);
+    test_node_has_child((IUnknown*)body, VARIANT_FALSE);

node = test_node_append_child((IUnknown*)body, (IUnknown*)elem);
+    test_node_has_child((IUnknown*)body, VARIANT_TRUE);
     elem2 = get_elem_iface((IUnknown*)node);
     IHTMLElement_Release(elem2);

@@ -2111,6 +2127,7 @@ static void test_create_elems(IHTMLDocument2 *doc)
     ok(hres == S_OK, "get_all failed: %08x\n", hres);
     test_elem_collection((IUnknown*)disp, NULL, 0);
     IDispatch_Release(disp);
+    test_node_has_child((IUnknown*)body, VARIANT_FALSE);

IHTMLElement_Release(body);
     IHTMLElement_Release(elem);