From: Gabriel Ivăncescu <gabrielopcode@gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com> --- dlls/jscript/dispex.c | 2 +- dlls/jscript/engine.c | 2 +- dlls/jscript/enumerator.c | 2 +- dlls/jscript/function.c | 6 +++--- dlls/jscript/jscript.h | 2 +- dlls/jscript/jsregexp.c | 2 +- dlls/jscript/set.c | 6 +++--- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 0685eca01fd..3538e985e18 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1115,7 +1115,7 @@ HRESULT gc_process_linked_obj(struct gc_ctx *gc_ctx, enum gc_traverse_op op, jsd return S_OK; } -HRESULT gc_process_linked_val(struct gc_ctx *gc_ctx, enum gc_traverse_op op, jsdisp_t *obj, jsval_t *link) +HRESULT gc_process_linked_val(struct gc_ctx *gc_ctx, enum gc_traverse_op op, jsval_t *link) { jsdisp_t *jsdisp; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 4006d54a058..de5a357c657 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -531,7 +531,7 @@ static HRESULT scope_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op op, unsigned i, cnt = vars->argc; for(i = 0; i < cnt; i++) { - hres = gc_process_linked_val(gc_ctx, op, dispex, &vars->var[i]); + hres = gc_process_linked_val(gc_ctx, op, &vars->var[i]); if(FAILED(hres)) return hres; } diff --git a/dlls/jscript/enumerator.c b/dlls/jscript/enumerator.c index 1f57f6b5173..73835f4418f 100644 --- a/dlls/jscript/enumerator.c +++ b/dlls/jscript/enumerator.c @@ -91,7 +91,7 @@ static void Enumerator_destructor(jsdisp_t *dispex) static HRESULT Enumerator_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op op, jsdisp_t *dispex) { - return gc_process_linked_val(gc_ctx, op, dispex, &enumerator_from_jsdisp(dispex)->item); + return gc_process_linked_val(gc_ctx, op, &enumerator_from_jsdisp(dispex)->item); } static HRESULT Enumerator_atEnd(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index b9663495e93..5d499ecabec 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -187,7 +187,7 @@ static HRESULT Arguments_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op if(arguments->buf) { for(i = 0; i < arguments->argc; i++) { - hres = gc_process_linked_val(gc_ctx, op, jsdisp, &arguments->buf[i]); + hres = gc_process_linked_val(gc_ctx, op, &arguments->buf[i]); if(FAILED(hres)) return hres; } @@ -1305,7 +1305,7 @@ static HRESULT BindFunction_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_ unsigned i; for(i = 0; i < function->argc; i++) { - hres = gc_process_linked_val(gc_ctx, op, &function->function.dispex, &function->args[i]); + hres = gc_process_linked_val(gc_ctx, op, &function->args[i]); if(FAILED(hres)) return hres; } @@ -1314,7 +1314,7 @@ static HRESULT BindFunction_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_ if(FAILED(hres)) return hres; - return gc_process_linked_val(gc_ctx, op, &function->function.dispex, &function->this); + return gc_process_linked_val(gc_ctx, op, &function->this); } static const function_vtbl_t BindFunctionVtbl = { diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 2c430b0c9ac..fa460b23b20 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -165,7 +165,7 @@ 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*,void**); -HRESULT gc_process_linked_val(struct gc_ctx*,enum gc_traverse_op,jsdisp_t*,jsval_t*); +HRESULT gc_process_linked_val(struct gc_ctx*,enum gc_traverse_op,jsval_t*); typedef struct { const WCHAR *name; diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index 3fe781f01a7..01cbdd2aeb9 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -559,7 +559,7 @@ static void RegExp_destructor(jsdisp_t *dispex) static HRESULT RegExp_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op op, jsdisp_t *dispex) { - return gc_process_linked_val(gc_ctx, op, dispex, ®exp_from_jsdisp(dispex)->last_index_val); + return gc_process_linked_val(gc_ctx, op, ®exp_from_jsdisp(dispex)->last_index_val); } static const builtin_prop_t RegExp_props[] = { diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index c114e3fd6e2..5ab7abe1285 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -375,10 +375,10 @@ static HRESULT Map_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op op, js } LIST_FOR_EACH_ENTRY(entry, &map->entries, struct jsval_map_entry, list_entry) { - hres = gc_process_linked_val(gc_ctx, op, dispex, &entry->key); + hres = gc_process_linked_val(gc_ctx, op, &entry->key); if(FAILED(hres)) return hres; - hres = gc_process_linked_val(gc_ctx, op, dispex, &entry->value); + hres = gc_process_linked_val(gc_ctx, op, &entry->value); if(FAILED(hres)) return hres; } @@ -825,7 +825,7 @@ static HRESULT WeakMap_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op op if(op == GC_TRAVERSE && entry->key->gc_marked) continue; - hres = gc_process_linked_val(gc_ctx, op, dispex, &entry->value); + hres = gc_process_linked_val(gc_ctx, op, &entry->value); if(FAILED(hres)) return hres; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10045