Gabriel Ivăncescu : vbscript: Implement ScriptTypeInfo_GetDllEntry.
Alexandre Julliard
julliard at winehq.org
Wed Dec 11 16:35:07 CST 2019
Module: wine
Branch: master
Commit: 5376e792c5e5f1e7b22e935fc53c1adb22ebda37
URL: https://source.winehq.org/git/wine.git/?a=commit;h=5376e792c5e5f1e7b22e935fc53c1adb22ebda37
Author: Gabriel Ivăncescu <gabrielopcode at gmail.com>
Date: Wed Dec 11 18:19:49 2019 +0100
vbscript: 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/vbscript/vbdisp.c | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c
index 94c68733cc..edf7739a5d 100644
--- a/dlls/vbscript/vbdisp.c
+++ b/dlls/vbscript/vbdisp.c
@@ -937,10 +937,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) && memid > This->num_vars)
+ {
+ 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