mshtml: Pass style as CSSStyle to current style property getters.

dlls/mshtml/htmlcurstyle.c

@@ -45,12 +45,12 @@ struct HTMLCurrentStyle {
 
 static inline HRESULT get_current_style_property(HTMLCurrentStyle *current_style, styleid_t sid, BSTR *p)
 {
-    return get_nsstyle_property(current_style->css_style.nsstyle, sid, COMPAT_MODE_QUIRKS, p);
+    return get_style_property(&current_style->css_style, sid, p);
 }
 
 static inline HRESULT get_current_style_property_var(HTMLCurrentStyle *This, styleid_t sid, VARIANT *v)
 {
-    return get_nsstyle_property_var(This->css_style.nsstyle, sid, COMPAT_MODE_QUIRKS, v);
+    return get_style_property_var(&This->css_style, sid, v);
 }
 
 static inline HTMLCurrentStyle *impl_from_IHTMLCurrentStyle(IHTMLCurrentStyle *iface)

dlls/mshtml/htmlstyle.c

@@ -1077,7 +1077,7 @@ static HRESULT nsstyle_to_bstr(const WCHAR *val, DWORD flags, BSTR *p)
     return S_OK;
 }
 
-HRESULT get_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, compat_mode_t compat_mode, BSTR *p)
+static HRESULT get_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, compat_mode_t compat_mode, BSTR *p)
 {
     nsAString str_value;
     const PRUnichar *value;
@@ -1095,7 +1095,7 @@ HRESULT get_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid,
     return hres;
 }
 
-HRESULT get_nsstyle_property_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, compat_mode_t compat_mode, VARIANT *p)
+static HRESULT get_nsstyle_property_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, compat_mode_t compat_mode, VARIANT *p)
 {
     unsigned flags = style_tbl[sid].flags;
     nsAString str_value;
@@ -1145,12 +1145,12 @@ HRESULT get_nsstyle_property_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t s
     return S_OK;
 }
 
-static inline HRESULT get_style_property(CSSStyle *style, styleid_t sid, BSTR *p)
+HRESULT get_style_property(CSSStyle *style, styleid_t sid, BSTR *p)
 {
     return get_nsstyle_property(style->nsstyle, sid, dispex_compat_mode(&style->dispex), p);
 }
 
-static inline HRESULT get_style_property_var(CSSStyle *style, styleid_t sid, VARIANT *v)
+HRESULT get_style_property_var(CSSStyle *style, styleid_t sid, VARIANT *v)
 {
     return get_nsstyle_property_var(style->nsstyle, sid, dispex_compat_mode(&style->dispex), v);
 }

dlls/mshtml/htmlstyle.h

@@ -140,8 +140,8 @@ HRESULT HTMLStyle_Create(HTMLElement*,HTMLStyle**) DECLSPEC_HIDDEN;
 void init_css_style(CSSStyle*,nsIDOMCSSStyleDeclaration*,style_qi_t,
                     dispex_static_data_t*,compat_mode_t) DECLSPEC_HIDDEN;
 
-HRESULT get_nsstyle_property(nsIDOMCSSStyleDeclaration*,styleid_t,compat_mode_t,BSTR*) DECLSPEC_HIDDEN;
-HRESULT get_nsstyle_property_var(nsIDOMCSSStyleDeclaration*,styleid_t,compat_mode_t,VARIANT*) DECLSPEC_HIDDEN;
+HRESULT get_style_property(CSSStyle*,styleid_t,BSTR*) DECLSPEC_HIDDEN;
+HRESULT get_style_property_var(CSSStyle*,styleid_t,VARIANT*) DECLSPEC_HIDDEN;
 
 HRESULT get_elem_style(HTMLElement*,styleid_t,BSTR*) DECLSPEC_HIDDEN;
 HRESULT set_elem_style(HTMLElement*,styleid_t,const WCHAR*) DECLSPEC_HIDDEN;