Reimplement IXMLDOMDocument::createElement() over ::createNode()

[Nikolay Sivov]

---
 dlls/msxml3/domdoc.c        |   26 +++++++++-----------------
 dlls/msxml3/msxml_private.h |   18 +++++++++++++++---
 dlls/msxml3/nodemap.c       |   12 ------------
 dlls/msxml3/tests/domdoc.c  |   25 ++++++++++++++++++++++++-
 4 files changed, 48 insertions(+), 33 deletions(-)

diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c
index f999e12..f3bd371 100644
--- a/dlls/msxml3/domdoc.c
+++ b/dlls/msxml3/domdoc.c
@@ -1038,28 +1038,17 @@ static HRESULT WINAPI domdoc_createElement(
     BSTR tagname,
     IXMLDOMElement** element )
 {
-    xmlNodePtr xmlnode;
     domdoc *This = impl_from_IXMLDOMDocument2( iface );
-    xmlChar *xml_name;
-    IUnknown *elem_unk;
-    HRESULT hr;
-
-    TRACE("%p->(%s,%p)\n", iface, debugstr_w(tagname), element);
+    VARIANT type;
 
-    if (!element) return E_INVALIDARG;
+    TRACE("(%p)->(%s,%p)\n", This, debugstr_w(tagname), element);
 
-    xml_name = xmlChar_from_wchar(tagname);
-    xmlnode = xmlNewDocNode(get_doc(This), NULL, xml_name, NULL);
-    xmldoc_add_orphan(xmlnode->doc, xmlnode);
+    if (!element || !tagname) return E_INVALIDARG;
 
-    TRACE("created xmlptr %p\n", xmlnode);
-    elem_unk = create_element(xmlnode);
-    heap_free(xml_name);
+    V_VT(&type) = VT_I1;
+    V_I1(&type) = NODE_ELEMENT;
 
-    hr = IUnknown_QueryInterface(elem_unk, &IID_IXMLDOMElement, (void **)element);
-    IUnknown_Release(elem_unk);
-    TRACE("returning %p\n", *element);
-    return hr;
+    return IXMLDOMDocument_createNode(iface, type, tagname, NULL, (IXMLDOMNode**)element);
 }
 
 
@@ -1347,6 +1336,9 @@ static HRESULT WINAPI domdoc_createNode(
 
     TRACE("node_type %d\n", node_type);
 
+    if ((!name || SysStringLen(name) == 0) && (node_type == NODE_ELEMENT))
+        return E_FAIL;
+
     xml_name = xmlChar_from_wchar(name);
 
     switch(node_type)
diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h
index e46642d..34211da 100644
--- a/dlls/msxml3/msxml_private.h
+++ b/dlls/msxml3/msxml_private.h
@@ -1,5 +1,5 @@
 /*
- *    MSXML Class Factory
+ *    Common definitions
  *
  * Copyright 2005 Mike McCormack
  *
@@ -128,8 +128,6 @@ extern HRESULT queryresult_create( xmlNodePtr, LPWSTR, IXMLDOMNodeList ** );
 xmlNodePtr xmlNodePtr_from_domnode( IXMLDOMNode *iface, xmlElementType type );
 
 /* helpers */
-extern xmlChar *xmlChar_from_wchar( LPWSTR str );
-
 extern LONG xmldoc_add_ref( xmlDocPtr doc );
 extern LONG xmldoc_release( xmlDocPtr doc );
 extern HRESULT xmldoc_add_orphan( xmlDocPtr doc, xmlNodePtr node );
@@ -249,4 +247,18 @@ static inline LPWSTR heap_strdupW(LPCWSTR str)
     return ret;
 }
 
