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

mshtml: Added IHTMLCSSStyleDeclaration::get_cssText implementation. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2018-09-07 14:45:03 +02:00 committed by Alexandre Julliard
parent 45f8c03cc7
commit 78b8ee543f
2 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dlls/mshtml/htmlstyle.c
View File

@ -2472,26 +2472,10 @@ static HRESULT WINAPI HTMLStyle_put_cssText(IHTMLStyle *iface, BSTR v)
static HRESULT WINAPI HTMLStyle_get_cssText(IHTMLStyle *iface, BSTR *p)
{
HTMLStyle *This = impl_from_IHTMLStyle(iface);
nsAString text_str;
nsresult nsres;
TRACE("(%p)->(%p)\n", This, p);
/* FIXME: Gecko style formatting is different than IE (uppercase). */
nsAString_Init(&text_str, NULL);
nsres = nsIDOMCSSStyleDeclaration_GetCssText(This->nsstyle, &text_str);
if(NS_SUCCEEDED(nsres)) {
const PRUnichar *text;
nsAString_GetData(&text_str, &text);
*p = *text ? SysAllocString(text) : NULL;
}else {
FIXME("GetCssStyle failed: %08x\n", nsres);
*p = NULL;
}
nsAString_Finish(&text_str);
return S_OK;
return IHTMLCSSStyleDeclaration_get_cssText(&This->IHTMLCSSStyleDeclaration_iface, p);
}
static HRESULT WINAPI HTMLStyle_put_pixelTop(IHTMLStyle *iface, LONG v)
@ -5802,8 +5786,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_put_cssText(IHTMLCSSStyleDeclarati
static HRESULT WINAPI HTMLCSSStyleDeclaration_get_cssText(IHTMLCSSStyleDeclaration *iface, BSTR *p)
{
HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface);
FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL;
nsAString text_str;
nsresult nsres;
TRACE("(%p)->(%p)\n", This, p);
/* NOTE: Quicks mode should use different formatting (uppercase, no ';' at the end of rule). */
nsAString_Init(&text_str, NULL);
nsres = nsIDOMCSSStyleDeclaration_GetCssText(This->nsstyle, &text_str);
return return_nsstr(nsres, &text_str, p);
}
static HRESULT WINAPI HTMLCSSStyleDeclaration_put_cursor(IHTMLCSSStyleDeclaration *iface, BSTR v)

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

@ -380,10 +380,17 @@ static void test_set_csstext(IHTMLStyle *style)
SysFreeString(str);
hres = IHTMLCSSStyleDeclaration_get_cssFloat(css_style, &str);
ok(hres == S_OK, "get_cssText failed: %08x\n", hres);
ok(hres == S_OK, "get_cssFloat failed: %08x\n", hres);
ok(!strcmp_wa(str, "left"), "cssFloat = %s\n", wine_dbgstr_w(str));
SysFreeString(str);
hres = IHTMLCSSStyleDeclaration_get_cssText(css_style, &str);
ok(hres == S_OK, "get_cssText failed: %08x\n", hres);
todo_wine_if(compat_mode < COMPAT_IE9)
ok(!strcmp_wa(str, compat_mode >= COMPAT_IE9 ? "float: left;" : "FLOAT: left"),
"cssFloat = %s\n", wine_dbgstr_w(str));
SysFreeString(str);
hres = IHTMLCSSStyleDeclaration_put_cssText(css_style, NULL);
ok(hres == S_OK, "put_cssText failed: %08x\n", hres);