marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Added IHTMLStyle::listStylePosition property implementation.

oldstable
Zhenbo Li 2014-08-10 21:14:37 +08:00 committed by Alexandre Julliard
parent ed9b0f758a
commit bf463eae05
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/mshtml/htmlstyle.c
View File

@ -128,6 +128,8 @@ static const WCHAR attrLineHeight[] =
{'l','i','n','e','-','h','e','i','g','h','t',0};
static const WCHAR attrListStyleType[] =
{'l','i','s','t','-','s','t','y','l','e','-','t','y','p','e',0};
static const WCHAR attrListStylePosition[] =
{'l','i','s','t','-','s','t','y','l','e','-','p','o','s','i','t','i','o','n',0};
static const WCHAR attrMargin[] =
{'m','a','r','g','i','n',0};
static const WCHAR attrMarginBottom[] =
@ -245,6 +247,7 @@ static const style_tbl_entry_t style_tbl[] = {
{attrLeft, DISPID_IHTMLSTYLE_LEFT},
{attrLetterSpacing, DISPID_IHTMLSTYLE_LETTERSPACING},
{attrLineHeight, DISPID_IHTMLSTYLE_LINEHEIGHT},
{attrListStylePosition, DISPID_IHTMLSTYLE_LISTSTYLEPOSITION},
{attrListStyleType, DISPID_IHTMLSTYLE_LISTSTYLETYPE},
{attrMargin, DISPID_IHTMLSTYLE_MARGIN},
{attrMarginBottom, DISPID_IHTMLSTYLE_MARGINBOTTOM},
@ -2196,15 +2199,19 @@ static HRESULT WINAPI HTMLStyle_get_listStyleType(IHTMLStyle *iface, BSTR *p)
static HRESULT WINAPI HTMLStyle_put_listStylePosition(IHTMLStyle *iface, BSTR v)
{
HTMLStyle *This = impl_from_IHTMLStyle(iface);
FIXME("(%p)->(%s)\n", This, debugstr_w(v));
return E_NOTIMPL;
TRACE("(%p)->(%s)\n", This, debugstr_w(v));
return set_style_attr(This, STYLEID_LISTSTYLEPOSITION, v, 0);
}
static HRESULT WINAPI HTMLStyle_get_listStylePosition(IHTMLStyle *iface, BSTR *p)
{
HTMLStyle *This = impl_from_IHTMLStyle(iface);
FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL;
TRACE("(%p)->(%p)\n", This, p);
return get_style_attr(This, STYLEID_LISTSTYLEPOSITION, p);
}
static HRESULT WINAPI HTMLStyle_put_listStyleImage(IHTMLStyle *iface, BSTR v)

1
dlls/mshtml/htmlstyle.h
View File

@ -78,6 +78,7 @@ typedef enum {
STYLEID_LEFT,
STYLEID_LETTER_SPACING,
STYLEID_LINE_HEIGHT,
STYLEID_LISTSTYLEPOSITION,
STYLEID_LISTSTYLETYPE,
STYLEID_MARGIN,
STYLEID_MARGIN_BOTTOM,

9
dlls/mshtml/tests/style.c
View File

@ -2161,6 +2161,15 @@ static void test_body_style(IHTMLStyle *style)
hres = IHTMLStyle_get_listStyleType(style, &str);
ok(hres == S_OK, "get_listStyleType failed: %08x\n", hres);
ok(!strcmp_wa(str, "square"), "listStyleType = %s\n", wine_dbgstr_w(str));
str = a2bstr("inside");
hres = IHTMLStyle_put_listStylePosition(style, str);
ok(hres == S_OK, "put_listStylePosition failed: %08x\n", hres);
SysFreeString(str);
hres = IHTMLStyle_get_listStylePosition(style, &str);
ok(hres == S_OK, "get_listStylePosition failed: %08x\n", hres);
ok(!strcmp_wa(str, "inside"), "listStyleType = %s\n", wine_dbgstr_w(str));
SysFreeString(str);
hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2);