+static inline xmlChar *xmlChar_from_wchar( LPWSTR str )
+{
+    DWORD len;
+    xmlChar *xmlstr;
+
+    if (!str) return NULL;
+
+    len = WideCharToMultiByte( CP_UTF8, 0, str, -1, NULL, 0, NULL, NULL );
+    xmlstr = heap_alloc( len );
+    if ( xmlstr )
+        WideCharToMultiByte( CP_UTF8, 0, str, -1, (LPSTR) xmlstr, len, NULL, NULL );
+    return xmlstr;
+}
+
 #endif /* __MSXML_PRIVATE__ */
diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c
index 91f7a32..5324eb6 100644
--- a/dlls/msxml3/nodemap.c
+++ b/dlls/msxml3/nodemap.c
@@ -185,18 +185,6 @@ static HRESULT WINAPI xmlnodemap_Invoke(
     return hr;
 }
 
-xmlChar *xmlChar_from_wchar( LPWSTR str )
-{
-    DWORD len;
-    xmlChar *xmlstr;
-
-    len = WideCharToMultiByte( CP_UTF8, 0, str, -1, NULL, 0, NULL, NULL );
-    xmlstr = heap_alloc( len );
-    if ( xmlstr )
-        WideCharToMultiByte( CP_UTF8, 0, str, -1, (LPSTR) xmlstr, len, NULL, NULL );
-    return xmlstr;
-}
-
 static HRESULT WINAPI xmlnodemap_getNamedItem(
     IXMLDOMNamedNodeMap *iface,
     BSTR name,
diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index 869e261..11115b6 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -1698,6 +1698,21 @@ static void test_create(void)
     V_VT(&var) = VT_I1;
     V_I1(&var) = NODE_ELEMENT;
     str = SysAllocString( szlc );
+    node = (IXMLDOMNode*)0x1;
+    r = IXMLDOMDocument_createNode( doc, var, NULL, NULL, &node );
+    ok( r == E_FAIL, "returns %08x\n", r );
+    ok( node == (void*)0x1, "expected same ptr, got %p\n", node);
+
+    V_VT(&var) = VT_I1;
+    V_I1(&var) = NODE_ELEMENT;
+    node = (IXMLDOMNode*)0x1;
+    r = IXMLDOMDocument_createNode( doc, var, _bstr_(""), NULL, &node );
+    ok( r == E_FAIL, "returns %08x\n", r );
+    ok( node == (void*)0x1, "expected same ptr, got %p\n", node);
+
+    V_VT(&var) = VT_I1;
+    V_I1(&var) = NODE_ELEMENT;
+    str = SysAllocString( szlc );
     r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node );
     ok( r == S_OK, "returns %08x\n", r );
     if( SUCCEEDED(r) ) IXMLDOMNode_Release( node );
@@ -2885,7 +2900,15 @@ static void test_xmlTypes(void)
         IXMLDOMImplementation_Release(pIXMLDOMImplementation);
     }
 
+    pRoot = (IXMLDOMElement*)0x1;
+    hr = IXMLDOMDocument_createElement(doc, NULL, &pRoot);
+    ok(hr == E_INVALIDARG, "ret %08x\n", hr );
+    ok(pRoot == (void*)0x1, "Expect same ptr, got %p\n", pRoot);
 
+    pRoot = (IXMLDOMElement*)0x1;
+    hr = IXMLDOMDocument_createElement(doc, _bstr_(""), &pRoot);
+    ok(hr == E_FAIL, "ret %08x\n", hr );
+    ok(pRoot == (void*)0x1, "Expect same ptr, got %p\n", pRoot);
 
     hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &pRoot);
     ok(hr == S_OK, "ret %08x\n", hr );
@@ -3146,7 +3169,7 @@ static void test_xmlTypes(void)
 
             /* Element */
             str = SysAllocString(szElement);
-            hr = IXMLDOMDocument_createElement(doc, szElement, &pElement);
+            hr = IXMLDOMDocument_createElement(doc, str, &pElement);
             SysFreeString(str);
             ok(hr == S_OK, "ret %08x\n", hr );
             if(hr == S_OK)
-- 
1.5.6.5


--=-mEjUrSue/5irczRX+Csj--