June 2024 - Wine-commits - list.winehq.org

Ziqing Hui : winegstreamer/video_encoder: Implement SetOutputType.
by Alexandre Julliard 28 Jun '24

28 Jun '24

Module: wine Branch: master Commit: 9c853fd36d98178e89a21a3a80bbe9ab302e601b URL: https://gitlab.winehq.org/wine/wine/-/commit/9c853fd36d98178e89a21a3a80bbe9… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jun 20 11:04:36 2024 +0800 winegstreamer/video_encoder: Implement SetOutputType. --- dlls/winegstreamer/video_encoder.c | 55 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/video_encoder.c b/dlls/winegstreamer/video_encoder.c index 73d3f757ff9..45ff8f355d1 100644 --- a/dlls/winegstreamer/video_encoder.c +++ b/dlls/winegstreamer/video_encoder.c @@ -41,6 +41,8 @@ struct video_encoder const GUID *const *output_types; UINT output_type_count; + IMFMediaType *output_type; + IMFAttributes *attributes; }; @@ -87,6 +89,8 @@ static ULONG WINAPI transform_Release(IMFTransform *iface) if (!refcount) { + if (encoder->output_type) + IMFMediaType_Release(encoder->output_type); IMFAttributes_Release(encoder->attributes); free(encoder); } @@ -195,8 +199,55 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) { - FIXME("iface %p, id %#lx, type %p, flags %#lx.\n", iface, id, type, flags); - return E_NOTIMPL; + struct video_encoder *encoder = impl_from_IMFTransform(iface); + UINT32 uint32_value; + UINT64 uint64_value; + GUID major, subtype; + ULONG i; + + TRACE("iface %p, id %#lx, type %p, flags %#lx.\n", iface, id, type, flags); + + if (!type) + { + if (encoder->output_type) + { + IMFMediaType_Release(encoder->output_type); + encoder->output_type = NULL; + } + return S_OK; + } + + if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major)) + || FAILED(IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype))) + return E_INVALIDARG; + + if (!IsEqualGUID(&major, &MFMediaType_Video)) + return MF_E_INVALIDMEDIATYPE; + + for (i = 0; i < encoder->output_type_count; ++i) + if (IsEqualGUID(&subtype, encoder->output_types[i])) + break; + if (i == encoder->output_type_count) + return MF_E_INVALIDMEDIATYPE; + + if (FAILED(IMFMediaType_GetUINT64(type, &MF_MT_FRAME_SIZE, &uint64_value))) + return MF_E_INVALIDMEDIATYPE; + + if (flags & MFT_SET_TYPE_TEST_ONLY) + return S_OK; + + if (FAILED(IMFMediaType_GetUINT64(type, &MF_MT_FRAME_RATE, &uint64_value)) + || FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AVG_BITRATE, &uint32_value)) + || FAILED(IMFMediaType_GetUINT32(type, &MF_MT_INTERLACE_MODE, &uint32_value))) + return MF_E_INVALIDMEDIATYPE; + + if (encoder->output_type) + IMFMediaType_Release(encoder->output_type); + IMFMediaType_AddRef((encoder->output_type = type)); + + /* FIXME: Add MF_MT_MPEG_SEQUENCE_HEADER attribute. */ + + return S_OK; } static HRESULT WINAPI transform_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type)

1 0

Ziqing Hui : winegstreamer/video_encoder: Implement GetOutputCurrentType.
by Alexandre Julliard 28 Jun '24

28 Jun '24

