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

Alexandros Frantzis : winex11: Use default wglGetPixelFormatAttribivARB implementation.
by Alexandre Julliard 19 Jun '24

19 Jun '24

Module: wine Branch: master Commit: 2e5b4ff32a0ae1260d75b2d4ceefd717fead3ffb URL: https://gitlab.winehq.org/wine/wine/-/commit/2e5b4ff32a0ae1260d75b2d4ceefd7… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed Jun 12 15:21:55 2024 +0300 winex11: Use default wglGetPixelFormatAttribivARB implementation. Populate all the ARB related fields of advertised pixel formats, so that the default implementation of wglGetPixelFormatAttribivARB (in opengl32) will be used to get the pixel format attributes. --- dlls/winex11.drv/opengl.c | 373 ++++++++++------------------------------------ 1 file changed, 79 insertions(+), 294 deletions(-)

1 0

Alistair Leslie-Hughes : msado15: Use the correct version when loading the typelib.
by Alexandre Julliard 19 Jun '24

19 Jun '24

Module: wine Branch: master Commit: 0a83c4f287b8bd7def878cf566318ad7b89a3d19 URL: https://gitlab.winehq.org/wine/wine/-/commit/0a83c4f287b8bd7def878cf566318a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 19 20:56:28 2024 +1000 msado15: Use the correct version when loading the typelib. --- dlls/msado15/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 6489ae3f9b7..2d2f220c06f 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -159,7 +159,7 @@ static HRESULT load_typelib(void) if(typelib) return S_OK; - hres = LoadRegTypeLib(&LIBID_ADODB, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); + hres = LoadRegTypeLib(&LIBID_ADODB, 2, 8, LOCALE_SYSTEM_DEFAULT, &tl); if(FAILED(hres)) { ERR("LoadRegTypeLib failed: %08lx\n", hres); return hres;

1 0

Alexandre Julliard : kernelbase: Don't use WRITECOPY protection on anonymous mappings.
by Alexandre Julliard 19 Jun '24

19 Jun '24

Module: wine Branch: master Commit: 2ac86fb8c3295886026ba0aaf7d2b38e81f343e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/2ac86fb8c3295886026ba0aaf7d2b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 21:00:46 2024 +0200 kernelbase: Don't use WRITECOPY protection on anonymous mappings. --- dlls/kernelbase/memory.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index faa6bd7d5ee..46b155b7a47 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -604,7 +604,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteProcessMemory( HANDLE process, void *addr, co SIZE_T size, SIZE_T *bytes_written ) { CROSS_PROCESS_WORK_LIST *list = open_cross_process_connection( process ); - DWORD old_prot, prot = PAGE_TARGETS_NO_UPDATE | PAGE_ENCLAVE_NO_CHANGE | PAGE_EXECUTE_WRITECOPY; + DWORD old_prot, prot = PAGE_TARGETS_NO_UPDATE | PAGE_ENCLAVE_NO_CHANGE; MEMORY_BASIC_INFORMATION info; void *base_addr; SIZE_T region_size; @@ -634,6 +634,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteProcessMemory( HANDLE process, void *addr, co base_addr = ROUND_ADDR( addr ); region_size = ROUND_SIZE( addr, size ); region_size = min( region_size, (char *)info.BaseAddress + info.RegionSize - (char *)base_addr ); + prot |= (info.Type == MEM_PRIVATE) ? PAGE_EXECUTE_READWRITE : PAGE_EXECUTE_WRITECOPY; send_cross_process_notification( list, CrossProcessPreVirtualProtect, base_addr, region_size, 1, prot );

1 0

Hans Leidekker : odbc32: Rebind parameters when the result length array is resized.
by Alexandre Julliard 19 Jun '24

19 Jun '24

