[PATCH v5 0/3] MR1918: Draft: Implement HTMLDocument_get_body and HTMLDocument_get_all for document fragments

[Santino Mazza (＠tati1454)]

This functions should also work with document fragments, in wine they only return NULL.

--
  v5: mshtml: Implement HTMLDocument_get_body for document fragments.
      mshtml: Implement get_all for document fragments.
      mshtml/tests: Test for get_all and get_body in document fragments.

https://gitlab.winehq.org/wine/wine/-/merge_requests/1918

[PATCH v5 1/3] mshtml/tests: Test for get_all and get_body in document fragments.

[Santino Mazza]

From: Santino Mazza

---
 dlls/mshtml/tests/dom.c | 61 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 57 insertions(+), 4 deletions(-)

diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index 6a960bfa21f..b1d683d46d1 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -10984,7 +10984,7 @@ static IHTMLDocument2 *create_docfrag(IHTMLDocument2 *doc)
 static void test_docfrag(IHTMLDocument2 *doc)
 {
     IHTMLDocument2 *frag, *owner_doc, *doc_node;
-    IHTMLElement *div, *body, *br;
+    IHTMLElement *div, *main_body, *frag_body, *br,*html;
     IHTMLElementCollection *col;
     IHTMLLocation *location;
     HRESULT hres;
@@ -10998,14 +10998,21 @@ static void test_docfrag(IHTMLDocument2 *doc)
         ET_BR
     };

+    static const elem_type_t frag_types[] = {
+            ET_HTML,
+            ET_DIV,
+            ET_DIV,
+            ET_BODY
+    };
+
     frag = create_docfrag(doc);

test_disp((IUnknown*)frag, &DIID_DispHTMLDocument, &CLSID_HTMLDocument, L"[object]");

-    body = (void*)0xdeadbeef;
-    hres = IHTMLDocument2_get_body(frag, &body);
+    frag_body = (void*)0xdeadbeef;
+    hres = IHTMLDocument2_get_body(frag, &frag_body);
     ok(hres == S_OK, "get_body failed: %08lx\n", hres);
-    ok(!body, "body != NULL\n");
+    ok(!frag_body, "body != NULL\n");

location = (void*)0xdeadbeef;
     hres = IHTMLDocument2_get_location(frag, &location);
@@ -11030,6 +11037,52 @@ static void test_docfrag(IHTMLDocument2 *doc)
     test_elem_collection((IUnknown*)col, all_types, ARRAY_SIZE(all_types));
     IHTMLElementCollection_Release(col);

+    html = test_create_elem(doc, L"HTML");
+    test_elem_source_index(html, -1);
+    test_node_append_child((IUnknown*)frag, (IUnknown*)html);
+    test_elem_source_index(html, 0);
+
+    div = test_create_elem(doc, L"DIV");
+    test_elem_source_index(div, -1);
+    test_node_append_child((IUnknown*)html, (IUnknown*)div);
+    test_elem_source_index(div, 1);
+    IHTMLElement_Release(div);
+
+    div = test_create_elem(doc, L"DIV");
+    test_elem_source_index(div, -1);
+    test_node_append_child((IUnknown*)html, (IUnknown*)div);
+    test_elem_source_index(div, 2);
+
+    frag_body = test_create_elem(doc, L"BODY");
+    test_elem_source_index(frag_body, -1);
+    test_node_append_child((IUnknown*)div, (IUnknown*)frag_body);
+    test_elem_source_index(frag_body, 3);
+    IHTMLElement_Release(frag_body);
+    IHTMLElement_Release(div);
+    IHTMLElement_Release(html);
+
+    hres = IHTMLDocument2_get_body(doc, &main_body);
+    ok(hres == S_OK, "get_body failed: %08lx\n", hres);
+    ok(main_body != NULL, "body == NULL\n");
+
+    hres = IHTMLDocument2_get_body(frag, &frag_body);
+    ok(hres == S_OK, "get_body failed: %08lx\n", hres);
+    todo_wine ok(frag_body != NULL, "body == NULL\n");
+    if (frag_body) {
+        todo_wine ok(!iface_cmp((IUnknown *) frag_body, (IUnknown *) main_body), "frag_body == main_body\n");
+        IHTMLElement_Release(frag_body);
+    }
+    IHTMLElement_Release(main_body);
+
+    col = NULL;
+    hres = IHTMLDocument2_get_all(frag, &col);
+    todo_wine ok(hres == S_OK, "get_all failed: %08lx\n", hres);
+    todo_wine ok(col != NULL, "got null elements collection\n");
+    if (col) {
+        test_elem_collection((IUnknown *) col, frag_types, ARRAY_SIZE(frag_types));
+        IHTMLElementCollection_Release(col);
+    }
+
     div = test_create_elem(frag, L"div");
     owner_doc = get_owner_doc((IUnknown*)div);
     doc_node = get_doc_node(doc);

[PATCH v5 2/3] mshtml: Implement get_all for document fragments.

[Santino Mazza]

From: Santino Mazza

