Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_fontWeight .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 64af8b3f7e4e968fc316f4f596826cee86bd0893
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=64af8b3f7e4e968fc316f4f596...

Author: Alistair Leslie-Hughes 
Date:   Sat Feb 21 21:08:17 2009 +1100

mshtml: Implement IHTMLCurrentStyle_get_fontWeight.

---

dlls/mshtml/htmlcurstyle.c |    4 ++--
 dlls/mshtml/htmlstyle.c    |    4 ----
 dlls/mshtml/htmlstyle.h    |    4 ++++
 dlls/mshtml/tests/dom.c    |    7 +++++++
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c
index e376056..4c02b3f 100644
--- a/dlls/mshtml/htmlcurstyle.c
+++ b/dlls/mshtml/htmlcurstyle.c
@@ -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)
diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c
index 84edd94..769e14e 100644
--- a/dlls/mshtml/htmlstyle.c
+++ b/dlls/mshtml/htmlstyle.c
@@ -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;
diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h
index 7cf135a..8db28df 100644
--- a/dlls/mshtml/htmlstyle.h
+++ b/dlls/mshtml/htmlstyle.h
@@ -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
diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index c2f51b7..ca05f6e 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -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)