Module: wine Branch: master Commit: bb46d4a621f946e387f613276a4db2311a4267c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb46d4a621f946e387f613276a4db2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 6 15:31:22 2024 +0200 odbc32: Rebind parameters when the result length array is resized. --- dlls/odbc32/proxyodbc.c | 84 +++++++++++++++++++++++++++++++++++++++++++++---- dlls/odbc32/unixlib.h | 33 +++++++++++++++++++ 2 files changed, 111 insertions(+), 6 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index d97837e5bca..47e0aff0b18 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -234,6 +234,10 @@ SQLRETURN WINAPI SQLBindCol(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNumber, return SQL_ERROR; } if (!alloc_binding( &handle->bind_col, SQL_PARAM_INPUT_OUTPUT, ColumnNumber, handle->row_count )) return SQL_ERROR; + handle->bind_col.param[i].col.target_type = TargetType; + handle->bind_col.param[i].col.target_value = TargetValue; + handle->bind_col.param[i].col.buffer_length = BufferLength; + params.StatementHandle = handle->unix_handle; if (StrLen_or_Ind) params.StrLen_or_Ind = handle->bind_col.param[i].len; if (SUCCESS(( ret = ODBC_CALL( SQLBindCol, &params )))) handle->bind_col.param[i].ptr = StrLen_or_Ind; @@ -274,6 +278,11 @@ SQLRETURN WINAPI SQLBindParam(SQLHSTMT StatementHandle, SQLUSMALLINT ParameterNu return SQL_ERROR; } if (!alloc_binding( &handle->bind_param, SQL_PARAM_INPUT, ParameterNumber, handle->row_count )) return SQL_ERROR; + handle->bind_param.param[i].param.value_type = ValueType; + handle->bind_param.param[i].param.parameter_type = ParameterType; + handle->bind_param.param[i].param.length_precision = LengthPrecision; + handle->bind_param.param[i].param.parameter_scale = ParameterScale; + handle->bind_param.param[i].param.parameter_value = ParameterValue; params.StatementHandle = handle->unix_handle; params.StrLen_or_Ind = handle->bind_param.param[i].len; @@ -1376,20 +1385,76 @@ static BOOL resize_result_lengths( struct handle *handle, UINT size ) UINT i; for (i = 0; i < handle->bind_col.count; i++) { - UINT8 *tmp = realloc( handle->bind_col.param[i].len, size * sizeof(UINT64) ); - if (!tmp) return FALSE; + UINT8 *tmp; + if (!handle->bind_col.param[i].ptr) continue; + if (!(tmp = realloc( handle->bind_col.param[i].len, size * sizeof(UINT64) ))) return FALSE; + if (tmp != handle->bind_col.param[i].len) + { + struct SQLBindCol_params params; + + params.StatementHandle = handle->unix_handle; + params.ColumnNumber = i + 1; + params.TargetType = handle->bind_col.param[i].col.target_type; + params.TargetValue = handle->bind_col.param[i].col.target_value; + params.BufferLength = handle->bind_col.param[i].col.buffer_length; + params.StrLen_or_Ind = tmp; + if (!SUCCESS(ODBC_CALL( SQLBindCol, &params ))) + { + free( tmp ); + return FALSE; + } + } handle->bind_col.param[i].len = tmp; } for (i = 0; i < handle->bind_param.count; i++) { - UINT8 *tmp = realloc( handle->bind_param.param[i].len, size * sizeof(UINT64) ); - if (!tmp) return FALSE; + UINT8 *tmp; + if (!handle->bind_param.param[i].ptr) continue; + if (!(tmp = realloc( handle->bind_param.param[i].len, size * sizeof(UINT64) ))) return FALSE; + if (tmp != handle->bind_param.param[i].len) + { + struct SQLBindParam_params params; + + params.StatementHandle = handle->unix_handle; + params.ParameterNumber = i + 1; + params.ValueType = handle->bind_param.param[i].param.value_type; + params.ParameterType = handle->bind_param.param[i].param.parameter_type; + params.LengthPrecision = handle->bind_param.param[i].param.length_precision; + params.ParameterScale = handle->bind_param.param[i].param.parameter_scale; + params.ParameterValue = handle->bind_param.param[i].param.parameter_value; + params.StrLen_or_Ind = tmp; + if (!SUCCESS(ODBC_CALL( SQLBindParam, &params ))) + { + free( tmp ); + return FALSE; + } + } handle->bind_param.param[i].len = tmp; } for (i = 0; i < handle->bind_parameter.count; i++) { - UINT8 *tmp = realloc( handle->bind_parameter.param[i].len, size * sizeof(UINT64) ); - if (!tmp) return FALSE; + UINT8 *tmp; + if (!(tmp = realloc( handle->bind_parameter.param[i].len, size * sizeof(UINT64) ))) return FALSE; + if (tmp != handle->bind_parameter.param[i].len) + { + struct SQLBindParameter_params params; + + params.StatementHandle = handle->unix_handle; + params.ParameterNumber = i + 1; + params.InputOutputType = handle->bind_parameter.param[i].parameter.input_output_type; + params.ValueType = handle->bind_parameter.param[i].parameter.value_type; + params.ParameterType = handle->bind_parameter.param[i].parameter.parameter_type; + params.ColumnSize = handle->bind_parameter.param[i].parameter.column_size; + params.DecimalDigits = handle->bind_parameter.param[i].parameter.decimal_digits; + params.ParameterValue = handle->bind_parameter.param[i].parameter.parameter_value; + params.BufferLength = handle->bind_parameter.param[i].parameter.buffer_length; + params.StrLen_or_Ind = tmp; + if (!SUCCESS(ODBC_CALL( SQLBindParameter, &params ))) + { + free( tmp ); + return FALSE; + } + } handle->bind_parameter.param[i].len = tmp; } return TRUE; @@ -1984,6 +2049,13 @@ SQLRETURN WINAPI SQLBindParameter(SQLHSTMT StatementHandle, SQLUSMALLINT Paramet return SQL_ERROR; } if (!alloc_binding( &handle->bind_parameter, InputOutputType, ParameterNumber, handle->row_count )) return SQL_ERROR; + handle->bind_parameter.param[i].parameter.input_output_type = InputOutputType; + handle->bind_parameter.param[i].parameter.value_type = ValueType; + handle->bind_parameter.param[i].parameter.parameter_type = ParameterType; + handle->bind_parameter.param[i].parameter.column_size = ColumnSize; + handle->bind_parameter.param[i].parameter.decimal_digits = DecimalDigits; + handle->bind_parameter.param[i].parameter.parameter_value = ParameterValue; + handle->bind_parameter.param[i].parameter.buffer_length = BufferLength; params.StatementHandle = handle->unix_handle; params.StrLen_or_Ind = handle->bind_parameter.param[i].len; diff --git a/dlls/odbc32/unixlib.h b/dlls/odbc32/unixlib.h index 0c683340cbe..b1f42363429 100644 --- a/dlls/odbc32/unixlib.h +++ b/dlls/odbc32/unixlib.h @@ -152,9 +152,42 @@ enum sql_funcs unix_funcs_count }; +struct bind_col_args +{ + INT16 target_type; + void *target_value; + INT64 buffer_length; +}; + +struct bind_param_args +{ + INT16 value_type; + INT16 parameter_type; + UINT64 length_precision; + INT16 parameter_scale; + void *parameter_value; +}; + +struct bind_parameter_args +{ + INT16 input_output_type; + INT16 value_type; + INT16 parameter_type; + UINT64 column_size; + INT16 decimal_digits; + void *parameter_value; + INT64 buffer_length; +}; + struct param { INT16 type; + union + { + struct bind_col_args col; + struct bind_param_args param; + struct bind_parameter_args parameter; + }; UINT8 *len; /* result length array stored in Unix lib */ void *ptr; /* result length ptr passed by client */ };

