- Wine-Devel - list.winehq.org

[PATCH 1/5] windows.media.speech: Add IVector<HSTRING>.
by Bernhard Kölbl March 28, 2022

March 28, 2022

And use it in listconstraint. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/Makefile.in | 3 +- dlls/windows.media.speech/listconstraint.c | 11 +- dlls/windows.media.speech/private.h | 2 + dlls/windows.media.speech/vector.c | 299 +++++++++++++++++++++ 4 files changed, 312 insertions(+), 3 deletions(-) create mode 100644 dlls/windows.media.speech/vector.c diff --git a/dlls/windows.media.speech/Makefile.in b/dlls/windows.media.speech/Makefile.in index 5dbdb03cf2f..5a8291ba6f0 100644 --- a/dlls/windows.media.speech/Makefile.in +++ b/dlls/windows.media.speech/Makefile.in @@ -6,6 +6,7 @@ C_SRCS = \ listconstraint.c \ main.c \ recognizer.c \ - synthesizer.c + synthesizer.c \ + vector.c IDL_SRCS = classes.idl diff --git a/dlls/windows.media.speech/listconstraint.c b/dlls/windows.media.speech/listconstraint.c index d641902f4bc..0c486a415a7 100644 --- a/dlls/windows.media.speech/listconstraint.c +++ b/dlls/windows.media.speech/listconstraint.c @@ -36,6 +36,7 @@ struct list_constraint LONG ref; BOOLEAN enabled; + IVector_HSTRING *commands; }; /* @@ -91,7 +92,10 @@ static ULONG WINAPI list_constraint_Release( ISpeechRecognitionListConstraint *i TRACE("iface %p, ref %lu.\n", iface, ref); if (!ref) + { + IVector_HSTRING_Release(impl->commands); free(impl); + } return ref; } @@ -337,12 +341,15 @@ static HRESULT WINAPI constraint_factory_CreateWithTag( ISpeechRecognitionListCo TRACE("iface %p, commands %p, tag %p, listconstraint %p.\n", iface, commands, tag, listconstraint); + *listconstraint = NULL; + if (!commands) return E_POINTER; - if (!(impl = calloc(1, sizeof(*impl)))) + if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; + if (FAILED(vector_hstring_create(&impl->commands))) { - *listconstraint = NULL; + free(impl); return E_OUTOFMEMORY; } diff --git a/dlls/windows.media.speech/private.h b/dlls/windows.media.speech/private.h index 3e2fa9aed38..a09b5f5ef7e 100644 --- a/dlls/windows.media.speech/private.h +++ b/dlls/windows.media.speech/private.h @@ -66,6 +66,8 @@ HRESULT typed_event_handlers_remove( struct list *list, EventRegistrationToken * HRESULT typed_event_handlers_notify( struct list *list, IInspectable *sender, IInspectable *args ); HRESULT typed_event_handlers_clear( struct list* list ); +HRESULT vector_hstring_create( IVector_HSTRING **out ); + #define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ static inline impl_type *impl_from( iface_type *iface ) \ { \ diff --git a/dlls/windows.media.speech/vector.c b/dlls/windows.media.speech/vector.c new file mode 100644 index 00000000000..e151ec31b49 --- /dev/null +++ b/dlls/windows.media.speech/vector.c @@ -0,0 +1,299 @@ +/* WinRT Windows.Media.Speech implementation + * + * Copyright 2022 Bernhard Kölbl for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(speech); + +/* + * + * IVector<HSTRING> + * + */ + +struct vector_hstring +{ + IVector_HSTRING IVector_HSTRING_iface; + LONG ref; + + UINT32 size; + UINT32 capacity; + HSTRING *elements; +}; + +static inline struct vector_hstring *impl_from_IVector_HSTRING( IVector_HSTRING *iface ) +{ + return CONTAINING_RECORD(iface, struct vector_hstring, IVector_HSTRING_iface); +} + +static HRESULT WINAPI vector_hstring_QueryInterface( IVector_HSTRING *iface, REFIID iid, void **out ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IAgileObject) || + IsEqualGUID(iid, &IID_IVector_HSTRING)) + { + IInspectable_AddRef((*out = &impl->IVector_HSTRING_iface)); + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI vector_hstring_AddRef( IVector_HSTRING *iface ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p, ref %lu.\n", iface, ref); + return ref; +} + +static ULONG WINAPI vector_hstring_Release( IVector_HSTRING *iface ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + + TRACE("iface %p, ref %lu.\n", iface, ref); + + if (!ref) + { + IVector_HSTRING_Clear(iface); + free(impl); + } + + return ref; +} + +static HRESULT WINAPI vector_hstring_GetIids( IVector_HSTRING *iface, ULONG *iid_count, IID **iids ) +{ + FIXME( "iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids ); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_hstring_GetRuntimeClassName( IVector_HSTRING *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_hstring_GetTrustLevel( IVector_HSTRING *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_hstring_GetAt( IVector_HSTRING *iface, UINT32 index, HSTRING *value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE( "iface %p, index %u, value %p.\n", iface, index, value ); + + *value = NULL; + if (index >= impl->size) return E_BOUNDS; + + return WindowsDuplicateString(impl->elements[index], value); +} + +static HRESULT WINAPI vector_hstring_get_Size( IVector_HSTRING *iface, UINT32 *value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + TRACE( "iface %p, value %p.\n", iface, value ); + *value = impl->size; + return S_OK; +} + +static HRESULT WINAPI vector_hstring_GetView( IVector_HSTRING *iface, IVectorView_HSTRING **value ) +{ + FIXME("iface %p, value %p stub!\n", iface, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_hstring_IndexOf( IVector_HSTRING *iface, HSTRING element, UINT32 *index, BOOLEAN *found ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + ULONG i; + + TRACE("iface %p, element %p, index %p, found %p.\n", iface, element, index, found); + + for (i = 0; i < impl->size; ++i) if (impl->elements[i] == element) break; + if ((*found = (i < impl->size))) *index = i; + else *index = 0; + + return S_OK; +} + +static HRESULT WINAPI vector_hstring_SetAt( IVector_HSTRING *iface, UINT32 index, HSTRING value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE( "iface %p, index %u, value %p.\n", iface, index, value ); + + if (index >= impl->size) return E_BOUNDS; + WindowsDeleteString(impl->elements[index]); + WindowsDuplicateString(value, &impl->elements[index]); + return S_OK; +} + +static HRESULT WINAPI vector_hstring_InsertAt( IVector_HSTRING *iface, UINT32 index, HSTRING value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + HSTRING *tmp = impl->elements; + + TRACE( "iface %p, index %u, value %p.\n", iface, index, value ); + + if (impl->size == impl->capacity) + { + impl->capacity = max(32, impl->capacity * 3 / 2); + if (!(impl->elements = realloc(impl->elements, impl->capacity * sizeof(*impl->elements)))) + { + impl->elements = tmp; + return E_OUTOFMEMORY; + } + } + + memmove(impl->elements + index + 1, impl->elements + index, (impl->size++ - index) * sizeof(*impl->elements)); + WindowsDuplicateString(value, &impl->elements[index]); + return S_OK; +} + +static HRESULT WINAPI vector_hstring_RemoveAt( IVector_HSTRING *iface, UINT32 index ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p, index %u.\n", iface, index); + + if (index >= impl->size) return E_BOUNDS; + + WindowsDeleteString(impl->elements[index]); + memmove(impl->elements + index, impl->elements + index + 1, (--impl->size - index) * sizeof(*impl->elements)); + return S_OK; +} + +static HRESULT WINAPI vector_hstring_Append( IVector_HSTRING *iface, HSTRING value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p, value %p.\n", iface, value); + + return IVector_HSTRING_InsertAt(iface, impl->size, value); +} + +static HRESULT WINAPI vector_hstring_RemoveAtEnd( IVector_HSTRING *iface ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p.\n", iface); + + if (impl->size) WindowsDeleteString(impl->elements[--impl->size]); + return S_OK; +} + +static HRESULT WINAPI vector_hstring_Clear( IVector_HSTRING *iface ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p.\n", iface); + + while (impl->size) IVector_HSTRING_RemoveAtEnd(iface); + free(impl->elements); + impl->capacity = 0; + impl->elements = NULL; + + return S_OK; +} + +static HRESULT WINAPI vector_hstring_GetMany( IVector_HSTRING *iface, UINT32 start_index, + UINT32 items_size, HSTRING *items, UINT *count ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + UINT32 i; + + TRACE("iface %p, start_index %u, items_size %u, items %p, count %p.\n", iface, start_index, items_size, items, count); + + if (start_index >= impl->size) return E_BOUNDS; + + for (i = start_index; i < impl->size; ++i) + { + if (i - start_index >= items_size) break; + WindowsDuplicateString(impl->elements[i], &items[i-start_index]); + } + *count = i - start_index; + + return S_OK; +} + +static HRESULT WINAPI vector_hstring_ReplaceAll( IVector_HSTRING *iface, UINT32 count, HSTRING *items ) +{ + HRESULT hr; + ULONG i; + + TRACE("iface %p, count %u, items %p.\n", iface, count, items); + + hr = IVector_HSTRING_Clear(iface); + for (i = 0; i < count && SUCCEEDED(hr); ++i) hr = IVector_HSTRING_Append(iface, items[i]); + return hr; +} + +static const struct IVector_HSTRINGVtbl vector_hstring_vtbl = +{ + /* IUnknown methods */ + vector_hstring_QueryInterface, + vector_hstring_AddRef, + vector_hstring_Release, + /* IInspectable methods */ + vector_hstring_GetIids, + vector_hstring_GetRuntimeClassName, + vector_hstring_GetTrustLevel, + /* IVector<HSTRING> methods */ + vector_hstring_GetAt, + vector_hstring_get_Size, + vector_hstring_GetView, + vector_hstring_IndexOf, + vector_hstring_SetAt, + vector_hstring_InsertAt, + vector_hstring_RemoveAt, + vector_hstring_Append, + vector_hstring_RemoveAtEnd, + vector_hstring_Clear, + vector_hstring_GetMany, + vector_hstring_ReplaceAll, +}; + +HRESULT vector_hstring_create( IVector_HSTRING **out ) +{ + struct vector_hstring *impl; + + TRACE("out %p.\n", out); + + if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; + impl->IVector_HSTRING_iface.lpVtbl = &vector_hstring_vtbl; + impl->ref = 1; + + *out = &impl->IVector_HSTRING_iface; + TRACE("created %p\n", *out); + return S_OK; +} -- 2.35.1

2 10

[PATCH v2 1/2] propsys: Implement VariantToStringWithDefault.
by Mohamad Al-Jaf March 28, 2022

March 28, 2022

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: - Support byref BSTR. - Support nested VARIANT including byref BSTR. --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 46 +++++++++++++++++++++++++++++++++++++++ include/propvarutil.h | 6 +++++ 3 files changed, 53 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 15749952e95..7391cf4aaa2 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -194,7 +194,7 @@ @ stub VariantToStringAlloc @ stub VariantToStringArray @ stub VariantToStringArrayAlloc -@ stub VariantToStringWithDefault +@ stdcall VariantToStringWithDefault(ptr wstr) @ stub VariantToUInt16 @ stub VariantToUInt16Array @ stub VariantToUInt16ArrayAlloc diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 8f6c52f7aa7..09f9a8aa892 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -416,6 +416,52 @@ PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR p return pszDefault; } +/****************************************************************** + * VariantToStringWithDefault (PROPSYS.@) + */ +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault) +{ + TRACE("(%p, %s)\n", pvar, debugstr_w(pszDefault)); + + switch(V_VT(pvar)) + { + case VT_BSTR: + { + if (V_BSTR(pvar) == NULL) + return L""; + + return V_BSTR(pvar); + } + case VT_BYREF | VT_BSTR: + { + if (*V_BSTRREF(pvar) == NULL) + return L""; + + return *V_BSTRREF(pvar); + } + case VT_BYREF | VT_VARIANT: + { + if (V_VT(V_VARIANTREF(pvar)) == VT_BSTR) + { + if (V_BSTR(V_VARIANTREF(pvar)) == NULL) + return L""; + + return V_BSTR(V_VARIANTREF(pvar)); + } + + if (V_VT(V_VARIANTREF(pvar)) == (VT_BYREF | VT_BSTR)) + { + if (*V_BSTRREF(V_VARIANTREF(pvar)) == NULL) + return L""; + + return *V_BSTRREF(V_VARIANTREF(pvar)); + } + } + } + + return pszDefault; +} + /****************************************************************** * PropVariantChangeType (PROPSYS.@) diff --git a/include/propvarutil.h b/include/propvarutil.h index 36a670f56e6..2515d71b3b6 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -93,6 +93,7 @@ HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); HRESULT WINAPI PropVariantToBuffer(REFPROPVARIANT propvarIn, void *ret, UINT cb); HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch); PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault); HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret); @@ -201,6 +202,11 @@ inline BOOL IsPropVariantString(REFPROPVARIANT propvar) return (PropVariantToStringWithDefault(propvar, NULL) != NULL); } +inline BOOL IsVariantString(const VARIANT *pvar) +{ + return (VariantToStringWithDefault(pvar, NULL) != NULL); +} + #endif /* NO_PROPVAR_INLINES */ #endif /* __cplusplus */ -- 2.35.1

2 8

[PATCH v3 1/2] propsys: Implement VariantToStringWithDefault.
by Mohamad Al-Jaf March 28, 2022

March 28, 2022

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: - Support byref BSTR. - Support nested VARIANT including byref BSTR. v3: - Consolidate code. --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 22 ++++++++++++++++++++++ include/propvarutil.h | 6 ++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 15749952e95..7391cf4aaa2 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -194,7 +194,7 @@ @ stub VariantToStringAlloc @ stub VariantToStringArray @ stub VariantToStringArrayAlloc -@ stub VariantToStringWithDefault +@ stdcall VariantToStringWithDefault(ptr wstr) @ stub VariantToUInt16 @ stub VariantToUInt16Array @ stub VariantToUInt16ArrayAlloc diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 8f6c52f7aa7..a1dfba78cce 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -416,6 +416,28 @@ PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR p return pszDefault; } +/****************************************************************** + * VariantToStringWithDefault (PROPSYS.@) + */ +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault) +{ + VARIANT var = *pvar; + + TRACE("(%p, %s)\n", pvar, debugstr_w(pszDefault)); + + if (V_VT(&var) == (VT_BYREF | VT_VARIANT)) var = *V_VARIANTREF(pvar); + if (V_VT(&var) == (VT_BYREF | VT_BSTR) || V_VT(&var) == VT_BSTR) + { + PCWSTR str; + str = V_ISBYREF(&var) ? *V_BSTRREF(&var) : V_BSTR(&var); + + if (!str) return L""; + return str; + } + + return pszDefault; +} + /****************************************************************** * PropVariantChangeType (PROPSYS.@) diff --git a/include/propvarutil.h b/include/propvarutil.h index 36a670f56e6..2515d71b3b6 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -93,6 +93,7 @@ HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); HRESULT WINAPI PropVariantToBuffer(REFPROPVARIANT propvarIn, void *ret, UINT cb); HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch); PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault); HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret); @@ -201,6 +202,11 @@ inline BOOL IsPropVariantString(REFPROPVARIANT propvar) return (PropVariantToStringWithDefault(propvar, NULL) != NULL); } +inline BOOL IsVariantString(const VARIANT *pvar) +{ + return (VariantToStringWithDefault(pvar, NULL) != NULL); +} + #endif /* NO_PROPVAR_INLINES */ #endif /* __cplusplus */ -- 2.35.1

