[PATCH 08/14] vbscript: Implement ScriptTypeInfo_Invoke.
Gabriel Ivăncescu
gabrielopcode at gmail.com
Mon Dec 9 09:29:31 CST 2019
Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
---
dlls/vbscript/vbdisp.c | 26 ++++++++++++++++++++++++--
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c
index a74b0ba..242010d 100644
--- a/dlls/vbscript/vbdisp.c
+++ b/dlls/vbscript/vbdisp.c
@@ -866,11 +866,33 @@ static HRESULT WINAPI ScriptTypeInfo_Invoke(ITypeInfo *iface, PVOID pvInstance,
DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr)
{
ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface);
+ enum memid_type memid_type = get_memid_type(This, memid);
+ ITypeInfo *disp_typeinfo;
+ IDispatch *disp;
+ HRESULT hr;
- FIXME("(%p)->(%p %d %d %p %p %p %p)\n", This, pvInstance, memid, wFlags,
+ TRACE("(%p)->(%p %d %d %p %p %p %p)\n", This, pvInstance, memid, wFlags,
pDispParams, pVarResult, pExcepInfo, puArgErr);
- return E_NOTIMPL;
+ if (!pvInstance) return E_INVALIDARG;
+ if (memid_type == memid_invalid) return TYPE_E_ELEMENTNOTFOUND;
+ if (memid_type == memid_inherited)
+ {
+ hr = get_dispatch_typeinfo(&disp_typeinfo);
+ if (FAILED(hr)) return hr;
+
+ return ITypeInfo_Invoke(disp_typeinfo, pvInstance, memid, wFlags, pDispParams,
+ pVarResult, pExcepInfo, puArgErr);
+ }
+
+ hr = IUnknown_QueryInterface((IUnknown*)pvInstance, &IID_IDispatch, (void**)&disp);
+ if (FAILED(hr)) return hr;
+
+ hr = IDispatch_Invoke(disp, memid, &IID_NULL, LOCALE_USER_DEFAULT, wFlags,
+ pDispParams, pVarResult, pExcepInfo, puArgErr);
+ IDispatch_Release(disp);
+
+ return hr;
}
static HRESULT WINAPI ScriptTypeInfo_GetDocumentation(ITypeInfo *iface, MEMBERID memid, BSTR *pBstrName,
--
2.21.0
More information about the wine-devel
mailing list