Module: wine Branch: master Commit: f5e4dd96e9c0ad73e12faf7e88264a997e6d76c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/f5e4dd96e9c0ad73e12faf7e88264a… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jun 26 16:46:42 2024 +0800 winegstreamer/video_encoder: Implement GetOutputCurrentType. --- dlls/winegstreamer/video_encoder.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/video_encoder.c b/dlls/winegstreamer/video_encoder.c index 45ff8f355d1..0c54bc543a2 100644 --- a/dlls/winegstreamer/video_encoder.c +++ b/dlls/winegstreamer/video_encoder.c @@ -258,8 +258,18 @@ static HRESULT WINAPI transform_GetInputCurrentType(IMFTransform *iface, DWORD i static HRESULT WINAPI transform_GetOutputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) { - FIXME("iface %p, id %#lx, type %p\n", iface, id, type); - return E_NOTIMPL; + struct video_encoder *encoder = impl_from_IMFTransform(iface); + HRESULT hr; + + TRACE("iface %p, id %#lx, type %p\n", iface, id, type); + + if (!encoder->output_type) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + if (FAILED(hr = MFCreateMediaType(type))) + return hr; + + return IMFMediaType_CopyAllItems(encoder->output_type, (IMFAttributes *)*type); } static HRESULT WINAPI transform_GetInputStatus(IMFTransform *iface, DWORD id, DWORD *flags)

1 0

Jacek Caban : jscript: Use to_disp in a few more places.
by Alexandre Julliard 28 Jun '24

28 Jun '24

Module: wine Branch: master Commit: be46a6033d44ee5da6974c076f6426dad2168469 URL: https://gitlab.winehq.org/wine/wine/-/commit/be46a6033d44ee5da6974c076f6426… Author: Jacek Caban <jacek(a)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;

1 0

Jacek Caban : jscript: Introduce to_jsdispex.
by Alexandre Julliard 28 Jun '24

28 Jun '24

Module: wine Branch: master Commit: 119b0bb77d5bb0d85290127d5899648be798e9fc URL: https://gitlab.winehq.org/wine/wine/-/commit/119b0bb77d5bb0d85290127d589964… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 27 19:54:33 2024 +0200 jscript: Introduce to_jsdispex. --- dlls/jscript/array.c | 2 +- dlls/jscript/dispex.c | 2 +- dlls/jscript/jscript.h | 5 +++++ dlls/jscript/json.c | 4 ++-- dlls/jscript/object.c | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index a8e2934b78d..9f9231c8b5f 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -1560,7 +1560,7 @@ static HRESULT Array_unshift(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsig hres = jsdisp_propput_idx(jsthis, i+argc, val); jsval_release(val); }else if(hres == DISP_E_UNKNOWNNAME) { - hres = IDispatchEx_DeleteMemberByDispID(&jsthis->IDispatchEx_iface, id); + hres = IDispatchEx_DeleteMemberByDispID(to_dispex(jsthis), id); } } diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index e8bd0be64b4..efefbb116b9 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1893,7 +1893,7 @@ static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, TRACE("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return IDispatchEx_InvokeEx(&This->IDispatchEx_iface, dispIdMember, lcid, wFlags, + return IDispatchEx_InvokeEx(to_dispex(This), dispIdMember, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, NULL); } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 1a9446893a1..80641731006 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -216,6 +216,11 @@ static inline IDispatch *to_disp(jsdisp_t *jsdisp) return (IDispatch*)&jsdisp->IDispatchEx_iface; } +static inline IDispatchEx *to_dispex(jsdisp_t *jsdisp) +{ + return &jsdisp->IDispatchEx_iface; +} + jsdisp_t *as_jsdisp(IDispatch*); jsdisp_t *to_jsdisp(IDispatch*); void jsdisp_free(jsdisp_t*); diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c index ee0fe87827c..b56d75d3570 100644 --- a/dlls/jscript/json.c +++ b/dlls/jscript/json.c @@ -671,7 +671,7 @@ static HRESULT stringify_object(stringify_ctx_t *ctx, jsdisp_t *obj) if(!append_char(ctx, '{')) return E_OUTOFMEMORY; - while((hres = IDispatchEx_GetNextDispID(&obj->IDispatchEx_iface, fdexEnumDefault, dispid, &dispid)) == S_OK) { + while((hres = IDispatchEx_GetNextDispID(to_dispex(obj), fdexEnumDefault, dispid, &dispid)) == S_OK) { stepback = ctx->buf_len; if(prop_cnt && !append_char(ctx, ',')) { @@ -693,7 +693,7 @@ static HRESULT stringify_object(stringify_ctx_t *ctx, jsdisp_t *obj) } } - hres = IDispatchEx_GetMemberName(&obj->IDispatchEx_iface, dispid, &prop_name); + hres = IDispatchEx_GetMemberName(to_dispex(obj), dispid, &prop_name); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index f25287b7a15..d62acfa178a 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -655,7 +655,7 @@ static HRESULT jsdisp_define_properties(script_ctx_t *ctx, jsdisp_t *obj, jsval_ if(FAILED(hres)) break; - hres = IDispatchEx_GetMemberName(&list_obj->IDispatchEx_iface, id, &name); + hres = IDispatchEx_GetMemberName(to_dispex(list_obj), id, &name); if(SUCCEEDED(hres)) hres = jsdisp_define_property(obj, name, &prop_desc); release_property_descriptor(&prop_desc);