1 0

Brendan McGrath : mf/tests: Add additional tests for MESessionClosed event.
by Alexandre Julliard 19 Jun '24

19 Jun '24

Module: wine Branch: master Commit: af565ce846d5548f8d0aaedb81985d246521131d URL: https://gitlab.winehq.org/wine/wine/-/commit/af565ce846d5548f8d0aaedb81985d… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Mon May 6 16:38:02 2024 +1000 mf/tests: Add additional tests for MESessionClosed event. --- dlls/mf/tests/mf.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index a2f183e5cc4..4773f202ccc 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6249,6 +6249,8 @@ static void test_media_session_Start(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaSession_Close(session); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = wait_media_event(session, callback, MESessionClosed, 1000, &propvar); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* Media session is shut down */ hr = IMFMediaSource_Shutdown(source); @@ -6331,6 +6333,9 @@ static void test_media_session_Start(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaSession_Close(session); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = wait_media_event(session, callback, MESessionClosed, 1000, &propvar); + todo_wine + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaSession_Shutdown(session); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaSource_Shutdown(source); @@ -6534,6 +6539,89 @@ static void test_MFEnumDeviceSources(void) CoUninitialize(); } +static void test_media_session_Close(void) +{ + media_type_desc video_rgb32_desc = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32), + }; + struct test_grabber_callback *grabber_callback; + IMFPresentationClock *presentation_clock; + IMFActivate *sink_activate; + IMFAsyncCallback *callback; + IMFMediaType *output_type; + IMFMediaSession *session; + IMFMediaSource *source; + IMFTopology *topology; + PROPVARIANT propvar; + IMFClock *clock; + UINT64 duration; + HRESULT hr; + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Failed to start up, hr %#lx.\n", hr); + + if (!(source = create_media_source(L"test.mp4", L"video/mp4"))) + { + todo_wine /* Gitlab CI Debian runner */ + win_skip("MP4 media source is not supported, skipping tests.\n"); + MFShutdown(); + return; + } + + grabber_callback = impl_from_IMFSampleGrabberSinkCallback(create_test_grabber_callback()); + hr = MFCreateMediaType(&output_type); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + init_media_type(output_type, video_rgb32_desc, -1); + hr = MFCreateSampleGrabberSinkActivate(output_type, &grabber_callback->IMFSampleGrabberSinkCallback_iface, &sink_activate); + ok(hr == S_OK, "Failed to create grabber sink, hr %#lx.\n", hr); + IMFMediaType_Release(output_type); + + hr = MFCreateMediaSession(NULL, &session); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + topology = create_test_topology(source, sink_activate, &duration); + hr = IMFMediaSession_SetTopology(session, 0, topology); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IMFTopology_Release(topology); + + hr = IMFMediaSession_GetClock(session, &clock); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFClock_QueryInterface(clock, &IID_IMFPresentationClock, (void **)&presentation_clock); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IMFClock_Release(clock); + + propvar.vt = VT_EMPTY; + hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + callback = create_test_callback(TRUE); + hr = wait_media_event(session, callback, MESessionStarted, 5000, &propvar); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaSession_Close(session); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaSource_Shutdown(source); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = wait_media_event_until_blocking(session, callback, MESessionClosed, 5000, &propvar); + todo_wine + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaSession_Shutdown(session); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + IMFPresentationClock_Release(presentation_clock); + IMFAsyncCallback_Release(callback); + IMFMediaSession_Release(session); + IMFActivate_ShutdownObject(sink_activate); + IMFActivate_Release(sink_activate); + IMFSampleGrabberSinkCallback_Release(&grabber_callback->IMFSampleGrabberSinkCallback_iface); + IMFMediaSource_Release(source); + + hr = MFShutdown(); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); +} + START_TEST(mf) { init_functions(); @@ -6568,4 +6656,5 @@ START_TEST(mf) test_MFCreateSequencerSegmentOffset(); test_media_session_Start(); test_MFEnumDeviceSources(); + test_media_session_Close(); }

