Jacek Caban : mshtml: Added IHTMLCurrentStyle:: styleFloat property implementation.
Alexandre Julliard
julliard at wine.codeweavers.com
Sat Jan 9 03:32:18 CST 2016
Module: wine
Branch: master
Commit: fef68e1af918a06c3f450f19c2a57332bb19d7e6
URL: http://source.winehq.org/git/wine.git/?a=commit;h=fef68e1af918a06c3f450f19c2a57332bb19d7e6
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Jan 7 16:30:18 2016 +0100
mshtml: Added IHTMLCurrentStyle::styleFloat property implementation.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mshtml/htmlcurstyle.c | 6 ++++--
dlls/mshtml/tests/style.c | 5 +++++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c
index 8e7a146..4257074 100644
--- a/dlls/mshtml/htmlcurstyle.c
+++ b/dlls/mshtml/htmlcurstyle.c
@@ -163,8 +163,10 @@ static HRESULT WINAPI HTMLCurrentStyle_get_position(IHTMLCurrentStyle *iface, BS
static HRESULT WINAPI HTMLCurrentStyle_get_styleFloat(IHTMLCurrentStyle *iface, BSTR *p)
{
HTMLCurrentStyle *This = impl_from_IHTMLCurrentStyle(iface);
- FIXME("(%p)->(%p)\n", This, p);
- return E_NOTIMPL;
+
+ TRACE("(%p)->(%p)\n", This, p);
+
+ return get_nsstyle_attr(This->nsstyle, STYLEID_FLOAT, p, 0);
}
static HRESULT WINAPI HTMLCurrentStyle_get_color(IHTMLCurrentStyle *iface, VARIANT *p)
diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c
index 5d8e158..18905b1 100644
--- a/dlls/mshtml/tests/style.c
+++ b/dlls/mshtml/tests/style.c
@@ -2899,6 +2899,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style)
ok(hres == S_OK, "get_textTransform failed: %08x\n", hres);
SysFreeString(str);
+ hres = IHTMLCurrentStyle_get_styleFloat(current_style, &str);
+ ok(hres == S_OK, "get_styleFloat failed: %08x\n", hres);
+ ok(!strcmp_wa(str, "none"), "styleFloat = %s\n", wine_dbgstr_w(str));
+ SysFreeString(str);
+
current_style2 = get_current_style2_iface((IUnknown*)current_style);
b = 100;
More information about the wine-cvs
mailing list