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

vbscript: Factor out detach_global_objects. 

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-17 22:46:27 +02:00 committed by Alexandre Julliard
parent ace3279a26
commit 43dbf3a60e
3 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/vbscript/global.c
View File

@ -2592,6 +2592,27 @@ static const builtin_prop_t err_props[] = {
{DISPID_ERR_RAISE, Err_Raise, 0, 1, 5}, {DISPID_ERR_RAISE, Err_Raise, 0, 1, 5},
}; };
void detach_global_objects(script_ctx_t *ctx)
{
if(ctx->err_obj) {
IDispatchEx_Release(&ctx->err_obj->IDispatchEx_iface);
ctx->err_obj = NULL;
}
if(ctx->global_obj) {
IDispatchEx_Release(&ctx->global_obj->IDispatchEx_iface);
ctx->global_obj = NULL;
}
if(ctx->script_obj) {
ScriptDisp *script_obj = ctx->script_obj;
ctx->script_obj = NULL;
script_obj->ctx = NULL;
IDispatchEx_Release(&script_obj->IDispatchEx_iface);
}
}
HRESULT init_global(script_ctx_t *ctx) HRESULT init_global(script_ctx_t *ctx)
{ {
HRESULT hres; HRESULT hres;

19
dlls/vbscript/vbscript.c
View File

@ -189,24 +189,7 @@ static void release_script(script_ctx_t *ctx)
ctx->site = NULL; ctx->site = NULL;
} }
if(ctx->err_obj) { detach_global_objects(ctx);
IDispatchEx_Release(&ctx->err_obj->IDispatchEx_iface);
ctx->err_obj = NULL;
}
if(ctx->global_obj) {
IDispatchEx_Release(&ctx->global_obj->IDispatchEx_iface);
ctx->global_obj = NULL;
}
if(ctx->script_obj) {
ScriptDisp *script_obj = ctx->script_obj;
ctx->script_obj = NULL;
script_obj->ctx = NULL;
IDispatchEx_Release(&script_obj->IDispatchEx_iface);
}
heap_pool_free(&ctx->heap); heap_pool_free(&ctx->heap);
heap_pool_init(&ctx->heap); heap_pool_init(&ctx->heap);
} }

1
dlls/vbscript/vbscript.h
View File

@ -363,6 +363,7 @@ void release_dynamic_vars(dynamic_var_t*) DECLSPEC_HIDDEN;
IDispatch *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDEN; IDispatch *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDEN;
void clear_ei(EXCEPINFO*) DECLSPEC_HIDDEN; void clear_ei(EXCEPINFO*) DECLSPEC_HIDDEN;
HRESULT report_script_error(script_ctx_t*) DECLSPEC_HIDDEN; HRESULT report_script_error(script_ctx_t*) DECLSPEC_HIDDEN;
void detach_global_objects(script_ctx_t*) DECLSPEC_HIDDEN;
typedef struct { typedef struct {
UINT16 len; UINT16 len;