1 0

Brendan McGrath : mf: Handle MediaSession Close when state is SESSION_STATE_RESTARTING_SOURCES.
by Alexandre Julliard 19 Jun '24

19 Jun '24

Module: wine Branch: master Commit: 02ca366b5a061bacc1581aeb1c4fd7912f827fd5 URL: https://gitlab.winehq.org/wine/wine/-/commit/02ca366b5a061bacc1581aeb1c4fd7… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Mon May 6 17:17:05 2024 +1000 mf: Handle MediaSession Close when state is SESSION_STATE_RESTARTING_SOURCES. Fixes the missing MESessionClosed event in this scenario. --- dlls/mf/session.c | 1 + dlls/mf/tests/mf.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 865399488ae..99e7b0872fb 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1274,6 +1274,7 @@ static void session_close(struct media_session *session) switch (session->state) { case SESSION_STATE_STOPPED: + case SESSION_STATE_RESTARTING_SOURCES: hr = session_finalize_sinks(session); break; case SESSION_STATE_STARTED: diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 4773f202ccc..483a8753f85 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6334,7 +6334,6 @@ static void test_media_session_Start(void) hr = IMFMediaSession_Close(session); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = wait_media_event(session, callback, MESessionClosed, 1000, &propvar); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaSession_Shutdown(session); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