1 0

Jacek Caban : jscript: Consistently use jsdisp_addref and jsdisp_release.
by Alexandre Julliard 28 Jun '24

28 Jun '24

Module: wine Branch: master Commit: 0cfa404f3bafb1e00c120cd9ccaef858913115b2 URL: https://gitlab.winehq.org/wine/wine/-/commit/0cfa404f3bafb1e00c120cd9ccaef8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 27 19:56:05 2024 +0200 jscript: Consistently use jsdisp_addref and jsdisp_release. --- dlls/jscript/dispex.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index efefbb116b9..cc4ff85b508 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1111,7 +1111,7 @@ static ULONG WINAPI ScriptTypeInfo_Release(ITypeInfo *iface) { for (i = This->num_funcs; i--;) release_bytecode(This->funcs[i].code->bytecode); - IDispatchEx_Release(&This->jsdisp->IDispatchEx_iface); + jsdisp_release(This->jsdisp); free(This->funcs); free(This->vars); free(This); @@ -1850,7 +1850,7 @@ static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LC } /* Keep a ref to the props and their names */ - IDispatchEx_AddRef(&This->IDispatchEx_iface); + jsdisp_addref(This); *ppTInfo = &typeinfo->ITypeInfo_iface; return S_OK;

1 0

Jacek Caban : jscript: Use default destructor for array objects.
by Alexandre Julliard 28 Jun '24

28 Jun '24

Module: wine Branch: master Commit: a9dec6088fa0ec11f5b398a229a3f75d178642fb URL: https://gitlab.winehq.org/wine/wine/-/commit/a9dec6088fa0ec11f5b398a229a3f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 27 20:08:31 2024 +0200 jscript: Use default destructor for array objects. --- dlls/jscript/array.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 9f9231c8b5f..dfd9eda75cc 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -1589,11 +1589,6 @@ done: return hres; } -static void Array_destructor(jsdisp_t *dispex) -{ - free(dispex); -} - static void Array_on_put(jsdisp_t *dispex, const WCHAR *name) { ArrayInstance *array = array_from_jsdisp(dispex); @@ -1643,7 +1638,6 @@ static const builtin_info_t Array_info = { .class = JSCLASS_ARRAY, .props_cnt = ARRAY_SIZE(Array_props), .props = Array_props, - .destructor = Array_destructor, .on_put = Array_on_put, }; @@ -1655,7 +1649,6 @@ static const builtin_info_t ArrayInst_info = { .class = JSCLASS_ARRAY, .props_cnt = ARRAY_SIZE(ArrayInst_props), .props = ArrayInst_props, - .destructor = Array_destructor, .on_put = Array_on_put, };

1 0

Jacek Caban : jscript: Use default destructor for Object instances.
by Alexandre Julliard 28 Jun '24

28 Jun '24

