marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
stable
Gabriel Ivăncescu 2019-09-17 15:54:33 +03:00 committed by Alexandre Julliard
parent 9dda8ca67a
commit ce9ef827f8
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/vbscript/vbdisp.c
View File

@ -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;

4
include/activscp.idl
View File

@ -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")