From: Gabriel Ivăncescu <gabrielopcode@gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com> --- dlls/jscript/arraybuf.c | 4 ++-- dlls/jscript/dispex.c | 2 +- dlls/jscript/engine.c | 4 ++-- dlls/jscript/function.c | 7 +++---- dlls/jscript/jscript.h | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/arraybuf.c b/dlls/jscript/arraybuf.c index d7f004c207e..68af4e97190 100644 --- a/dlls/jscript/arraybuf.c +++ b/dlls/jscript/arraybuf.c @@ -644,7 +644,7 @@ static void DataView_destructor(jsdisp_t *dispex) static HRESULT DataView_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op op, jsdisp_t *dispex) { DataViewInstance *view = dataview_from_jsdisp(dispex); - return gc_process_linked_obj(gc_ctx, op, dispex, &view->buffer->dispex, (void**)&view->buffer); + return gc_process_linked_obj(gc_ctx, op, &view->buffer->dispex, (void**)&view->buffer); } static const builtin_info_t DataView_info = { @@ -1034,7 +1034,7 @@ static HRESULT TypedArray_fill_props(jsdisp_t *dispex) static HRESULT TypedArray_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op op, jsdisp_t *dispex) { TypedArrayInstance *typedarr = typedarr_from_jsdisp(dispex); - return gc_process_linked_obj(gc_ctx, op, dispex, &typedarr->buffer->dispex, (void**)&typedarr->buffer); + return gc_process_linked_obj(gc_ctx, op, &typedarr->buffer->dispex, (void**)&typedarr->buffer); } static const builtin_prop_t TypedArrayInst_props[] = { diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 14eb30b03c5..0685eca01fd 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1100,7 +1100,7 @@ HRESULT gc_run(script_ctx_t *ctx) return S_OK; } -HRESULT gc_process_linked_obj(struct gc_ctx *gc_ctx, enum gc_traverse_op op, jsdisp_t *obj, jsdisp_t *link, void **unlink_ref) +HRESULT gc_process_linked_obj(struct gc_ctx *gc_ctx, enum gc_traverse_op op, jsdisp_t *link, void **unlink_ref) { if(op == GC_TRAVERSE_UNLINK) { *unlink_ref = NULL; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 243b922c8f1..4006d54a058 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -538,7 +538,7 @@ static HRESULT scope_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op op, } if(scope->next) { - hres = gc_process_linked_obj(gc_ctx, op, dispex, &scope->next->dispex, (void**)&scope->next); + hres = gc_process_linked_obj(gc_ctx, op, &scope->next->dispex, (void**)&scope->next); if(FAILED(hres)) return hres; } @@ -552,7 +552,7 @@ static HRESULT scope_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op op, return S_OK; } - return scope->obj && (jsobj = to_jsdisp(scope->obj)) ? gc_process_linked_obj(gc_ctx, op, dispex, jsobj, (void**)&scope->obj) : S_OK; + return scope->obj && (jsobj = to_jsdisp(scope->obj)) ? gc_process_linked_obj(gc_ctx, op, jsobj, (void**)&scope->obj) : S_OK; } static const builtin_info_t scope_info = { diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 5ff28e6e9ee..b9663495e93 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -194,7 +194,7 @@ static HRESULT Arguments_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op } if(arguments->scope) { - hres = gc_process_linked_obj(gc_ctx, op, jsdisp, &arguments->scope->dispex, (void**)&arguments->scope); + hres = gc_process_linked_obj(gc_ctx, op, &arguments->scope->dispex, (void**)&arguments->scope); if(FAILED(hres)) return hres; } @@ -942,8 +942,7 @@ static HRESULT InterpretedFunction_gc_traverse(struct gc_ctx *gc_ctx, enum gc_tr if(!function->scope_chain) return S_OK; - return gc_process_linked_obj(gc_ctx, op, &function->function.dispex, &function->scope_chain->dispex, - (void**)&function->scope_chain); + return gc_process_linked_obj(gc_ctx, op, &function->scope_chain->dispex, (void**)&function->scope_chain); } static const function_vtbl_t InterpretedFunctionVtbl = { @@ -1311,7 +1310,7 @@ static HRESULT BindFunction_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_ return hres; } - hres = gc_process_linked_obj(gc_ctx, op, &function->function.dispex, &function->target->dispex, (void**)&function->target); + hres = gc_process_linked_obj(gc_ctx, op, &function->target->dispex, (void**)&function->target); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index f484b059bff..2c430b0c9ac 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -164,7 +164,7 @@ HRESULT create_named_item_script_obj(script_ctx_t*,named_item_t*); named_item_t *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned); void release_named_item(named_item_t*); HRESULT gc_run(script_ctx_t*); -HRESULT gc_process_linked_obj(struct gc_ctx*,enum gc_traverse_op,jsdisp_t*,jsdisp_t*,void**); +HRESULT gc_process_linked_obj(struct gc_ctx*,enum gc_traverse_op,jsdisp_t*,void**); HRESULT gc_process_linked_val(struct gc_ctx*,enum gc_traverse_op,jsdisp_t*,jsval_t*); typedef struct { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10045