Jacek Caban : mshtml: Use variant_to_nsstr in IHTMLDOMNode3:: put_textContent.
Alexandre Julliard
julliard at winehq.org
Fri Apr 19 17:30:46 CDT 2019
Module: wine
Branch: master
Commit: d538e86a60c8c8776dc2989309200d7c3abcb8ad
URL: https://source.winehq.org/git/wine.git/?a=commit;h=d538e86a60c8c8776dc2989309200d7c3abcb8ad
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Apr 19 16:37:23 2019 +0200
mshtml: Use variant_to_nsstr in IHTMLDOMNode3::put_textContent.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mshtml/htmlnode.c | 7 +------
dlls/mshtml/tests/elements.js | 5 +++++
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c
index 36cfc80..32f6efd 100644
--- a/dlls/mshtml/htmlnode.c
+++ b/dlls/mshtml/htmlnode.c
@@ -1245,12 +1245,7 @@ static HRESULT WINAPI HTMLDOMNode3_put_textContent(IHTMLDOMNode3 *iface, VARIANT
TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));
- if(V_VT(&v) != VT_BSTR) {
- FIXME("unsupported argument %s\n", debugstr_variant(&v));
- return E_NOTIMPL;
- }
-
- nsAString_Init(&nsstr, V_BSTR(&v));
+ variant_to_nsstr(&v, FALSE, &nsstr);
nsres = nsIDOMNode_SetTextContent(This->nsnode, &nsstr);
nsAString_Finish(&nsstr);
if(NS_FAILED(nsres)) {
diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js
index 4c647d6..4f0c802 100644
--- a/dlls/mshtml/tests/elements.js
+++ b/dlls/mshtml/tests/elements.js
@@ -77,6 +77,11 @@ function test_textContent() {
ok(div.textContent === "", "div.textContent = " + div.textContent);
ok(div.childNodes.length === 0, "div.childNodes.length = " + div.childNodes.length);
+ div.textContent = null;
+ ok(div.textContent === "", "div.textContent = " + div.textContent);
+ div.textContent = 11;
+ ok(div.textContent === "11", "div.textContent = " + div.textContent);
+
ok(document.textContent === null, "document.textContent = " + document.textContent);
next_test();
More information about the wine-cvs
mailing list