mshtml: Added IHTMLCurrentStyle::styleFloat property implementation.
authorJacek Caban <jacek@codeweavers.com>
Thu, 7 Jan 2016 15:30:18 +0000 (16:30 +0100)
committerAlexandre Julliard <julliard@winehq.org>
Fri, 8 Jan 2016 12:38:38 +0000 (21:38 +0900)
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
dlls/mshtml/htmlcurstyle.c
dlls/mshtml/tests/style.c

index 8e7a1467b8bd6985973bf6fad10c1ecfca57aa11..4257074521f03b253ae498c7418edaa544d93441 100644 (file)
@@ -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)
index 5d8e1582d3b991d5ffced14f62e36ee7fc865faf..18905b13f144079228f607b8b48e8aba2f581f69 100644 (file)
@@ -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;