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

Ziqing Hui : winegstreamer/video_encoder: Implement SetOutputType.
by Alexandre Julliard June 28, 2024

June 28, 2024

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

Jacek Caban : jscript: Introduce to_jsdispex.
by Alexandre Julliard June 28, 2024

June 28, 2024

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: Always free jsdisp_t in jsdisp_free.
by Alexandre Julliard June 28, 2024

June 28, 2024

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

Jacek Caban : jscript: Use to_disp in a few more places.
by Alexandre Julliard June 28, 2024

June 28, 2024

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: Use default destructor for array objects.
by Alexandre Julliard June 28, 2024

June 28, 2024

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: Consistently use jsdisp_addref and jsdisp_release.
by Alexandre Julliard June 28, 2024

June 28, 2024

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 Object instances.
by Alexandre Julliard June 28, 2024

June 28, 2024

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

Elizabeth Figura : wined3d: Implement wined3d_check_device_format_conversion().
by Alexandre Julliard June 28, 2024

June 28, 2024

Module: wine Branch: master Commit: d8379aa2cc33e5b69c0ddceff59921e0822c7722 URL: https://gitlab.winehq.org/wine/wine/-/commit/d8379aa2cc33e5b69c0ddceff59921… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Sat Jun 8 19:13:14 2024 -0500 wined3d: Implement wined3d_check_device_format_conversion(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44888 --- dlls/d3d9/directx.c | 3 ++ dlls/d3d9/tests/visual.c | 136 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/directx.c | 43 +++++++++++++-- 3 files changed, 177 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index d5b8e276075..13d32b00680 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -414,6 +414,9 @@ static HRESULT WINAPI d3d9_CheckDeviceFormatConversion(IDirect3D9Ex *iface, UINT if (output_idx >= d3d9->wined3d_output_count) return D3DERR_INVALIDCALL; + if (src_format == dst_format) + return S_OK; + wined3d_mutex_lock(); hr = wined3d_check_device_format_conversion(d3d9->wined3d_outputs[output_idx], wined3d_device_type_from_d3d(device_type), wined3dformat_from_d3dformat(src_format), diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e924588630e..724d9ef1e39 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -28682,6 +28682,141 @@ static void test_default_attribute_components(void) release_test_context(&context); } +static void test_format_conversion(void) +{ + D3DADAPTER_IDENTIFIER9 identifier; + struct d3d9_test_context context; + HRESULT hr; + + static const struct + { + D3DFORMAT src_format; + D3DFORMAT dst_format; + HRESULT expect_hr; + bool broken_warp; + } + tests[] = + { + {D3DFMT_X8R8G8B8, D3DFMT_A8R8G8B8, S_OK}, + {D3DFMT_A8R8G8B8, D3DFMT_X8R8G8B8, S_OK}, + {D3DFMT_R5G6B5, D3DFMT_X8R8G8B8, S_OK}, + {D3DFMT_YUY2, D3DFMT_X8R8G8B8, S_OK, .broken_warp = true}, + {D3DFMT_YUY2, D3DFMT_R5G6B5, S_OK, .broken_warp = true}, + {D3DFMT_R32F, D3DFMT_R16F, D3DERR_NOTAVAILABLE}, + + {D3DFMT_L8, D3DFMT_L8, S_OK}, + {D3DFMT_X8R8G8B8, D3DFMT_L8, D3DERR_NOTAVAILABLE}, + {D3DFMT_A8, D3DFMT_L8, D3DERR_NOTAVAILABLE}, + {D3DFMT_A8L8, D3DFMT_L8, D3DERR_NOTAVAILABLE}, + {D3DFMT_L16, D3DFMT_L8, D3DERR_NOTAVAILABLE}, + {D3DFMT_L8, D3DFMT_A8, D3DERR_NOTAVAILABLE}, + {D3DFMT_L8, D3DFMT_L16, D3DERR_NOTAVAILABLE}, + {D3DFMT_L8, D3DFMT_A8L8, D3DERR_NOTAVAILABLE}, + }; + + static const D3DFORMAT all_formats[] = + { + D3DFMT_R8G8B8, + D3DFMT_A8R8G8B8, + D3DFMT_X8R8G8B8, + D3DFMT_R5G6B5, + D3DFMT_X1R5G5B5, + D3DFMT_A1R5G5B5, + D3DFMT_A4R4G4B4, + D3DFMT_R3G3B2, + D3DFMT_A8, + D3DFMT_A8R3G3B2, + D3DFMT_X4R4G4B4, + D3DFMT_A2B10G10R10, + D3DFMT_A8B8G8R8, + D3DFMT_X8B8G8R8, + D3DFMT_G16R16, + D3DFMT_A2R10G10B10, + D3DFMT_A16B16G16R16, + D3DFMT_A8P8, + D3DFMT_P8, + D3DFMT_L8, + D3DFMT_A8L8, + D3DFMT_A4L4, + D3DFMT_V8U8, + D3DFMT_L6V5U5, + D3DFMT_X8L8V8U8, + D3DFMT_Q8W8V8U8, + D3DFMT_V16U16, + D3DFMT_A2W10V10U10, + D3DFMT_UYVY, + D3DFMT_YUY2, + D3DFMT_DXT1, + D3DFMT_DXT2, + D3DFMT_DXT3, + D3DFMT_DXT4, + D3DFMT_DXT5, + D3DFMT_MULTI2_ARGB8, + D3DFMT_G8R8_G8B8, + D3DFMT_R8G8_B8G8, + D3DFMT_D16_LOCKABLE, + D3DFMT_D32, + D3DFMT_D15S1, + D3DFMT_D24S8, + D3DFMT_D24X8, + D3DFMT_D24X4S4, + D3DFMT_D16, + D3DFMT_L16, + D3DFMT_D32F_LOCKABLE, + D3DFMT_D24FS8, + D3DFMT_D32_LOCKABLE, + D3DFMT_S8_LOCKABLE, + D3DFMT_VERTEXDATA, + D3DFMT_INDEX16, + D3DFMT_INDEX32, + D3DFMT_Q16W16V16U16, + D3DFMT_R16F, + D3DFMT_G16R16F, + D3DFMT_A16B16G16R16F, + D3DFMT_R32F, + D3DFMT_G32R32F, + D3DFMT_A32B32G32R32F, + D3DFMT_CxV8U8, + D3DFMT_A1, + D3DFMT_A2B10G10R10_XR_BIAS, + D3DFMT_BINARYBUFFER, + 200, + }; + + if (!init_test_context(&context)) + return; + + hr = IDirect3D9_GetAdapterIdentifier(context.d3d, D3DADAPTER_DEFAULT, 0, &identifier); + ok(hr == S_OK, "Failed to get adapter identifier, hr %#lx.\n", hr); + + for (unsigned int i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3D9_CheckDeviceFormatConversion(context.d3d, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, tests[i].src_format, tests[i].dst_format); + todo_wine_if (i == 5) + ok(hr == tests[i].expect_hr + || broken(tests[i].broken_warp && adapter_is_warp(&identifier) && hr == D3DERR_NOTAVAILABLE), + "Got hr %#lx for %u to %u.\n", hr, tests[i].src_format, tests[i].dst_format); + } + + for (unsigned int src_format = 0; src_format < ARRAY_SIZE(all_formats); ++src_format) + { + for (unsigned int dst_format = 0; dst_format < ARRAY_SIZE(all_formats); ++dst_format) + { + hr = IDirect3D9_CheckDeviceFormatConversion(context.d3d, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, all_formats[src_format], all_formats[dst_format]); + if (src_format == dst_format) + ok(hr == S_OK, "Got hr %#lx for %u to %u.\n", + hr, all_formats[src_format], all_formats[dst_format]); + else + ok(hr == S_OK || hr == D3DERR_NOTAVAILABLE, "Got hr %#lx for %u to %u.\n", + hr, all_formats[src_format], all_formats[dst_format]); + } + } + + release_test_context(&context); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -28838,4 +28973,5 @@ START_TEST(visual) test_mipmap_upload(); test_default_diffuse(); test_default_attribute_components(); + test_format_conversion(); } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9df95bdea55..f236a59f963 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2184,12 +2184,45 @@ unsigned int CDECL wined3d_calculate_format_pitch(const struct wined3d_adapter * } HRESULT CDECL wined3d_check_device_format_conversion(const struct wined3d_output *output, - enum wined3d_device_type device_type, enum wined3d_format_id src_format, - enum wined3d_format_id dst_format) + enum wined3d_device_type device_type, enum wined3d_format_id src_format_id, + enum wined3d_format_id dst_format_id) { - FIXME("output %p, device_type %s, src_format %s, dst_format %s stub!\n", - output, debug_d3ddevicetype(device_type), debug_d3dformat(src_format), - debug_d3dformat(dst_format)); + const struct wined3d_format *src_format = wined3d_get_format(output->adapter, src_format_id, 0); + const struct wined3d_format *dst_format = wined3d_get_format(output->adapter, dst_format_id, 0); + + TRACE("output %p, device_type %s, src_format %s, dst_format %s.\n", + output, debug_d3ddevicetype(device_type), debug_d3dformat(src_format_id), + debug_d3dformat(dst_format_id)); + + if (!(src_format->caps[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3D_FORMAT_CAP_BLIT)) + { + TRACE("Source format does not support blitting.\n"); + return WINED3DERR_NOTAVAILABLE; + } + + if (!(dst_format->caps[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3D_FORMAT_CAP_BLIT)) + { + TRACE("Destination format does not support blitting.\n"); + return WINED3DERR_NOTAVAILABLE; + } + + /* Source cannot be depth/stencil (although it can be YUV or compressed, + * and AMD also allows blitting from luminance formats). */ + if (src_format->depth_size || src_format->stencil_size) + { + TRACE("Source format is depth/stencil.\n"); + return WINED3DERR_NOTAVAILABLE; + } + + /* The destination format must be a simple RGB format (no luminance, YUV, + * compression, etc.) All such formats have a nonzero red_size; the only + * exceptions are X24G8 (not supported in d3d9) and A8 (which, it turns out, + * no vendor reports support for converting to). */ + if (!dst_format->red_size) + { + TRACE("Destination format is not a simple RGB format.\n"); + return WINED3DERR_NOTAVAILABLE; + } return WINED3D_OK; }

