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>

mshtml: Replace get_htmldoc_classinfo with more generic helper.
4632045f · Jacek Caban · Alexandre Julliard · 91c568bc · 4632045f · 4632045f
Commit 4632045f authored Apr 20, 2017 by Jacek Caban Committed by Alexandre Julliard Apr 20, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

dispex.c dlls/mshtml/dispex.c +2 -2

htmldoc.c dlls/mshtml/htmldoc.c +1 -1

mshtml_private.h dlls/mshtml/mshtml_private.h +1 -1

No files found.
--- a/dlls/mshtml/dispex.c
+++ b/dlls/mshtml/dispex.c
@@ -188,7 +188,7 @@ void release_typelib(void)
    DeleteCriticalSection(&cs_dispex_static_data);
 }

-HRESULT get_htmldoc_classinfo(ITypeInfo **typeinfo)
+HRESULT get_class_typeinfo(const CLSID *clsid, ITypeInfo **typeinfo)
 {
    HRESULT hres;

@@ -197,7 +197,7 @@ HRESULT get_htmldoc_classinfo(ITypeInfo **typeinfo)
    if (!typelib)
        return hres;

-    hres = ITypeLib_GetTypeInfoOfGuid(typelib, &CLSID_HTMLDocument, typeinfo);
+    hres = ITypeLib_GetTypeInfoOfGuid(typelib, clsid, typeinfo);
    if(FAILED(hres))
        ERR("GetTypeInfoOfGuid failed: %08x\n", hres);
    return hres;

--- a/dlls/mshtml/htmldoc.c
+++ b/dlls/mshtml/htmldoc.c
@@ -4473,7 +4473,7 @@ static HRESULT WINAPI ProvideClassInfo_GetClassInfo(IProvideClassInfo* iface,
 {
    HTMLDocument *This = impl_from_IProvideClassInfo(iface);
    TRACE("(%p)->(%p)\n", This, ppTI);
-    return get_htmldoc_classinfo(ppTI);
+    return get_class_typeinfo(&CLSID_HTMLDocument, ppTI);
 }

 static const IProvideClassInfoVtbl ProvideClassInfoVtbl = {

--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -316,7 +316,7 @@ HRESULT dispex_get_dynid(DispatchEx*,const WCHAR*,DISPID*) DECLSPEC_HIDDEN;
 void dispex_traverse(DispatchEx*,nsCycleCollectionTraversalCallback*) DECLSPEC_HIDDEN;
 void dispex_unlink(DispatchEx*) 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;
 void dispex_info_add_interface(dispex_data_t*,tid_t) DECLSPEC_HIDDEN;