ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vbscript: Append to the global lists when the code is executed, rather than compiled. 

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-11 14:34:24 +02:00 committed by Alexandre Julliard
parent 9933c776c7
commit b7eb693e7f
2 changed files with 105 additions and 76 deletions
dlls/vbscript
compile.cvbscript.c

102
dlls/vbscript/compile.c
View File

@ -1759,6 +1759,7 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl)
static BOOL lookup_script_identifier(script_ctx_t *script, const WCHAR *identifier)
{
class_desc_t *class;
vbscode_t *code;
unsigned i;
for(i = 0; i < script->global_vars_cnt; i++) {
@ -1776,6 +1777,30 @@ static BOOL lookup_script_identifier(script_ctx_t *script, const WCHAR *identifi
return TRUE;
}
LIST_FOR_EACH_ENTRY(code, &script->code_list, vbscode_t, entry) {
unsigned var_cnt = code->main_code.var_cnt;
var_desc_t *vars = code->main_code.vars;
function_t *func;
if(!code->pending_exec)
continue;
for(i = 0; i < var_cnt; i++) {
if(!wcsicmp(vars[i].name, identifier))
return TRUE;
}
for(func = code->funcs; func; func = func->next) {
if(!wcsicmp(func->name, identifier))
return TRUE;
}
for(class = code->classes; class; class = class->next) {
if(!wcsicmp(class->name, identifier))
return TRUE;
}
}
return FALSE;
}
@ -1864,13 +1889,11 @@ static void release_compiler(compile_ctx_t *ctx)
HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *delimiter, DWORD flags, vbscode_t **ret)
{
function_t *new_func, *func_iter;
function_decl_t *func_decl;
class_decl_t *class_decl;
function_t *new_func;
compile_ctx_t ctx;
vbscode_t *code;
size_t cnt;
unsigned i;
HRESULT hres;
if (!src) src = L"";
@ -1922,79 +1945,6 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli
return compile_error(script, hres);
}
cnt = script->global_vars_cnt + ctx.code->main_code.var_cnt;
if(cnt > script->global_vars_size) {
dynamic_var_t **new_vars;
if(script->global_vars)
new_vars = heap_realloc(script->global_vars, cnt * sizeof(*new_vars));
else
new_vars = heap_alloc(cnt * sizeof(*new_vars));
if(!new_vars)
return compile_error(script, E_OUTOFMEMORY);
script->global_vars = new_vars;
script->global_vars_size = cnt;
}
cnt = script->global_funcs_cnt;
for(func_iter = ctx.code->funcs; func_iter; func_iter = func_iter->next)
cnt++;
if(cnt > script->global_funcs_size) {
function_t **new_funcs;
if(script->global_funcs)
new_funcs = heap_realloc(script->global_funcs, cnt * sizeof(*new_funcs));
else
new_funcs = heap_alloc(cnt * sizeof(*new_funcs));
if(!new_funcs)
return compile_error(script, E_OUTOFMEMORY);
script->global_funcs = new_funcs;
script->global_funcs_size = cnt;
}
for(i = 0; i < ctx.code->main_code.var_cnt; i++) {
dynamic_var_t *var = compiler_alloc(ctx.code, sizeof(*var));
if(!var) {
release_compiler(&ctx);
return compile_error(script, E_OUTOFMEMORY);
}
var->name = ctx.code->main_code.vars[i].name;
V_VT(&var->v) = VT_EMPTY;
var->is_const = FALSE;
var->array = NULL;
script->global_vars[script->global_vars_cnt + i] = var;
}
script->global_vars_cnt += ctx.code->main_code.var_cnt;
for(func_iter = ctx.code->funcs; func_iter; func_iter = func_iter->next) {
unsigned i;
for(i = 0; i < script->global_funcs_cnt; i++) {
if(!wcsicmp(script->global_funcs[i]->name, func_iter->name)) {
/* global function already exists, replace it */
script->global_funcs[i] = func_iter;
break;
}
}
if(i == script->global_funcs_cnt)
script->global_funcs[script->global_funcs_cnt++] = func_iter;
}
if(ctx.code->classes) {
class_desc_t *class = ctx.code->classes;
while(1) {
class->ctx = script;
if(!class->next)
break;
class = class->next;
}
class->next = script->classes;
script->classes = ctx.code->classes;
code->last_class = class;
}
code->is_persistent = (flags & SCRIPTTEXT_ISPERSISTENT) != 0;
if(TRACE_ON(vbscript_disas))

79
dlls/vbscript/vbscript.c
View File

@ -82,6 +82,85 @@ static inline BOOL is_started(VBScript *This)
static HRESULT exec_global_code(script_ctx_t *ctx, vbscode_t *code, VARIANT *res)
{
function_t *func_iter, **new_funcs;
dynamic_var_t *var, **new_vars;
size_t cnt, i;
cnt = ctx->global_vars_cnt + code->main_code.var_cnt;
if (cnt > ctx->global_vars_size)
{
if (ctx->global_vars)
new_vars = heap_realloc(ctx->global_vars, cnt * sizeof(*new_vars));
else
new_vars = heap_alloc(cnt * sizeof(*new_vars));
if (!new_vars)
return E_OUTOFMEMORY;
ctx->global_vars = new_vars;
ctx->global_vars_size = cnt;
}
cnt = ctx->global_funcs_cnt;
for (func_iter = code->funcs; func_iter; func_iter = func_iter->next)
cnt++;
if (cnt > ctx->global_funcs_size)
{
if (ctx->global_funcs)
new_funcs = heap_realloc(ctx->global_funcs, cnt * sizeof(*new_funcs));
else
new_funcs = heap_alloc(cnt * sizeof(*new_funcs));
if (!new_funcs)
return E_OUTOFMEMORY;
ctx->global_funcs = new_funcs;
ctx->global_funcs_size = cnt;
}
for (i = 0; i < code->main_code.var_cnt; i++)
{
if (!(var = heap_pool_alloc(&ctx->heap, sizeof(*var))))
return E_OUTOFMEMORY;
var->name = code->main_code.vars[i].name;
V_VT(&var->v) = VT_EMPTY;
var->is_const = FALSE;
var->array = NULL;
ctx->global_vars[ctx->global_vars_cnt + i] = var;
}
ctx->global_vars_cnt += code->main_code.var_cnt;
for (func_iter = code->funcs; func_iter; func_iter = func_iter->next)
{
for (i = 0; i < ctx->global_funcs_cnt; i++)
{
if (!wcsicmp(ctx->global_funcs[i]->name, func_iter->name))
{
/* global function already exists, replace it */
ctx->global_funcs[i] = func_iter;
break;
}
}
if (i == ctx->global_funcs_cnt)
ctx->global_funcs[ctx->global_funcs_cnt++] = func_iter;
}
if (code->classes)
{
class_desc_t *class = code->classes;
while (1)
{
class->ctx = ctx;
if (!class->next)
break;
class = class->next;
}
class->next = ctx->classes;
ctx->classes = code->classes;
code->last_class = class;
}
code->pending_exec = FALSE;
return exec_script(ctx, TRUE, &code->main_code, NULL, NULL, res);
}