Module: wine Branch: master Commit: d4ff0c9f36d2057ed1b0367da7bc3568fdddcba3 URL: https://gitlab.winehq.org/wine/wine/-/commit/d4ff0c9f36d2057ed1b0367da7bc35… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 27 20:11:17 2024 +0200 jscript: Use default destructor for Object instances. --- dlls/jscript/object.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index d62acfa178a..382f4107c45 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -448,11 +448,6 @@ done: return r ? jsval_copy(argv[0], r) : S_OK; } -static void Object_destructor(jsdisp_t *dispex) -{ - free(dispex); -} - static const builtin_prop_t Object_props[] = { {L"__defineGetter__", Object_defineGetter, PROPF_METHOD|PROPF_ES6|2}, {L"__defineSetter__", Object_defineSetter, PROPF_METHOD|PROPF_ES6|2}, @@ -468,12 +463,10 @@ static const builtin_info_t Object_info = { .class = JSCLASS_OBJECT, .props_cnt = ARRAY_SIZE(Object_props), .props = Object_props, - .destructor = Object_destructor, }; static const builtin_info_t ObjectInst_info = { - .class = JSCLASS_OBJECT, - .destructor = Object_destructor, + .class = JSCLASS_OBJECT, }; static void release_property_descriptor(property_desc_t *desc)

1 0

Jacek Caban : jscript: Always free jsdisp_t in jsdisp_free.
by Alexandre Julliard 28 Jun '24

28 Jun '24

Module: wine Branch: master Commit: 930a61a4555012304a21996e5819b7bc97030480 URL: https://gitlab.winehq.org/wine/wine/-/commit/930a61a4555012304a21996e5819b7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 27 20:13:17 2024 +0200 jscript: Always free jsdisp_t in jsdisp_free. Instead of class-specific destructors. --- dlls/jscript/arraybuf.c | 1 - dlls/jscript/dispex.c | 3 +-- dlls/jscript/engine.c | 1 - dlls/jscript/enumerator.c | 1 - dlls/jscript/function.c | 3 --- dlls/jscript/jsregexp.c | 1 - dlls/jscript/set.c | 4 ---- dlls/jscript/string.c | 1 - dlls/jscript/vbarray.c | 1 - 9 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/jscript/arraybuf.c b/dlls/jscript/arraybuf.c index f12720d42b0..fc01773338f 100644 --- a/dlls/jscript/arraybuf.c +++ b/dlls/jscript/arraybuf.c @@ -592,7 +592,6 @@ static void DataView_destructor(jsdisp_t *dispex) DataViewInstance *view = dataview_from_jsdisp(dispex); if(view->buffer) jsdisp_release(&view->buffer->dispex); - free(view); } static HRESULT DataView_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op op, jsdisp_t *dispex) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index cc4ff85b508..a678421f0a3 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2263,8 +2263,7 @@ void jsdisp_free(jsdisp_t *obj) if(obj->builtin_info->destructor) obj->builtin_info->destructor(obj); - else - free(obj); + free(obj); } #ifdef TRACE_REFCNT diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 5bc9f4de20e..60b479fb83b 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -476,7 +476,6 @@ static void scope_destructor(jsdisp_t *dispex) if(scope->obj) IDispatch_Release(scope->obj); - free(scope); } static unsigned scope_idx_length(jsdisp_t *dispex) diff --git a/dlls/jscript/enumerator.c b/dlls/jscript/enumerator.c index ed671f5cbbe..203bfa8b8e0 100644 --- a/dlls/jscript/enumerator.c +++ b/dlls/jscript/enumerator.c @@ -87,7 +87,6 @@ static void Enumerator_destructor(jsdisp_t *dispex) if(This->enumvar) IEnumVARIANT_Release(This->enumvar); jsval_release(This->item); - free(dispex); } static HRESULT Enumerator_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op op, jsdisp_t *dispex) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 75f313b0975..9c339b807f7 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -115,8 +115,6 @@ static void Arguments_destructor(jsdisp_t *jsdisp) if(arguments->scope) scope_release(arguments->scope); - - free(arguments); } static unsigned Arguments_idx_length(jsdisp_t *jsdisp) @@ -580,7 +578,6 @@ static void Function_destructor(jsdisp_t *dispex) { FunctionInstance *function = function_from_jsdisp(dispex); function->vtbl->destructor(function); - free(function); } static HRESULT Function_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op op, jsdisp_t *dispex) diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index d184f2f2685..e3a707b1f6b 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -550,7 +550,6 @@ static void RegExp_destructor(jsdisp_t *dispex) regexp_destroy(This->jsregexp); jsval_release(This->last_index_val); jsstr_release(This->str); - free(This); } static HRESULT RegExp_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op op, jsdisp_t *dispex) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index f2fe562e519..5a568607a43 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -359,8 +359,6 @@ static void Map_destructor(jsdisp_t *dispex) assert(!entry->deleted); release_map_entry(entry); } - - free(map); } static HRESULT Map_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op op, jsdisp_t *dispex) @@ -806,8 +804,6 @@ static void WeakMap_destructor(jsdisp_t *dispex) while(weakmap->map.root) remove_weakmap_entry(RB_ENTRY_VALUE(weakmap->map.root, struct weakmap_entry, entry)); - - free(weakmap); } static HRESULT WeakMap_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op op, jsdisp_t *dispex) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 38a80eecb2a..ab7497912f2 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1499,7 +1499,6 @@ static void String_destructor(jsdisp_t *dispex) StringInstance *This = string_from_jsdisp(dispex); jsstr_release(This->str); - free(This); } static unsigned String_idx_length(jsdisp_t *jsdisp) diff --git a/dlls/jscript/vbarray.c b/dlls/jscript/vbarray.c index c46b331e787..55500c86769 100644 --- a/dlls/jscript/vbarray.c +++ b/dlls/jscript/vbarray.c @@ -235,7 +235,6 @@ static void VBArray_destructor(jsdisp_t *dispex) VBArrayInstance *vbarray = vbarray_from_jsdisp(dispex); SafeArrayDestroy(vbarray->safearray); - free(vbarray); } static const builtin_prop_t VBArray_props[] = {

