Jacek Caban : mshtml: Moved creating HTML element to separated function.

[Alexandre Julliard]

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

Author: Jacek Caban 
Date:   Thu Oct 11 14:07:44 2012 +0200

mshtml: Moved creating HTML element to separated function.

---

dlls/mshtml/htmldoc.c        |   14 +-------------
 dlls/mshtml/htmlelem.c       |   18 ++++++++++++++++++
 dlls/mshtml/mshtml_private.h |    1 +
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c
index 6954d17..986397c 100644
--- a/dlls/mshtml/htmldoc.c
+++ b/dlls/mshtml/htmldoc.c
@@ -1033,24 +1033,12 @@ static HRESULT WINAPI HTMLDocument_createElement(IHTMLDocument2 *iface, BSTR eTa
                                                  IHTMLElement **newElem)
 {
     HTMLDocument *This = impl_from_IHTMLDocument2(iface);
-    HTMLDocumentNode *doc_node;
-    nsIDOMHTMLElement *nselem;
     HTMLElement *elem;
     HRESULT hres;

TRACE("(%p)->(%s %p)\n", This, debugstr_w(eTag), newElem);

-    /* Use owner doc if called on document fragment */
-    doc_node = This->doc_node;
-    if(!doc_node->nsdoc)
-        doc_node = doc_node->node.doc;
-
-    hres = create_nselem(doc_node, eTag, &nselem);
-    if(FAILED(hres))
-        return hres;
-
-    hres = HTMLElement_Create(doc_node, (nsIDOMNode*)nselem, TRUE, &elem);
-    nsIDOMHTMLElement_Release(nselem);
+    hres = create_element(This->doc_node, eTag, &elem);
     if(FAILED(hres))
         return hres;

diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c
index aa3b68f..157d7af 100644
--- a/dlls/mshtml/htmlelem.c
+++ b/dlls/mshtml/htmlelem.c
@@ -199,6 +199,24 @@ HRESULT create_nselem(HTMLDocumentNode *doc, const WCHAR *tag, nsIDOMHTMLElement
     return S_OK;
 }

+HRESULT create_element(HTMLDocumentNode *doc, const WCHAR *tag, HTMLElement **ret)
+{
+    nsIDOMHTMLElement *nselem;
+    HRESULT hres;
+
+    /* Use owner doc if called on document fragment */
+    if(!doc->nsdoc)
+        doc = doc->node.doc;
+
+    hres = create_nselem(doc, tag, &nselem);
+    if(FAILED(hres))
+        return hres;
+
+    hres = HTMLElement_Create(doc, (nsIDOMNode*)nselem, TRUE, ret);
+    nsIDOMHTMLElement_Release(nselem);
+    return hres;
+}
+
 static HRESULT WINAPI HTMLElement_QueryInterface(IHTMLElement *iface,
                                                  REFIID riid, void **ppv)
 {
diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index a30895d..d199d21 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -838,6 +838,7 @@ HRESULT get_node_text(HTMLDOMNode*,BSTR*) DECLSPEC_HIDDEN;
 HRESULT replace_node_by_html(nsIDOMHTMLDocument*,nsIDOMNode*,const WCHAR*) DECLSPEC_HIDDEN;

HRESULT create_nselem(HTMLDocumentNode*,const WCHAR*,nsIDOMHTMLElement**) DECLSPEC_HIDDEN;
+HRESULT create_element(HTMLDocumentNode*,const WCHAR*,HTMLElement**) DECLSPEC_HIDDEN;

HRESULT HTMLDOMTextNode_Create(HTMLDocumentNode*,nsIDOMNode*,HTMLDOMNode**) DECLSPEC_HIDDEN;