1 0

Ziqing Hui : mf/tests: Add more tests for h264 encoder type attributes.
by Alexandre Julliard June 28, 2024

June 28, 2024

Module: wine Branch: master Commit: 2b094ace7e2d4b711d3e02255056e74ee71dce17 URL: https://gitlab.winehq.org/wine/wine/-/commit/2b094ace7e2d4b711d3e02255056e7… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jun 26 14:48:51 2024 +0800 mf/tests: Add more tests for h264 encoder type attributes. --- dlls/mf/tests/mf_test.h | 1 + dlls/mf/tests/transform.c | 82 ++++++++++++++++++++++++++++++++--------------- 2 files changed, 58 insertions(+), 25 deletions(-) diff --git a/dlls/mf/tests/mf_test.h b/dlls/mf/tests/mf_test.h index b3247ba00cc..9fa5d4fef41 100644 --- a/dlls/mf/tests/mf_test.h +++ b/dlls/mf/tests/mf_test.h @@ -58,6 +58,7 @@ struct attribute_desc PROPVARIANT value; BOOL ratio; BOOL required; + BOOL required_set; BOOL todo; BOOL todo_value; }; diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 262e3bc4726..deec2c7dd92 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -63,6 +63,8 @@ DEFINE_MEDIATYPE_GUID(MEDIASUBTYPE_IV50,MAKEFOURCC('I','V','5','0')); DEFINE_GUID(mft_output_sample_incomplete,0xffffff,0xffff,0xffff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff); +static const GUID test_attr_guid = {0xdeadbeef}; + struct media_buffer { IMediaBuffer IMediaBuffer_iface; @@ -678,13 +680,25 @@ static void check_mft_set_input_type_required_(int line, IMFTransform *transform for (attr = attributes; attr && attr->key; attr++) { winetest_push_context("%s", debugstr_a(attr->name)); + hr = IMFMediaType_DeleteItem(media_type, attr->key); ok_(__FILE__, line)(hr == S_OK, "DeleteItem returned %#lx\n", hr); + hr = IMFTransform_SetInputType(transform, 0, media_type, MFT_SET_TYPE_TEST_ONLY); todo_wine_if(attr->todo) ok_(__FILE__, line)(FAILED(hr) == attr->required, "SetInputType returned %#lx.\n", hr); + + if (attr->required_set) + { + hr = IMFTransform_SetInputType(transform, 0, media_type, 0); + ok_(__FILE__, line)(FAILED(hr), "SetInputType Succeeded.\n"); + hr = IMFTransform_SetInputType(transform, 0, NULL, 0); + ok_(__FILE__, line)(hr == S_OK, "Failed to clear input type.\n"); + } + hr = IMFMediaType_SetItem(media_type, attr->key, &attr->value); ok_(__FILE__, line)(hr == S_OK, "SetItem returned %#lx\n", hr); + winetest_pop_context(); } @@ -759,12 +773,24 @@ static void check_mft_set_output_type_required_(int line, IMFTransform *transfor for (attr = attributes; attr && attr->key; attr++) { winetest_push_context("%s", debugstr_a(attr->name)); + hr = IMFMediaType_DeleteItem(media_type, attr->key); ok_(__FILE__, line)(hr == S_OK, "DeleteItem returned %#lx\n", hr); + hr = IMFTransform_SetOutputType(transform, 0, media_type, MFT_SET_TYPE_TEST_ONLY); ok_(__FILE__, line)(FAILED(hr) == attr->required, "SetOutputType returned %#lx.\n", hr); + + if (attr->required_set) + { + hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); + ok_(__FILE__, line)(FAILED(hr), "SetOutputType Succeeded.\n"); + hr = IMFTransform_SetOutputType(transform, 0, NULL, 0); + ok_(__FILE__, line)(hr == S_OK, "Failed to clear output type.\n"); + } + hr = IMFMediaType_SetItem(media_type, attr->key, &attr->value); ok_(__FILE__, line)(hr == S_OK, "SetItem returned %#lx\n", hr); + winetest_pop_context(); } @@ -3810,43 +3836,43 @@ static void test_h264_encoder(void) {.subtype = &MFVideoFormat_H264}, }, }; - static const media_type_desc default_outputs[] = + static const media_type_desc default_inputs[] = { - { - ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), - ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_H264), - }, + {ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_IYUV)}, + {ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YV12)}, + {ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12)}, + {ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YUY2)}, }; - static const media_type_desc default_inputs[] = + static const media_type_desc default_outputs[] = { - { - ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), - ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_IYUV), - }, - { - ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), - ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YV12), - }, - { - ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), - ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12), - }, - { - ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), - ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YUY2), - }, + {ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_H264)}, }; static const struct attribute_desc expect_transform_attributes[] = { ATTR_UINT32(MFT_ENCODER_SUPPORTS_CONFIG_EVENT, 1), {0}, }; + static const struct attribute_desc expect_common_attributes[] = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + {0}, + }; + static const struct attribute_desc expect_available_input_attributes[] = + { + ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), + ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), + ATTR_UINT32(MF_MT_VIDEO_NOMINAL_RANGE, MFNominalRange_Wide), + ATTR_UINT32(MF_MT_INTERLACE_MODE, MFVideoInterlace_Progressive), + ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), + {0}, + }; const struct attribute_desc input_type_desc[] = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12, .required = TRUE), ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001, .required = TRUE), ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE), + ATTR_UINT32(test_attr_guid, 0), {0}, }; const struct attribute_desc output_type_desc[] = @@ -3854,9 +3880,10 @@ static void test_h264_encoder(void) ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_H264, .required = TRUE), ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE), - ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), - ATTR_UINT32(MF_MT_AVG_BITRATE, 193540), - ATTR_UINT32(MF_MT_INTERLACE_MODE, MFVideoInterlace_Progressive), + ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001, .required_set = TRUE), + ATTR_UINT32(MF_MT_AVG_BITRATE, 193540, .required_set = TRUE), + ATTR_UINT32(MF_MT_INTERLACE_MODE, MFVideoInterlace_Progressive, .required_set = TRUE), + ATTR_UINT32(test_attr_guid, 0), {0}, }; const struct attribute_desc expect_input_type_desc[] = @@ -3865,6 +3892,7 @@ static void test_h264_encoder(void) ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12), ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), + ATTR_UINT32(test_attr_guid, 0), {0}, }; const struct attribute_desc expect_output_type_desc[] = @@ -3876,6 +3904,7 @@ static void test_h264_encoder(void) ATTR_UINT32(MF_MT_AVG_BITRATE, 193540), ATTR_BLOB(MF_MT_MPEG_SEQUENCE_HEADER, test_h264_sequence_header, sizeof(test_h264_sequence_header)), ATTR_UINT32(MF_MT_INTERLACE_MODE, MFVideoInterlace_Progressive), + ATTR_UINT32(test_attr_guid, 0), {0}, }; static const MFT_OUTPUT_STREAM_INFO expect_output_info = {.cbSize = 0x8000}; @@ -3929,6 +3958,7 @@ static void test_h264_encoder(void) { winetest_push_context("out %lu", i); ok(hr == S_OK, "GetOutputAvailableType returned %#lx.\n", hr); + check_media_type(media_type, expect_common_attributes, -1); check_media_type(media_type, default_outputs[i], -1); ret = IMFMediaType_Release(media_type); ok(ret == 0, "Release returned %lu\n", ret); @@ -3948,6 +3978,8 @@ static void test_h264_encoder(void) { winetest_push_context("out %lu", i); ok(hr == S_OK, "IMFTransform_GetInputAvailableType returned %#lx\n", hr); + check_media_type(media_type, expect_common_attributes, -1); + check_media_type(media_type, expect_available_input_attributes, -1); check_media_type(media_type, default_inputs[i], -1); ret = IMFMediaType_Release(media_type); ok(ret == 0, "Release returned %lu\n", ret);

