- Wine-Commits - list.winehq.org

Zebediah Figura : vkd3d-shader/spirv: Remove handling of VKD3DSPR_OUTCONTROLPOINT.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: vkd3d Branch: master Commit: fa23165cc019a2f1cab53c1bc5ee0c482138bd20 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fa23165cc019a2f1cab53c1bc5ee0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jul 16 23:49:09 2023 -0500 vkd3d-shader/spirv: Remove handling of VKD3DSPR_OUTCONTROLPOINT. I/O normalization removes this register type. --- libs/vkd3d-shader/spirv.c | 1 - libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a43d1c00..d6cbab70 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4862,7 +4862,6 @@ static void spirv_compiler_emit_shader_phase_input(struct spirv_compiler *compil spirv_compiler_emit_input_register(compiler, dst); return; case VKD3DSPR_OUTPOINTID: /* Emitted in spirv_compiler_emit_initial_declarations(). */ - case VKD3DSPR_OUTCONTROLPOINT: /* See spirv_compiler_leave_shader_phase(). */ return; default: FIXME("Unhandled shader phase input register %#x.\n", reg->type); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 2b22e536..fd7f890b 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1119,7 +1119,7 @@ static inline bool vkd3d_shader_instruction_has_texel_offset(const struct vkd3d_ static inline bool vkd3d_shader_register_is_input(const struct vkd3d_shader_register *reg) { - return reg->type == VKD3DSPR_INPUT || reg->type == VKD3DSPR_INCONTROLPOINT || reg->type == VKD3DSPR_OUTCONTROLPOINT; + return reg->type == VKD3DSPR_INPUT || reg->type == VKD3DSPR_INCONTROLPOINT; } static inline bool vkd3d_shader_register_is_output(const struct vkd3d_shader_register *reg)

1 0

Gabriel Ivăncescu : mshtml/tests: Fix BindInfo leak in htmldoc test.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: cb4939eb0ebfe24d6a818e3de060363a58ef9535 URL: https://gitlab.winehq.org/wine/wine/-/commit/cb4939eb0ebfe24d6a818e3de06036… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 3 20:47:59 2023 +0200 mshtml/tests: Fix BindInfo leak in htmldoc test. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/htmldoc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 4db4777dca4..f2ad881df39 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -836,6 +836,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, hres = IInternetProtocolSink_ReportResult(pOIProtSink, S_OK, 0, NULL); ok(hres == S_OK, "ReportResult failed: %08lx\n", hres); + ReleaseBindInfo(&bindinfo); return S_OK; }

1 0

Gabriel Ivăncescu : jscript: Fix value arg leak in transform_json_object.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 8f82586fd9720d8771d91d081f77b8ad4fb72e8b URL: https://gitlab.winehq.org/wine/wine/-/commit/8f82586fd9720d8771d91d081f77b8… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 3 20:47:59 2023 +0200 jscript: Fix value arg leak in transform_json_object. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/json.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c index e07ad863348..277a5e01144 100644 --- a/dlls/jscript/json.c +++ b/dlls/jscript/json.c @@ -295,7 +295,7 @@ static jsval_t transform_json_object(struct transform_json_object_ctx *proc_ctx, if(!obj) { FIXME("non-JS obj in JSON object: %p\n", get_object(args[1])); proc_ctx->hres = E_NOTIMPL; - return jsval_undefined(); + goto ret; }else if(is_class(obj, JSCLASS_ARRAY)) { unsigned i, length = array_get_length(obj); WCHAR buf[14], *buf_end; @@ -306,13 +306,13 @@ static jsval_t transform_json_object(struct transform_json_object_ctx *proc_ctx, str = idx_to_str(i, buf_end); if(!(jsstr = jsstr_alloc(str))) { proc_ctx->hres = E_OUTOFMEMORY; - return jsval_undefined(); + goto ret; } res = transform_json_object(proc_ctx, obj, jsstr); jsstr_release(jsstr); if(is_undefined(res)) { if(FAILED(proc_ctx->hres)) - return jsval_undefined(); + goto ret; if(FAILED(jsdisp_get_id(obj, str, 0, &id))) continue; proc_ctx->hres = disp_delete((IDispatch*)&obj->IDispatchEx_iface, id, &b); @@ -321,7 +321,7 @@ static jsval_t transform_json_object(struct transform_json_object_ctx *proc_ctx, jsval_release(res); } if(FAILED(proc_ctx->hres)) - return jsval_undefined(); + goto ret; } }else { id = DISPID_STARTENUM; @@ -330,7 +330,7 @@ static jsval_t transform_json_object(struct transform_json_object_ctx *proc_ctx, if(proc_ctx->hres == S_FALSE) break; if(FAILED(proc_ctx->hres) || FAILED(proc_ctx->hres = jsdisp_get_prop_name(obj, id, &jsstr))) - return jsval_undefined(); + goto ret; res = transform_json_object(proc_ctx, obj, jsstr); if(is_undefined(res)) { if(SUCCEEDED(proc_ctx->hres)) @@ -344,7 +344,7 @@ static jsval_t transform_json_object(struct transform_json_object_ctx *proc_ctx, } jsstr_release(jsstr); if(FAILED(proc_ctx->hres)) - return jsval_undefined(); + goto ret; } } } @@ -352,6 +352,8 @@ static jsval_t transform_json_object(struct transform_json_object_ctx *proc_ctx, args[0] = jsval_string(name); proc_ctx->hres = disp_call_value(proc_ctx->ctx, proc_ctx->reviver, jsval_obj(holder), DISPATCH_METHOD, ARRAY_SIZE(args), args, &res); +ret: + jsval_release(args[1]); return FAILED(proc_ctx->hres) ? jsval_undefined() : res; }

1 0

Gabriel Ivăncescu : jscript: Don't addref before calling jsdisp_propput_name.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: aa18bbedea6cee6c80b027c1137a5657e7a5e9ca URL: https://gitlab.winehq.org/wine/wine/-/commit/aa18bbedea6cee6c80b027c1137a56… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 3 20:47:59 2023 +0200 jscript: Don't addref before calling jsdisp_propput_name. It already increases refcount. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/engine.c | 2 +- dlls/jscript/jsregexp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 1bf5bb77858..76e6a271bdf 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -758,7 +758,7 @@ static HRESULT detach_scope(script_ctx_t *ctx, call_frame_t *frame, scope_chain_ if (scope == frame->base_scope && func->name && func->local_ref == INVALID_LOCAL_REF && ctx->version >= SCRIPTLANGUAGEVERSION_ES5) - jsdisp_propput_name(jsobj, func->name, jsval_obj(jsdisp_addref(frame->function_instance))); + jsdisp_propput_name(jsobj, func->name, jsval_obj(frame->function_instance)); index = scope->scope_index; for(i = 0; i < frame->function->local_scopes[index].locals_cnt; i++) diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index 378dee9bc53..70673ec190e 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -390,7 +390,7 @@ static HRESULT create_match_array(script_ctx_t *ctx, jsstr_t *input_str, if(FAILED(hres)) break; - hres = jsdisp_propput_name(array, L"input", jsval_string(jsstr_addref(input_str))); + hres = jsdisp_propput_name(array, L"input", jsval_string(input_str)); if(FAILED(hres)) break;

1 0

Gabriel Ivăncescu : jscript: Fix array leak in Array.filter.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 736eb107483732e3a4b6a319129fa92227317a16 URL: https://gitlab.winehq.org/wine/wine/-/commit/736eb107483732e3a4b6a319129fa9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 3 20:47:59 2023 +0200 jscript: Fix array leak in Array.filter. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/array.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 7e5bcaeaefe..078e2ce7d4c 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -1152,6 +1152,8 @@ static HRESULT Array_filter(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsign if(r) *r = jsval_obj(arr); + else + jsdisp_release(arr); done: jsdisp_release(jsthis); return hres;

1 0

Gabriel Ivăncescu : mshtml: Fix window leak on error in async_stop_request.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 4b3cee0c5d6a93986f0bf3ed6b5aa9732ddb1f2f URL: https://gitlab.winehq.org/wine/wine/-/commit/4b3cee0c5d6a93986f0bf3ed6b5aa9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 3 20:47:58 2023 +0200 mshtml: Fix window leak on error in async_stop_request. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/navigate.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 373cfa03585..90ca22ea8b1 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1415,16 +1415,16 @@ static HRESULT async_stop_request(nsChannelBSC *This) stop_request_task_t *task; HRESULT hres; + task = malloc(sizeof(*task)); + if(!task) + return E_OUTOFMEMORY; + IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); if(!This->bsc.read) { TRACE("No data read, calling OnStartRequest\n"); on_start_nsrequest(This); } - task = malloc(sizeof(*task)); - if(!task) - return E_OUTOFMEMORY; - IBindStatusCallback_AddRef(&This->bsc.IBindStatusCallback_iface); task->bsc = This;

1 0

Jacek Caban : shcore: Avoid implicit enum casts.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 5d7156f10b54a23670ba8c235bcd1512a7be1460 URL: https://gitlab.winehq.org/wine/wine/-/commit/5d7156f10b54a23670ba8c235bcd15… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 24 19:44:24 2023 +0200 shcore: Avoid implicit enum casts. --- dlls/shcore/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index a195d8f307a..67ee3b25171 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -67,7 +67,7 @@ HRESULT WINAPI GetProcessDpiAwareness(HANDLE process, PROCESS_DPI_AWARENESS *val HRESULT WINAPI SetProcessDpiAwareness(PROCESS_DPI_AWARENESS value) { - if (SetProcessDpiAwarenessInternal( value )) return S_OK; + if (SetProcessDpiAwarenessInternal( (DPI_AWARENESS)value )) return S_OK; return HRESULT_FROM_WIN32( GetLastError() ); }

1 0

Jacek Caban : webservices: Store xmlbuf encoding as unsigned int.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 88ec915034d2947088213e79de0b20ade85d372b URL: https://gitlab.winehq.org/wine/wine/-/commit/88ec915034d2947088213e79de0b20… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 24 19:45:52 2023 +0200 webservices: Store xmlbuf encoding as unsigned int. Avoids enum casts when it's used for reader. --- dlls/webservices/heap.c | 2 +- dlls/webservices/webservices_private.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/heap.c b/dlls/webservices/heap.c index 93c57d523bd..b2ee514b970 100644 --- a/dlls/webservices/heap.c +++ b/dlls/webservices/heap.c @@ -320,7 +320,7 @@ HRESULT WINAPI WsGetHeapProperty( WS_HEAP *handle, WS_HEAP_PROPERTY_ID id, void } #define XML_BUFFER_INITIAL_ALLOCATED_SIZE 256 -struct xmlbuf *alloc_xmlbuf( WS_HEAP *heap, SIZE_T size, WS_XML_WRITER_ENCODING_TYPE encoding, WS_CHARSET charset, +struct xmlbuf *alloc_xmlbuf( WS_HEAP *heap, SIZE_T size, unsigned int encoding, WS_CHARSET charset, const WS_XML_DICTIONARY *dict_static, WS_XML_DICTIONARY *dict ) { struct xmlbuf *ret; diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 806d79ba4f2..e4a76afb7dd 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -27,7 +27,7 @@ struct xmlbuf WS_HEAP *heap; WS_BYTES bytes; SIZE_T size; - WS_XML_WRITER_ENCODING_TYPE encoding; + unsigned int encoding; WS_CHARSET charset; const WS_XML_DICTIONARY *dict_static; WS_XML_DICTIONARY *dict; @@ -38,7 +38,7 @@ void *ws_alloc_zero( WS_HEAP *, SIZE_T ); void *ws_realloc( WS_HEAP *, void *, SIZE_T, SIZE_T ); void *ws_realloc_zero( WS_HEAP *, void *, SIZE_T, SIZE_T ); void ws_free( WS_HEAP *, void *, SIZE_T ); -struct xmlbuf *alloc_xmlbuf( WS_HEAP *, SIZE_T, WS_XML_WRITER_ENCODING_TYPE, WS_CHARSET, +struct xmlbuf *alloc_xmlbuf( WS_HEAP *, SIZE_T, unsigned int, WS_CHARSET, const WS_XML_DICTIONARY *, WS_XML_DICTIONARY * ); void free_xmlbuf( struct xmlbuf * );

1 0

Gabriel Ivăncescu : jscript/tests: Fix variant leak after conversion when testing VariantChangeType.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 59e00860a7daeb2bea933622f581b0eb2c34cf1d URL: https://gitlab.winehq.org/wine/wine/-/commit/59e00860a7daeb2bea933622f581b0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 3 20:47:59 2023 +0200 jscript/tests: Fix variant leak after conversion when testing VariantChangeType. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/tests/caller.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/jscript/tests/caller.c b/dlls/jscript/tests/caller.c index 8a1ebb83a33..99b6a21e7fb 100644 --- a/dlls/jscript/tests/caller.c +++ b/dlls/jscript/tests/caller.c @@ -173,6 +173,7 @@ static void test_change_type(IVariantChangeType *change_type, VARIANT *src, cons else { call_change_type(change_type, &v, src, VT_UNKNOWN); ok(V_UNKNOWN(&v) == V_UNKNOWN(src), "V_UNKNOWN(v) != V_UNKNOWN(src)\n"); + VariantClear(&v); } if(V_VT(src) != VT_DISPATCH) @@ -180,6 +181,7 @@ static void test_change_type(IVariantChangeType *change_type, VARIANT *src, cons else { call_change_type(change_type, &v, src, VT_DISPATCH); ok(V_DISPATCH(&v) == V_DISPATCH(src), "V_DISPATCH(v) != V_DISPATCH(src)\n"); + VariantClear(&v); } }

1 0

Gabriel Ivăncescu : jscript/tests: Fix Date object leak in test_default_value.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: febdb0a121a7497098fef744685291dff7840c29 URL: https://gitlab.winehq.org/wine/wine/-/commit/febdb0a121a7497098fef744685291… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 3 20:47:59 2023 +0200 jscript/tests: Fix Date object leak in test_default_value. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/tests/run.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index c5d9c47e63c..509f01e3211 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -3069,6 +3069,7 @@ static void test_default_value(void) V_VT(&v) = VT_EMPTY; hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); ok(hres == E_UNEXPECTED, "Invoke failed: %08lx\n", hres); + IDispatch_Release(disp); hres = parse_script_expr(L"new Date()", &v, &script); ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres);

1 0