Module: wine Branch: master Commit: 26c7b39407b0259a2b88f670a4f00747879961d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26c7b39407b0259a2b88f670a...
Author: Gabriel Ivăncescu gabrielopcode@gmail.com Date: Fri Dec 13 14:59:52 2019 +0200
jscript: Implement ScriptTypeInfo_AddressOfMember.
Signed-off-by: Gabriel Ivăncescu gabrielopcode@gmail.com Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/jscript/dispex.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 0c4705171d..f5f545c8bb 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1087,10 +1087,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) && !get_var_from_memid(This, memid)) + { + 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)