Module: wine Branch: master Commit: ce9ef827f886e1cc3873b4064e9b3a17a29aae34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce9ef827f886e1cc3873b4064...
Author: Gabriel Ivăncescu gabrielopcode@gmail.com Date: Tue Sep 17 15:54:33 2019 +0300
vbscript: Add support for the SCRIPTPROC_ISEXPRESSION flag in ParseProcedureText.
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/vbscript/vbdisp.c | 2 +- include/activscp.idl | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index a907f40bea..0f6209f43e 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -626,7 +626,7 @@ static HRESULT Procedure_invoke(vbdisp_t *This, VARIANT *args, unsigned args_cnt TRACE("\n");
IActiveScriptSite_OnEnterScript(ctx->site); - hres = exec_script(ctx, This->desc->value_func, NULL, NULL, NULL); + hres = exec_script(ctx, This->desc->value_func, NULL, NULL, res); IActiveScriptSite_OnLeaveScript(ctx->site);
return hres; diff --git a/include/activscp.idl b/include/activscp.idl index 57179cf52f..97e7f5b6cb 100644 --- a/include/activscp.idl +++ b/include/activscp.idl @@ -113,10 +113,12 @@ cpp_quote(" SCRIPTTEXT_ISVISIBLE | \") cpp_quote(" SCRIPTTEXT_ISEXPRESSION | \") cpp_quote(" SCRIPTTEXT_ISPERSISTENT | \") cpp_quote(" SCRIPTTEXT_HOSTMANAGESSOURCE)") +cpp_quote("#define SCRIPTPROC_ISEXPRESSION 0x00000020") cpp_quote("#define SCRIPTPROC_HOSTMANAGESSOURCE 0x00000080") cpp_quote("#define SCRIPTPROC_IMPLICIT_THIS 0x00000100") cpp_quote("#define SCRIPTPROC_IMPLICIT_PARENTS 0x00000200") -cpp_quote("#define SCRIPTPROC_ALL_FLAGS (SCRIPTPROC_HOSTMANAGESSOURCE | \") +cpp_quote("#define SCRIPTPROC_ALL_FLAGS (SCRIPTPROC_ISEXPRESSION | \") +cpp_quote(" SCRIPTPROC_HOSTMANAGESSOURCE | \") cpp_quote(" SCRIPTPROC_IMPLICIT_THIS | \") cpp_quote(" SCRIPTPROC_IMPLICIT_PARENTS)") cpp_quote("#define SCRIPTINFO_IUNKNOWN 0x00000001")