Gabriel Ivăncescu : vbscript: Implement ScriptTypeInfo_AddressOfMember.
Alexandre Julliard
julliard at winehq.org
Wed Dec 11 16:35:07 CST 2019
Module: wine
Branch: master
Commit: 313d6de3fbbb45074788554c110770243c138c9a
URL: https://source.winehq.org/git/wine.git/?a=commit;h=313d6de3fbbb45074788554c110770243c138c9a
Author: Gabriel Ivăncescu <gabrielopcode at gmail.com>
Date: Wed Dec 11 18:19:56 2019 +0100
vbscript: Implement ScriptTypeInfo_AddressOfMember.
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 | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c
index edf7739a5d..319867b0ea 100644
--- a/dlls/vbscript/vbdisp.c
+++ b/dlls/vbscript/vbdisp.c
@@ -981,10 +981,22 @@ static HRESULT WINAPI ScriptTypeInfo_GetRefTypeInfo(ITypeInfo *iface, HREFTYPE h
static HRESULT WINAPI ScriptTypeInfo_AddressOfMember(ITypeInfo *iface, MEMBERID memid, INVOKEKIND invKind, PVOID *ppv)
{
ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface);
+ ITypeInfo *disp_typeinfo;
+ HRESULT hr;
- FIXME("(%p)->(%d %d %p)\n", This, memid, invKind, ppv);
+ TRACE("(%p)->(%d %d %p)\n", This, memid, invKind, ppv);
- return E_NOTIMPL;
+ if (!ppv) return E_INVALIDARG;
+ *ppv = NULL;
+
+ if (!get_func_from_memid(This, memid) && memid > This->num_vars)
+ {
+ hr = get_dispatch_typeinfo(&disp_typeinfo);
+ if (FAILED(hr)) return hr;
+
+ return ITypeInfo_AddressOfMember(disp_typeinfo, memid, invKind, ppv);
+ }
+ return TYPE_E_BADMODULEKIND;
}
static HRESULT WINAPI ScriptTypeInfo_CreateInstance(ITypeInfo *iface, IUnknown *pUnkOuter, REFIID riid, PVOID *ppvObj)
More information about the wine-cvs
mailing list