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

mshtml: Initialize HTMLStyleSheetRule object with compat mode. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2021-03-15 16:18:31 +01:00 committed by Alexandre Julliard
parent 23ce468b2a
commit 687c6685fc
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dlls/mshtml/htmlstylesheet.c
View File

@ -207,29 +207,32 @@ static dispex_static_data_t HTMLStyleSheetRule_dispex = {
HTMLStyleSheetRule_iface_tids HTMLStyleSheetRule_iface_tids
}; };
static IHTMLStyleSheetRule *HTMLStyleSheetRule_Create(nsIDOMCSSRule *nsstylesheetrule) static HRESULT create_style_sheet_rule(nsIDOMCSSRule *nsstylesheetrule, compat_mode_t compat_mode,
IHTMLStyleSheetRule **ret)
{ {
HTMLStyleSheetRule *ret; HTMLStyleSheetRule *rule;
nsresult nsres; nsresult nsres;
if(!(ret = heap_alloc(sizeof(*ret)))) if(!(rule = heap_alloc(sizeof(*rule))))
return NULL; return E_OUTOFMEMORY;
ret->IHTMLStyleSheetRule_iface.lpVtbl = &HTMLStyleSheetRuleVtbl; rule->IHTMLStyleSheetRule_iface.lpVtbl = &HTMLStyleSheetRuleVtbl;
ret->ref = 1; rule->ref = 1;
ret->nsstylesheetrule = NULL; rule->nsstylesheetrule = NULL;
init_dispex(&ret->dispex, (IUnknown *)&ret->IHTMLStyleSheetRule_iface, &HTMLStyleSheetRule_dispex); init_dispex_with_compat_mode(&rule->dispex, (IUnknown *)&rule->IHTMLStyleSheetRule_iface, &HTMLStyleSheetRule_dispex,
compat_mode);
if (nsstylesheetrule) if (nsstylesheetrule)
{ {
nsres = nsIDOMCSSRule_QueryInterface(nsstylesheetrule, &IID_nsIDOMCSSRule, nsres = nsIDOMCSSRule_QueryInterface(nsstylesheetrule, &IID_nsIDOMCSSRule,
(void **)&ret->nsstylesheetrule); (void **)&rule->nsstylesheetrule);
if (NS_FAILED(nsres)) if (NS_FAILED(nsres))
ERR("Could not get nsIDOMCSSRule interface: %08x\n", nsres); ERR("Could not get nsIDOMCSSRule interface: %08x\n", nsres);
} }
return &ret->IHTMLStyleSheetRule_iface; *ret = &rule->IHTMLStyleSheetRule_iface;
return S_OK;
} }
static inline HTMLStyleSheetRulesCollection *impl_from_IHTMLStyleSheetRulesCollection(IHTMLStyleSheetRulesCollection *iface) static inline HTMLStyleSheetRulesCollection *impl_from_IHTMLStyleSheetRulesCollection(IHTMLStyleSheetRulesCollection *iface)
@ -339,13 +342,13 @@ static HRESULT WINAPI HTMLStyleSheetRulesCollection_get_length(IHTMLStyleSheetRu
} }
static HRESULT WINAPI HTMLStyleSheetRulesCollection_item(IHTMLStyleSheetRulesCollection *iface, static HRESULT WINAPI HTMLStyleSheetRulesCollection_item(IHTMLStyleSheetRulesCollection *iface,
LONG index, IHTMLStyleSheetRule **ppHTMLStyleSheetRule) LONG index, IHTMLStyleSheetRule **p)
{ {
HTMLStyleSheetRulesCollection *This = impl_from_IHTMLStyleSheetRulesCollection(iface); HTMLStyleSheetRulesCollection *This = impl_from_IHTMLStyleSheetRulesCollection(iface);
nsIDOMCSSRule *nsstylesheetrule; nsIDOMCSSRule *nsstylesheetrule;
nsresult nsres; nsresult nsres;
TRACE("(%p)->(%d %p)\n", This, index, ppHTMLStyleSheetRule); TRACE("(%p)->(%d %p)\n", This, index, p);
nsres = nsIDOMCSSRuleList_Item(This->nslist, index, &nsstylesheetrule); nsres = nsIDOMCSSRuleList_Item(This->nslist, index, &nsstylesheetrule);
if(NS_FAILED(nsres)) if(NS_FAILED(nsres))
@ -353,8 +356,7 @@ static HRESULT WINAPI HTMLStyleSheetRulesCollection_item(IHTMLStyleSheetRulesCol
if(!nsstylesheetrule) if(!nsstylesheetrule)
return E_INVALIDARG; return E_INVALIDARG;
*ppHTMLStyleSheetRule = HTMLStyleSheetRule_Create(nsstylesheetrule); return create_style_sheet_rule(nsstylesheetrule, dispex_compat_mode(&This->dispex), p);
return *ppHTMLStyleSheetRule ? S_OK : E_OUTOFMEMORY;
} }
static const IHTMLStyleSheetRulesCollectionVtbl HTMLStyleSheetRulesCollectionVtbl = { static const IHTMLStyleSheetRulesCollectionVtbl HTMLStyleSheetRulesCollectionVtbl = {