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

mshtml: Added IHTMLDocument7::get_characterSet implementation and use it in get_charset. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2017-09-12 13:14:19 +02:00 committed by Alexandre Julliard
parent 67012e8300
commit 2fc598ddb0
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dlls/mshtml/htmldoc.c
View File

@ -918,19 +918,10 @@ static HRESULT WINAPI HTMLDocument_put_charset(IHTMLDocument2 *iface, BSTR v)
static HRESULT WINAPI HTMLDocument_get_charset(IHTMLDocument2 *iface, BSTR *p)
{
HTMLDocument *This = impl_from_IHTMLDocument2(iface);
nsAString charset_str;
nsresult nsres;
TRACE("(%p)->(%p)\n", This, p);
if(!This->doc_node->nsdoc) {
FIXME("NULL nsdoc\n");
return E_FAIL;
}
nsAString_Init(&charset_str, NULL);
nsres = nsIDOMHTMLDocument_GetCharacterSet(This->doc_node->nsdoc, &charset_str);
return return_nsstr(nsres, &charset_str, p);
return IHTMLDocument7_get_characterSet(&This->IHTMLDocument7_iface, p);
}
static HRESULT WINAPI HTMLDocument_put_defaultCharset(IHTMLDocument2 *iface, BSTR v)
@ -3321,8 +3312,19 @@ static HRESULT WINAPI HTMLDocument7_get_onmsthumbnailclick(IHTMLDocument7 *iface
static HRESULT WINAPI HTMLDocument7_get_characterSet(IHTMLDocument7 *iface, BSTR *p)
{
HTMLDocument *This = impl_from_IHTMLDocument7(iface);
FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL;
nsAString charset_str;
nsresult nsres;
TRACE("(%p)->(%p)\n", This, p);
if(!This->doc_node->nsdoc) {
FIXME("NULL nsdoc\n");
return E_FAIL;
}
nsAString_Init(&charset_str, NULL);
nsres = nsIDOMHTMLDocument_GetCharacterSet(This->doc_node->nsdoc, &charset_str);
return return_nsstr(nsres, &charset_str, p);
}
static HRESULT WINAPI HTMLDocument7_createElement(IHTMLDocument7 *iface, BSTR bstrTag, IHTMLElement **newElem)