1 0

Ziqing Hui : winegstreamer/video_encoder: Implement GetOutputAvailableType.
by Alexandre Julliard June 28, 2024

June 28, 2024

Module: wine Branch: master Commit: c73dddbf0f8627395b6e813b4f096bcc1a0b6e27 URL: https://gitlab.winehq.org/wine/wine/-/commit/c73dddbf0f8627395b6e813b4f096b… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jun 20 10:59:43 2024 +0800 winegstreamer/video_encoder: Implement GetOutputAvailableType. --- dlls/winegstreamer/video_encoder.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/video_encoder.c b/dlls/winegstreamer/video_encoder.c index beb74003d64..73d3f757ff9 100644 --- a/dlls/winegstreamer/video_encoder.c +++ b/dlls/winegstreamer/video_encoder.c @@ -38,6 +38,9 @@ struct video_encoder IMFTransform IMFTransform_iface; LONG refcount; + const GUID *const *output_types; + UINT output_type_count; + IMFAttributes *attributes; }; @@ -174,8 +177,14 @@ static HRESULT WINAPI transform_GetInputAvailableType(IMFTransform *iface, DWORD static HRESULT WINAPI transform_GetOutputAvailableType(IMFTransform *iface, DWORD id, DWORD index, IMFMediaType **type) { - FIXME("iface %p, id %#lx, index %#lx, type %p.\n", iface, id, index, type); - return E_NOTIMPL; + struct video_encoder *encoder = impl_from_IMFTransform(iface); + + TRACE("iface %p, id %#lx, index %#lx, type %p.\n", iface, id, index, type); + + *type = NULL; + if (index >= encoder->output_type_count) + return MF_E_NO_MORE_TYPES; + return MFCreateVideoMediaTypeFromSubtype(encoder->output_types[index], (IMFVideoMediaType **)type); } static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) @@ -275,7 +284,8 @@ static const IMFTransformVtbl transform_vtbl = transform_ProcessOutput, }; -static HRESULT video_encoder_create(struct video_encoder **out) +static HRESULT video_encoder_create(const GUID *const *output_types, UINT output_type_count, + struct video_encoder **out) { struct video_encoder *encoder; HRESULT hr; @@ -286,6 +296,9 @@ static HRESULT video_encoder_create(struct video_encoder **out) encoder->IMFTransform_iface.lpVtbl = &transform_vtbl; encoder->refcount = 1; + encoder->output_types = output_types; + encoder->output_type_count = output_type_count; + if (FAILED(hr = MFCreateAttributes(&encoder->attributes, 16))) goto failed; if (FAILED(hr = IMFAttributes_SetUINT32(encoder->attributes, &MFT_ENCODER_SUPPORTS_CONFIG_EVENT, TRUE))) @@ -302,6 +315,11 @@ failed: return hr; } +static const GUID *const h264_encoder_output_types[] = +{ + &MFVideoFormat_H264, +}; + HRESULT h264_encoder_create(REFIID riid, void **out) { const MFVIDEOFORMAT input_format = @@ -327,7 +345,8 @@ HRESULT h264_encoder_create(REFIID riid, void **out) return hr; } - if (FAILED(hr = video_encoder_create(&encoder))) + if (FAILED(hr = video_encoder_create(h264_encoder_output_types, ARRAY_SIZE(h264_encoder_output_types), + &encoder))) return hr; TRACE("Created h264 encoder transform %p.\n", &encoder->IMFTransform_iface);

1 0