1 0

Brendan McGrath : mf: Handle an error during Media Session Close.
by Alexandre Julliard 19 Jun '24

19 Jun '24

Module: wine Branch: master Commit: 427e848d0d469ff9d337f31da2bf4b61e136ff73 URL: https://gitlab.winehq.org/wine/wine/-/commit/427e848d0d469ff9d337f31da2bf4b… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Mon May 6 17:20:23 2024 +1000 mf: Handle an error during Media Session Close. Fixes the missing MESessionClosed event in this scenario. --- dlls/mf/session.c | 9 ++++++++- dlls/mf/tests/mf.c | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 99e7b0872fb..dc9578ce86b 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -3193,8 +3193,15 @@ static void session_set_sink_stream_state(struct media_session *session, IMFStre break; } - if (session->presentation.flags & SESSION_FLAG_END_OF_PRESENTATION || FAILED(hr)) + if (session->presentation.flags & SESSION_FLAG_END_OF_PRESENTATION) session_set_stopped(session, hr); + else if (FAILED(hr)) + { + if (session->presentation.flags & SESSION_FLAG_FINALIZE_SINKS) + session_set_closed(session, hr); + else + session_set_stopped(session, hr); + } break; default: diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 483a8753f85..c42676b38d9 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6603,7 +6603,6 @@ static void test_media_session_Close(void) hr = IMFMediaSource_Shutdown(source); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = wait_media_event_until_blocking(session, callback, MESessionClosed, 5000, &propvar); - todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFMediaSession_Shutdown(session);

1 0

Alfred Agrell : winegstreamer: Implement AM_MEDIA_TYPE to wg_format converter for Cinepak video.
by Alexandre Julliard 19 Jun '24

19 Jun '24

Module: wine Branch: master Commit: ed819cc973eb59be29491101070e2c7c106fdcb7 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed819cc973eb59be29491101070e2c… Author: Alfred Agrell <floating(a)muncher.se> Date: Thu May 23 19:43:26 2024 +0200 winegstreamer: Implement AM_MEDIA_TYPE to wg_format converter for Cinepak video. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56698 --- dlls/winegstreamer/quartz_parser.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 3902c652648..af6a3ea7750 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -980,6 +980,30 @@ static bool amt_to_wg_format_video(const AM_MEDIA_TYPE *mt, struct wg_format *fo return false; } +static bool amt_to_wg_format_video_cinepak(const AM_MEDIA_TYPE *mt, struct wg_format *format) +{ + const VIDEOINFOHEADER *video_format = (const VIDEOINFOHEADER *)mt->pbFormat; + + if (!IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) + { + FIXME("Unknown format type %s.\n", debugstr_guid(&mt->formattype)); + return false; + } + if (mt->cbFormat < sizeof(VIDEOINFOHEADER) || !mt->pbFormat) + { + ERR("Unexpected format size %lu.\n", mt->cbFormat); + return false; + } + + format->major_type = WG_MAJOR_TYPE_VIDEO_CINEPAK; + format->u.video.width = video_format->bmiHeader.biWidth; + format->u.video.height = video_format->bmiHeader.biHeight; + format->u.video.fps_n = 10000000; + format->u.video.fps_d = video_format->AvgTimePerFrame; + + return true; +} + static bool amt_to_wg_format_video_wmv(const AM_MEDIA_TYPE *mt, struct wg_format *format) { const VIDEOINFOHEADER *video_format = (const VIDEOINFOHEADER *)mt->pbFormat; @@ -1054,6 +1078,8 @@ bool amt_to_wg_format(const AM_MEDIA_TYPE *mt, struct wg_format *format) if (IsEqualGUID(&mt->majortype, &MEDIATYPE_Video)) { + if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_CVID)) + return amt_to_wg_format_video_cinepak(mt, format); if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_WMV1) || IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_WMV2) || IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_WMVA)

