system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 09:25:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

vbscript: Implement script persistence.

Browse source 
Persistent code has to be re-executed if the script is uninitialized and
then reinitialized and restarted.

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>
This commit is contained in:
Gabriel Ivăncescu 2019-11-08 18:19:06 +01:00 committed by Alexandre Julliard
parent 71ce853032
commit e2eb099a94
3 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
dlls/vbscript/compile.c
View file

@ -1997,8 +1997,11 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli
class->next = script->classes;
script->classes = ctx.classes;
code->last_class = class;
}
code->is_persistent = (flags & SCRIPTTEXT_ISPERSISTENT) != 0;
if(TRACE_ON(vbscript_disas))
dump_code(&ctx);
@ -2016,7 +2019,7 @@ HRESULT compile_procedure(script_ctx_t *script, const WCHAR *src, const WCHAR *d
vbscode_t *code;
HRESULT hres;
hres = compile_script(script, src, delimiter, flags, &code);
hres = compile_script(script, src, delimiter, flags & ~SCRIPTTEXT_ISPERSISTENT, &code);
if(FAILED(hres))
return hres;

12
dlls/vbscript/vbscript.c
View file

@ -130,6 +130,7 @@ IDispatch *lookup_named_item(script_ctx_t *ctx, const WCHAR *name, unsigned flag
static void release_script(script_ctx_t *ctx)
{
vbscode_t *code, *code_next;
class_desc_t *class_desc;
unsigned i;
@ -148,6 +149,17 @@ static void release_script(script_ctx_t *ctx)
ctx->global_funcs_cnt = 0;
ctx->global_funcs_size = 0;
LIST_FOR_EACH_ENTRY_SAFE(code, code_next, &ctx->code_list, vbscode_t, entry)
{
if(code->is_persistent)
{
code->pending_exec = TRUE;
if(code->last_class) code->last_class->next = NULL;
}
else
release_vbscode(code);
}
while(!list_empty(&ctx->named_items)) {
named_item_t *iter = LIST_ENTRY(list_head(&ctx->named_items), named_item_t, entry);

3
dlls/vbscript/vbscript.h
View file

@ -341,6 +341,7 @@ struct _vbscode_t {
BOOL option_explicit;
BOOL pending_exec;
BOOL is_persistent;
function_t main_code;
IDispatch *context;
@ -349,6 +350,8 @@ struct _vbscode_t {
unsigned bstr_cnt;
heap_pool_t heap;
class_desc_t *last_class;
struct list entry;
};