1 0

Eric Pouech : cmd: Use precedence in command chaining.
by Alexandre Julliard 28 Jun '24

28 Jun '24

Module: wine Branch: master Commit: 355b4938339e183bb3638da568baae7fb8f76cb2 URL: https://gitlab.winehq.org/wine/wine/-/commit/355b4938339e183bb3638da568baae… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri May 3 12:00:30 2024 +0200 cmd: Use precedence in command chaining. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/wcmdmain.c | 69 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 47 insertions(+), 22 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 7d8a0ce307f..9fc78119f3c 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2240,6 +2240,19 @@ static const char* debugstr_token(enum builder_token tkn, union token_parameter } } +static unsigned token_get_precedence(enum builder_token tkn) +{ + switch (tkn) + { + case TKN_EOL: return 5; + case TKN_BAR: return 4; + case TKN_AMPAMP: return 3; + case TKN_BARBAR: return 2; + case TKN_AMP: return 1; + default: return 0; + } +} + static void node_builder_init(struct node_builder *builder) { memset(builder, 0, sizeof(*builder)); @@ -2315,7 +2328,7 @@ static void redirection_list_append(CMD_REDIRECTION **redir, CMD_REDIRECTION *la } } -static BOOL node_builder_parse(struct node_builder *builder, CMD_NODE **result) +static BOOL node_builder_parse(struct node_builder *builder, unsigned precedence, CMD_NODE **result) { CMD_REDIRECTION *redir = NULL; unsigned bogus_line; @@ -2346,14 +2359,14 @@ static BOOL node_builder_parse(struct node_builder *builder, CMD_NODE **result) /* empty lines are allowed here */ while ((tkn = node_builder_peek_next_token(builder, &pmt)) == TKN_EOL) node_builder_consume(builder); - ERROR_IF(!node_builder_parse(builder, &left)); + ERROR_IF(!node_builder_parse(builder, 0, &left)); /* temp before using precedence in chaining */ while ((tkn = node_builder_peek_next_token(builder, &pmt)) != TKN_CLOSEPAR) { ERROR_IF(tkn != TKN_EOL); node_builder_consume(builder); /* FIXME potential empty here?? */ - ERROR_IF(!node_builder_parse(builder, &right)); + ERROR_IF(!node_builder_parse(builder, 0, &right)); left = node_create_binary(CMD_CONCAT, left, right); } node_builder_consume(builder); @@ -2381,32 +2394,44 @@ static BOOL node_builder_parse(struct node_builder *builder, CMD_NODE **result) break; case TKN_AMP: ERROR_IF(!left); - node_builder_consume(builder); - if (node_builder_peek_next_token(builder, &pmt) == TKN_CLOSEPAR) + if (!(done = token_get_precedence(tkn) <= precedence)) { - done = TRUE; - break; + node_builder_consume(builder); + if (node_builder_peek_next_token(builder, &pmt) == TKN_CLOSEPAR) + { + done = TRUE; + break; + } + ERROR_IF(!node_builder_parse(builder, token_get_precedence(tkn), &right)); + left = node_create_binary(CMD_CONCAT, left, right); } - ERROR_IF(!node_builder_parse(builder, &right)); - left = node_create_binary(CMD_CONCAT, left, right); break; case TKN_AMPAMP: ERROR_IF(!left); - node_builder_consume(builder); - ERROR_IF(!node_builder_parse(builder, &right)); - left = node_create_binary(CMD_ONSUCCESS, left, right); + if (!(done = token_get_precedence(tkn) <= precedence)) + { + node_builder_consume(builder); + ERROR_IF(!node_builder_parse(builder, token_get_precedence(tkn), &right)); + left = node_create_binary(CMD_ONSUCCESS, left, right); + } break; case TKN_BAR: ERROR_IF(!left); - node_builder_consume(builder); - ERROR_IF(!node_builder_parse(builder, &right)); - left = node_create_binary(CMD_PIPE, left, right); + if (!(done = token_get_precedence(tkn) <= precedence)) + { + node_builder_consume(builder); + ERROR_IF(!node_builder_parse(builder, token_get_precedence(tkn), &right)); + left = node_create_binary(CMD_PIPE, left, right); + } break; case TKN_BARBAR: ERROR_IF(!left); - node_builder_consume(builder); - ERROR_IF(!node_builder_parse(builder, &right)); - left = node_create_binary(CMD_ONFAILURE, left, right); + if (!(done = token_get_precedence(tkn) <= precedence)) + { + node_builder_consume(builder); + ERROR_IF(!node_builder_parse(builder, token_get_precedence(tkn), &right)); + left = node_create_binary(CMD_ONFAILURE, left, right); + } break; case TKN_COMMAND: ERROR_IF(left); @@ -2437,7 +2462,7 @@ static BOOL node_builder_parse(struct node_builder *builder, CMD_NODE **result) ERROR_IF(!if_condition_parse(pmt.command->command, &end, &cond)); command_dispose(pmt.command); node_builder_consume(builder); - if (!node_builder_parse(builder, &then_block)) + if (!node_builder_parse(builder, 0, &then_block)) { if_condition_dispose(&cond); ERROR_IF(TRUE); @@ -2446,7 +2471,7 @@ static BOOL node_builder_parse(struct node_builder *builder, CMD_NODE **result) if (tkn == TKN_ELSE) { node_builder_consume(builder); - if (!node_builder_parse(builder, &else_block)) + if (!node_builder_parse(builder, 0, &else_block)) { if_condition_dispose(&cond); node_dispose_tree(then_block); @@ -2499,7 +2524,7 @@ static BOOL node_builder_parse(struct node_builder *builder, CMD_NODE **result) node_builder_consume(builder); } while (tkn != TKN_CLOSEPAR); if (!node_builder_expect_token(builder, TKN_DO) || - !node_builder_parse(builder, &do_block)) + !node_builder_parse(builder, 0, &do_block)) { for_control_dispose(for_ctrl); ERROR_IF(TRUE); @@ -2538,7 +2563,7 @@ static BOOL node_builder_generate(struct node_builder *builder, CMD_NODE **node) } else { - if (node_builder_parse(builder, node) && + if (node_builder_parse(builder, 0, node) && builder->pos + 1 >= builder->num) /* consumed all tokens? */ return TRUE; /* print error on first unused token */

