Module: wine Branch: master Commit: be46a6033d44ee5da6974c076f6426dad2168469 URL: https://gitlab.winehq.org/wine/wine/-/commit/be46a6033d44ee5da6974c076f6426d...
Author: Jacek Caban jacek@codeweavers.com Date: Thu Jun 27 19:51:33 2024 +0200
jscript: Use to_disp in a few more places.
---
dlls/jscript/engine.c | 2 +- dlls/jscript/json.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 66bd5a98ff1..5bc9f4de20e 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -3317,7 +3317,7 @@ static HRESULT bind_event_target(script_ctx_t *ctx, function_code_t *func, jsdis disp = get_object(v); hres = IDispatch_QueryInterface(disp, &IID_IBindEventHandler, (void**)&target); if(SUCCEEDED(hres)) { - hres = IBindEventHandler_BindHandler(target, func->name, (IDispatch*)&func_obj->IDispatchEx_iface); + hres = IBindEventHandler_BindHandler(target, func->name, to_disp(func_obj)); IBindEventHandler_Release(target); if(FAILED(hres)) WARN("BindEvent failed: %08lx\n", hres); diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c index a8c026b8587..ee0fe87827c 100644 --- a/dlls/jscript/json.c +++ b/dlls/jscript/json.c @@ -315,7 +315,7 @@ static jsval_t transform_json_object(struct transform_json_object_ctx *proc_ctx, goto ret; if(FAILED(jsdisp_get_id(obj, str, 0, &id))) continue; - proc_ctx->hres = disp_delete((IDispatch*)&obj->IDispatchEx_iface, id, &b); + proc_ctx->hres = disp_delete(to_disp(obj), id, &b); }else { proc_ctx->hres = jsdisp_define_data_property(obj, str, PROPF_WRITABLE | PROPF_ENUMERABLE | PROPF_CONFIGURABLE, res); jsval_release(res); @@ -334,7 +334,7 @@ static jsval_t transform_json_object(struct transform_json_object_ctx *proc_ctx, res = transform_json_object(proc_ctx, obj, jsstr); if(is_undefined(res)) { if(SUCCEEDED(proc_ctx->hres)) - proc_ctx->hres = disp_delete((IDispatch*)&obj->IDispatchEx_iface, id, &b); + proc_ctx->hres = disp_delete(to_disp(obj), id, &b); }else { if(!(str = jsstr_flatten(jsstr))) proc_ctx->hres = E_OUTOFMEMORY;