1 0

Alfred Agrell : winegstreamer: Make AVI splitter use end of previous frame if the current frame doesn't have a timestamp.
by Alexandre Julliard 19 Jun '24

19 Jun '24

Module: wine Branch: master Commit: fb523ed66f91ed1feaa1989677c723dd0bfac6cd URL: https://gitlab.winehq.org/wine/wine/-/commit/fb523ed66f91ed1feaa1989677c723… Author: Alfred Agrell <floating(a)muncher.se> Date: Wed Jun 5 16:40:13 2024 +0200 winegstreamer: Make AVI splitter use end of previous frame if the current frame doesn't have a timestamp. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56698 --- dlls/winegstreamer/quartz_parser.c | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index af6a3ea7750..90dbc067bb4 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -100,6 +100,9 @@ struct parser_source bool need_segment; bool eos; + + bool interpolate_timestamps; + UINT64 prev_end_pts; }; static inline struct parser *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -1182,30 +1185,34 @@ static HRESULT send_sample(struct parser_source *pin, IMediaSample *sample, return S_OK; } - if (buffer->has_pts) + if (buffer->has_pts || (pin->interpolate_timestamps && pin->prev_end_pts != 0)) { - REFERENCE_TIME start_pts = buffer->pts; + UINT64 start_pts = (buffer->has_pts ? buffer->pts : pin->prev_end_pts); + REFERENCE_TIME start_reftime = start_pts; if (offset) - start_pts += scale_uint64(offset, 10000000, bytes_per_second); - start_pts -= pin->seek.llCurrent; - start_pts *= pin->seek.dRate; + start_reftime += scale_uint64(offset, 10000000, bytes_per_second); + start_reftime -= pin->seek.llCurrent; + start_reftime *= pin->seek.dRate; if (buffer->has_duration) { - REFERENCE_TIME end_pts = buffer->pts + buffer->duration; + UINT64 end_pts = start_pts + buffer->duration; + REFERENCE_TIME end_reftime = end_pts; + pin->prev_end_pts = end_pts; if (offset + size < buffer->size) - end_pts = buffer->pts + scale_uint64(offset + size, 10000000, bytes_per_second); - end_pts -= pin->seek.llCurrent; - end_pts *= pin->seek.dRate; + end_reftime = end_reftime + scale_uint64(offset + size, 10000000, bytes_per_second); + end_reftime -= pin->seek.llCurrent; + end_reftime *= pin->seek.dRate; - IMediaSample_SetTime(sample, &start_pts, &end_pts); - IMediaSample_SetMediaTime(sample, &start_pts, &end_pts); + IMediaSample_SetTime(sample, &start_reftime, &end_reftime); + IMediaSample_SetMediaTime(sample, &start_reftime, &end_reftime); } else { - IMediaSample_SetTime(sample, &start_pts, NULL); + pin->prev_end_pts = 0; + IMediaSample_SetTime(sample, &start_reftime, NULL); IMediaSample_SetMediaTime(sample, NULL, NULL); } } @@ -2320,6 +2327,7 @@ static const struct strmbase_sink_ops avi_splitter_sink_ops = static BOOL avi_splitter_filter_init_gst(struct parser *filter) { wg_parser_t parser = filter->wg_parser; + struct parser_source *src; uint32_t i, stream_count; WCHAR source_name[20]; @@ -2327,8 +2335,10 @@ static BOOL avi_splitter_filter_init_gst(struct parser *filter) for (i = 0; i < stream_count; ++i) { swprintf(source_name, ARRAY_SIZE(source_name), L"Stream %02u", i); - if (!create_pin(filter, wg_parser_get_stream(parser, i), source_name)) + src = create_pin(filter, wg_parser_get_stream(parser, i), source_name); + if (!src) return FALSE; + src->interpolate_timestamps = TRUE; } return TRUE;

