August 2022 - Wine-commits - list.winehq.org

Francisco Casas : vkd3d-shader/hlsl: Set objects' register size back to 0.
by Alexandre Julliard 23 Aug '22

23 Aug '22

Module: vkd3d Branch: master Commit: 96a723670093fee604e0171e96553e51a1013c63 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/96a723670093fee604e0171e96553… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Aug 2 10:29:34 2022 -0400 vkd3d-shader/hlsl: Set objects' register size back to 0. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 38df7e8a..f3386e4c 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -198,7 +198,6 @@ static void hlsl_type_calculate_reg_size(struct hlsl_ctx *ctx, struct hlsl_type { unsigned int element_size = type->e.array.type->reg_size; - assert(element_size); if (is_sm4) type->reg_size = (type->e.array.elements_count - 1) * align(element_size, 4) + element_size; else @@ -218,8 +217,6 @@ static void hlsl_type_calculate_reg_size(struct hlsl_ctx *ctx, struct hlsl_type struct hlsl_struct_field *field = &type->e.record.fields[i]; unsigned int field_size = field->type->reg_size; - assert(field_size); - type->reg_size = hlsl_type_get_sm4_offset(field->type, type->reg_size); field->reg_offset = type->reg_size; type->reg_size += field_size; @@ -230,8 +227,7 @@ static void hlsl_type_calculate_reg_size(struct hlsl_ctx *ctx, struct hlsl_type } case HLSL_CLASS_OBJECT: - /* For convenience when performing copy propagation. */ - type->reg_size = 1; + type->reg_size = 0; break; } }

1 0

Francisco Casas : vkd3d-shader/hlsl: Support initialization of implicit size arrays.
by Alexandre Julliard 23 Aug '22

23 Aug '22

Module: vkd3d Branch: master Commit: 3d9baef321cb73ddbfbea09c06cc99e72f1425dc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3d9baef321cb73ddbfbea09c06cc9… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Aug 8 18:11:03 2022 -0400 vkd3d-shader/hlsl: Support initialization of implicit size arrays. HLSL_ARRAY_ELEMENTS_COUNT_IMPLICIT (zero) is used as a temporal value for elements_count for implicit size arrays. This value is replaced by the correct one after parsing the initializer. In case the implicit array is not initialized correctly, hlsl_error() is called but the array size is kept at 0. So the rest of the code must handle these cases. In shader model 5.1, unlike in 5.0, declaring a multi-dimensional object-type array with the last dimension implicit results in an error. This happens even in presence of an initializer. So, both gen_struct_fields() and declare_vars() first check if the shader model is 5.1, the array elements are objects, and if there is at least one implicit array size to handle the whole type as an unbounded resource array. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 11 +- libs/vkd3d-shader/hlsl.h | 2 + libs/vkd3d-shader/hlsl.y | 144 +++++++++++++++++++++- tests/hlsl-initializer-implicit-array.shader_test | 16 +-- 4 files changed, 158 insertions(+), 15 deletions(-)

1 0

Francisco Casas : vkd3d-shader/hlsl: Rename 'inner_type' to 'element_type' in function name.
by Alexandre Julliard 23 Aug '22

23 Aug '22

