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

vbscript: Move init_global call to CreateInstance.

Browse Source 
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2019-10-18 16:20:40 +02:00 committed by Alexandre Julliard
parent 229a583c54
commit cef14ac338
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dlls/vbscript/vbscript.c
View File

@ -128,18 +128,6 @@ IDispatch *lookup_named_item(script_ctx_t *ctx, const WCHAR *name, unsigned flag
return NULL; return NULL;
} }
static HRESULT set_ctx_site(VBScript *This)
{
HRESULT hres;
hres = init_global(This->ctx);
if(FAILED(hres))
return hres;
change_state(This, SCRIPTSTATE_INITIALIZED);
return S_OK;
}
static void release_script(script_ctx_t *ctx) static void release_script(script_ctx_t *ctx)
{ {
class_desc_t *class_desc; class_desc_t *class_desc;
@ -434,7 +422,9 @@ static HRESULT WINAPI VBScript_SetScriptSite(IActiveScript *iface, IActiveScript
if(hres == S_OK) if(hres == S_OK)
This->ctx->lcid = lcid; This->ctx->lcid = lcid;
return This->is_initialized ? set_ctx_site(This) : S_OK; if(This->is_initialized)
change_state(This, SCRIPTSTATE_INITIALIZED);
return S_OK;
} }
static HRESULT WINAPI VBScript_GetScriptSite(IActiveScript *iface, REFIID riid, static HRESULT WINAPI VBScript_GetScriptSite(IActiveScript *iface, REFIID riid,
@ -748,7 +738,9 @@ static HRESULT WINAPI VBScriptParse_InitNew(IActiveScriptParse *iface)
return E_UNEXPECTED; return E_UNEXPECTED;
This->is_initialized = TRUE; This->is_initialized = TRUE;
return This->ctx->site ? set_ctx_site(This) : S_OK; if(This->ctx->site)
change_state(This, SCRIPTSTATE_INITIALIZED);
return S_OK;
} }
static HRESULT WINAPI VBScriptParse_AddScriptlet(IActiveScriptParse *iface, static HRESULT WINAPI VBScriptParse_AddScriptlet(IActiveScriptParse *iface,
@ -968,6 +960,12 @@ HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pU
list_init(&ctx->code_list); list_init(&ctx->code_list);
list_init(&ctx->named_items); list_init(&ctx->named_items);
hres = init_global(ctx);
if(FAILED(hres)) {
IActiveScript_Release(&ret->IActiveScript_iface);
return hres;
}
hres = IActiveScript_QueryInterface(&ret->IActiveScript_iface, riid, ppv); hres = IActiveScript_QueryInterface(&ret->IActiveScript_iface, riid, ppv);
IActiveScript_Release(&ret->IActiveScript_iface); IActiveScript_Release(&ret->IActiveScript_iface);
return hres; return hres;