diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 06a9a5382b9..7efdce62e90 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -376,7 +376,7 @@ static HRESULT var_to_styleval(const VARIANT *v, WCHAR *buf, DWORD flags, const return S_OK; } default: - FIXME("not implemented vt %d\n", V_VT(v)); + FIXME("not implemented for %s\n", debugstr_variant(v)); return E_NOTIMPL; } @@ -851,7 +851,7 @@ static HRESULT WINAPI HTMLStyle_put_fontSize(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); switch(V_VT(&v)) { case VT_BSTR: @@ -891,7 +891,7 @@ static HRESULT WINAPI HTMLStyle_put_color(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); switch(V_VT(&v)) { case VT_BSTR: @@ -937,7 +937,7 @@ static HRESULT WINAPI HTMLStyle_put_backgroundColor(IHTMLStyle *iface, VARIANT v { HTMLStyle *This = impl_from_IHTMLStyle(iface); - TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); switch(V_VT(&v)) { case VT_BSTR: @@ -1053,7 +1053,7 @@ static HRESULT WINAPI HTMLStyle_put_backgroundPositionX(IHTMLStyle *iface, VARIA DWORD val_len; HRESULT hres; - TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); hres = var_to_styleval(&v, buf, ATTR_FIX_PX, &val); if(FAILED(hres)) @@ -1146,7 +1146,7 @@ static HRESULT WINAPI HTMLStyle_put_backgroundPositionY(IHTMLStyle *iface, VARIA DWORD val_len; HRESULT hres; - TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); hres = var_to_styleval(&v, buf, ATTR_FIX_PX, &val); if(FAILED(hres)) @@ -1231,7 +1231,9 @@ static HRESULT WINAPI HTMLStyle_get_backgroundPositionY(IHTMLStyle *iface, VARIA static HRESULT WINAPI HTMLStyle_put_wordSpacing(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + return set_nsstyle_attr_var(This->nsstyle, STYLEID_WORD_SPACING, &v, 0); } @@ -1245,7 +1247,9 @@ static HRESULT WINAPI HTMLStyle_get_wordSpacing(IHTMLStyle *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle_put_letterSpacing(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + return set_nsstyle_attr_var(This->nsstyle, STYLEID_LETTER_SPACING, &v, 0); } @@ -1441,7 +1445,7 @@ static HRESULT WINAPI HTMLStyle_get_textAlign(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_textIndent(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1455,7 +1459,7 @@ static HRESULT WINAPI HTMLStyle_get_textIndent(IHTMLStyle *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle_put_lineHeight(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1470,7 +1474,7 @@ static HRESULT WINAPI HTMLStyle_put_marginTop(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_nsstyle_attr_var(This->nsstyle, STYLEID_MARGIN_TOP, &v, ATTR_FIX_PX); } @@ -1488,7 +1492,7 @@ static HRESULT WINAPI HTMLStyle_put_marginRight(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - TRACE("(%p)->(v(%d))\n", This, V_VT(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_nsstyle_attr_var(This->nsstyle, STYLEID_MARGIN_RIGHT, &v, ATTR_FIX_PX); } @@ -1504,7 +1508,7 @@ static HRESULT WINAPI HTMLStyle_put_marginBottom(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_nsstyle_attr_var(This->nsstyle, STYLEID_MARGIN_BOTTOM, &v, ATTR_FIX_PX); } @@ -1522,7 +1526,7 @@ static HRESULT WINAPI HTMLStyle_put_marginLeft(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_nsstyle_attr_var(This->nsstyle, STYLEID_MARGIN_LEFT, &v, ATTR_FIX_PX); } @@ -1556,7 +1560,7 @@ static HRESULT WINAPI HTMLStyle_put_paddingTop(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_nsstyle_attr_var(This->nsstyle, STYLEID_PADDING_TOP, &v, ATTR_FIX_PX); } @@ -1574,7 +1578,7 @@ static HRESULT WINAPI HTMLStyle_put_paddingRight(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_nsstyle_attr_var(This->nsstyle, STYLEID_PADDING_RIGHT, &v, ATTR_FIX_PX); } @@ -1592,7 +1596,7 @@ static HRESULT WINAPI HTMLStyle_put_paddingBottom(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_nsstyle_attr_var(This->nsstyle, STYLEID_PADDING_BOTTOM, &v, ATTR_FIX_PX); } @@ -1610,7 +1614,7 @@ static HRESULT WINAPI HTMLStyle_put_paddingLeft(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_nsstyle_attr_var(This->nsstyle, STYLEID_PADDING_LEFT, &v, ATTR_FIX_PX); } @@ -1742,7 +1746,7 @@ static HRESULT WINAPI HTMLStyle_put_borderTopColor(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_nsstyle_attr_var(This->nsstyle, STYLEID_BORDER_TOP_COLOR, &v, ATTR_HEX_INT); } @@ -1760,7 +1764,7 @@ static HRESULT WINAPI HTMLStyle_put_borderRightColor(IHTMLStyle *iface, VARIANT { HTMLStyle *This = impl_from_IHTMLStyle(iface); - TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_nsstyle_attr_var(This->nsstyle, STYLEID_BORDER_RIGHT_COLOR, &v, ATTR_HEX_INT); } @@ -1778,7 +1782,7 @@ static HRESULT WINAPI HTMLStyle_put_borderBottomColor(IHTMLStyle *iface, VARIANT { HTMLStyle *This = impl_from_IHTMLStyle(iface); - TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_nsstyle_attr_var(This->nsstyle, STYLEID_BORDER_BOTTOM_COLOR, &v, ATTR_HEX_INT); } @@ -1796,7 +1800,7 @@ static HRESULT WINAPI HTMLStyle_put_borderLeftColor(IHTMLStyle *iface, VARIANT v { HTMLStyle *This = impl_from_IHTMLStyle(iface); - TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_nsstyle_attr_var(This->nsstyle, STYLEID_BORDER_LEFT_COLOR, &v, ATTR_HEX_INT); } @@ -1827,7 +1831,9 @@ static HRESULT WINAPI HTMLStyle_get_borderWidth(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_borderTopWidth(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + return set_nsstyle_attr_var(This->nsstyle, STYLEID_BORDER_TOP_WIDTH, &v, 0); } @@ -1843,14 +1849,18 @@ static HRESULT WINAPI HTMLStyle_get_borderTopWidth(IHTMLStyle *iface, VARIANT *p static HRESULT WINAPI HTMLStyle_put_borderRightWidth(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + return set_nsstyle_attr_var(This->nsstyle, STYLEID_BORDER_RIGHT_WIDTH, &v, 0); } static HRESULT WINAPI HTMLStyle_get_borderRightWidth(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr_var(This->nsstyle, STYLEID_BORDER_RIGHT_WIDTH, p, 0); } @@ -1858,7 +1868,8 @@ static HRESULT WINAPI HTMLStyle_put_borderBottomWidth(IHTMLStyle *iface, VARIANT { HTMLStyle *This = impl_from_IHTMLStyle(iface); - TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + return set_nsstyle_attr_var(This->nsstyle, STYLEID_BORDER_BOTTOM_WIDTH, &v, 0); } @@ -1872,7 +1883,9 @@ static HRESULT WINAPI HTMLStyle_get_borderBottomWidth(IHTMLStyle *iface, VARIANT static HRESULT WINAPI HTMLStyle_put_borderLeftWidth(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + return set_nsstyle_attr_var(This->nsstyle, STYLEID_BORDER_LEFT_WIDTH, &v, 0); } @@ -2010,7 +2023,7 @@ static HRESULT WINAPI HTMLStyle_put_width(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_nsstyle_attr_var(This->nsstyle, STYLEID_WIDTH, &v, ATTR_FIX_PX); }