Module: vkd3d Branch: master Commit: f843a7babbee093caa9873f0cd7ac0ac44b7a95d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f843a7babbee093caa9873f0cd7ac… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Aug 16 12:33:51 2022 -0400 vkd3d-shader/hlsl: Rename 'inner_type' to 'element_type' in function name. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 6 +++--- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl_codegen.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index a47e3d2d..01709c8c 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -370,7 +370,7 @@ static struct hlsl_type *get_type_from_deref(struct hlsl_ctx *ctx, const struct type = deref->var->data_type; for (i = 0; i < deref->path_len; ++i) - type = hlsl_get_inner_type_from_path_index(ctx, type, deref->path[i].node); + type = hlsl_get_element_type_from_path_index(ctx, type, deref->path[i].node); return type; } @@ -423,7 +423,7 @@ static bool init_deref_from_component_index(struct hlsl_ctx *ctx, struct hlsl_bl return true; } -struct hlsl_type *hlsl_get_inner_type_from_path_index(struct hlsl_ctx *ctx, const struct hlsl_type *type, +struct hlsl_type *hlsl_get_element_type_from_path_index(struct hlsl_ctx *ctx, const struct hlsl_type *type, struct hlsl_ir_node *idx) { assert(idx); @@ -963,7 +963,7 @@ struct hlsl_ir_load *hlsl_new_load_index(struct hlsl_ctx *ctx, const struct hlsl type = get_type_from_deref(ctx, deref); if (idx) - type = hlsl_get_inner_type_from_path_index(ctx, type, idx); + type = hlsl_get_element_type_from_path_index(ctx, type, idx); if (!(load = hlsl_alloc(ctx, sizeof(*load)))) return NULL; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 7970665c..96466ee1 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -735,7 +735,7 @@ struct hlsl_ir_function_decl *hlsl_get_func_decl(struct hlsl_ctx *ctx, const cha struct hlsl_type *hlsl_get_type(struct hlsl_scope *scope, const char *name, bool recursive); struct hlsl_ir_var *hlsl_get_var(struct hlsl_scope *scope, const char *name); -struct hlsl_type *hlsl_get_inner_type_from_path_index(struct hlsl_ctx *ctx, const struct hlsl_type *type, +struct hlsl_type *hlsl_get_element_type_from_path_index(struct hlsl_ctx *ctx, const struct hlsl_type *type, struct hlsl_ir_node *idx); struct hlsl_type *hlsl_new_array_type(struct hlsl_ctx *ctx, struct hlsl_type *basic_type, unsigned int array_size); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 36a417e5..cae663cf 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -116,7 +116,7 @@ static struct hlsl_ir_node *new_offset_instr_from_deref(struct hlsl_ctx *ctx, st list_move_tail(&block->instrs, &idx_block.instrs); - type = hlsl_get_inner_type_from_path_index(ctx, type, deref->path[i].node); + type = hlsl_get_element_type_from_path_index(ctx, type, deref->path[i].node); } return offset;

1 0

Jeremy Newman : update fr wine-devel mailman links
by Alexandre Julliard 22 Aug '22

22 Aug '22

Module: website Branch: master Commit: cb06a2aaacb0c78f076df1c7dcee79682ec669c3 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/cb06a2aaacb0c78f076df1c7dc… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Aug 22 13:13:41 2022 -0500 update fr wine-devel mailman links --- templates/fr/forums.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/fr/forums.template b/templates/fr/forums.template index afe8ca84..ab320344 100644 --- a/templates/fr/forums.template +++ b/templates/fr/forums.template @@ -35,8 +35,8 @@ Voici les plus utiles pour les utilisateurs : <li> <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> - [<a href="//www.winehq.org/mailman/listinfo/wine-devel">(Dés-)inscription</a>] - [<a href="//www.winehq.org/pipermail/wine-devel/">Archive</a>] + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-devel.winehq.org/">(Dés-)inscription</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-devel(a)winehq.org/">Archive</a>] Une liste moyen trafic (50 messages par jour) pour la discussion sur le développement de Wine, les patchs ou tout autre élément intéressant pour les développeurs Wine. </li>

1 0

Cressida Silver : WWN #424.
by Alexandre Julliard 22 Aug '22

22 Aug '22

Module: website Branch: master Commit: e2701352c9e67575a111f0b5bb6e786d958bb323 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/e2701352c9e67575a111f0b5bb… Author: Cressida Silver <cjsilver(a)codeweavers.com> Date: Fri Aug 19 09:59:52 2022 -0500 WWN #424. --- news/en/2022081902.xml | 13 ++ wwn/en/wn20220819_424.xml | 301 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 314 insertions(+)

1 0

Jeremy Newman : fix link
by Alexandre Julliard 22 Aug '22

22 Aug '22

Module: website Branch: master Commit: be3f34949a5262b3c6dceed090bb161a38df56e2 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/be3f34949a5262b3c6dceed090… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Aug 22 11:46:44 2022 -0500 fix link --- news/en/2022081902.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/news/en/2022081902.xml b/news/en/2022081902.xml index 9c8deb94..7a18bd76 100644 --- a/news/en/2022081902.xml +++ b/news/en/2022081902.xml @@ -2,7 +2,7 @@ <date>August 19, 2022</date> <title>World Wine News Issue 424</title> <body> - <a href="{$root}/wwn/ISS">WWN Issue 424</a> was released today. + <a href="{$root}/wwn/424">WWN Issue 424</a> was released today. <ul> <li><a href="{$root}/wwn/424#Wine 7.15" class="">Wine 7.15</a></li>

1 0

Jeremy Newman : wine-devel migrated to mailman 3
by Alexandre Julliard 22 Aug '22

22 Aug '22

Module: website Branch: master Commit: 39f50685ab89e4b703e0560e32ded464e469d294 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/39f50685ab89e4b703e0560e32… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Aug 22 11:43:06 2022 -0500 wine-devel migrated to mailman 3 --- templates/en/forums.template | 4 ++-- templates/ko/forums.template | 4 ++-- templates/nl/forums.template | 4 ++-- templates/pl/forums.template | 4 ++-- templates/pt/forums.template | 4 ++-- templates/tr/forums.template | 6 +++--- templates/zh-cn/forums.template | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/templates/en/forums.template b/templates/en/forums.template index c9e4c6f6..d11daa55 100644 --- a/templates/en/forums.template +++ b/templates/en/forums.template @@ -54,8 +54,8 @@ You can set your subscription to not send you email, or send as a digest. <li> <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> - [<a href="//www.winehq.org/mailman/listinfo/wine-devel">(Un-)Subscribe</a>] - [<a href="//www.winehq.org/pipermail/wine-devel/">Archive</a>] + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-devel.winehq.org/">(Un-)Subscribe</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-devel(a)winehq.org/">Archive</a>] A medium traffic (50/day) open list for discussing Wine development, WineHQ, patches or anything else of interest to Wine developers. </li> diff --git a/templates/ko/forums.template b/templates/ko/forums.template index 7618a4d7..be2882af 100644 --- a/templates/ko/forums.template +++ b/templates/ko/forums.template @@ -49,8 +49,8 @@ href="https://www.winehq.org/mailman3/postorius/lists/?all-lists">웹 페이지< </li> <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-devel">구독/해지</a>] - [<a href="//www.winehq.org/pipermail/wine-devel/">메시지 기록</a>] + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-devel.winehq.org/">구독/해지</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-devel(a)winehq.org/">메시지 기록</a>] <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> Wine 개발, WineHQ, 패치, 기타 Wine 개발자들의 관심사에 대해서 토론하는 공개 메일링 리스트입니다. 메시지 전송 빈도: 1일에 50여통(중간) diff --git a/templates/nl/forums.template b/templates/nl/forums.template index b0165d74..7829ab77 100644 --- a/templates/nl/forums.template +++ b/templates/nl/forums.template @@ -48,8 +48,8 @@ Anders behandeld de software van de mailinglijsten uw bericht als spam. <li> <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> - [<a href="//www.winehq.org/mailman/listinfo/wine-devel">In- uitschrijven</a>] - [<a href="//www.winehq.org/pipermail/wine-devel/">Archief</a>] + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-devel.winehq.org/">In- uitschrijven</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-devel(a)winehq.org/">Archief</a>] Een lijst met ongeveer 100 berichten per dag voor de discussie over de ontwikkeling van Wine, WineHQ, patches en alle andere interessante dingen voor Wine ontwikkelaars. </li> diff --git a/templates/pl/forums.template b/templates/pl/forums.template index 81c7dc7b..fa8fb88b 100644 --- a/templates/pl/forums.template +++ b/templates/pl/forums.template @@ -44,8 +44,8 @@ oprogramowanie listy mailingowej. </li> <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-devel">(Wy-/Za-)pisz</a>] - [<a href="//www.winehq.org/pipermail/wine-devel/">Archiwum</a>] + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-devel.winehq.org/">(Wy-/Za-)pisz</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-devel(a)winehq.org/">Archiwum</a>] <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> Średni ruch (50/dziennie) otwarta lista dla dyskusji nt. tworzenia Wine, WineHQ, łatek lub czegokolwiek innego leżącego w zakresie interesu programistów Wine. diff --git a/templates/pt/forums.template b/templates/pt/forums.template index 3b0c4151..68d57b1e 100644 --- a/templates/pt/forums.template +++ b/templates/pt/forums.template @@ -44,8 +44,8 @@ do contrário o seu email será tratado como um possível spam pelo software da </li> <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-devel">(Des-)Inscrever</a>] - [<a href="//www.winehq.org/pipermail/wine-devel/">Arquivo</a>] + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-devel.winehq.org/">(Des-)Inscrever</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-devel(a)winehq.org/">Arquivo</a>] <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> Uma lista aberta de tráfego médio (50/dia) para discutir desenvolvimento do Wine, WineHQ, patches e qualquer outra coisa de interesse a desenvolvedores do Wine. diff --git a/templates/tr/forums.template b/templates/tr/forums.template index fa32782b..b20c807c 100644 --- a/templates/tr/forums.template +++ b/templates/tr/forums.template @@ -1,4 +1,4 @@ - +x  <h1 class="title">Önemli Posta Listeleri / Forumlar</h1> @@ -40,8 +40,8 @@ </li> <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-devel">Abone ol/iptal et</a>] - [<a href="//www.winehq.org/pipermail/wine-devel/">Arşiv</a>] + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-devel.winehq.org/">Abone ol/iptal et</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-devel(a)winehq.org/">Arşiv</a>] <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> Wine geliştirmesi, WineHQ, yamalar ve Wine geliştiricileri ile alakalı diğer şeylerle ilgili orta trafikli (50/gün) bir açık liste </li> diff --git a/templates/zh-cn/forums.template b/templates/zh-cn/forums.template index 4e4baab8..d493610c 100644 --- a/templates/zh-cn/forums.template +++ b/templates/zh-cn/forums.template @@ -41,8 +41,8 @@ <li> <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> - [<a href="//www.winehq.org/mailman/listinfo/wine-devel">（取消）订阅</a>] - [<a href="//www.winehq.org/pipermail/wine-devel/">存档</a>] + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-devel.winehq.org/">（取消）订阅</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-devel(a)winehq.org/">存档</a>] 一个中等流量（50封/天）的开放性列表，用于讨论 Wine 开发、WineHQ、patches 或者其他 Wine 开发者感兴趣的事情。 </li>

1 0

Nikolay Sivov : evr: Add IMFGetService stub.
by Alexandre Julliard 19 Aug '22

19 Aug '22

Module: wine Branch: master Commit: 7f71eda49705cba0b6bceb3a19bbdfbb0e0dddaf URL: https://gitlab.winehq.org/wine/wine/-/commit/7f71eda49705cba0b6bceb3a19bbdf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 18 23:46:42 2022 +0300 evr: Add IMFGetService stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/evr.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 1 + 2 files changed, 43 insertions(+) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index e64151b650c..ef2d247f79a 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -35,6 +35,7 @@ struct evr struct strmbase_renderer renderer; IEVRFilterConfig IEVRFilterConfig_iface; IAMFilterMiscFlags IAMFilterMiscFlags_iface; + IMFGetService IMFGetService_iface; }; static struct evr *impl_from_strmbase_renderer(struct strmbase_renderer *iface) @@ -50,6 +51,8 @@ static HRESULT evr_query_interface(struct strmbase_renderer *iface, REFIID iid, *out = &filter->IEVRFilterConfig_iface; else if (IsEqualGUID(iid, &IID_IAMFilterMiscFlags)) *out = &filter->IAMFilterMiscFlags_iface; + else if (IsEqualGUID(iid, &IID_IMFGetService)) + *out = &filter->IMFGetService_iface; else return E_NOINTERFACE; @@ -173,6 +176,44 @@ static const IAMFilterMiscFlagsVtbl filter_misc_flags_vtbl = filter_misc_flags_GetMiscFlags, }; +static struct evr *impl_from_IMFGetService(IMFGetService *iface) +{ + return CONTAINING_RECORD(iface, struct evr, IMFGetService_iface); +} + +static HRESULT WINAPI filter_get_service_QueryInterface(IMFGetService *iface, REFIID riid, void **obj) +{ + struct evr *filter = impl_from_IMFGetService(iface); + return IUnknown_QueryInterface(filter->renderer.filter.outer_unk, riid, obj); +} + +static ULONG WINAPI filter_get_service_AddRef(IMFGetService *iface) +{ + struct evr *filter = impl_from_IMFGetService(iface); + return IUnknown_AddRef(filter->renderer.filter.outer_unk); +} + +static ULONG WINAPI filter_get_service_Release(IMFGetService *iface) +{ + struct evr *filter = impl_from_IMFGetService(iface); + return IUnknown_Release(filter->renderer.filter.outer_unk); +} + +static HRESULT WINAPI filter_get_service_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) +{ + FIXME("iface %p, service %s, riid %s, obj %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + + return E_NOTIMPL; +} + +static const IMFGetServiceVtbl filter_get_service_vtbl = +{ + filter_get_service_QueryInterface, + filter_get_service_AddRef, + filter_get_service_Release, + filter_get_service_GetService, +}; + HRESULT evr_filter_create(IUnknown *outer, void **out) { struct evr *object; @@ -184,6 +225,7 @@ HRESULT evr_filter_create(IUnknown *outer, void **out) &CLSID_EnhancedVideoRenderer, L"EVR Input0", &renderer_ops); object->IEVRFilterConfig_iface.lpVtbl = &filter_config_vtbl; object->IAMFilterMiscFlags_iface.lpVtbl = &filter_misc_flags_vtbl; + object->IMFGetService_iface.lpVtbl = &filter_get_service_vtbl; TRACE("Created EVR %p.\n", object); *out = &object->renderer.filter.IUnknown_inner; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 37bb55739d3..7875a05ce83 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -279,6 +279,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); check_interface(filter, &IID_IBaseFilter, TRUE); check_interface(filter, &IID_IEVRFilterConfig, TRUE); + check_interface(filter, &IID_IMFGetService, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); check_interface(filter, &IID_IMediaPosition, TRUE); check_interface(filter, &IID_IMediaSeeking, TRUE);

1 0

Nikolay Sivov : evr: Add IMFVideoRenderer stub to the filter.
by Alexandre Julliard 19 Aug '22

19 Aug '22

Module: wine Branch: master Commit: bf8c08d9e38686aeecfbbf22a595327888079494 URL: https://gitlab.winehq.org/wine/wine/-/commit/bf8c08d9e38686aeecfbbf22a59532… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 19 13:25:26 2022 +0300 evr: Add IMFVideoRenderer stub to the filter. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/evr.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 1 + 2 files changed, 44 insertions(+) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index ef2d247f79a..581fca0365e 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -36,6 +36,7 @@ struct evr IEVRFilterConfig IEVRFilterConfig_iface; IAMFilterMiscFlags IAMFilterMiscFlags_iface; IMFGetService IMFGetService_iface; + IMFVideoRenderer IMFVideoRenderer_iface; }; static struct evr *impl_from_strmbase_renderer(struct strmbase_renderer *iface) @@ -53,6 +54,8 @@ static HRESULT evr_query_interface(struct strmbase_renderer *iface, REFIID iid, *out = &filter->IAMFilterMiscFlags_iface; else if (IsEqualGUID(iid, &IID_IMFGetService)) *out = &filter->IMFGetService_iface; + else if (IsEqualGUID(iid, &IID_IMFVideoRenderer)) + *out = &filter->IMFVideoRenderer_iface; else return E_NOINTERFACE; @@ -214,6 +217,45 @@ static const IMFGetServiceVtbl filter_get_service_vtbl = filter_get_service_GetService, }; +static struct evr *impl_from_IMFVideoRenderer(IMFVideoRenderer *iface) +{ + return CONTAINING_RECORD(iface, struct evr, IMFVideoRenderer_iface); +} + +static HRESULT WINAPI filter_video_renderer_QueryInterface(IMFVideoRenderer *iface, REFIID riid, void **obj) +{ + struct evr *filter = impl_from_IMFVideoRenderer(iface); + return IUnknown_QueryInterface(filter->renderer.filter.outer_unk, riid, obj); +} + +static ULONG WINAPI filter_video_renderer_AddRef(IMFVideoRenderer *iface) +{ + struct evr *filter = impl_from_IMFVideoRenderer(iface); + return IUnknown_AddRef(filter->renderer.filter.outer_unk); +} + +static ULONG WINAPI filter_video_renderer_Release(IMFVideoRenderer *iface) +{ + struct evr *filter = impl_from_IMFVideoRenderer(iface); + return IUnknown_Release(filter->renderer.filter.outer_unk); +} + +static HRESULT WINAPI filter_video_renderer_InitializeRenderer(IMFVideoRenderer *iface, IMFTransform *mixer, + IMFVideoPresenter *presenter) +{ + FIXME("iface %p, mixer %p, presenter %p.\n", iface, mixer, presenter); + + return E_NOTIMPL; +} + +static const IMFVideoRendererVtbl filter_video_renderer_vtbl = +{ + filter_video_renderer_QueryInterface, + filter_video_renderer_AddRef, + filter_video_renderer_Release, + filter_video_renderer_InitializeRenderer, +}; + HRESULT evr_filter_create(IUnknown *outer, void **out) { struct evr *object; @@ -226,6 +268,7 @@ HRESULT evr_filter_create(IUnknown *outer, void **out) object->IEVRFilterConfig_iface.lpVtbl = &filter_config_vtbl; object->IAMFilterMiscFlags_iface.lpVtbl = &filter_misc_flags_vtbl; object->IMFGetService_iface.lpVtbl = &filter_get_service_vtbl; + object->IMFVideoRenderer_iface.lpVtbl = &filter_video_renderer_vtbl; TRACE("Created EVR %p.\n", object); *out = &object->renderer.filter.IUnknown_inner; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 7875a05ce83..c4604c954b3 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -280,6 +280,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IBaseFilter, TRUE); check_interface(filter, &IID_IEVRFilterConfig, TRUE); check_interface(filter, &IID_IMFGetService, TRUE); + check_interface(filter, &IID_IMFVideoRenderer, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); check_interface(filter, &IID_IMediaPosition, TRUE); check_interface(filter, &IID_IMediaSeeking, TRUE);

1 0

Nikolay Sivov : evr: Implement lazy initialization with mixer and presenter instances.
by Alexandre Julliard 19 Aug '22

19 Aug '22

Module: wine Branch: master Commit: b1c3bb4f0c221cacf1b7ec227979a3f540779fb2 URL: https://gitlab.winehq.org/wine/wine/-/commit/b1c3bb4f0c221cacf1b7ec227979a3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 19 21:54:41 2022 +0300 evr: Implement lazy initialization with mixer and presenter instances. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/evr.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 96 insertions(+), 4 deletions(-) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index 581fca0365e..2251cb5522e 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -37,8 +37,63 @@ struct evr IAMFilterMiscFlags IAMFilterMiscFlags_iface; IMFGetService IMFGetService_iface; IMFVideoRenderer IMFVideoRenderer_iface; + + IMFTransform *mixer; + IMFVideoPresenter *presenter; }; +static void evr_uninitialize(struct evr *filter) +{ + if (filter->mixer) + { + IMFTransform_Release(filter->mixer); + filter->mixer = NULL; + } + + if (filter->presenter) + { + IMFVideoPresenter_Release(filter->presenter); + filter->presenter = NULL; + } +} + +static HRESULT evr_initialize(struct evr *filter, IMFTransform *mixer, IMFVideoPresenter *presenter) +{ + HRESULT hr = S_OK; + + if (mixer) + { + IMFTransform_AddRef(mixer); + } + else if (FAILED(hr = CoCreateInstance(&CLSID_MFVideoMixer9, NULL, CLSCTX_INPROC_SERVER, + &IID_IMFTransform, (void **)&mixer))) + { + WARN("Failed to create default mixer instance, hr %#lx.\n", hr); + return hr; + } + + if (presenter) + { + IMFVideoPresenter_AddRef(presenter); + } + else if (FAILED(hr = CoCreateInstance(&CLSID_MFVideoPresenter9, NULL, CLSCTX_INPROC_SERVER, + &IID_IMFVideoPresenter, (void **)&presenter))) + { + WARN("Failed to create default presenter instance, hr %#lx.\n", hr); + IMFTransform_Release(mixer); + return hr; + } + + evr_uninitialize(filter); + + filter->mixer = mixer; + filter->presenter = presenter; + + /* FIXME: configure mixer and presenter */ + + return hr; +} + static struct evr *impl_from_strmbase_renderer(struct strmbase_renderer *iface) { return CONTAINING_RECORD(iface, struct evr, renderer); @@ -67,6 +122,7 @@ static void evr_destroy(struct strmbase_renderer *iface) { struct evr *filter = impl_from_strmbase_renderer(iface); + evr_uninitialize(filter); strmbase_renderer_cleanup(&filter->renderer); free(filter); } @@ -204,9 +260,36 @@ static ULONG WINAPI filter_get_service_Release(IMFGetService *iface) static HRESULT WINAPI filter_get_service_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) { - FIXME("iface %p, service %s, riid %s, obj %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + struct evr *filter = impl_from_IMFGetService(iface); + HRESULT hr = E_NOINTERFACE; + IMFGetService *gs; - return E_NOTIMPL; + TRACE("iface %p, service %s, riid %s, obj %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + + EnterCriticalSection(&filter->renderer.filter.filter_cs); + + if (IsEqualGUID(service, &MR_VIDEO_RENDER_SERVICE)) + { + if (!filter->presenter) + hr = evr_initialize(filter, NULL, NULL); + + if (filter->presenter) + hr = IMFVideoPresenter_QueryInterface(filter->presenter, &IID_IMFGetService, (void **)&gs); + } + else + { + FIXME("Unsupported service %s.\n", debugstr_guid(service)); + } + + LeaveCriticalSection(&filter->renderer.filter.filter_cs); + + if (gs) + { + hr = IMFGetService_GetService(gs, service, riid, obj); + IMFGetService_Release(gs); + } + + return hr; } static const IMFGetServiceVtbl filter_get_service_vtbl = @@ -243,9 +326,18 @@ static ULONG WINAPI filter_video_renderer_Release(IMFVideoRenderer *iface) static HRESULT WINAPI filter_video_renderer_InitializeRenderer(IMFVideoRenderer *iface, IMFTransform *mixer, IMFVideoPresenter *presenter) { - FIXME("iface %p, mixer %p, presenter %p.\n", iface, mixer, presenter); + struct evr *filter = impl_from_IMFVideoRenderer(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, mixer %p, presenter %p.\n", iface, mixer, presenter); + + EnterCriticalSection(&filter->renderer.filter.filter_cs); + + hr = evr_initialize(filter, mixer, presenter); + + LeaveCriticalSection(&filter->renderer.filter.filter_cs); + + return hr; } static const IMFVideoRendererVtbl filter_video_renderer_vtbl =

1 0