November 2021 - Wine-Devel - list.winehq.org

[PATCH 1/2] mf/tests: Add some more tests for session rate control.
by Nikolay Sivov Nov. 9, 2021

Nov. 9, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 200 +++++++++++++++++++++++++++------------------ 1 file changed, 122 insertions(+), 78 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 1740e4e36d9..623781a6ba2 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1163,8 +1163,6 @@ static void test_session_events(IMFMediaSession *session) static void test_media_session(void) { - IMFRateControl *rate_control, *rate_control2; - MFCLOCK_PROPERTIES clock_props; IMFRateSupport *rate_support; IMFAttributes *attributes; IMFMediaSession *session; @@ -1174,10 +1172,7 @@ static void test_media_session(void) DWORD status, caps; IMFGetService *gs; IMFClock *clock; - IUnknown *unk; HRESULT hr; - float rate; - BOOL thin; hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); ok(hr == S_OK, "Startup failure, hr %#x.\n", hr); @@ -1186,81 +1181,15 @@ static void test_media_session(void) ok(hr == S_OK, "Failed to create media session, hr %#x.\n", hr); check_interface(session, &IID_IMFGetService, TRUE); + todo_wine check_interface(session, &IID_IMFRateSupport, TRUE); + todo_wine check_interface(session, &IID_IMFRateControl, TRUE); check_interface(session, &IID_IMFAttributes, FALSE); check_interface(session, &IID_IMFTopologyNodeAttributeEditor, FALSE); - - hr = MFGetService((IUnknown *)session, &MF_TOPONODE_ATTRIBUTE_EDITOR_SERVICE, &IID_IMFTopologyNodeAttributeEditor, - (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - - check_interface(unk, &IID_IMFMediaSession, FALSE); - - IUnknown_Release(unk); - - hr = MFGetService((IUnknown *)session, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rate_support); - ok(hr == S_OK, "Failed to get rate support interface, hr %#x.\n", hr); - - hr = MFGetService((IUnknown *)session, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, (void **)&rate_control); - ok(hr == S_OK, "Failed to get rate control interface, hr %#x.\n", hr); - - hr = MFGetService((IUnknown *)session, &MF_LOCAL_MFT_REGISTRATION_SERVICE, &IID_IMFLocalMFTRegistration, (void **)&unk); - ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Vista */, "Failed to get registration service, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IUnknown_Release(unk); - - hr = IMFRateSupport_QueryInterface(rate_support, &IID_IMFMediaSession, (void **)&unk); - ok(hr == S_OK, "Failed to get session interface, hr %#x.\n", hr); - ok(unk == (IUnknown *)session, "Unexpected pointer.\n"); - IUnknown_Release(unk); - - hr = IMFRateControl_GetRate(rate_control, NULL, NULL); - ok(FAILED(hr), "Unexpected hr %#x.\n", hr); - - rate = 0.0f; - hr = IMFRateControl_GetRate(rate_control, NULL, &rate); - ok(hr == S_OK, "Failed to get playback rate, hr %#x.\n", hr); - ok(rate == 1.0f, "Unexpected rate %f.\n", rate); - - hr = IMFRateControl_GetRate(rate_control, &thin, NULL); - ok(FAILED(hr), "Unexpected hr %#x.\n", hr); - - thin = TRUE; - rate = 0.0f; - hr = IMFRateControl_GetRate(rate_control, &thin, &rate); - ok(hr == S_OK, "Failed to get playback rate, hr %#x.\n", hr); - ok(!thin, "Unexpected thinning.\n"); - ok(rate == 1.0f, "Unexpected rate %f.\n", rate); - - hr = IMFMediaSession_GetClock(session, &clock); - ok(hr == S_OK, "Failed to get clock, hr %#x.\n", hr); - - check_interface(clock, &IID_IMFPresentationClock, TRUE); - - hr = IMFClock_QueryInterface(clock, &IID_IMFRateControl, (void **)&rate_control2); - ok(hr == S_OK, "Failed to get rate control, hr %#x.\n", hr); - - rate = 0.0f; - hr = IMFRateControl_GetRate(rate_control2, NULL, &rate); - ok(hr == S_OK, "Failed to get clock rate, hr %#x.\n", hr); - ok(rate == 1.0f, "Unexpected rate %f.\n", rate); - - hr = IMFRateControl_SetRate(rate_control, FALSE, 1.5f); -todo_wine - ok(hr == S_OK, "Failed to set rate, hr %#x.\n", hr); - - IMFRateControl_Release(rate_control2); - - hr = IMFClock_GetProperties(clock, &clock_props); - ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); - IMFClock_Release(clock); - - IMFRateControl_Release(rate_control); - IMFRateSupport_Release(rate_support); - - IMFMediaSession_Release(session); - - hr = MFCreateMediaSession(NULL, &session); - ok(hr == S_OK, "Failed to create media session, hr %#x.\n", hr); + check_interface(session, &IID_IMFLocalMFTRegistration, FALSE); + check_service_interface(session, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, TRUE); + check_service_interface(session, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, TRUE); + check_service_interface(session, &MF_TOPONODE_ATTRIBUTE_EDITOR_SERVICE, &IID_IMFTopologyNodeAttributeEditor, TRUE); + check_service_interface(session, &MF_LOCAL_MFT_REGISTRATION_SERVICE, &IID_IMFLocalMFTRegistration, TRUE); hr = IMFMediaSession_GetClock(session, &clock); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -1359,6 +1288,103 @@ todo_wine ok(hr == S_OK, "Shutdown failure, hr %#x.\n", hr); } +static void test_media_session_rate_control(void) +{ + IMFRateControl *rate_control, *clock_rate_control; + IMFPresentationClock *presentation_clock; + IMFPresentationTimeSource *time_source; + MFCLOCK_PROPERTIES clock_props; + IMFRateSupport *rate_support; + IMFMediaSession *session; + IMFClock *clock; + HRESULT hr; + float rate; + BOOL thin; + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Startup failure, hr %#x.\n", hr); + + hr = MFCreateMediaSession(NULL, &session); + ok(hr == S_OK, "Failed to create media session, hr %#x.\n", hr); + + hr = MFGetService((IUnknown *)session, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rate_support); + ok(hr == S_OK, "Failed to get rate support interface, hr %#x.\n", hr); + + hr = MFGetService((IUnknown *)session, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, (void **)&rate_control); + ok(hr == S_OK, "Failed to get rate control interface, hr %#x.\n", hr); + + hr = IMFRateControl_GetRate(rate_control, NULL, NULL); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + + rate = 0.0f; + hr = IMFRateControl_GetRate(rate_control, NULL, &rate); + ok(hr == S_OK, "Failed to get playback rate, hr %#x.\n", hr); + ok(rate == 1.0f, "Unexpected rate %f.\n", rate); + + hr = IMFRateControl_GetRate(rate_control, &thin, NULL); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + + thin = TRUE; + rate = 0.0f; + hr = IMFRateControl_GetRate(rate_control, &thin, &rate); + ok(hr == S_OK, "Failed to get playback rate, hr %#x.\n", hr); + ok(!thin, "Unexpected thinning.\n"); + ok(rate == 1.0f, "Unexpected rate %f.\n", rate); + + hr = IMFMediaSession_GetClock(session, &clock); + ok(hr == S_OK, "Failed to get clock, hr %#x.\n", hr); + + hr = IMFClock_QueryInterface(clock, &IID_IMFPresentationClock, (void **)&presentation_clock); + ok(hr == S_OK, "Failed to get rate control, hr %#x.\n", hr); + + hr = IMFClock_QueryInterface(clock, &IID_IMFRateControl, (void **)&clock_rate_control); + ok(hr == S_OK, "Failed to get rate control, hr %#x.\n", hr); + + rate = 0.0f; + hr = IMFRateControl_GetRate(clock_rate_control, NULL, &rate); + ok(hr == S_OK, "Failed to get clock rate, hr %#x.\n", hr); + ok(rate == 1.0f, "Unexpected rate %f.\n", rate); + + hr = IMFRateControl_SetRate(clock_rate_control, FALSE, 1.5f); + ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); + + hr = IMFRateControl_SetRate(rate_control, FALSE, 1.5f); +todo_wine + ok(hr == S_OK, "Failed to set rate, hr %#x.\n", hr); + + hr = IMFClock_GetProperties(clock, &clock_props); + ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); + + hr = MFCreateSystemTimeSource(&time_source); + ok(hr == S_OK, "Failed to create time source, hr %#x.\n", hr); + + hr = IMFPresentationClock_SetTimeSource(presentation_clock, time_source); + ok(hr == S_OK, "Failed to set time source, hr %#x.\n", hr); + + hr = IMFRateControl_SetRate(rate_control, FALSE, 1.5f); +todo_wine + ok(hr == S_OK, "Failed to set rate, hr %#x.\n", hr); + + rate = 0.0f; + hr = IMFRateControl_GetRate(clock_rate_control, NULL, &rate); + ok(hr == S_OK, "Failed to get clock rate, hr %#x.\n", hr); + ok(rate == 1.0f, "Unexpected rate %f.\n", rate); + + IMFPresentationTimeSource_Release(time_source); + + IMFRateControl_Release(clock_rate_control); + IMFPresentationClock_Release(presentation_clock); + IMFClock_Release(clock); + + IMFRateControl_Release(rate_control); + IMFRateSupport_Release(rate_support); + + IMFMediaSession_Release(session); + + hr = MFShutdown(); + ok(hr == S_OK, "Shutdown failure, hr %#x.\n", hr); +} + static HRESULT WINAPI test_grabber_callback_QueryInterface(IMFSampleGrabberSinkCallback *iface, REFIID riid, void **obj) { @@ -2563,6 +2589,19 @@ static void test_presentation_clock(void) ok(hr == S_OK, "Failed to get clock properties, hr %#x.\n", hr); ok(!memcmp(&props, &props2, sizeof(props)), "Unexpected clock properties.\n"); + /* Changing rate at initial state. */ + hr = IMFPresentationClock_GetState(clock, 0, &state); + ok(hr == S_OK, "Failed to get clock state, hr %#x.\n", hr); + ok(state == MFCLOCK_STATE_INVALID, "Unexpected state %d.\n", state); + + hr = IMFRateControl_SetRate(rate_control, FALSE, 0.0f); + ok(hr == S_OK, "Failed to set clock rate, hr %#x.\n", hr); + hr = IMFRateControl_GetRate(rate_control, &thin, &rate); + ok(hr == S_OK, "Failed to get clock rate, hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate.\n"); + hr = IMFRateControl_SetRate(rate_control, FALSE, 1.0f); + ok(hr == S_OK, "Failed to set clock rate, hr %#x.\n", hr); + /* State changes. */ for (i = 0; i < ARRAY_SIZE(clock_state_change); ++i) { @@ -2642,6 +2681,10 @@ static void test_presentation_clock(void) ok(hr == S_OK, "Failed to set clock rate, hr %#x.\n", hr); hr = IMFRateControl_SetRate(rate_control, TRUE, -1.0f); ok(hr == MF_E_THINNING_UNSUPPORTED, "Unexpected hr %#x.\n", hr); + hr = IMFRateControl_SetRate(rate_control, TRUE, 0.0f); + ok(hr == MF_E_THINNING_UNSUPPORTED, "Unexpected hr %#x.\n", hr); + hr = IMFRateControl_SetRate(rate_control, TRUE, 1.0f); + ok(hr == MF_E_THINNING_UNSUPPORTED, "Unexpected hr %#x.\n", hr); hr = IMFPresentationClock_GetState(clock, 0, &state); ok(hr == S_OK, "Failed to get clock state, hr %#x.\n", hr); @@ -5355,6 +5398,7 @@ START_TEST(mf) test_MFGetService(); test_sequencer_source(); test_media_session(); + test_media_session_rate_control(); test_MFShutdownObject(); test_presentation_clock(); test_sample_grabber(); -- 2.33.0

1 1

[PATCH 3/3] include: Add SQLGetDiagFieldW prototype
by Alistair Leslie-Hughes Nov. 9, 2021

Nov. 9, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/sqlucode.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/sqlucode.h b/include/sqlucode.h index 7e1fb677cce..f1eaace87c1 100644 --- a/include/sqlucode.h +++ b/include/sqlucode.h @@ -62,6 +62,10 @@ SQLRETURN WINAPI SQLSetStmtAttrW(SQLHSTMT StatementHandle, SQLINTEGER Attribute, SQLPOINTER Value, SQLINTEGER StringLength); +SQLRETURN WINAPI SQLGetDiagFieldW(SQLSMALLINT type, SQLHANDLE handle, + SQLSMALLINT record, SQLSMALLINT field, SQLPOINTER info, + SQLSMALLINT info_len, SQLSMALLINT *ret_len); + #ifdef __cplusplus } #endif -- 2.33.0

1 0

[PATCH 2/3] msdasql: Initial query value
by Alistair Leslie-Hughes Nov. 9, 2021

Nov. 9, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 25dfd801250..6e9c4b680e9 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -1062,6 +1062,7 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn command->IConvertType_iface.lpVtbl = &converttypeVtbl; command->ICommandPrepare_iface.lpVtbl = &commandprepareVtbl; command->refs = 1; + command->query = NULL; IUnknown_QueryInterface(&session->session_iface, &IID_IUnknown, (void**)&command->session); -- 2.33.0

1 0

[PATCH 1/3] msdasql: Fixup GetCommandText wrt dialect
by Alistair Leslie-Hughes Nov. 9, 2021

Nov. 9, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index e52e8cd18d8..25dfd801250 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -834,8 +834,11 @@ static HRESULT WINAPI command_GetCommandText(ICommandText *iface, GUID *dialect, if (!command->query) return DB_E_NOCOMMAND; - if (IsEqualGUID(&DBGUID_DEFAULT, dialect)) + if (!IsEqualGUID(&DBGUID_DEFAULT, dialect)) + { + *dialect = DBGUID_DEFAULT; hr = DB_S_DIALECTIGNORED; + } *commandstr = heap_alloc((lstrlenW(command->query)+1)*sizeof(WCHAR)); wcscpy(*commandstr, command->query); -- 2.33.0

1 0

[PATCH] sechost: Fix hang when a device notification callback tries to register/unregister a notify.
by Brendan Shanks Nov. 8, 2021

Nov. 8, 2021

Fixes 4 second hang in Yooka-Laylee and the Impossible Lair when a controller is connected. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/sechost/service.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/sechost/service.c b/dlls/sechost/service.c index c447263bd0f..e6f4eb75db0 100644 --- a/dlls/sechost/service.c +++ b/dlls/sechost/service.c @@ -1992,9 +1992,11 @@ static DWORD WINAPI device_notify_proc( void *arg ) RPC_WSTR binding_str; DWORD err = ERROR_SUCCESS; struct device_notify_registration *registration; + struct device_notification_details *details_copy; + unsigned int details_copy_nelems, details_copy_size; plugplay_rpc_handle handle = NULL; DWORD code = 0; - unsigned int size; + unsigned int i, size; BYTE *buf; if ((err = RpcStringBindingComposeW( NULL, protseq, NULL, endpoint, NULL, &binding_str ))) @@ -2026,6 +2028,9 @@ static DWORD WINAPI device_notify_proc( void *arg ) return 1; } + details_copy_size = 8; + details_copy = heap_alloc( details_copy_size * sizeof(*details_copy) ); + for (;;) { buf = NULL; @@ -2046,15 +2051,31 @@ static DWORD WINAPI device_notify_proc( void *arg ) break; } + /* Make a copy to avoid a hang if a callback tries to register or unregister for notifications. */ + i = 0; + details_copy_nelems = 0; EnterCriticalSection( &service_cs ); LIST_FOR_EACH_ENTRY(registration, &device_notify_list, struct device_notify_registration, entry) { - registration->details.cb( registration->details.handle, code, (DEV_BROADCAST_HDR *)buf ); + details_copy[i++] = registration->details; + details_copy_nelems++; + if (i == details_copy_size) + { + details_copy_size *= 2; + details_copy = heap_realloc( details_copy, details_copy_size * sizeof(*details_copy) ); + } } LeaveCriticalSection(&service_cs); + + for (i = 0; i < details_copy_nelems; i++) + { + details_copy[i].cb( details_copy[i].handle, code, (DEV_BROADCAST_HDR *)buf ); + } MIDL_user_free(buf); } + heap_free( details_copy ); + __TRY { plugplay_unregister_listener( handle ); -- 2.32.0

1 0

[PATCH v2 1/5] winegstreamer: Implement INSSBuffer::GetBuffer().
by Zebediah Figura Nov. 8, 2021

Nov. 8, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/wm_reader.c | 8 ++++++-- dlls/wmvcore/tests/wmvcore.c | 18 ++++++++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 12d1f04c270..2de0610165d 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -243,8 +243,12 @@ static HRESULT WINAPI buffer_GetMaxLength(INSSBuffer *iface, DWORD *size) static HRESULT WINAPI buffer_GetBuffer(INSSBuffer *iface, BYTE **data) { - FIXME("iface %p, data %p, stub!\n", iface, data); - return E_NOTIMPL; + struct buffer *buffer = impl_from_INSSBuffer(iface); + + TRACE("buffer %p, data %p.\n", buffer, data); + + *data = buffer->data; + return S_OK; } static HRESULT WINAPI buffer_GetBufferAndLength(INSSBuffer *iface, BYTE **data, DWORD *size) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 0e7c6380c92..685dd92e27e 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -602,9 +602,9 @@ static void test_sync_reader_streaming(void) IWMProfile *profile; QWORD pts, duration; INSSBuffer *sample; + BYTE *data, *data2; HANDLE file; HRESULT hr; - BYTE *data; BOOL ret; file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); @@ -677,6 +677,11 @@ static void test_sync_reader_streaming(void) { hr = INSSBuffer_GetBufferAndLength(sample, &data, &size); ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = INSSBuffer_GetBuffer(sample, &data2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(data2 == data, "Data pointers didn't match.\n"); + ref = INSSBuffer_Release(sample); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -737,6 +742,11 @@ static void test_sync_reader_streaming(void) { hr = INSSBuffer_GetBufferAndLength(sample, &data, &size); ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = INSSBuffer_GetBuffer(sample, &data2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(data2 == data, "Data pointers didn't match.\n"); + ref = INSSBuffer_Release(sample); ok(!ref, "Got outstanding refcount %d.\n", ref); } @@ -1183,9 +1193,9 @@ static HRESULT WINAPI callback_OnSample(IWMReaderCallback *iface, DWORD output, QWORD time, QWORD duration, DWORD flags, INSSBuffer *sample, void *context) { struct callback *callback = impl_from_IWMReaderCallback(iface); + BYTE *data, *data2; HRESULT hr; DWORD size; - BYTE *data; if (winetest_debug > 1) trace("%u: %04x: IWMReaderCallback::OnSample(output %u, time %I64u, duration %I64u, flags %#x)\n", @@ -1196,6 +1206,10 @@ static HRESULT WINAPI callback_OnSample(IWMReaderCallback *iface, DWORD output, hr = INSSBuffer_GetBufferAndLength(sample, &data, &size); ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = INSSBuffer_GetBuffer(sample, &data2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(data2 == data, "Data pointers didn't match.\n"); + ok(callback->got_started > 0, "Got %u WMT_STARTED callbacks.\n", callback->got_started); ok(!callback->got_eof, "Got %u WMT_EOF callbacks.\n", callback->got_eof); ++callback->got_sample; -- 2.33.0

1 4

[PATCH 1/2] winegstreamer: Support block_alignment attribute mapping.
by Rémi Bernon Nov. 8, 2021

Nov. 8, 2021

Planet Coaster adds this attribute to its media type when loading user music in some of the supported formats, and missing it will make media type matching only partially succeed. This will also be useful for WMA/XMA compressed formats. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/mfplat.c | 10 ++++++++-- dlls/winegstreamer/unixlib.h | 1 + dlls/winegstreamer/wg_parser.c | 8 +++++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 58200dc409a..340cb92e87a 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -547,8 +547,8 @@ static inline UINT64 make_uint64(UINT32 high, UINT32 low) static IMFMediaType *mf_media_type_from_wg_format_audio(const struct wg_format *format) { + unsigned int i, block_alignment; IMFMediaType *type; - unsigned int i; for (i = 0; i < ARRAY_SIZE(audio_formats); ++i) { @@ -564,6 +564,8 @@ static IMFMediaType *mf_media_type_from_wg_format_audio(const struct wg_format * IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, format->u.audio.channels); IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_CHANNEL_MASK, format->u.audio.channel_mask); IMFMediaType_SetUINT32(type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); + block_alignment = format->u.audio.channels * audio_formats[i].depth / 8; + IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, block_alignment); return type; } @@ -621,7 +623,7 @@ IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format) static void mf_media_type_to_wg_format_audio(IMFMediaType *type, struct wg_format *format) { - UINT32 rate, channels, channel_mask, depth; + UINT32 rate, channels, channel_mask, depth, block_alignment; unsigned int i; GUID subtype; @@ -658,10 +660,14 @@ static void mf_media_type_to_wg_format_audio(IMFMediaType *type, struct wg_forma } } + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, &block_alignment))) + block_alignment = 0; + format->major_type = WG_MAJOR_TYPE_AUDIO; format->u.audio.channels = channels; format->u.audio.channel_mask = channel_mask; format->u.audio.rate = rate; + format->u.audio.block_alignment = block_alignment; for (i = 0; i < ARRAY_SIZE(audio_formats); ++i) { diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index 90101893541..9a98e97e7d7 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -87,6 +87,7 @@ struct wg_format uint32_t channels; uint32_t channel_mask; /* In WinMM format. */ uint32_t rate; + uint32_t block_alignment; } audio; } u; }; diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index c3c9051a174..3b341dad9eb 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -411,13 +411,19 @@ static GstCaps *wg_format_to_caps_audio(const struct wg_format *format) GstAudioChannelPosition positions[32]; GstAudioFormat audio_format; GstAudioInfo info; + GstCaps *caps; if ((audio_format = wg_audio_format_to_gst(format->u.audio.format)) == GST_AUDIO_FORMAT_UNKNOWN) return NULL; wg_channel_mask_to_gst(positions, format->u.audio.channel_mask, format->u.audio.channels); gst_audio_info_set_format(&info, audio_format, format->u.audio.rate, format->u.audio.channels, positions); - return gst_audio_info_to_caps(&info); + caps = gst_audio_info_to_caps(&info); + + if (format->u.audio.block_alignment) + gst_caps_set_simple(caps, "block_align", G_TYPE_INT, format->u.audio.block_alignment, NULL); + + return caps; } static GstVideoFormat wg_video_format_to_gst(enum wg_video_format format) -- 2.33.0

