From 6cc0e706dd7f5afa340470a77ef9488896e4e213 Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <nsivov@codeweavers.com>
Date: Mon, 6 May 2013 16:03:06 +0400
Subject: [PATCH] msxml3: Always return False for nodes that can't have
 children.

---
 dlls/msxml3/cdata.c         | 2 +-
 dlls/msxml3/comment.c       | 2 +-
 dlls/msxml3/msxml_private.h | 9 +++++++++
 dlls/msxml3/text.c          | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c
index 7fd4a37eb5f..61c0ce2d956 100644
--- a/dlls/msxml3/cdata.c
+++ b/dlls/msxml3/cdata.c
@@ -333,7 +333,7 @@ static HRESULT WINAPI domcdata_hasChildNodes(
 {
     domcdata *This = impl_from_IXMLDOMCDATASection( iface );
     TRACE("(%p)->(%p)\n", This, ret);
-    return node_has_childnodes(&This->node, ret);
+    return return_var_false(ret);
 }
 
 static HRESULT WINAPI domcdata_get_ownerDocument(
diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c
index be49e717f11..879ca4837e7 100644
--- a/dlls/msxml3/comment.c
+++ b/dlls/msxml3/comment.c
@@ -332,7 +332,7 @@ static HRESULT WINAPI domcomment_hasChildNodes(
 {
     domcomment *This = impl_from_IXMLDOMComment( iface );
     TRACE("(%p)->(%p)\n", This, ret);
-    return node_has_childnodes(&This->node, ret);
+    return return_var_false(ret);
 }
 
 static HRESULT WINAPI domcomment_get_ownerDocument(
diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h
index 6c24119c350..17e19a71813 100644
--- a/dlls/msxml3/msxml_private.h
+++ b/dlls/msxml3/msxml_private.h
@@ -475,6 +475,15 @@ static inline HRESULT return_null_bstr(BSTR *p)
     return S_FALSE;
 }
 
+static inline HRESULT return_var_false(VARIANT_BOOL *p)
+{
+    if(!p)
+        return E_INVALIDARG;
+
+    *p = VARIANT_FALSE;
+    return S_FALSE;
+}
+
 extern IXMLDOMParseError *create_parseError( LONG code, BSTR url, BSTR reason, BSTR srcText,
                                              LONG line, LONG linepos, LONG filepos ) DECLSPEC_HIDDEN;
 extern HRESULT DOMDocument_create(MSXML_VERSION, IUnknown*, void**) DECLSPEC_HIDDEN;
diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c
index e9c64c17bf7..fd8e33adfb2 100644
--- a/dlls/msxml3/text.c
+++ b/dlls/msxml3/text.c
@@ -330,7 +330,7 @@ static HRESULT WINAPI domtext_hasChildNodes(
 {
     domtext *This = impl_from_IXMLDOMText( iface );
     TRACE("(%p)->(%p)\n", This, ret);
-    return node_has_childnodes(&This->node, ret);
+    return return_var_false(ret);
 }
 
 static HRESULT WINAPI domtext_get_ownerDocument(
-- 
2.11.4.GIT