Gabriel Ivăncescu : jscript: Implement ScriptTypeInfo_GetDllEntry.
Alexandre Julliard
julliard at winehq.org
Fri Dec 13 15:27:23 CST 2019
Module: wine
Branch: master
Commit: dff51ec93385d9e4ed2ff18824a3f4ace4f963c7
URL: https://source.winehq.org/git/wine.git/?a=commit;h=dff51ec93385d9e4ed2ff18824a3f4ace4f963c7
Author: Gabriel Ivăncescu <gabrielopcode at gmail.com>
Date: Fri Dec 13 14:59:51 2019 +0200
jscript: Implement ScriptTypeInfo_GetDllEntry.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/jscript/dispex.c | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c
index dd1fcc7d0f..0c4705171d 100644
--- a/dlls/jscript/dispex.c
+++ b/dlls/jscript/dispex.c
@@ -1043,10 +1043,23 @@ static HRESULT WINAPI ScriptTypeInfo_GetDllEntry(ITypeInfo *iface, MEMBERID memi
BSTR *pBstrDllName, BSTR *pBstrName, WORD *pwOrdinal)
{
ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface);
+ ITypeInfo *disp_typeinfo;
+ HRESULT hr;
- FIXME("(%p)->(%d %d %p %p %p)\n", This, memid, invKind, pBstrDllName, pBstrName, pwOrdinal);
+ TRACE("(%p)->(%d %d %p %p %p)\n", This, memid, invKind, pBstrDllName, pBstrName, pwOrdinal);
- return E_NOTIMPL;
+ if (pBstrDllName) *pBstrDllName = NULL;
+ if (pBstrName) *pBstrName = NULL;
+ if (pwOrdinal) *pwOrdinal = 0;
+
+ if (!get_func_from_memid(This, memid) && !get_var_from_memid(This, memid))
+ {
+ hr = get_dispatch_typeinfo(&disp_typeinfo);
+ if (FAILED(hr)) return hr;
+
+ return ITypeInfo_GetDllEntry(disp_typeinfo, memid, invKind, pBstrDllName, pBstrName, pwOrdinal);
+ }
+ return TYPE_E_BADMODULEKIND;
}
static HRESULT WINAPI ScriptTypeInfo_GetRefTypeInfo(ITypeInfo *iface, HREFTYPE hRefType, ITypeInfo **ppTInfo)
More information about the wine-cvs
mailing list