3 10

[PATCH v3 1/4] wined3d: Avoid accessing the "bo" member of struct wined3d_buffer_vk.
by Zebediah Figura Nov. 8, 2021

Nov. 8, 2021

So as to allow the "buffer_object" field to point to other another wined3d_bo_vk; namely, one allocated and still in use by the client thread. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 4 ++-- dlls/wined3d/buffer.c | 13 ++++++++----- dlls/wined3d/context_vk.c | 8 ++++---- dlls/wined3d/view.c | 14 ++++++++++---- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 25 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 2bd3aa31e49..2e14972f4d8 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1745,7 +1745,7 @@ static void adapter_vk_draw_primitive(struct wined3d_device *device, if (parameters->indirect) { - struct wined3d_bo_vk *bo = &indirect_vk->bo; + struct wined3d_bo_vk *bo = (struct wined3d_bo_vk *)indirect_vk->b.buffer_object; uint32_t stride, size; wined3d_context_vk_reference_bo(context_vk, bo); @@ -1817,7 +1817,7 @@ static void adapter_vk_dispatch_compute(struct wined3d_device *device, if (parameters->indirect) { - struct wined3d_bo_vk *bo = &indirect_vk->bo; + struct wined3d_bo_vk *bo = (struct wined3d_bo_vk *)indirect_vk->b.buffer_object; wined3d_context_vk_reference_bo(context_vk, bo); VK_CALL(vkCmdDispatchIndirect(vk_command_buffer, bo->vk_buffer, diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 62f84c96f96..0a72f19935b 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1459,11 +1459,13 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf const VkDescriptorBufferInfo *wined3d_buffer_vk_get_buffer_info(struct wined3d_buffer_vk *buffer_vk) { + struct wined3d_bo_vk *bo = (struct wined3d_bo_vk *)buffer_vk->b.buffer_object; + if (buffer_vk->b.bo_user.valid) return &buffer_vk->buffer_info; - buffer_vk->buffer_info.buffer = buffer_vk->bo.vk_buffer; - buffer_vk->buffer_info.offset = buffer_vk->bo.buffer_offset; + buffer_vk->buffer_info.buffer = bo->vk_buffer; + buffer_vk->buffer_info.offset = bo->buffer_offset; buffer_vk->buffer_info.range = buffer_vk->b.resource.size; buffer_vk->b.bo_user.valid = true; @@ -1537,7 +1539,7 @@ static void wined3d_buffer_vk_upload_ranges(struct wined3d_buffer *buffer, struc if (!ranges->offset && ranges->size == resource->size) flags |= WINED3D_MAP_DISCARD; - dst_bo = &wined3d_buffer_vk(buffer)->bo; + dst_bo = (struct wined3d_bo_vk *)buffer->buffer_object; if (!(dst_bo->memory_type & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) || (!(flags & WINED3D_MAP_DISCARD) && dst_bo->command_buffer_id > context_vk->completed_command_buffer_id)) { @@ -1629,6 +1631,7 @@ void wined3d_buffer_vk_barrier(struct wined3d_buffer_vk *buffer_vk, if (src_bind_mask) { + const struct wined3d_bo_vk *bo = (struct wined3d_bo_vk *)buffer_vk->b.buffer_object; const struct wined3d_vk_info *vk_info = context_vk->vk_info; VkBufferMemoryBarrier vk_barrier; @@ -1643,8 +1646,8 @@ void wined3d_buffer_vk_barrier(struct wined3d_buffer_vk *buffer_vk, vk_barrier.dstAccessMask = vk_access_mask_from_bind_flags(bind_mask); vk_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - vk_barrier.buffer = buffer_vk->bo.vk_buffer; - vk_barrier.offset = buffer_vk->bo.buffer_offset; + vk_barrier.buffer = bo->vk_buffer; + vk_barrier.offset = bo->buffer_offset; vk_barrier.size = buffer_vk->b.resource.size; VK_CALL(vkCmdPipelineBarrier(wined3d_context_vk_get_command_buffer(context_vk), vk_pipeline_stage_mask_from_bind_flags(src_bind_mask), diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 54c5eb6bc24..854a800c0e4 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2496,7 +2496,7 @@ static void wined3d_context_vk_bind_vertex_buffers(struct wined3d_context_vk *co { buffer_vk = wined3d_buffer_vk(buffer); buffer_info = wined3d_buffer_vk_get_buffer_info(buffer_vk); - wined3d_context_vk_reference_bo(context_vk, &buffer_vk->bo); + wined3d_context_vk_reference_bo(context_vk, (struct wined3d_bo_vk *)buffer->buffer_object); buffers[count] = buffer_info->buffer; offsets[count] = buffer_info->offset + stream->offset; ++count; @@ -2535,7 +2535,7 @@ static void wined3d_context_vk_bind_stream_output_buffers(struct wined3d_context { buffer_vk = wined3d_buffer_vk(buffer); buffer_info = wined3d_buffer_vk_get_buffer_info(buffer_vk); - wined3d_context_vk_reference_bo(context_vk, &buffer_vk->bo); + wined3d_context_vk_reference_bo(context_vk, (struct wined3d_bo_vk *)buffer->buffer_object); buffers[count] = buffer_info->buffer; if ((offsets[count] = stream->offset) == ~0u) { @@ -2737,7 +2737,7 @@ static bool wined3d_shader_descriptor_writes_vk_add_cbv_write(struct wined3d_sha if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding->binding_idx, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, buffer_info, NULL, NULL)) return false; - wined3d_context_vk_reference_bo(context_vk, &buffer_vk->bo); + wined3d_context_vk_reference_bo(context_vk, (struct wined3d_bo_vk *)buffer->buffer_object); return true; } @@ -3385,7 +3385,7 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c idx_type = VK_INDEX_TYPE_UINT32; buffer_vk = wined3d_buffer_vk(state->index_buffer); buffer_info = wined3d_buffer_vk_get_buffer_info(buffer_vk); - wined3d_context_vk_reference_bo(context_vk, &buffer_vk->bo); + wined3d_context_vk_reference_bo(context_vk, (struct wined3d_bo_vk *)buffer_vk->b.buffer_object); VK_CALL(vkCmdBindIndexBuffer(vk_command_buffer, buffer_info->buffer, buffer_info->offset + state->index_offset, idx_type)); } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 374e693b17d..ee398be15f0 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -672,17 +672,19 @@ static VkBufferView wined3d_view_vk_create_vk_buffer_view(struct wined3d_context struct wined3d_device_vk *device_vk; VkBufferView vk_buffer_view; unsigned int offset, size; + struct wined3d_bo_vk *bo; VkResult vr; get_buffer_view_range(&buffer_vk->b, desc, &view_format_vk->f, &offset, &size); wined3d_buffer_prepare_location(&buffer_vk->b, &context_vk->c, WINED3D_LOCATION_BUFFER); + bo = (struct wined3d_bo_vk *)buffer_vk->b.buffer_object; create_info.sType = VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO; create_info.pNext = NULL; create_info.flags = 0; - create_info.buffer = buffer_vk->bo.vk_buffer; + create_info.buffer = bo->vk_buffer; create_info.format = view_format_vk->vk_format; - create_info.offset = buffer_vk->bo.buffer_offset + offset; + create_info.offset = bo->buffer_offset + offset; create_info.range = size; device_vk = wined3d_device_vk(buffer_vk->b.resource.device); @@ -1082,6 +1084,7 @@ static void wined3d_shader_resource_view_vk_cs_init(void *object) VkBufferView vk_buffer_view; uint32_t default_flags = 0; VkImageView vk_image_view; + struct wined3d_bo_vk *bo; TRACE("srv_vk %p.\n", srv_vk); @@ -1099,12 +1102,13 @@ static void wined3d_shader_resource_view_vk_cs_init(void *object) if (!vk_buffer_view) return; + bo = (struct wined3d_bo_vk *)buffer_vk->b.buffer_object; TRACE("Created buffer view 0x%s.\n", wine_dbgstr_longlong(vk_buffer_view)); srv_vk->view_vk.u.vk_buffer_view = vk_buffer_view; srv_vk->view_vk.bo_user.valid = true; - list_add_head(&buffer_vk->bo.b.users, &srv_vk->view_vk.bo_user.entry); + list_add_head(&bo->b.users, &srv_vk->view_vk.bo_user.entry); return; } @@ -2204,11 +2208,13 @@ static void wined3d_unordered_access_view_vk_cs_init(void *object) if ((vk_buffer_view = wined3d_view_vk_create_vk_buffer_view(context_vk, desc, buffer_vk, format_vk))) { + struct wined3d_bo_vk *bo = (struct wined3d_bo_vk *)buffer_vk->b.buffer_object; + TRACE("Created buffer view 0x%s.\n", wine_dbgstr_longlong(vk_buffer_view)); uav_vk->view_vk.u.vk_buffer_view = vk_buffer_view; uav_vk->view_vk.bo_user.valid = true; - list_add_head(&buffer_vk->bo.b.users, &view_vk->bo_user.entry); + list_add_head(&bo->b.users, &view_vk->bo_user.entry); } if (desc->flags & (WINED3D_VIEW_BUFFER_COUNTER | WINED3D_VIEW_BUFFER_APPEND)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8da8a60d28e..dd04569d86a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -6315,7 +6315,7 @@ static inline void wined3d_context_vk_reference_resource(const struct wined3d_co struct wined3d_resource *resource) { if (resource->type == WINED3D_RTYPE_BUFFER) - wined3d_context_vk_reference_bo(context_vk, &wined3d_buffer_vk(buffer_from_resource(resource))->bo); + wined3d_context_vk_reference_bo(context_vk, (struct wined3d_bo_vk *)buffer_from_resource(resource)->buffer_object); else wined3d_context_vk_reference_texture(context_vk, wined3d_texture_vk(texture_from_resource(resource))); } -- 2.33.0

3 10

[PATCH 1/5] winegstreamer: Implement INSSBuffer::GetBuffer().
by Zebediah Figura Nov. 8, 2021

Nov. 8, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/wm_reader.c | 8 ++++++-- dlls/wmvcore/tests/wmvcore.c | 18 ++++++++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 12d1f04c270..2de0610165d 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -243,8 +243,12 @@ static HRESULT WINAPI buffer_GetMaxLength(INSSBuffer *iface, DWORD *size) static HRESULT WINAPI buffer_GetBuffer(INSSBuffer *iface, BYTE **data) { - FIXME("iface %p, data %p, stub!\n", iface, data); - return E_NOTIMPL; + struct buffer *buffer = impl_from_INSSBuffer(iface); + + TRACE("buffer %p, data %p.\n", buffer, data); + + *data = buffer->data; + return S_OK; } static HRESULT WINAPI buffer_GetBufferAndLength(INSSBuffer *iface, BYTE **data, DWORD *size) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 0e7c6380c92..685dd92e27e 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -602,9 +602,9 @@ static void test_sync_reader_streaming(void) IWMProfile *profile; QWORD pts, duration; INSSBuffer *sample; + BYTE *data, *data2; HANDLE file; HRESULT hr; - BYTE *data; BOOL ret; file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); @@ -677,6 +677,11 @@ static void test_sync_reader_streaming(void) { hr = INSSBuffer_GetBufferAndLength(sample, &data, &size); ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = INSSBuffer_GetBuffer(sample, &data2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(data2 == data, "Data pointers didn't match.\n"); + ref = INSSBuffer_Release(sample); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -737,6 +742,11 @@ static void test_sync_reader_streaming(void) { hr = INSSBuffer_GetBufferAndLength(sample, &data, &size); ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = INSSBuffer_GetBuffer(sample, &data2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(data2 == data, "Data pointers didn't match.\n"); + ref = INSSBuffer_Release(sample); ok(!ref, "Got outstanding refcount %d.\n", ref); } @@ -1183,9 +1193,9 @@ static HRESULT WINAPI callback_OnSample(IWMReaderCallback *iface, DWORD output, QWORD time, QWORD duration, DWORD flags, INSSBuffer *sample, void *context) { struct callback *callback = impl_from_IWMReaderCallback(iface); + BYTE *data, *data2; HRESULT hr; DWORD size; - BYTE *data; if (winetest_debug > 1) trace("%u: %04x: IWMReaderCallback::OnSample(output %u, time %I64u, duration %I64u, flags %#x)\n", @@ -1196,6 +1206,10 @@ static HRESULT WINAPI callback_OnSample(IWMReaderCallback *iface, DWORD output, hr = INSSBuffer_GetBufferAndLength(sample, &data, &size); ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = INSSBuffer_GetBuffer(sample, &data2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(data2 == data, "Data pointers didn't match.\n"); + ok(callback->got_started > 0, "Got %u WMT_STARTED callbacks.\n", callback->got_started); ok(!callback->got_eof, "Got %u WMT_EOF callbacks.\n", callback->got_eof); ++callback->got_sample; -- 2.33.0

2 7

[PATCH 1/2] msvcrt: Increase module's reference count before returning from _beginthread[ex]().
by Arkadiusz Hiler Nov. 8, 2021

Nov. 8, 2021

Increasing DLL's reference count from the trampoline function makes it prone to race conditions. The thread can start executing after we have already returned from _beginthread[ex]() and the DLL might have been freed. Fixes rare crash on launch with Baldur's Gate 3. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/msvcrt/thread.c | 50 +++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/thread.c b/dlls/msvcrt/thread.c index 01500d93d91..173763d0eb1 100644 --- a/dlls/msvcrt/thread.c +++ b/dlls/msvcrt/thread.c @@ -32,6 +32,9 @@ typedef struct { _beginthreadex_start_routine_t start_address_ex; }; void *arglist; +#if _MSVCR_VER >= 140 + HMODULE module; +#endif } _beginthread_trampoline_t; /********************************************************************* @@ -113,16 +116,10 @@ static DWORD CALLBACK _beginthread_trampoline(LPVOID arg) thread_data_t *data = msvcrt_get_thread_data(); memcpy(&local_trampoline,arg,sizeof(local_trampoline)); - data->handle = local_trampoline.thread; free(arg); - + data->handle = local_trampoline.thread; #if _MSVCR_VER >= 140 - if (!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, - (void*)local_trampoline.start_address, &data->module)) - { - data->module = NULL; - WARN("failed to get module for the start_address: %d\n", GetLastError()); - } + data->module = local_trampoline.module; #endif local_trampoline.start_address(local_trampoline.arglist); @@ -162,7 +159,19 @@ uintptr_t CDECL _beginthread( trampoline->start_address = start_address; trampoline->arglist = arglist; +#if _MSVCR_VER >= 140 + if(!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, + (void*)start_address, &trampoline->module)) + { + trampoline->module = NULL; + WARN("failed to get module for the start_address: %d\n", GetLastError()); + } +#endif + if(ResumeThread(thread) == -1) { +#if _MSVCR_VER >= 140 + FreeLibrary(trampoline->module); +#endif free(trampoline); *_errno() = EAGAIN; return -1; @@ -181,19 +190,10 @@ static DWORD CALLBACK _beginthreadex_trampoline(LPVOID arg) thread_data_t *data = msvcrt_get_thread_data(); memcpy(&local_trampoline, arg, sizeof(local_trampoline)); - data->handle = local_trampoline.thread; free(arg); - + data->handle = local_trampoline.thread; #if _MSVCR_VER >= 140 - { - thread_data_t *data = msvcrt_get_thread_data(); - if (!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, - (void*)local_trampoline.start_address_ex, &data->module)) - { - data->module = NULL; - WARN("failed to get module for the start_address: %d\n", GetLastError()); - } - } + data->module = local_trampoline.module; #endif retval = local_trampoline.start_address_ex(local_trampoline.arglist); @@ -225,9 +225,21 @@ uintptr_t CDECL _beginthreadex( trampoline->start_address_ex = start_address; trampoline->arglist = arglist; +#if _MSVCR_VER >= 140 + if(!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, + (void*)start_address, &trampoline->module)) + { + trampoline->module = NULL; + WARN("failed to get module for the start_address: %d\n", GetLastError()); + } +#endif + thread = CreateThread(security, stack_size, _beginthreadex_trampoline, trampoline, initflag, thrdaddr); if(!thread) { +#if _MSVCR_VER >= 140 + FreeLibrary(trampoline->module); +#endif free(trampoline); msvcrt_set_errno(GetLastError()); return 0; -- 2.33.1

2 3