ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Implement IHTMLCurrentStyle_get_fontWeight.

This commit is contained in:
Alistair Leslie-Hughes 2009-02-21 21:08:17 +11:00 committed by Alexandre Julliard
parent 4aa0591c96
commit 64af8b3f7e
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/mshtml/htmlcurstyle.c
View File

@ -181,8 +181,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_fontVariant(IHTMLCurrentStyle *iface,
static HRESULT WINAPI HTMLCurrentStyle_get_fontWeight(IHTMLCurrentStyle *iface, VARIANT *p)
{
HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface);
FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL;
TRACE("(%p)->(%p)\n", This, p);
return get_nsstyle_attr_var(This->nsstyle, STYLEID_FONT_WEIGHT, p, ATTR_STR_TO_INT);
}
static HRESULT WINAPI HTMLCurrentStyle_get_fontSize(IHTMLCurrentStyle *iface, VARIANT *p)

4
dlls/mshtml/htmlstyle.c
View File

@ -212,10 +212,6 @@ static LPWSTR fix_url_value(LPCWSTR val)
return ret;
}
#define ATTR_FIX_PX 1
#define ATTR_FIX_URL 2
#define ATTR_STR_TO_INT 4
HRESULT set_nsstyle_attr(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, LPCWSTR value, DWORD flags)
{
nsAString str_name, str_value, str_empty;

4
dlls/mshtml/htmlstyle.h
View File

@ -80,3 +80,7 @@ HRESULT set_nsstyle_attr(nsIDOMCSSStyleDeclaration*,styleid_t,LPCWSTR,DWORD);
HRESULT set_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, VARIANT *value, DWORD flags);
HRESULT get_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, VARIANT *p, DWORD flags);
#define ATTR_FIX_PX 1
#define ATTR_FIX_URL 2
#define ATTR_STR_TO_INT 4

7
dlls/mshtml/tests/dom.c
View File

@ -2371,6 +2371,7 @@ static void test_current_style(IHTMLCurrentStyle *current_style)
{
BSTR str;
HRESULT hres;
VARIANT v;
test_disp((IUnknown*)current_style, &DIID_DispHTMLCurrentStyle);
test_ifaces((IUnknown*)current_style, cstyle_iids);
@ -2438,6 +2439,12 @@ static void test_current_style(IHTMLCurrentStyle *current_style)
ok(hres == S_OK, "get_cursor failed: %08x\n", hres);
ok(!strcmp_wa(str, "default"), "get_cursor returned %s\n", dbgstr_w(str));
SysFreeString(str);
hres = IHTMLCurrentStyle_get_fontWeight(current_style, &v);
ok(hres == S_OK, "get_fontWeight failed: %08x\n", hres);
ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v));
ok( V_I4(&v) == 400, "expect 400 got (%d)\n", V_I4(&v));
VariantClear(&v);
}
static void test_style2(IHTMLStyle2 *style2)