Gabriel Ivăncescu : mshtml: Implement inline attributes parsing for createElement.
Alexandre Julliard
julliard at winehq.org
Wed Nov 10 15:34:47 CST 2021
Module: wine
Branch: master
Commit: a5be97d6342d02659cc86795ae2634b048e2803a
URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5be97d6342d02659cc86795ae2634b048e2803a
Author: Gabriel Ivăncescu <gabrielopcode at gmail.com>
Date: Tue Nov 9 23:00:38 2021 +0200
mshtml: Implement inline attributes parsing for createElement.
We let gecko parse a dummy unknown tag (after validation) using a contextual
fragment, and then copy its attributes to the proper element with correct tag.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mshtml/htmlelem.c | 134 +++++++++++++++++++++++++++++++++++++-
dlls/mshtml/tests/documentmode.js | 63 ++++++++++++++++++
2 files changed, 196 insertions(+), 1 deletion(-)
diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c
index de69e2f26d8..91ccfb97abc 100644
--- a/dlls/mshtml/htmlelem.c
+++ b/dlls/mshtml/htmlelem.c
@@ -355,6 +355,134 @@ static inline HTMLElement *impl_from_IHTMLElement(IHTMLElement *iface)
return CONTAINING_RECORD(iface, HTMLElement, IHTMLElement_iface);
}
+static HRESULT copy_nselem_attrs(nsIDOMElement *nselem_with_attrs, nsIDOMElement *nselem)
+{
+ nsIDOMMozNamedAttrMap *attrs;
+ nsAString name_str, val_str;
+ nsresult nsres, nsres2;
+ nsIDOMAttr *attr;
+ UINT32 i, length;
+
+ nsres = nsIDOMElement_GetAttributes(nselem_with_attrs, &attrs);
+ if(NS_FAILED(nsres))
+ return E_FAIL;
+
+ nsres = nsIDOMMozNamedAttrMap_GetLength(attrs, &length);
+ if(NS_FAILED(nsres)) {
+ nsIDOMMozNamedAttrMap_Release(attrs);
+ return E_FAIL;
+ }
+
+ nsAString_Init(&name_str, NULL);
+ nsAString_Init(&val_str, NULL);
+ for(i = 0; i < length; i++) {
+ nsres = nsIDOMMozNamedAttrMap_Item(attrs, i, &attr);
+ if(NS_FAILED(nsres))
+ continue;
+
+ nsres = nsIDOMAttr_GetNodeName(attr, &name_str);
+ nsres2 = nsIDOMAttr_GetNodeValue(attr, &val_str);
+ nsIDOMAttr_Release(attr);
+ if(NS_FAILED(nsres) || NS_FAILED(nsres2))
+ continue;
+
+ nsIDOMElement_SetAttribute(nselem, &name_str, &val_str);
+ }
+ nsAString_Finish(&name_str);
+ nsAString_Finish(&val_str);
+
+ nsIDOMMozNamedAttrMap_Release(attrs);
+ return S_OK;
+}
+
+static HRESULT create_nselem_parse(HTMLDocumentNode *doc, const WCHAR *tag, nsIDOMElement **ret)
+{
+ static const WCHAR prefix[4] = L"<FOO";
+ nsIDOMDocumentFragment *nsfragment;
+ WCHAR *p = wcschr(tag + 1, '>');
+ UINT32 i, name_len, size;
+ nsIDOMElement *nselem;
+ nsIDOMRange *nsrange;
+ nsIDOMNode *nsnode;
+ nsresult nsres;
+ nsAString str;
+ HRESULT hres;
+
+ if(!p || p[1] || wcschr(tag + 1, '<'))
+ return E_FAIL;
+ if(!doc->nsdoc) {
+ WARN("NULL nsdoc\n");
+ return E_UNEXPECTED;
+ }
+
+ /* Ignore the starting token and > or /> end token */
+ name_len = p - tag - 1 - (p[-1] == '/');
+
+ /* Get the tag name using HTML whitespace rules */
+ for(i = 1; i <= name_len; i++) {
+ if((tag[i] >= 0x09 && tag[i] <= 0x0d) || tag[i] == ' ') {
+ name_len = i - 1;
+ break;
+ }
+ }
+ if(!name_len)
+ return E_FAIL;
+ size = (p + 2 - (tag + 1 + name_len)) * sizeof(WCHAR);
+
+ /* Parse the input via a contextual fragment, using a dummy unknown tag */
+ nsres = nsIDOMHTMLDocument_CreateRange(doc->nsdoc, &nsrange);
+ if(NS_FAILED(nsres))
+ return map_nsresult(nsres);
+
+ if(!(p = heap_alloc(sizeof(prefix) + size))) {
+ nsIDOMRange_Release(nsrange);
+ return E_OUTOFMEMORY;
+ }
+ memcpy(p, prefix, sizeof(prefix));
+ memcpy(p + ARRAY_SIZE(prefix), tag + 1 + name_len, size);
+
+ nsAString_InitDepend(&str, p);
+ nsIDOMRange_CreateContextualFragment(nsrange, &str, &nsfragment);
+ nsIDOMRange_Release(nsrange);
+ nsAString_Finish(&str);
+ heap_free(p);
+ if(NS_FAILED(nsres))
+ return map_nsresult(nsres);
+
+ /* Grab the parsed element and copy its attributes into the proper element */
+ nsres = nsIDOMDocumentFragment_GetFirstChild(nsfragment, &nsnode);
+ nsIDOMDocumentFragment_Release(nsfragment);
+ if(NS_FAILED(nsres) || !nsnode)
+ return E_FAIL;
+
+ nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMElement, (void**)&nselem);
+ nsIDOMNode_Release(nsnode);
+ if(NS_FAILED(nsres))
+ return E_FAIL;
+
+ if(!(p = heap_alloc((name_len + 1) * sizeof(WCHAR))))
+ hres = E_OUTOFMEMORY;
+ else {
+ memcpy(p, tag + 1, name_len * sizeof(WCHAR));
+ p[name_len] = '\0';
+
+ nsAString_InitDepend(&str, p);
+ nsres = nsIDOMHTMLDocument_CreateElement(doc->nsdoc, &str, ret);
+ nsAString_Finish(&str);
+ heap_free(p);
+
+ if(NS_FAILED(nsres))
+ hres = map_nsresult(nsres);
+ else {
+ hres = copy_nselem_attrs(nselem, *ret);
+ if(FAILED(hres))
+ nsIDOMElement_Release(*ret);
+ }
+ }
+ nsIDOMElement_Release(nselem);
+ return hres;
+}
+
HRESULT create_nselem(HTMLDocumentNode *doc, const WCHAR *tag, nsIDOMElement **ret)
{
nsAString tag_str;
@@ -385,7 +513,11 @@ HRESULT create_element(HTMLDocumentNode *doc, const WCHAR *tag, HTMLElement **re
if(!doc->nsdoc)
doc = doc->node.doc;
- hres = create_nselem(doc, tag, &nselem);
+ /* IE8 and below allow creating elements with attributes, such as <div class="a"> */
+ if(tag[0] == '<' && dispex_compat_mode(&doc->node.event_target.dispex) <= COMPAT_MODE_IE8)
+ hres = create_nselem_parse(doc, tag, &nselem);
+ else
+ hres = create_nselem(doc, tag, &nselem);
if(FAILED(hres))
return hres;
diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js
index 02a5f5f3f75..d5662239bfa 100644
--- a/dlls/mshtml/tests/documentmode.js
+++ b/dlls/mshtml/tests/documentmode.js
@@ -488,6 +488,69 @@ sync_test("style_props", function() {
}
});
+sync_test("createElement_inline_attr", function() {
+ var v = document.documentMode, e, s;
+
+ if(v < 9) {
+ s = document.createElement("<div>").tagName;
+ ok(s === "DIV", "<div>.tagName returned " + s);
+ s = document.createElement("<div >").tagName;
+ ok(s === "DIV", "<div >.tagName returned " + s);
+ s = document.createElement("<div/>").tagName;
+ ok(s === "DIV", "<div/>.tagName returned " + s);
+ e = 0;
+ try {
+ document.createElement("<div");
+ }catch(ex) {
+ e = ex.number;
+ }
+ ok(e === 0x4005 - 0x80000000, "<div e = " + e);
+ e = 0;
+ try {
+ document.createElement("<div test=1");
+ }catch(ex) {
+ e = ex.number;
+ }
+ ok(e === 0x4005 - 0x80000000, "<div test=1 e = " + e);
+
+ var tags = [ "div", "head", "body", "title", "html" ];
+
+ for(var i = 0; i < tags.length; i++) {
+ e = document.createElement("<" + tags[i] + " test='a\"' abcd=\""b"\">");
+ ok(e.tagName === tags[i].toUpperCase(), "<" + tags[i] + " test=\"a\" abcd=\"b\">.tagName returned " + e.tagName);
+ todo_wine_if(v == 8).
+ ok(e.test === "a\"", "<" + tags[i] + " test='a\"' abcd=\""b"\">.test returned " + e.test);
+ todo_wine_if(v == 8).
+ ok(e.abcd === "\"b\"", "<" + tags[i] + " test='a\"' abcd=\""b"\">.abcd returned " + e.abcd);
+ }
+ }else {
+ s = "";
+ e = 0;
+ try {
+ document.createElement("<div>");
+ }catch(ex) {
+ s = ex.toString();
+ e = ex.number;
+ }
+ todo_wine.
+ ok(e === undefined, "<div> e = " + e);
+ todo_wine.
+ ok(s === "InvalidCharacterError", "<div> s = " + s);
+ s = "";
+ e = 0;
+ try {
+ document.createElement("<div test=\"a\">");
+ }catch(ex) {
+ s = ex.toString();
+ e = ex.number;
+ }
+ todo_wine.
+ ok(e === undefined, "<div test=\"a\"> e = " + e);
+ todo_wine.
+ ok(s === "InvalidCharacterError", "<div test=\"a\"> s = " + s);
+ }
+});
+
sync_test("JS objs", function() {
var g = window;
More information about the wine-cvs
mailing list