1 1

[PATCH] maintainers: Update the path to strmbase.
by Zebediah Figura March 28, 2022

March 28, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 9ceae9e80bf..14fe2e0cb9b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -109,8 +109,8 @@ F: dlls/qcap/ F: dlls/qdvd/ F: dlls/qedit/ F: dlls/quartz/ -F: dlls/strmbase/ F: dlls/winegstreamer/quartz_parser.c +F: libs/strmbase/ DirectWrite M: Nikolay Sivov <nsivov(a)codeweavers.com> -- 2.35.1

1 0

[PATCH 1/5] d3dcompiler: Initialize initial_filename in D3DCompile2().
by Matteo Bruni March 28, 2022

March 28, 2022

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dcompiler_43/compiler.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 4d2642f17e3..ba7789f45a8 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -891,6 +891,7 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen preprocess_info.pfn_open_include = open_include; preprocess_info.pfn_close_include = close_include; preprocess_info.include_context = include; + initial_filename = filename ? filename : ""; hlsl_info.type = VKD3D_SHADER_STRUCTURE_TYPE_HLSL_SOURCE_INFO; hlsl_info.next = NULL; -- 2.34.1

4 13

[PATCH 1/6] strmbase: Add a separate id for pins.
by Rémi Bernon March 28, 2022

March 28, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- include/wine/strmbase.h | 1 + libs/strmbase/filter.c | 2 +- libs/strmbase/pin.c | 6 ++++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 3e92136b7f7..1b4cc3f7657 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -36,6 +36,7 @@ struct strmbase_pin struct strmbase_filter *filter; PIN_DIRECTION dir; WCHAR name[128]; + WCHAR id[128]; IPin *peer; AM_MEDIA_TYPE mt; diff --git a/libs/strmbase/filter.c b/libs/strmbase/filter.c index 92b4f1cb4b6..ee41611a198 100644 --- a/libs/strmbase/filter.c +++ b/libs/strmbase/filter.c @@ -436,7 +436,7 @@ static HRESULT WINAPI filter_FindPin(IBaseFilter *iface, const WCHAR *id, IPin * for (i = 0; (pin = filter->ops->filter_get_pin(filter, i)); ++i) { - if (!lstrcmpW(id, pin->name)) + if (!lstrcmpW(id, pin->id)) { IPin_AddRef(*ret = &pin->IPin_iface); return S_OK; diff --git a/libs/strmbase/pin.c b/libs/strmbase/pin.c index 1aecb7a8c98..03330837477 100644 --- a/libs/strmbase/pin.c +++ b/libs/strmbase/pin.c @@ -383,10 +383,10 @@ static HRESULT WINAPI pin_QueryId(IPin *iface, WCHAR **id) TRACE("pin %p %s:%s, id %p.\n", pin, debugstr_w(pin->filter->name), debugstr_w(pin->name), id); - if (!(*id = CoTaskMemAlloc((lstrlenW(pin->name) + 1) * sizeof(WCHAR)))) + if (!(*id = CoTaskMemAlloc((lstrlenW(pin->id) + 1) * sizeof(WCHAR)))) return E_OUTOFMEMORY; - lstrcpyW(*id, pin->name); + lstrcpyW(*id, pin->id); return S_OK; } @@ -770,6 +770,7 @@ void strmbase_source_init(struct strmbase_source *pin, struct strmbase_filter *f pin->pin.filter = filter; pin->pin.dir = PINDIR_OUTPUT; lstrcpyW(pin->pin.name, name); + lstrcpyW(pin->pin.id, name); pin->pin.ops = &func_table->base; pin->pFuncsTable = func_table; } @@ -1172,6 +1173,7 @@ void strmbase_sink_init(struct strmbase_sink *pin, struct strmbase_filter *filte pin->pin.filter = filter; pin->pin.dir = PINDIR_INPUT; lstrcpyW(pin->pin.name, name); + lstrcpyW(pin->pin.id, name); pin->pin.ops = &func_table->base; pin->pFuncsTable = func_table; pin->pAllocator = pin->preferred_allocator = allocator; -- 2.35.1

3 12

[PATCH v3 resend 1/4] winegstreamer: Implement H264 decoder GetInputStreamInfo.
by Rémi Bernon March 28, 2022

March 28, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Resending with the sign-offs but without PATCH 5 which will require some changes. Supersedes: 230378-230382 dlls/mf/tests/mf.c | 6 ------ dlls/winegstreamer/h264_decoder.c | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index e58d8278b82..6563ca81b29 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6790,17 +6790,11 @@ static void test_h264_decoder(void) flags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE; memset(&input_info, 0xcd, sizeof(input_info)); hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); - todo_wine ok(hr == S_OK, "GetInputStreamInfo returned %#lx\n", hr); - todo_wine ok(input_info.hnsMaxLatency == 0, "got hnsMaxLatency %s\n", wine_dbgstr_longlong(input_info.hnsMaxLatency)); - todo_wine ok(input_info.dwFlags == flags, "got dwFlags %#lx\n", input_info.dwFlags); - todo_wine ok(input_info.cbSize == 0x1000, "got cbSize %lu\n", input_info.cbSize); - todo_wine ok(input_info.cbMaxLookahead == 0, "got cbMaxLookahead %#lx\n", input_info.cbMaxLookahead); - todo_wine ok(input_info.cbAlignment == 0, "got cbAlignment %#lx\n", input_info.cbAlignment); flags = MFT_OUTPUT_STREAM_WHOLE_SAMPLES | MFT_OUTPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_OUTPUT_STREAM_FIXED_SAMPLE_SIZE; diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 2f4b42ed101..f24b07ef496 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -217,8 +217,20 @@ static HRESULT WINAPI transform_GetStreamIDs(IMFTransform *iface, DWORD input_si static HRESULT WINAPI transform_GetInputStreamInfo(IMFTransform *iface, DWORD id, MFT_INPUT_STREAM_INFO *info) { - FIXME("iface %p, id %#lx, info %p stub!\n", iface, id, info); - return E_NOTIMPL; + struct h264_decoder *decoder = impl_from_IMFTransform(iface); + + TRACE("iface %p, id %#lx, info %p.\n", iface, id, info); + + if (!decoder->input_type) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + info->hnsMaxLatency = 0; + info->dwFlags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE; + info->cbSize = 0x1000; + info->cbMaxLookahead = 0; + info->cbAlignment = 0; + + return S_OK; } static HRESULT WINAPI transform_GetOutputStreamInfo(IMFTransform *iface, DWORD id, MFT_OUTPUT_STREAM_INFO *info) -- 2.35.1

1 3

[tools 1/2] testbot/cgi: Add support for nameless actions.
by Francois Gouget March 28, 2022

March 28, 2022

Action names starting with a dot will not be sent to the form page. This can be useful to get a clean 'get' URL. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 2565c077b..83b078b24 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -555,6 +555,11 @@ Returns a list of actions that can be applied after completing or reading this form. Each action is a string which is used as the label of a button at the bottom of the form. +If an action name starts with a dot, the button label omits the dot and the +corresponding <input> field gets no name attribute. Note that this means the +action name is not sent to the form so it probably does not make sense to have +more than one such action per form. + By default there is no action. =back @@ -573,7 +578,9 @@ sub GenerateActions($) print "<div class='ItemActions'>\n"; foreach my $Action (@{$self->GetActions()}) { - print "<input type='submit' name='Action' value='$Action'/>\n"; + print "<input type='submit' "; + print "name='Action' " if ($Action !~ s/^\.//); + print "value='$Action'/>\n"; } print "</div>\n"; } -- 2.30.2

1 1

[tools 1/2] testbot/web: Use the property descriptors in the Activity page.
by Francois Gouget March 28, 2022

March 28, 2022

The whole point is to pass them to _initialize() so FormPage::Validate() can then do its job. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Activity.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 272215f95..d98f50a6c 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -45,7 +45,7 @@ sub _initialize($$$) my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Hours", "Hours", !1, 1, "N", 3), ); - $self->SUPER::_initialize($Request, $RequiredRole); + $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); $self->{Method} = "get"; if (!$self->GetParam("Hours") or !$self->Validate() or -- 2.30.2

1 1

[tools] testbot/cgi: Remove the PageBase::SetCurrentSession() $Page parameter.
by Francois Gouget March 28, 2022

March 28, 2022

It is unused and there is no indication it may be needed one day. With that change none of the 'session management' methods take a $Page parameter. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/Page.pm | 2 +- testbot/lib/WineTestBot/CGI/PageBase.pm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 014324f60..d5874129a 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -241,7 +241,7 @@ sub SetCurrentSession($$) { my ($self, $Session) = @_; - $self->{PageBase}->SetCurrentSession($self, $Session); + $self->{PageBase}->SetCurrentSession($Session); } sub Redirect($$) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index aa90245cf..6eba0e0eb 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -224,9 +224,9 @@ sub GetCurrentSession($) return $self->{Session}; } -sub SetCurrentSession($$$) +sub SetCurrentSession($$) { - my ($self, $Page, $Session) = @_; + my ($self, $Session) = @_; $self->{Session} = $Session; if (! defined($Session)) -- 2.30.2

1 0