1 0

Eric Pouech : cmd: Add success/failure return code tests for CALL command.
by Alexandre Julliard 28 Jun '24

28 Jun '24

Module: wine Branch: master Commit: 7ccc169570496d58b91ed0355c21fc136f3ba53d URL: https://gitlab.winehq.org/wine/wine/-/commit/7ccc169570496d58b91ed0355c21fc… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Jun 27 16:39:47 2024 +0200 cmd: Add success/failure return code tests for CALL command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd | 23 ++++++++++++++++------- programs/cmd/tests/test_builtins.cmd.exp | 19 +++++++++++++------ 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index e97d447ba26..d31cb3ef72a 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -451,14 +451,23 @@ if 1==0 (echo p1) else echo p2||echo p3 echo --- if 1==0 (echo q1) else echo q2&echo q3 echo ------------- Testing internal commands return codes -call :setError 0 &&echo SUCCESS||echo FAILURE %errorlevel% -call :setError 33 &&echo SUCCESS||echo FAILURE %errorlevel% -call :setError 666 -echo foo &&echo SUCCESS||echo FAILURE %errorlevel% -echo foo >> h:\i\dont\exist\at\all.txt &&echo SUCCESS||echo FAILURE %errorlevel% -type NUL &&echo SUCCESS||echo FAILURE %errorlevel% -type h:\i\dont\exist\at\all.txt &&echo SUCCESS||echo FAILURE %errorlevel% +setlocal EnableDelayedExpansion + +echo --- call and IF/FOR blocks +call :setError 0 &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel! +call :setError 33 &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel! +call :setError 666 & (echo foo &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (echo foo >> h:\i\dont\exist\at\all.txt &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & ((if 1==1 echo "">NUL) &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & ((if 1==0 echo "">NUL) &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & ((if 1==1 (call :setError 33)) &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & ((if 1==0 (call :setError 33) else call :setError 34) &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & ((for %%i in () do echo "") &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & ((for %%i in () do call :setError 33) &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & ((for %%i in (a) do call :setError 0) &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & ((for %%i in (a) do call :setError 33) &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) echo --- +setlocal DisableDelayedExpansion echo ------------ Testing 'set' ------------ call :setError 0 rem Remove any WINE_FOO* WINE_BA* environment variables from shell before proceeding diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index b4d85161fbb..1799bc795fc 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -450,13 +450,20 @@ p2 q2 q3 ------------- Testing internal commands return codes -SUCCESS -FAILURE 0 +--- call and IF/FOR blocks +SUCCESS 0 +(a)todo_wine@FAILURE 33 @todo_wine(a)foo@space@ -(a)todo_wine@SUCCESS -(a)todo_wine@FAILURE 666 -SUCCESS -(a)todo_wine@FAILURE 0 +(a)todo_wine@SUCCESS 666 +(a)todo_wine@FAILURE 1 +SUCCESS 666 +(a)todo_wine@SUCCESS 666 +(a)todo_wine@FAILURE 33 +(a)todo_wine@FAILURE 34 +SUCCESS 666 +(a)todo_wine@SUCCESS 666 +(a)todo_wine@SUCCESS 0 +(a)todo_wine@FAILURE 33 @todo_wine(a)--- ------------ Testing 'set' ------------ 1

1 0