Jacek Caban : mshtml: Added IHTMLElement::get_id implementation.

[Alexandre Julliard]

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

Author: Jacek Caban 
Date:   Wed Jun 18 00:09:08 2008 +0200

mshtml: Added IHTMLElement::get_id implementation.

---

dlls/mshtml/htmlelem.c  |   24 ++++++++++++++++++++++--
 dlls/mshtml/tests/dom.c |   25 +++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c
index 22e8c5c..440c523 100644
--- a/dlls/mshtml/htmlelem.c
+++ b/dlls/mshtml/htmlelem.c
@@ -297,8 +297,28 @@ static HRESULT WINAPI HTMLElement_put_id(IHTMLElement *iface, BSTR v)
 static HRESULT WINAPI HTMLElement_get_id(IHTMLElement *iface, BSTR *p)
 {
     HTMLElement *This = HTMLELEM_THIS(iface);
-    FIXME("(%p)->(%p)\n", This, p);
-    return E_NOTIMPL;
+    const PRUnichar *id;
+    nsAString id_str;
+    nsresult nsres;
+
+    TRACE("(%p)->(%p)\n", This, p);
+
+    *p = NULL;
+
+    if(!This->nselem)
+        return S_OK;
+
+    nsAString_Init(&id_str, NULL);
+    nsres = nsIDOMHTMLElement_GetId(This->nselem, &id_str);
+    nsAString_GetData(&id_str, &id);
+
+    if(NS_FAILED(nsres))
+        ERR("GetId failed: %08x\n", nsres);
+    else if(*id)
+        *p = SysAllocString(id);
+
+    nsAString_Finish(&id_str);
+    return S_OK;
 }

static HRESULT WINAPI HTMLElement_get_tagName(IHTMLElement *iface, BSTR *p)
diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index ad06e5b..638a673 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -866,6 +866,28 @@ static IHTMLDOMNode *_get_child_item(unsigned line, IHTMLDOMChildrenCollection *
     return node;
 }

+#define test_elem_id(e,i) _test_elem_id(__LINE__,e,i)
+static void _test_elem_id(unsigned line, IUnknown *unk, const char *exid)
+{
+    IHTMLElement *elem;
+    BSTR id = (void*)0xdeadbeef;
+    HRESULT hres;
+
+    hres = IUnknown_QueryInterface(unk, &IID_IHTMLElement, (void**)&elem);
+    ok_(__FILE__,line) (hres == S_OK, "Coule not get IHTMLElement: %08x\n", hres);
+
+    hres = IHTMLElement_get_id(elem, &id);
+    IHTMLElement_Release(elem);
+    ok_(__FILE__,line) (hres == S_OK, "get_id failed: %08x\n", hres);
+
+    if(exid)
+        ok_(__FILE__,line) (!strcmp_wa(id, exid), "unexpected id %s\n", dbgstr_w(id));
+    else
+        ok_(__FILE__,line) (!id, "id=%s\n", dbgstr_w(id));
+
+    SysFreeString(id);
+}
+
 static void test_elem_col_item(IHTMLElementCollection *col, LPCWSTR n,
         const elem_type_t *elem_types, long len)
 {
@@ -1628,6 +1650,7 @@ static void test_elems(IHTMLDocument2 *doc)
         hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLInputElement, (void**)&input);
         ok(hres == S_OK, "Could not get IHTMLInputElement: %08x\n", hres);

+        test_elem_id((IUnknown*)elem, "in");
         test_input_get_disabled(input, VARIANT_FALSE);

IHTMLInputElement_Release(input);
@@ -1676,6 +1699,8 @@ static void test_elems(IHTMLDocument2 *doc)
         if(node) {
             type = get_node_type((IUnknown*)node);
             ok(type == 8, "type=%ld\n", type);
+
+            test_elem_id((IUnknown*)node, NULL);
             IHTMLDOMNode_Release(node);
         }