Skip to content

W
wine-winehq
Commit ce9ef827 authored by Gabriel Ivăncescu's avatar Gabriel Ivăncescu Committed by Alexandre Julliard
Browse files
Options

vbscript: Add support for the SCRIPTPROC_ISEXPRESSION flag in ParseProcedureText.

Signed-off-by: 's avatarGabriel Ivăncescu <gabrielopcode@gmail.com> Signed-off-by: 's avatarJacek Caban <jacek@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 9dda8ca6
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
dlls/vbscript/vbdisp.c
View file @ ce9ef827
...@@ -626,7 +626,7 @@ static HRESULT Procedure_invoke(vbdisp_t *This, VARIANT *args, unsigned args_cnt ...@@ -626,7 +626,7 @@ static HRESULT Procedure_invoke(vbdisp_t *This, VARIANT *args, unsigned args_cnt
TRACE("\n"); TRACE("\n");
IActiveScriptSite_OnEnterScript(ctx->site); 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); IActiveScriptSite_OnLeaveScript(ctx->site);
return hres; return hres;
......
include/activscp.idl
View file @ ce9ef827
...@@ -113,10 +113,12 @@ cpp_quote(" SCRIPTTEXT_ISVISIBLE | \\") ...@@ -113,10 +113,12 @@ cpp_quote(" SCRIPTTEXT_ISVISIBLE | \\")
cpp_quote(" SCRIPTTEXT_ISEXPRESSION | \\") cpp_quote(" SCRIPTTEXT_ISEXPRESSION | \\")
cpp_quote(" SCRIPTTEXT_ISPERSISTENT | \\") cpp_quote(" SCRIPTTEXT_ISPERSISTENT | \\")
cpp_quote(" SCRIPTTEXT_HOSTMANAGESSOURCE)") cpp_quote(" SCRIPTTEXT_HOSTMANAGESSOURCE)")
cpp_quote("#define SCRIPTPROC_ISEXPRESSION 0x00000020")
cpp_quote("#define SCRIPTPROC_HOSTMANAGESSOURCE 0x00000080") cpp_quote("#define SCRIPTPROC_HOSTMANAGESSOURCE 0x00000080")
cpp_quote("#define SCRIPTPROC_IMPLICIT_THIS 0x00000100") cpp_quote("#define SCRIPTPROC_IMPLICIT_THIS 0x00000100")
cpp_quote("#define SCRIPTPROC_IMPLICIT_PARENTS 0x00000200") 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_THIS | \\")
cpp_quote(" SCRIPTPROC_IMPLICIT_PARENTS)") cpp_quote(" SCRIPTPROC_IMPLICIT_PARENTS)")
cpp_quote("#define SCRIPTINFO_IUNKNOWN 0x00000001") cpp_quote("#define SCRIPTINFO_IUNKNOWN 0x00000001")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment