March 2022 - Wine-Devel - list.winehq.org

[PATCH] ntoskrnl.exe: Make USD pointers volatile to silent a warning.
by Rémi Bernon March 29, 2022

March 29, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntoskrnl.exe/instr.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index 8f1aa4d45a3..05976c38b27 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -497,8 +497,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(int); #define SIB_BASE( sib, rex ) (((sib) & 7) | (((rex) & REX_B) ? 8 : 0)) /* keep in sync with dlls/ntdll/thread.c:thread_init */ -static const BYTE *wine_user_shared_data = (BYTE *)0x7ffe0000; -static const BYTE *user_shared_data = (BYTE *)0xfffff78000000000; +static const volatile BYTE *const volatile wine_user_shared_data = (BYTE *)0x7ffe0000; +static const volatile BYTE *const volatile user_shared_data = (BYTE *)0xfffff78000000000; static inline DWORD64 *get_int_reg( CONTEXT *context, int index ) { @@ -843,7 +843,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) ULONGLONG temp = 0; TRACE("USD offset %#x at %p.\n", (unsigned int)offset, (void *)context->Rip); - memcpy( &temp, wine_user_shared_data + offset, data_size ); + memcpy( &temp, (BYTE *)wine_user_shared_data + offset, data_size ); store_reg_word( context, instr[2], (BYTE *)&temp, long_op, rex, INSTR_OP_MOV ); context->Rip += prefixlen + len + 2; return ExceptionContinueExecution; @@ -869,19 +869,19 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) switch (*instr) { case 0x8a: - store_reg_byte( context, instr[1], wine_user_shared_data + offset, + store_reg_byte( context, instr[1], (BYTE *)wine_user_shared_data + offset, rex, INSTR_OP_MOV ); break; case 0x8b: - store_reg_word( context, instr[1], wine_user_shared_data + offset, + store_reg_word( context, instr[1], (BYTE *)wine_user_shared_data + offset, long_op, rex, INSTR_OP_MOV ); break; case 0x0b: - store_reg_word( context, instr[1], wine_user_shared_data + offset, + store_reg_word( context, instr[1], (BYTE *)wine_user_shared_data + offset, long_op, rex, INSTR_OP_OR ); break; case 0x33: - store_reg_word( context, instr[1], wine_user_shared_data + offset, + store_reg_word( context, instr[1], (BYTE *)wine_user_shared_data + offset, long_op, rex, INSTR_OP_XOR ); break; } @@ -902,7 +902,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) if (offset <= KSHARED_USER_DATA_PAGE_SIZE - data_size) { TRACE("USD offset %#x at %p.\n", (unsigned int)offset, (void *)context->Rip); - memcpy( &context->Rax, wine_user_shared_data + offset, data_size ); + memcpy( &context->Rax, (BYTE *)wine_user_shared_data + offset, data_size ); context->Rip += prefixlen + len + 1; return ExceptionContinueExecution; } -- 2.35.1

2 4

[PATCH] dlls/{mciwave, winmm}: properly handle mmioRead/mmioWrite in case of errors
by Eric Pouech March 29, 2022

March 29, 2022

In C, an inequality comparison between a signed and an unsigned integer ends up with an unsigned comparison. So, force signed comparison to catch both case of errors and partial read operation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52628 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mciwave/mciwave.c | 3 ++- dlls/winmm/mmio.c | 8 +++----- dlls/winmm/playsound.c | 3 ++- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 1d9abce84a3..3bb271f66ec 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -291,7 +291,8 @@ static DWORD WAVE_mciReadFmt(WINE_MCIWAVE* wmw, const MMCKINFO* pckMainRIFF) if (!pwfx) return MCIERR_OUT_OF_MEMORY; r = mmioRead(wmw->hFile, (HPSTR)pwfx, mmckInfo.cksize); - if (r < sizeof(PCMWAVEFORMAT)) { + /* forcing signed comparison to catch errors (negative value) as well */ + if (r < (LONG)sizeof(PCMWAVEFORMAT)) { HeapFree(GetProcessHeap(), 0, pwfx); return MCIERR_INVALID_FILE; } diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 352da62a215..3bcde1fe34b 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -1231,10 +1231,8 @@ MMRESULT WINAPI mmioDescend(HMMIO hmmio, LPMMCKINFO lpck, while (TRUE) { - LONG ix; - - ix = mmioRead(hmmio, (LPSTR)lpck, 3 * sizeof(DWORD)); - if (ix < 2*sizeof(DWORD)) + /* forcing signed comparison to catch errors as well */ + if (mmioRead(hmmio, (LPSTR)lpck, 3 * sizeof(DWORD)) < (LONG)(2*sizeof(DWORD))) { mmioSeek(hmmio, dwOldPos, SEEK_SET); WARN("return ChunkNotFound\n"); @@ -1336,7 +1334,7 @@ MMRESULT WINAPI mmioCreateChunk(HMMIO hmmio, MMCKINFO* lpck, UINT uFlags) ix = mmioWrite(hmmio, (LPSTR)lpck, size); TRACE("after mmioWrite ix = %ld req = %ld, errno = %d\n", ix, size, errno); - if (ix < size) { + if (ix != size) { mmioSeek(hmmio, dwOldPos, SEEK_SET); WARN("return CannotWrite\n"); return MMIOERR_CANNOTWRITE; diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 0858f958583..95131bddce6 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -361,7 +361,8 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) lpWaveFormat = HeapAlloc(GetProcessHeap(), 0, mmckInfo.cksize); if (!lpWaveFormat) goto errCleanUp; - if (mmioRead(hmmio, (HPSTR)lpWaveFormat, mmckInfo.cksize) < sizeof(PCMWAVEFORMAT)) + /* forcing signed comparison to catch errors as well */ + if (mmioRead(hmmio, (HPSTR)lpWaveFormat, mmckInfo.cksize) < (LONG)sizeof(PCMWAVEFORMAT)) goto errCleanUp; TRACE("wFormatTag=%04X !\n", lpWaveFormat->wFormatTag);

2 1

[PATCH] mciseq: Print data only when successfully read.
by Rémi Bernon March 29, 2022

March 29, 2022

This may lead to a uninitialized use of twd otherwise. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mciseq/mcimidi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 4211ed5ca4a..2d3c4975296 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -937,8 +937,8 @@ static DWORD MIDI_player(WINE_MCIMIDI* wmm, DWORD dwFlags) if (TRACE_ON(mcimidi)) { WORD twd; - MIDI_mciReadWord(wmm, &twd); /* == 0 */ - TRACE("Got sequence number %u\n", twd); + if (MIDI_mciReadWord(wmm, &twd)) WARN("Failed to read word\n"); + else TRACE("Got sequence number %u\n", twd); } break; case 0x01: /* any text */ -- 2.35.1

1 0

[PATCH] kernelbase/tests: Initialize input buffer to silent a warning.
by Rémi Bernon March 29, 2022

March 29, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- FWIW the issue here is the same as in the other patches sent earlier, where GCC warns about an non-initialized buffer being passed as a pointer to const, probably assuming that it is then an input parameter and that uninitialized data might be read from it. dlls/kernelbase/tests/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 1c0c8a2318b..dc0d3cc1184 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -1189,7 +1189,7 @@ static void test_PathCchCanonicalize(void) static void test_PathCchCanonicalizeEx(void) { - WCHAR path_inW[PATHCCH_MAX_CCH + 1], path_outW[PATHCCH_MAX_CCH]; + WCHAR path_inW[PATHCCH_MAX_CCH + 1] = {0}, path_outW[PATHCCH_MAX_CCH]; CHAR path_outA[4096]; BOOL skip_new_flags = TRUE; HRESULT hr; -- 2.35.1

1 0

[PATCH] user.exe16: Initialize RECT to silent a warning.
by Rémi Bernon March 29, 2022

March 29, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user.exe16/message.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 915585267d6..ef34ee5906a 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -1385,7 +1385,7 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT case LB_GETSELITEMS: { INT *items32 = (INT *)lParam; - INT16 *items, buffer[512]; + INT16 *items, buffer[512] = {0}; unsigned int i; wParam = min( wParam, 0x7f80 ); /* Must be < 64K */ @@ -1451,7 +1451,7 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT case CB_GETDROPPEDCONTROLRECT: { RECT *r32 = (RECT *)lParam; - RECT16 rect; + RECT16 rect = {0}; lParam = MapLS( &rect ); ret = callback( HWND_16(hwnd), (msg == LB_GETITEMRECT) ? LB_GETITEMRECT16 : CB_GETDROPPEDCONTROLRECT16, -- 2.35.1

1 0

[PATCH] shlwapi/tests: Initialize input buffer to silent a warning.
by Rémi Bernon March 29, 2022

March 29, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/shlwapi/tests/clist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/tests/clist.c b/dlls/shlwapi/tests/clist.c index 5f88e92a5a6..54bff21ae8d 100644 --- a/dlls/shlwapi/tests/clist.c +++ b/dlls/shlwapi/tests/clist.c @@ -567,7 +567,7 @@ static void test_IStream_Read(void) static void test_IStream_Write(void) { struct dummystream streamobj; - char buff[256]; + char buff[256] = {0}; HRESULT hRet; if (!pIStream_Write) -- 2.35.1

1 0

[PATCH v4 1/5] windows.media.speech: Add IVector<HSTRING>.
by Rémi Bernon March 29, 2022

March 29, 2022

From: Bernhard Kölbl <besentv(a)gmail.com> And use it in listconstraint. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v4: Add missing call to impl_from_IIterator_HSTRING. 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 | 313 +++++++++++++++++++++ 4 files changed, 326 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..13a36499a46 --- /dev/null +++ b/dlls/windows.media.speech/vector.c @@ -0,0 +1,313 @@ +/* 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); + HSTRING tmp; + HRESULT hr; + + TRACE( "iface %p, index %u, value %p.\n", iface, index, value ); + + if (index >= impl->size) return E_BOUNDS; + + if (FAILED(hr = WindowsDuplicateString(value, &tmp))) return hr; + + WindowsDeleteString(impl->elements[index]); + impl->elements[index] = tmp; + 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, *tmp2 = impl->elements; + HRESULT hr; + + TRACE( "iface %p, index %u, value %p.\n", iface, index, value ); + + if (FAILED(hr = WindowsDuplicateString(value, &tmp))) return hr; + + 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 = tmp2; + return E_OUTOFMEMORY; + } + } + + memmove(impl->elements + index + 1, impl->elements + index, (impl->size++ - index) * sizeof(*impl->elements)); + impl->elements[index] = tmp; + 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, UINT32 *count ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + HRESULT hr; + 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; + if (FAILED(hr = WindowsDuplicateString(impl->elements[i], &items[i-start_index]))) goto error; + } + *count = i - start_index; + + return S_OK; + +error: + *count = 0; + while (i-- > start_index) WindowsDeleteString(items[i-start_index]); + return hr; +} + +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

1 4

[PATCH v3 1/5] windows.media.speech: Add IVector<HSTRING>.
by Rémi Bernon March 29, 2022

March 29, 2022

From: Bernhard Kölbl <besentv(a)gmail.com> And use it in listconstraint. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Handle allocation failures. v3: Add a missing check and fix size handling in error path in PATCH 5. 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 | 313 +++++++++++++++++++++ 4 files changed, 326 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..13a36499a46 --- /dev/null +++ b/dlls/windows.media.speech/vector.c @@ -0,0 +1,313 @@ +/* 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); + HSTRING tmp; + HRESULT hr; + + TRACE( "iface %p, index %u, value %p.\n", iface, index, value ); + + if (index >= impl->size) return E_BOUNDS; + + if (FAILED(hr = WindowsDuplicateString(value, &tmp))) return hr; + + WindowsDeleteString(impl->elements[index]); + impl->elements[index] = tmp; + 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, *tmp2 = impl->elements; + HRESULT hr; + + TRACE( "iface %p, index %u, value %p.\n", iface, index, value ); + + if (FAILED(hr = WindowsDuplicateString(value, &tmp))) return hr; + + 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 = tmp2; + return E_OUTOFMEMORY; + } + } + + memmove(impl->elements + index + 1, impl->elements + index, (impl->size++ - index) * sizeof(*impl->elements)); + impl->elements[index] = tmp; + 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, UINT32 *count ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + HRESULT hr; + 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; + if (FAILED(hr = WindowsDuplicateString(impl->elements[i], &items[i-start_index]))) goto error; + } + *count = i - start_index; + + return S_OK; + +error: + *count = 0; + while (i-- > start_index) WindowsDeleteString(items[i-start_index]); + return hr; +} + +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

3 7

[PATCH] winevulkan: Update to VK spec version 1.3.210.
by Georg Lehmann March 29, 2022

March 29, 2022

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 2a3129bacfe..505aaa81c60 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.3.208" +VK_XML_VERSION = "1.3.210" WINE_VK_VERSION = (1, 3) # Filenames to create. -- 2.35.1

1 0

[tools 1/2] testbot/cgi: Add an API to set the page refresh interval.
by Francois Gouget March 29, 2022

March 29, 2022

It can be called early, removing the need to override GeneratePage() just for that purpose. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/Page.pm | 19 +++++++++++++++++++ testbot/lib/WineTestBot/CGI/PageBase.pm | 15 ++++++++++++++- testbot/web/Activity.pl | 8 ++++---- testbot/web/JobDetails.pl | 16 ++++------------ testbot/web/PatchesList.pl | 10 +--------- testbot/web/index.pl | 15 ++++----------- 6 files changed, 46 insertions(+), 37 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index d5874129a..6197e4e38 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -141,6 +141,25 @@ sub escapeHTML($$) return $self->{CGIObj}->escapeHTML($String); } +=pod +=over 12 + +=head1 C<SetRefreshInterval()> + +Sets the page refresh interval in seconds. + +This can be called at any point before GenerateHttpHeaders(). + +=back +=cut + +sub SetRefreshInterval($$) +{ + my ($self, $Seconds) = @_; + + $self->{PageBase}->SetRefreshInterval($Seconds); +} + # # CGI parameters support diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 6eba0e0eb..5ce070189 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -81,7 +81,8 @@ sub new($$$$@) my ($Page, $Request, $RequiredRole) = @_; my $self = {Request => $Request, - Session => undef}; + Session => undef, + Refresh => undef}; $self = bless $self, $class; if (defined($RequiredRole) && $RequiredRole ne "") @@ -111,6 +112,13 @@ sub CreatePageBase($$$@) return WineTestBot::CGI::PageBase->new(@_); } +sub SetRefreshInterval($$) +{ + my ($self, $Seconds) = @_; + + $self->{Refresh} = $Seconds; +} + # # Session management @@ -363,6 +371,11 @@ sub GenerateHttpHeaders($) # HTTP/1.0 $Request->headers_out->add("Pragma", "no-cache"); + if ($self->{Refresh}) + { + $self->{Request}->headers_out->add("Refresh", $self->{Refresh}); + } + # Force char set $Request->content_type("text/html; charset=UTF-8"); diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index d98f50a6c..cbe3f8721 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -56,6 +56,10 @@ sub _initialize($$$) # either). $self->SetParam("Hours", $HOURS_DEFAULT); } + if ($self->GetParam("Hours") <= $HOURS_DEFAULT) + { + $self->SetRefreshInterval(60); + } } sub GetPageTitle($$) @@ -69,10 +73,6 @@ sub GeneratePage($) { my ($self) = @_; - if ($self->GetParam("Hours") <= $HOURS_DEFAULT) - { - $self->{Request}->headers_out->add("Refresh", "60"); - } $self->SUPER::GeneratePage(); } diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 8d93957ce..5e302c098 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -57,6 +57,10 @@ sub _initialize($$$) $self->{JobId} = $JobId; $self->SUPER::_initialize($Request, $RequiredRole, CreateStepsTasks(undef, $self->{Job})); + if ($self->{Job}->Status =~ /^(?:queued|running)$/) + { + $self->SetRefreshInterval(30); + } } sub GetPageTitle($) @@ -241,18 +245,6 @@ sub SortKeys($$$) return \@SortedKeys; } -sub GeneratePage($) -{ - my ($self) = @_; - - if ($self->{Job}->Status =~ /^(queued|running)$/) - { - $self->{Request}->headers_out->add("Refresh", "30"); - } - - $self->SUPER::GeneratePage(); -} - sub InitMoreInfo($) { my ($self) = @_; diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index 6728a285f..04ca0208c 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -33,6 +33,7 @@ sub _initialize($$$) my ($self, $Request, $RequiredRole) = @_; $self->SUPER::_initialize($Request, $RequiredRole, CreatePatches()); + $self->SetRefreshInterval(60); } sub SortKeys($$$) @@ -65,15 +66,6 @@ sub GetActions($$) return []; } -sub GeneratePage($) -{ - my ($self) = @_; - - $self->{Request}->headers_out->add("Refresh", "60"); - - $self->SUPER::GeneratePage(); -} - sub GenerateDataCell($$$$$) { my ($self, $CollectionBlock, $Item, $PropertyDescriptor, $DetailsPage) = @_; diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 451258ec6..1f362fc32 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -268,6 +268,10 @@ sub _initialize($$$) # Replace with the default value so the cutoff can be calculated $self->SetParam("Days", $DAYS_DEFAULT); } + if (!$self->GetErrMessage() and $self->GetParam("Days") <= $DAYS_DEFAULT) + { + $self->SetRefreshInterval(60); + } # The action is a no-op so unset it to not need to redefine OnAction() $self->SetParam("Action", undef); } @@ -280,17 +284,6 @@ sub OutputDot($$) "width='20' height='20' />"; } -sub GeneratePage($) -{ - my ($self) = @_; - - if (!$self->GetErrMessage() and $self->GetParam("Days") <= $DAYS_DEFAULT) - { - $self->{Request}->headers_out->add("Refresh", "60"); - } - $self->SUPER::GeneratePage(); -} - sub GenerateBody($) { my ($self) = @_; -- 2.30.2

1 1