Jacek Caban : mshtml: Use set_nsstyle_attr_var in IHTMLStyle:: put_left implementation.
Alexandre Julliard
julliard at winehq.org
Tue Oct 14 08:29:37 CDT 2008
Module: wine
Branch: master
Commit: 53d6b6616e93e7aaf6ac8a31f40b3742fbdec7fc
URL: http://source.winehq.org/git/wine.git/?a=commit;h=53d6b6616e93e7aaf6ac8a31f40b3742fbdec7fc
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Oct 13 14:51:27 2008 -0500
mshtml: Use set_nsstyle_attr_var in IHTMLStyle::put_left implementation.
---
dlls/mshtml/htmlstyle.c | 10 +---------
dlls/mshtml/tests/dom.c | 11 +++++++++++
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c
index baa9cce..e90d723 100644
--- a/dlls/mshtml/htmlstyle.c
+++ b/dlls/mshtml/htmlstyle.c
@@ -1625,15 +1625,7 @@ static HRESULT WINAPI HTMLStyle_put_left(IHTMLStyle *iface, VARIANT v)
TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));
- switch(V_VT(&v)) {
- case VT_BSTR:
- return set_style_attr(This, STYLEID_LEFT, V_BSTR(&v), 0);
- default:
- FIXME("unimplemented vt %d\n", V_VT(&v));
- return E_NOTIMPL;
- }
-
- return S_OK;
+ return set_nsstyle_attr_var(This->nsstyle, STYLEID_LEFT, &v, 0);
}
static HRESULT WINAPI HTMLStyle_get_left(IHTMLStyle *iface, VARIANT *p)
diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index a3108d4..f2252a1 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -2339,6 +2339,17 @@ static void test_default_style(IHTMLStyle *style)
ok(!strcmp_wa(V_BSTR(&v), "3px"), "V_BSTR(v) = %s\n", dbgstr_w(V_BSTR(&v)));
VariantClear(&v);
+ V_VT(&v) = VT_NULL;
+ hres = IHTMLStyle_put_left(style, v);
+ ok(hres == S_OK, "put_left failed: %08x\n", hres);
+
+ V_VT(&v) = VT_EMPTY;
+ hres = IHTMLStyle_get_left(style, &v);
+ ok(hres == S_OK, "get_left failed: %08x\n", hres);
+ ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v));
+ ok(!V_BSTR(&v), "V_BSTR(v) != NULL\n");
+ VariantClear(&v);
+
V_VT(&v) = VT_EMPTY;
hres = IHTMLStyle_get_top(style, &v);
ok(hres == S_OK, "get_top failed: %08x\n", hres);
More information about the wine-cvs
mailing list