system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

mshtml: Added IHTMLStyle::[get|put]_left implementation.

Browse source
This commit is contained in:
Jacek Caban 2008-10-06 09:50:28 -05:00 committed by Alexandre Julliard
parent cc528d2698
commit d7d2587c62
3 changed files with 49 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
dlls/mshtml/htmlstyle.c
View file

@ -55,6 +55,8 @@ static const WCHAR attrFontStyle[] =
{'f','o','n','t','-','s','t','y','l','e',0};
static const WCHAR attrFontWeight[] =
{'f','o','n','t','-','w','e','i','g','h','t',0};
static const WCHAR attrLeft[] =
{'l','e','f','t',0};
static const WCHAR attrMargin[] =
{'m','a','r','g','i','n',0};
static const WCHAR attrMarginLeft[] =
@ -82,6 +84,7 @@ static const LPCWSTR style_strings[] = {
attrFontSize,
attrFontStyle,
attrFontWeight,
attrLeft,
attrMargin,
attrMarginLeft,
attrMarginRight,
@ -1459,15 +1462,35 @@ static HRESULT WINAPI HTMLStyle_get_top(IHTMLStyle *iface, VARIANT *p)
static HRESULT WINAPI HTMLStyle_put_left(IHTMLStyle *iface, VARIANT v)
{
HTMLStyle *This = HTMLSTYLE_THIS(iface);
FIXME("(%p)->(v%d)\n", This, V_VT(&v));
return E_NOTIMPL;
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;
}
static HRESULT WINAPI HTMLStyle_get_left(IHTMLStyle *iface, VARIANT *p)
{
HTMLStyle *This = HTMLSTYLE_THIS(iface);
FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL;
BSTR ret;
HRESULT hres;
TRACE("(%p)->(%p)\n", This, p);
hres = get_style_attr(This, STYLEID_LEFT, &ret);
if(FAILED(hres))
return hres;
V_VT(p) = VT_BSTR;
V_BSTR(p) = ret;
return S_OK;
}
static HRESULT WINAPI HTMLStyle_get_position(IHTMLStyle *iface, BSTR *p)

1
dlls/mshtml/htmlstyle.h
View file

@ -42,6 +42,7 @@ typedef enum {
STYLEID_FONT_SIZE,
STYLEID_FONT_STYLE,
STYLEID_FONT_WEIGHT,
STYLEID_LEFT,
STYLEID_MARGIN,
STYLEID_MARGIN_LEFT,
STYLEID_MARGIN_RIGHT,

21
dlls/mshtml/tests/dom.c
View file

@ -2097,6 +2097,27 @@ static void test_default_style(IHTMLStyle *style)
hres = IHTMLStyle_put_border(style, str);
ok(hres == S_OK, "get_border failed: %08x\n", hres);
SysFreeString(str);
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_BSTR;
V_BSTR(&v) = a2bstr("3px");
hres = IHTMLStyle_put_left(style, v);
ok(hres == S_OK, "put_left failed: %08x\n", hres);
VariantClear(&v);
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(!strcmp_wa(V_BSTR(&v), "3px"), "V_BSTR(v) = %s\n", dbgstr_w(V_BSTR(&v)));
VariantClear(&v);
}
static void test_default_selection(IHTMLDocument2 *doc)