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

jscript: Initialize the script context in SetScriptSite. 

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 2020-02-20 21:26:38 +01:00 committed by Alexandre Julliard
parent efb5050894
commit 522340aeb3
1 changed files with 48 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
dlls/jscript/jscript.c
View File

@ -57,6 +57,7 @@ typedef struct {
DWORD version; DWORD version;
BOOL html_mode; BOOL html_mode;
BOOL is_encode; BOOL is_encode;
BOOL is_initialized;
IActiveScriptSite *site; IActiveScriptSite *site;
@ -343,23 +344,6 @@ static void exec_queued_code(JScript *This)
clear_script_queue(This); clear_script_queue(This);
} }
static HRESULT set_ctx_site(JScript *This)
{
HRESULT hres;
This->ctx->lcid = This->lcid;
hres = init_global(This->ctx);
if(FAILED(hres))
return hres;
IActiveScriptSite_AddRef(This->site);
This->ctx->site = This->site;
change_state(This, SCRIPTSTATE_INITIALIZED);
return S_OK;
}
static void decrease_state(JScript *This, SCRIPTSTATE state) static void decrease_state(JScript *This, SCRIPTSTATE state)
{ {
if(This->ctx) { if(This->ctx) {
@ -641,6 +625,35 @@ static HRESULT WINAPI JScript_SetScriptSite(IActiveScript *iface,
if(InterlockedCompareExchange(&This->thread_id, GetCurrentThreadId(), 0)) if(InterlockedCompareExchange(&This->thread_id, GetCurrentThreadId(), 0))
return E_UNEXPECTED; return E_UNEXPECTED;
if(!This->ctx) {
script_ctx_t *ctx = heap_alloc_zero(sizeof(script_ctx_t));
if(!ctx)
return E_OUTOFMEMORY;
ctx->ref = 1;
ctx->state = SCRIPTSTATE_UNINITIALIZED;
ctx->active_script = &This->IActiveScript_iface;
ctx->safeopt = This->safeopt;
ctx->version = This->version;
ctx->html_mode = This->html_mode;
ctx->acc = jsval_undefined();
heap_pool_init(&ctx->tmp_heap);
hres = create_jscaller(ctx);
if(FAILED(hres)) {
heap_free(ctx);
return hres;
}
ctx->last_match = jsstr_empty();
ctx = InterlockedCompareExchangePointer((void**)&This->ctx, ctx, NULL);
if(ctx) {
script_release(ctx);
return E_UNEXPECTED;
}
}
This->site = pass; This->site = pass;
IActiveScriptSite_AddRef(This->site); IActiveScriptSite_AddRef(This->site);
@ -648,7 +661,18 @@ static HRESULT WINAPI JScript_SetScriptSite(IActiveScript *iface,
if(hres == S_OK) if(hres == S_OK)
This->lcid = lcid; This->lcid = lcid;
return This->ctx ? set_ctx_site(This) : S_OK; This->ctx->lcid = This->lcid;
hres = init_global(This->ctx);
if(FAILED(hres))
return hres;
IActiveScriptSite_AddRef(This->site);
This->ctx->site = This->site;
if(This->is_initialized)
change_state(This, SCRIPTSTATE_INITIALIZED);
return S_OK;
} }
static HRESULT WINAPI JScript_GetScriptSite(IActiveScript *iface, REFIID riid, static HRESULT WINAPI JScript_GetScriptSite(IActiveScript *iface, REFIID riid,
@ -677,7 +701,7 @@ static HRESULT WINAPI JScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE s
return S_OK; return S_OK;
} }
if(!This->ctx) if(!This->is_initialized || !This->ctx)
return E_UNEXPECTED; return E_UNEXPECTED;
switch(ss) { switch(ss) {
@ -900,42 +924,16 @@ static ULONG WINAPI JScriptParse_Release(IActiveScriptParse *iface)
static HRESULT WINAPI JScriptParse_InitNew(IActiveScriptParse *iface) static HRESULT WINAPI JScriptParse_InitNew(IActiveScriptParse *iface)
{ {
JScript *This = impl_from_IActiveScriptParse(iface); JScript *This = impl_from_IActiveScriptParse(iface);
script_ctx_t *ctx;
HRESULT hres;
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
if(This->ctx) if(This->is_initialized)
return E_UNEXPECTED; return E_UNEXPECTED;
This->is_initialized = TRUE;
ctx = heap_alloc_zero(sizeof(script_ctx_t)); if(This->site)
if(!ctx) change_state(This, SCRIPTSTATE_INITIALIZED);
return E_OUTOFMEMORY; return S_OK;
ctx->ref = 1;
ctx->state = SCRIPTSTATE_UNINITIALIZED;
ctx->active_script = &This->IActiveScript_iface;
ctx->safeopt = This->safeopt;
ctx->version = This->version;
ctx->html_mode = This->html_mode;
ctx->acc = jsval_undefined();
heap_pool_init(&ctx->tmp_heap);
hres = create_jscaller(ctx);
if(FAILED(hres)) {
heap_free(ctx);
return hres;
}
ctx->last_match = jsstr_empty();
ctx = InterlockedCompareExchangePointer((void**)&This->ctx, ctx, NULL);
if(ctx) {
script_release(ctx);
return E_UNEXPECTED;
}
return This->site ? set_ctx_site(This) : S_OK;
} }
static HRESULT WINAPI JScriptParse_AddScriptlet(IActiveScriptParse *iface, static HRESULT WINAPI JScriptParse_AddScriptlet(IActiveScriptParse *iface,