1 0

Alfred Agrell : quartz/tests: Add Cinepak test to avi splitter.
by Alexandre Julliard 19 Jun '24

19 Jun '24

Module: wine Branch: master Commit: 66ceeed861c0d8a02db90df878f97d1a683b1379 URL: https://gitlab.winehq.org/wine/wine/-/commit/66ceeed861c0d8a02db90df878f97d… Author: Alfred Agrell <floating(a)muncher.se> Date: Tue May 28 18:05:54 2024 +0200 quartz/tests: Add Cinepak test to avi splitter. --- dlls/quartz/tests/avisplit.c | 11 ++++++++--- dlls/quartz/tests/rsrc.rc | 4 ++++ dlls/quartz/tests/test_cinepak.avi | Bin 0 -> 6702 bytes 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 25e313aa4b4..f7fadb606c4 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -1677,9 +1677,9 @@ static void test_seeking(void) ok(ret, "Failed to delete file, error %lu.\n", GetLastError()); } -static void test_streaming(void) +static void test_streaming(const WCHAR *resname) { - const WCHAR *filename = load_resource(L"test.avi"); + const WCHAR *filename = load_resource(resname); IBaseFilter *filter = create_avi_splitter(); IFilterGraph2 *graph = connect_input(filter, filename); struct testfilter testsink; @@ -1691,6 +1691,8 @@ static void test_streaming(void) ULONG ref; DWORD ret; + winetest_push_context("File %ls", resname); + testfilter_init(&testsink); IFilterGraph2_AddFilter(graph, &testsink.filter.IBaseFilter_iface, L"sink"); IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); @@ -1761,6 +1763,8 @@ static void test_streaming(void) ok(!ref, "Got outstanding refcount %ld.\n", ref); ret = DeleteFileW(filename); ok(ret, "Failed to delete file, error %lu.\n", GetLastError()); + + winetest_pop_context(); } START_TEST(avisplit) @@ -1787,7 +1791,8 @@ START_TEST(avisplit) test_unconnected_filter_state(); test_connect_pin(); test_seeking(); - test_streaming(); + test_streaming(L"test.avi"); + test_streaming(L"test_cinepak.avi"); CoUninitialize(); } diff --git a/dlls/quartz/tests/rsrc.rc b/dlls/quartz/tests/rsrc.rc index a16edacf1d1..a15520d21ac 100644 --- a/dlls/quartz/tests/rsrc.rc +++ b/dlls/quartz/tests/rsrc.rc @@ -39,3 +39,7 @@ test.wav RCDATA "test.wav" /* ffmpeg -f lavfi -i smptebars -f lavfi -i "sine=frequency=1000" -t 2.04 -r 25 -f mpeg -vcodec mpeg1video -vf scale=64x48 -acodec mp2 -ar 32k -ab 96k test2.mpg */ /* @makedep: test2.mpg */ test2.mpg RCDATA "test2.mpg" + +/* ffmpeg -f lavfi -i smptebars -t 5 -r 1 -f avi -vcodec cinepak -pix_fmt rgb24 -vf scale=32x24 test_cinepak.avi */ +/* @makedep: test_cinepak.avi */ +test_cinepak.avi RCDATA "test_cinepak.avi" diff --git a/dlls/quartz/tests/test_cinepak.avi b/dlls/quartz/tests/test_cinepak.avi new file mode 100644 index 00000000000..006ee289b37 Binary files /dev/null and b/dlls/quartz/tests/test_cinepak.avi differ

1 0