---
 dlls/mshtml/htmldoc.c   | 4 ++--
 dlls/mshtml/tests/dom.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c
index 90c4706abee..ac471e9e1a8 100644
--- a/dlls/mshtml/htmldoc.c
+++ b/dlls/mshtml/htmldoc.c
@@ -495,8 +495,8 @@ static HRESULT WINAPI HTMLDocument_get_all(IHTMLDocument2 *iface, IHTMLElementCo
     TRACE("(%p)->(%p)\n", This, p);

if(!This->dom_document) {
-        WARN("NULL dom_document\n");
-        return E_UNEXPECTED;
+        *p = create_all_collection(&This->node, FALSE);
+        return S_OK;
     }

nsres = nsIDOMDocument_GetDocumentElement(This->dom_document, &nselem);
diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index b1d683d46d1..dfdae8d92be 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -11076,8 +11076,8 @@ static void test_docfrag(IHTMLDocument2 *doc)

col = NULL;
     hres = IHTMLDocument2_get_all(frag, &col);
-    todo_wine ok(hres == S_OK, "get_all failed: %08lx\n", hres);
-    todo_wine ok(col != NULL, "got null elements collection\n");
+    ok(hres == S_OK, "get_all failed: %08lx\n", hres);
+    ok(col != NULL, "got null elements collection\n");
     if (col) {
         test_elem_collection((IUnknown *) col, frag_types, ARRAY_SIZE(frag_types));
         IHTMLElementCollection_Release(col);

[PATCH v5 3/3] mshtml: Implement HTMLDocument_get_body for document fragments.

[Santino Mazza]

From: Santino Mazza

---
 dlls/mshtml/htmldoc.c   | 20 +++++++++++++++-----
 dlls/mshtml/tests/dom.c |  4 ++--
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c
index ac471e9e1a8..5db8c51bd76 100644
--- a/dlls/mshtml/htmldoc.c
+++ b/dlls/mshtml/htmldoc.c
@@ -523,20 +523,30 @@ static HRESULT WINAPI HTMLDocument_get_all(IHTMLDocument2 *iface, IHTMLElementCo
 static HRESULT WINAPI HTMLDocument_get_body(IHTMLDocument2 *iface, IHTMLElement **p)
 {
     HTMLDocumentNode *This = impl_from_IHTMLDocument2(iface);
-    nsIDOMHTMLElement *nsbody = NULL;
+    nsIDOMElement *nsbody = NULL;
     HTMLElement *element;
+    nsresult nsres;
     HRESULT hres;

TRACE("(%p)->(%p)\n", This, p);

if(This->html_document) {
-        nsresult nsres;
-
-        nsres = nsIDOMHTMLDocument_GetBody(This->html_document, &nsbody);
+        nsres = nsIDOMHTMLDocument_GetBody(This->html_document, (nsIDOMHTMLElement **)&nsbody);
         if(NS_FAILED(nsres)) {
             TRACE("Could not get body: %08lx\n", nsres);
             return E_UNEXPECTED;
         }
+    }else {
+        nsAString nsnode_name;
+        nsIDOMDocumentFragment *frag;
+
+        nsres = nsIDOMNode_QueryInterface(This->node.nsnode, &IID_nsIDOMDocumentFragment, (void**)&frag);
+        if(!NS_FAILED(nsres)) {
+            nsAString_InitDepend(&nsnode_name, L"BODY");
+            nsIDOMDocumentFragment_QuerySelector(frag, &nsnode_name, &nsbody);
+            nsAString_Finish(&nsnode_name);
+            nsIDOMDocumentFragment_Release(frag);
+        }
     }

if(!nsbody) {
@@ -545,7 +555,7 @@ static HRESULT WINAPI HTMLDocument_get_body(IHTMLDocument2 *iface, IHTMLElement
     }

hres = get_element((nsIDOMElement*)nsbody, &element);
-    nsIDOMHTMLElement_Release(nsbody);
+    nsIDOMElement_Release(nsbody);
     if(FAILED(hres))
         return hres;

diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index dfdae8d92be..856d70b3e1a 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -11067,9 +11067,9 @@ static void test_docfrag(IHTMLDocument2 *doc)

hres = IHTMLDocument2_get_body(frag, &frag_body);
     ok(hres == S_OK, "get_body failed: %08lx\n", hres);
-    todo_wine ok(frag_body != NULL, "body == NULL\n");
+    ok(frag_body != NULL, "body == NULL\n");
     if (frag_body) {
-        todo_wine ok(!iface_cmp((IUnknown *) frag_body, (IUnknown *) main_body), "frag_body == main_body\n");
+        ok(!iface_cmp((IUnknown *) frag_body, (IUnknown *) main_body), "frag_body == main_body\n");
         IHTMLElement_Release(frag_body);
     }
     IHTMLElement_Release(main_body);

[Gabriel Ivăncescu (＠insn)]

Gabriel Ivăncescu (@insn) commented about dlls/mshtml/htmldoc.c:
>  }
>
>  hres = get_element((nsIDOMElement*)nsbody, &element);

You forgot to remove the cast here.