Jacek Caban : mshtml: Replace get_htmldoc_classinfo with more generic helper.

Alexandre Julliard julliard at winehq.org
Thu Apr 20 16:41:35 CDT 2017


Module: wine
Branch: master
Commit: 4632045f9ae92ec3803d9e3c7587061d9ed8a181
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4632045f9ae92ec3803d9e3c7587061d9ed8a181

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Thu Apr 20 16:23:50 2017 +0200

mshtml: Replace get_htmldoc_classinfo with more generic helper.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/mshtml/dispex.c         | 4 ++--
 dlls/mshtml/htmldoc.c        | 2 +-
 dlls/mshtml/mshtml_private.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c
index caaf788..6e7f1be 100644
--- 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;
diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c
index 4271326..57679fc 100644
--- 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 = {
diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index 89f2fcb..c0b1d29 100644
--- 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;
 




More information about the wine-cvs mailing list