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

mshtml: Replace get_htmldoc_classinfo with more generic helper. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2017-04-20 16:23:50 +02:00 committed by Alexandre Julliard
parent 91c568bc6d
commit 4632045f9a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/mshtml/dispex.c
View File

@ -188,7 +188,7 @@ void release_typelib(void)
DeleteCriticalSection(&cs_dispex_static_data); DeleteCriticalSection(&cs_dispex_static_data);
} }
HRESULT get_htmldoc_classinfo(ITypeInfo **typeinfo) HRESULT get_class_typeinfo(const CLSID *clsid, ITypeInfo **typeinfo)
{ {
HRESULT hres; HRESULT hres;
@ -197,7 +197,7 @@ HRESULT get_htmldoc_classinfo(ITypeInfo **typeinfo)
if (!typelib) if (!typelib)
return hres; return hres;
hres = ITypeLib_GetTypeInfoOfGuid(typelib, &CLSID_HTMLDocument, typeinfo); hres = ITypeLib_GetTypeInfoOfGuid(typelib, clsid, typeinfo);
if(FAILED(hres)) if(FAILED(hres))
ERR("GetTypeInfoOfGuid failed: %08x\n", hres); ERR("GetTypeInfoOfGuid failed: %08x\n", hres);
return hres; return hres;

2
dlls/mshtml/htmldoc.c
View File

@ -4473,7 +4473,7 @@ static HRESULT WINAPI ProvideClassInfo_GetClassInfo(IProvideClassInfo* iface,
{ {
HTMLDocument *This = impl_from_IProvideClassInfo(iface); HTMLDocument *This = impl_from_IProvideClassInfo(iface);
TRACE("(%p)->(%p)\n", This, ppTI); TRACE("(%p)->(%p)\n", This, ppTI);
return get_htmldoc_classinfo(ppTI); return get_class_typeinfo(&CLSID_HTMLDocument, ppTI);
} }
static const IProvideClassInfoVtbl ProvideClassInfoVtbl = { static const IProvideClassInfoVtbl ProvideClassInfoVtbl = {

2
dlls/mshtml/mshtml_private.h
View File

@ -316,7 +316,7 @@ HRESULT dispex_get_dynid(DispatchEx*,const WCHAR*,DISPID*) DECLSPEC_HIDDEN;
void dispex_traverse(DispatchEx*,nsCycleCollectionTraversalCallback*) DECLSPEC_HIDDEN; void dispex_traverse(DispatchEx*,nsCycleCollectionTraversalCallback*) DECLSPEC_HIDDEN;
void dispex_unlink(DispatchEx*) DECLSPEC_HIDDEN; void dispex_unlink(DispatchEx*) DECLSPEC_HIDDEN;
void release_typelib(void) DECLSPEC_HIDDEN; void release_typelib(void) DECLSPEC_HIDDEN;
HRESULT get_htmldoc_classinfo(ITypeInfo **typeinfo) DECLSPEC_HIDDEN; HRESULT get_class_typeinfo(const CLSID*,ITypeInfo**) DECLSPEC_HIDDEN;
const dispex_static_data_vtbl_t *dispex_get_vtbl(DispatchEx*) DECLSPEC_HIDDEN; const dispex_static_data_vtbl_t *dispex_get_vtbl(DispatchEx*) DECLSPEC_HIDDEN;
void dispex_info_add_interface(dispex_data_t*,tid_t) DECLSPEC_HIDDEN; void dispex_info_add_interface(dispex_data_t*,tid_t) DECLSPEC_HIDDEN;