Commit 8d40873d authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

mshtml: Add IHTMLCSSStyleDeclaration2::transform property implementation.

parent d90c1e1c
...@@ -794,6 +794,10 @@ static const style_tbl_entry_t style_tbl[] = { ...@@ -794,6 +794,10 @@ static const style_tbl_entry_t style_tbl[] = {
STDPROPID_XOBJ_TOP STDPROPID_XOBJ_TOP
}, },
{ {
L"transform",
DISPID_IHTMLCSSSTYLEDECLARATION2_TRANSFORM
},
{
vertical_alignW, vertical_alignW,
DISPID_IHTMLCSSSTYLEDECLARATION_VERTICALALIGN, DISPID_IHTMLCSSSTYLEDECLARATION_VERTICALALIGN,
DISPID_A_VERTICALALIGN, DISPID_A_VERTICALALIGN,
...@@ -9577,15 +9581,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_msTouchSelect(IHTMLCSSStyleDe ...@@ -9577,15 +9581,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_msTouchSelect(IHTMLCSSStyleDe
static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_transform(IHTMLCSSStyleDeclaration2 *iface, BSTR v) static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_transform(IHTMLCSSStyleDeclaration2 *iface, BSTR v)
{ {
CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface);
FIXME("(%p)->(%s)\n", This, debugstr_w(v)); TRACE("(%p)->(%s)\n", This, debugstr_w(v));
return E_NOTIMPL; return set_style_property(This, STYLEID_TRANSFORM, v);
} }
static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_transform(IHTMLCSSStyleDeclaration2 *iface, BSTR *p) static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_transform(IHTMLCSSStyleDeclaration2 *iface, BSTR *p)
{ {
CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface);
FIXME("(%p)->(%p)\n", This, p); TRACE("(%p)->(%p)\n", This, p);
return E_NOTIMPL; return get_style_property(This, STYLEID_TRANSFORM, p);
} }
static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_transformOrigin(IHTMLCSSStyleDeclaration2 *iface, BSTR v) static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_transformOrigin(IHTMLCSSStyleDeclaration2 *iface, BSTR v)
......
...@@ -126,6 +126,7 @@ typedef enum { ...@@ -126,6 +126,7 @@ typedef enum {
STYLEID_TEXT_INDENT, STYLEID_TEXT_INDENT,
STYLEID_TEXT_TRANSFORM, STYLEID_TEXT_TRANSFORM,
STYLEID_TOP, STYLEID_TOP,
STYLEID_TRANSFORM,
STYLEID_VERTICAL_ALIGN, STYLEID_VERTICAL_ALIGN,
STYLEID_VISIBILITY, STYLEID_VISIBILITY,
STYLEID_WHITE_SPACE, STYLEID_WHITE_SPACE,
......
...@@ -829,6 +829,34 @@ static void test_css_style_declaration(IHTMLCSSStyleDeclaration *css_style) ...@@ -829,6 +829,34 @@ static void test_css_style_declaration(IHTMLCSSStyleDeclaration *css_style)
VariantClear(&v); VariantClear(&v);
} }
static void test_css_style_declaration2(IHTMLCSSStyleDeclaration2 *css_style)
{
BSTR str;
HRESULT hres;
str = SysAllocString(L"translate(30px, 20px)");
hres = IHTMLCSSStyleDeclaration2_put_transform(css_style, str);
ok(hres == S_OK, "put_transform failed: %08x\n", hres);
SysFreeString(str);
str = NULL;
hres = IHTMLCSSStyleDeclaration2_get_transform(css_style, &str);
ok(hres == S_OK, "get_transform failed: %08x\n", hres);
ok(!lstrcmpW(str, L"translate(30px, 20px)"), "transform = %s\n", wine_dbgstr_w(str));
SysFreeString(str);
str = SysAllocString(L"none");
hres = IHTMLCSSStyleDeclaration2_put_transform(css_style, str);
ok(hres == S_OK, "put_transform failed: %08x\n", hres);
SysFreeString(str);
str = NULL;
hres = IHTMLCSSStyleDeclaration2_get_transform(css_style, &str);
ok(hres == S_OK, "get_transform failed: %08x\n", hres);
ok(!lstrcmpW(str, L"none"), "transform = %s\n", wine_dbgstr_w(str));
SysFreeString(str);
}
static void test_body_style(IHTMLStyle *style) static void test_body_style(IHTMLStyle *style)
{ {
IHTMLCSSStyleDeclaration *css_style; IHTMLCSSStyleDeclaration *css_style;
...@@ -2977,8 +3005,11 @@ static void test_body_style(IHTMLStyle *style) ...@@ -2977,8 +3005,11 @@ static void test_body_style(IHTMLStyle *style)
win_skip("IHTMLStyle6 not available\n"); win_skip("IHTMLStyle6 not available\n");
} }
if(compat_mode >= COMPAT_IE9) if(compat_mode >= COMPAT_IE9) {
test_css_style_declaration(css_style); test_css_style_declaration(css_style);
if(css_style2)
test_css_style_declaration2(css_style2);
}
if(css_style2) if(css_style2)
IHTMLCSSStyleDeclaration2_Release(css_style2); IHTMLCSSStyleDeclaration2_Release(css_style2);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment