November 2023 - Wine-commits

Dmitry Timoshkov : uxtheme: Parse app/class name in OpenThemeData().
by Alexandre Julliard 08 Nov '23

08 Nov '23

Module: wine Branch: master Commit: 9d8250e55e6fa0e3b6a9768ac991ec9d5ec1ccee URL: https://gitlab.winehq.org/wine/wine/-/commit/9d8250e55e6fa0e3b6a9768ac991ec… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 30 18:22:08 2023 +0300 uxtheme: Parse app/class name in OpenThemeData(). Themed Delphi applications use "explorer::listview" and "explorer::treeview": https://gitlab.com/freepascal.org/lazarus/lazarus/-/blob/main/lcl/interface… Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/uxtheme/msstyles.c | 35 +++++++++++++++++++++++++++++++---- dlls/uxtheme/tests/system.c | 4 ++-- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index cfd21a48989..a9b46f8ef22 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -1022,6 +1022,23 @@ static void MSSTYLES_ParseThemeIni(PTHEME_FILE tf, BOOL setMetrics) } } +static void parse_app_class_name(LPCWSTR name, LPWSTR app_name, LPWSTR class_name) +{ + LPCWSTR p; + + app_name[0] = class_name[0] = 0; + + p = wcsstr(name, L"::"); + if (p) + { + lstrcpynW(app_name, name, min(p - name + 1, MAX_THEME_APP_NAME)); + p += 2; + lstrcpynW(class_name, p, min(wcslen(p) + 1, MAX_THEME_CLASS_NAME)); + } + else + lstrcpynW(class_name, name, MAX_THEME_CLASS_NAME); +} + /*********************************************************************** * MSSTYLES_OpenThemeClass * @@ -1036,6 +1053,8 @@ static void MSSTYLES_ParseThemeIni(PTHEME_FILE tf, BOOL setMetrics) PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList, UINT dpi) { PTHEME_CLASS cls = NULL; + WCHAR buf[MAX_THEME_APP_NAME + MAX_THEME_CLASS_NAME]; + WCHAR szAppName[MAX_THEME_APP_NAME]; WCHAR szClassName[MAX_THEME_CLASS_NAME]; LPCWSTR start; LPCWSTR end; @@ -1052,14 +1071,22 @@ PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList, U start = pszClassList; while((end = wcschr(start, ';'))) { len = end-start; - lstrcpynW(szClassName, start, min(len+1, ARRAY_SIZE(szClassName))); + lstrcpynW(buf, start, min(len+1, ARRAY_SIZE(buf))); start = end+1; - cls = MSSTYLES_FindClass(tfActiveTheme, pszAppName, szClassName); + + parse_app_class_name(buf, szAppName, szClassName); + if (szAppName[0]) + cls = MSSTYLES_FindClass(tfActiveTheme, szAppName, szClassName); + else + cls = MSSTYLES_FindClass(tfActiveTheme, pszAppName, szClassName); if(cls) break; } if(!cls && *start) { - lstrcpynW(szClassName, start, ARRAY_SIZE(szClassName)); - cls = MSSTYLES_FindClass(tfActiveTheme, pszAppName, szClassName); + parse_app_class_name(start, szAppName, szClassName); + if (szAppName[0]) + cls = MSSTYLES_FindClass(tfActiveTheme, szAppName, szClassName); + else + cls = MSSTYLES_FindClass(tfActiveTheme, pszAppName, szClassName); } if(cls) { TRACE("Opened app %s, class %s from list %s\n", debugstr_w(cls->szAppName), debugstr_w(cls->szClassName), debugstr_w(pszClassList)); diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index c9fdf30820d..eca609b7971 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -560,14 +560,14 @@ static void test_OpenThemeData(void) SetLastError(0xdeadbeef); hTheme = OpenThemeData(hWnd, L"dead::beef;explorer::treeview"); + todo_wine ok(!hTheme, "OpenThemeData() should fail\n"); + todo_wine ok(GetLastError() == E_PROP_ID_UNSUPPORTED, "Got unexpected %#lx.\n", GetLastError()); SetLastError(0xdeadbeef); hTheme = OpenThemeData(hWnd, L"explorer::treeview"); - todo_wine ok(hTheme != NULL, "OpenThemeData() failed\n"); - todo_wine ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%08lx\n", GetLastError()); CloseThemeData(hTheme);

1 0

Dmitry Timoshkov : uxtheme/tests: Add a test for SetWindowTheme/OpenThemeData sequence.
by Alexandre Julliard 08 Nov '23

08 Nov '23

Module: wine Branch: master Commit: 992d197d87e0343a28e67a80997fc2334fea6e8b URL: https://gitlab.winehq.org/wine/wine/-/commit/992d197d87e0343a28e67a80997fc2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 2 12:51:04 2023 +0300 uxtheme/tests: Add a test for SetWindowTheme/OpenThemeData sequence. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/uxtheme/tests/system.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index eca609b7971..de9419a032a 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -558,6 +558,16 @@ static void test_OpenThemeData(void) /* Only do the next checks if we have an active theme */ + hRes = SetWindowTheme(hWnd, L"explorer", NULL); + ok(hRes == S_OK, "Got unexpected hr %#lx.\n", hRes); + SetLastError(0xdeadbeef); + hTheme = OpenThemeData(hWnd, L"explorer::treeview"); + todo_wine + ok(!hTheme, "OpenThemeData() should fail\n"); + todo_wine + ok(GetLastError() == E_PROP_ID_UNSUPPORTED, "Got unexpected %#lx.\n", GetLastError()); + SetWindowTheme(hWnd, NULL, NULL); + SetLastError(0xdeadbeef); hTheme = OpenThemeData(hWnd, L"dead::beef;explorer::treeview"); todo_wine

1 0

Dmitry Timoshkov : uxtheme: Move fall back to default class to MSSTYLES_OpenThemeClass().
by Alexandre Julliard 08 Nov '23

08 Nov '23

Module: wine Branch: master Commit: 87f1a380190aeb69e486c743f485f4a286592459 URL: https://gitlab.winehq.org/wine/wine/-/commit/87f1a380190aeb69e486c743f485f4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 2 14:19:06 2023 +0300 uxtheme: Move fall back to default class to MSSTYLES_OpenThemeClass(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/uxtheme/msstyles.c | 7 +++++++ dlls/uxtheme/system.c | 4 ---- dlls/uxtheme/tests/system.c | 2 -- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index a9b46f8ef22..4c67e3b15c5 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -1079,6 +1079,10 @@ PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList, U cls = MSSTYLES_FindClass(tfActiveTheme, szAppName, szClassName); else cls = MSSTYLES_FindClass(tfActiveTheme, pszAppName, szClassName); + + /* Fall back to default class if the specified subclass is not found */ + if (!cls) cls = MSSTYLES_FindClass(tfActiveTheme, NULL, szClassName); + if(cls) break; } if(!cls && *start) { @@ -1087,6 +1091,9 @@ PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList, U cls = MSSTYLES_FindClass(tfActiveTheme, szAppName, szClassName); else cls = MSSTYLES_FindClass(tfActiveTheme, pszAppName, szClassName); + + /* Fall back to default class if the specified subclass is not found */ + if (!cls) cls = MSSTYLES_FindClass(tfActiveTheme, NULL, szClassName); } if(cls) { TRACE("Opened app %s, class %s from list %s\n", debugstr_w(cls->szAppName), debugstr_w(cls->szClassName), debugstr_w(pszClassList)); diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 2c041356930..83cbaea5dfa 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -641,10 +641,6 @@ static HTHEME open_theme_data(HWND hwnd, LPCWSTR pszClassList, DWORD flags, UINT if (pszUseClassList) hTheme = MSSTYLES_OpenThemeClass(pszAppName, pszUseClassList, dpi); - - /* Fall back to default class if the specified subclass is not found */ - if (!hTheme) - hTheme = MSSTYLES_OpenThemeClass(NULL, pszUseClassList, dpi); } if(IsWindow(hwnd)) SetPropW(hwnd, (LPCWSTR)MAKEINTATOM(atWindowTheme), hTheme); diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index de9419a032a..6c7e87c1040 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -583,9 +583,7 @@ static void test_OpenThemeData(void) SetLastError(0xdeadbeef); hTheme = OpenThemeData(hWnd, L"deadbeef::treeview;dead::beef"); - todo_wine ok(hTheme != NULL, "OpenThemeData() failed\n"); - todo_wine ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%08lx\n", GetLastError()); CloseThemeData(hTheme);

1 0

Dmitry Timoshkov : uxtheme: If the application class is already set then OpenThemeData() should fail.
by Alexandre Julliard 08 Nov '23

08 Nov '23

Module: wine Branch: master Commit: dfffe7b49c3b60dd9d96c2f45a88d59d0f7d9587 URL: https://gitlab.winehq.org/wine/wine/-/commit/dfffe7b49c3b60dd9d96c2f45a88d5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 2 14:21:36 2023 +0300 uxtheme: If the application class is already set then OpenThemeData() should fail. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/uxtheme/msstyles.c | 18 ++++++++++++------ dlls/uxtheme/tests/system.c | 2 -- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 4c67e3b15c5..4fc9a344661 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -1076,9 +1076,12 @@ PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList, U parse_app_class_name(buf, szAppName, szClassName); if (szAppName[0]) - cls = MSSTYLES_FindClass(tfActiveTheme, szAppName, szClassName); - else - cls = MSSTYLES_FindClass(tfActiveTheme, pszAppName, szClassName); + { + /* If the application class is already set then fail */ + if (pszAppName) return NULL; + pszAppName = szAppName; + } + cls = MSSTYLES_FindClass(tfActiveTheme, pszAppName, szClassName); /* Fall back to default class if the specified subclass is not found */ if (!cls) cls = MSSTYLES_FindClass(tfActiveTheme, NULL, szClassName); @@ -1088,9 +1091,12 @@ PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList, U if(!cls && *start) { parse_app_class_name(start, szAppName, szClassName); if (szAppName[0]) - cls = MSSTYLES_FindClass(tfActiveTheme, szAppName, szClassName); - else - cls = MSSTYLES_FindClass(tfActiveTheme, pszAppName, szClassName); + { + /* If the application class is already set then fail */ + if (pszAppName) return NULL; + pszAppName = szAppName; + } + cls = MSSTYLES_FindClass(tfActiveTheme, pszAppName, szClassName); /* Fall back to default class if the specified subclass is not found */ if (!cls) cls = MSSTYLES_FindClass(tfActiveTheme, NULL, szClassName); diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 6c7e87c1040..c79a6c85a35 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -562,9 +562,7 @@ static void test_OpenThemeData(void) ok(hRes == S_OK, "Got unexpected hr %#lx.\n", hRes); SetLastError(0xdeadbeef); hTheme = OpenThemeData(hWnd, L"explorer::treeview"); - todo_wine ok(!hTheme, "OpenThemeData() should fail\n"); - todo_wine ok(GetLastError() == E_PROP_ID_UNSUPPORTED, "Got unexpected %#lx.\n", GetLastError()); SetWindowTheme(hWnd, NULL, NULL);

1 0

Ziqing Hui : winegstreamer: Implement ProcessSample for media sink.
by Alexandre Julliard 08 Nov '23

08 Nov '23

Module: wine Branch: master Commit: 37b2548399c393b2c0d7b8fa74971359c5a9f66c URL: https://gitlab.winehq.org/wine/wine/-/commit/37b2548399c393b2c0d7b8fa749713… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Aug 18 10:03:45 2023 +0800 winegstreamer: Implement ProcessSample for media sink. --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/main.c | 21 ++++++++++ dlls/winegstreamer/media_sink.c | 88 ++++++++++++++++++++++++++++++++++++++- dlls/winegstreamer/unix_private.h | 1 + dlls/winegstreamer/unixlib.h | 8 ++++ dlls/winegstreamer/wg_muxer.c | 5 +++ dlls/winegstreamer/wg_parser.c | 19 +++++++++ 7 files changed, 141 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 22d92cfeef7..8712980092b 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -114,6 +114,7 @@ HRESULT wg_muxer_create(const char *format, wg_muxer_t *muxer); void wg_muxer_destroy(wg_muxer_t muxer); HRESULT wg_muxer_add_stream(wg_muxer_t muxer, UINT32 stream_id, const struct wg_format *format); HRESULT wg_muxer_start(wg_muxer_t muxer); +HRESULT wg_muxer_push_sample(wg_muxer_t muxer, struct wg_sample *sample, UINT32 stream_id); unsigned int wg_format_get_bytes_for_uncompressed(wg_video_format format, unsigned int width, unsigned int height); unsigned int wg_format_get_max_size(const struct wg_format *format); diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 58ad8c6f3d7..3eb82bdccf5 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -523,6 +523,27 @@ HRESULT wg_muxer_start(wg_muxer_t muxer) return S_OK; } +HRESULT wg_muxer_push_sample(wg_muxer_t muxer, struct wg_sample *sample, UINT32 steam_id) +{ + struct wg_muxer_push_sample_params params = + { + .muxer = muxer, + .sample = sample, + .stream_id = steam_id, + }; + NTSTATUS status; + + TRACE("muxer %#I64x, sample %p.\n", muxer, sample); + + if ((status = WINE_UNIX_CALL(unix_wg_muxer_push_sample, &params))) + { + WARN("Failed to push sample, status %#lx.\n", status); + return HRESULT_FROM_NT(status); + } + + return S_OK; +} + #define ALIGN(n, alignment) (((n) + (alignment) - 1) & ~((alignment) - 1)) unsigned int wg_format_get_stride(const struct wg_format *format) diff --git a/dlls/winegstreamer/media_sink.c b/dlls/winegstreamer/media_sink.c index 489ede1d26a..d9c15291b61 100644 --- a/dlls/winegstreamer/media_sink.c +++ b/dlls/winegstreamer/media_sink.c @@ -31,6 +31,7 @@ enum async_op ASYNC_START, ASYNC_STOP, ASYNC_PAUSE, + ASYNC_PROCESS, }; struct async_command @@ -39,6 +40,15 @@ struct async_command LONG refcount; enum async_op op; + + union + { + struct + { + IMFSample *sample; + UINT32 stream_id; + } process; + } u; }; struct stream_sink @@ -142,7 +152,11 @@ static ULONG WINAPI async_command_Release(IUnknown *iface) ULONG refcount = InterlockedDecrement(&command->refcount); if (!refcount) + { + if (command->op == ASYNC_PROCESS && command->u.process.sample) + IMFSample_Release(command->u.process.sample); free(command); + } return refcount; } @@ -301,9 +315,41 @@ static HRESULT WINAPI stream_sink_GetMediaTypeHandler(IMFStreamSink *iface, IMFM static HRESULT WINAPI stream_sink_ProcessSample(IMFStreamSink *iface, IMFSample *sample) { - FIXME("iface %p, sample %p stub!\n", iface, sample); + struct stream_sink *stream_sink = impl_from_IMFStreamSink(iface); + struct media_sink *media_sink = impl_from_IMFFinalizableMediaSink(stream_sink->media_sink); + struct async_command *command; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, sample %p.\n", iface, sample); + + EnterCriticalSection(&media_sink->cs); + + if (media_sink->state == STATE_SHUTDOWN) + { + LeaveCriticalSection(&media_sink->cs); + return MF_E_SHUTDOWN; + } + + if (media_sink->state != STATE_STARTED && media_sink->state != STATE_PAUSED) + { + LeaveCriticalSection(&media_sink->cs); + return MF_E_INVALIDREQUEST; + } + + if (FAILED(hr = (async_command_create(ASYNC_PROCESS, &command)))) + { + LeaveCriticalSection(&media_sink->cs); + return hr; + } + IMFSample_AddRef((command->u.process.sample = sample)); + command->u.process.stream_id = stream_sink->id; + + if (FAILED(hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &media_sink->async_callback, &command->IUnknown_iface))) + IUnknown_Release(&command->IUnknown_iface); + + LeaveCriticalSection(&media_sink->cs); + + return hr; } static HRESULT WINAPI stream_sink_PlaceMarker(IMFStreamSink *iface, MFSTREAMSINK_MARKER_TYPE marker_type, @@ -521,6 +567,40 @@ static HRESULT media_sink_pause(struct media_sink *media_sink) return media_sink_queue_stream_event(media_sink, MEStreamSinkPaused); } +static HRESULT media_sink_process(struct media_sink *media_sink, IMFSample *sample, UINT32 stream_id) +{ + wg_muxer_t muxer = media_sink->muxer; + struct wg_sample *wg_sample; + LONGLONG time, duration; + UINT32 value; + HRESULT hr; + + TRACE("media_sink %p, sample %p, stream_id %u.\n", media_sink, sample, stream_id); + + if (FAILED(hr = wg_sample_create_mf(sample, &wg_sample))) + return hr; + + if (SUCCEEDED(IMFSample_GetSampleTime(sample, &time))) + { + wg_sample->flags |= WG_SAMPLE_FLAG_HAS_PTS; + wg_sample->pts = time; + } + if (SUCCEEDED(IMFSample_GetSampleDuration(sample, &duration))) + { + wg_sample->flags |= WG_SAMPLE_FLAG_HAS_DURATION; + wg_sample->duration = duration; + } + if (SUCCEEDED(IMFSample_GetUINT32(sample, &MFSampleExtension_CleanPoint, &value)) && value) + wg_sample->flags |= WG_SAMPLE_FLAG_SYNC_POINT; + if (SUCCEEDED(IMFSample_GetUINT32(sample, &MFSampleExtension_Discontinuity, &value)) && value) + wg_sample->flags |= WG_SAMPLE_FLAG_DISCONTINUITY; + + hr = wg_muxer_push_sample(muxer, wg_sample, stream_id); + wg_sample_release(wg_sample); + + return hr; +} + static HRESULT WINAPI media_sink_QueryInterface(IMFFinalizableMediaSink *iface, REFIID riid, void **obj) { struct media_sink *media_sink = impl_from_IMFFinalizableMediaSink(iface); @@ -1022,6 +1102,10 @@ static HRESULT WINAPI media_sink_callback_Invoke(IMFAsyncCallback *iface, IMFAsy case ASYNC_PAUSE: hr = media_sink_pause(media_sink); break; + case ASYNC_PROCESS: + if (FAILED(hr = media_sink_process(media_sink, command->u.process.sample, command->u.process.stream_id))) + WARN("Failed to process sample, hr %#lx.\n", hr); + break; default: WARN("Unsupported op %u.\n", command->op); break; diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h index ad1817d8c2d..f639b03bcce 100644 --- a/dlls/winegstreamer/unix_private.h +++ b/dlls/winegstreamer/unix_private.h @@ -69,6 +69,7 @@ extern NTSTATUS wg_muxer_create(void *args) DECLSPEC_HIDDEN; extern NTSTATUS wg_muxer_destroy(void *args) DECLSPEC_HIDDEN; extern NTSTATUS wg_muxer_add_stream(void *args) DECLSPEC_HIDDEN; extern NTSTATUS wg_muxer_start(void *args) DECLSPEC_HIDDEN; +extern NTSTATUS wg_muxer_push_sample(void *args) DECLSPEC_HIDDEN; /* wg_allocator.c */ diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index 70bbe89208f..6c0c61f76bb 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -385,6 +385,13 @@ struct wg_muxer_add_stream_params const struct wg_format *format; }; +struct wg_muxer_push_sample_params +{ + wg_muxer_t muxer; + struct wg_sample *sample; + UINT32 stream_id; +}; + enum unix_funcs { unix_wg_init_gstreamer, @@ -429,6 +436,7 @@ enum unix_funcs unix_wg_muxer_destroy, unix_wg_muxer_add_stream, unix_wg_muxer_start, + unix_wg_muxer_push_sample, unix_wg_funcs_count, }; diff --git a/dlls/winegstreamer/wg_muxer.c b/dlls/winegstreamer/wg_muxer.c index aa453ad9837..5d37489f994 100644 --- a/dlls/winegstreamer/wg_muxer.c +++ b/dlls/winegstreamer/wg_muxer.c @@ -343,3 +343,8 @@ NTSTATUS wg_muxer_start(void *args) return STATUS_SUCCESS; } + +NTSTATUS wg_muxer_push_sample(void *args) +{ + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 065b4216dd4..5a526b15712 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1923,6 +1923,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = X(wg_muxer_destroy), X(wg_muxer_add_stream), X(wg_muxer_start), + X(wg_muxer_push_sample), }; C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == unix_wg_funcs_count); @@ -2166,6 +2167,23 @@ NTSTATUS wow64_wg_muxer_add_stream(void *args) return wg_muxer_add_stream(&params); } +NTSTATUS wow64_wg_muxer_push_sample(void *args) +{ + struct + { + wg_muxer_t muxer; + PTR32 sample; + UINT32 stream_id; + } *params32 = args; + struct wg_muxer_push_sample_params params = + { + .muxer = params32->muxer, + .sample = ULongToPtr(params32->sample), + .stream_id = params32->stream_id, + }; + return wg_muxer_push_sample(&params); +} + const unixlib_entry_t __wine_unix_call_wow64_funcs[] = { #define X64(name) [unix_ ## name] = wow64_ ## name @@ -2211,6 +2229,7 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = X(wg_muxer_destroy), X64(wg_muxer_add_stream), X(wg_muxer_start), + X64(wg_muxer_push_sample), }; C_ASSERT(ARRAYSIZE(__wine_unix_call_wow64_funcs) == unix_wg_funcs_count);

1 0

Ziqing Hui : winegstreamer: Implement wg_muxer_push_sample.
by Alexandre Julliard 08 Nov '23

08 Nov '23

Module: wine Branch: master Commit: d0153cf37f334ee35d79335d3a77d29c91c2cb85 URL: https://gitlab.winehq.org/wine/wine/-/commit/d0153cf37f334ee35d79335d3a77d2… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Aug 17 11:02:16 2023 +0800 winegstreamer: Implement wg_muxer_push_sample. --- dlls/winegstreamer/wg_muxer.c | 105 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 104 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_muxer.c b/dlls/winegstreamer/wg_muxer.c index 5d37489f994..7402ba91a58 100644 --- a/dlls/winegstreamer/wg_muxer.c +++ b/dlls/winegstreamer/wg_muxer.c @@ -59,6 +59,9 @@ struct wg_muxer GstPad *my_sink; GstCaps *my_sink_caps; + pthread_mutex_t mutex; + guint64 offset; + struct list streams; }; @@ -81,6 +84,19 @@ static struct wg_muxer *get_muxer(wg_muxer_t muxer) return (struct wg_muxer *)(ULONG_PTR)muxer; } +static struct wg_muxer_stream *muxer_get_stream_by_id(struct wg_muxer *muxer, DWORD id) +{ + struct wg_muxer_stream *stream; + + LIST_FOR_EACH_ENTRY(stream, &muxer->streams, struct wg_muxer_stream, entry) + { + if (stream->id == id) + return stream; + } + + return NULL; +} + static bool muxer_try_muxer_factory(struct wg_muxer *muxer, GstElementFactory *muxer_factory) { struct wg_muxer_stream *stream; @@ -146,6 +162,46 @@ static gboolean muxer_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *qu } } +static gboolean muxer_sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) +{ + struct wg_muxer *muxer = gst_pad_get_element_private(pad); + const GstSegment *segment; + + GST_DEBUG("pad %p, parent %p, event %p, muxer %p, type \"%s\".", + pad, parent, event, muxer, GST_EVENT_TYPE_NAME(event)); + + switch (event->type) + { + case GST_EVENT_SEGMENT: + pthread_mutex_lock(&muxer->mutex); + + gst_event_parse_segment(event, &segment); + if (segment->format != GST_FORMAT_BYTES) + { + pthread_mutex_unlock(&muxer->mutex); + GST_FIXME("Unhandled segment format \"%s\".", gst_format_get_name(segment->format)); + break; + } + muxer->offset = segment->start; + + pthread_mutex_unlock(&muxer->mutex); + break; + + default: + GST_WARNING("Ignoring \"%s\" event.", GST_EVENT_TYPE_NAME(event)); + break; + } + + gst_event_unref(event); + return TRUE; +} + +static GstFlowReturn muxer_sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *buffer) +{ + GST_FIXME("Stub."); + return GST_FLOW_ERROR; +} + static void stream_free(struct wg_muxer_stream *stream) { if (stream->parser_src_caps) @@ -166,6 +222,8 @@ NTSTATUS wg_muxer_create(void *args) if (!(muxer = calloc(1, sizeof(*muxer)))) return STATUS_NO_MEMORY; list_init(&muxer->streams); + muxer->offset = GST_BUFFER_OFFSET_NONE; + pthread_mutex_init(&muxer->mutex, NULL); if (!(muxer->container = gst_bin_new("wg_muxer"))) goto out; @@ -182,6 +240,8 @@ NTSTATUS wg_muxer_create(void *args) goto out; gst_pad_set_element_private(muxer->my_sink, muxer); gst_pad_set_query_function(muxer->my_sink, muxer_sink_query_cb); + gst_pad_set_event_function(muxer->my_sink, muxer_sink_event_cb); + gst_pad_set_chain_function(muxer->my_sink, muxer_sink_chain_cb); gst_object_unref(template); @@ -199,6 +259,7 @@ out: gst_caps_unref(muxer->my_sink_caps); if (muxer->container) gst_object_unref(muxer->container); + pthread_mutex_destroy(&muxer->mutex); free(muxer); return status; @@ -214,10 +275,14 @@ NTSTATUS wg_muxer_destroy(void *args) list_remove(&stream->entry); stream_free(stream); } + gst_object_unref(muxer->my_sink); gst_caps_unref(muxer->my_sink_caps); gst_element_set_state(muxer->container, GST_STATE_NULL); gst_object_unref(muxer->container); + + pthread_mutex_destroy(&muxer->mutex); + free(muxer); return S_OK; @@ -346,5 +411,43 @@ NTSTATUS wg_muxer_start(void *args) NTSTATUS wg_muxer_push_sample(void *args) { - return STATUS_NOT_IMPLEMENTED; + struct wg_muxer_push_sample_params *params = args; + struct wg_muxer *muxer = get_muxer(params->muxer); + struct wg_sample *sample = params->sample; + struct wg_muxer_stream *stream; + GstFlowReturn ret; + GstBuffer *buffer; + + if (!(stream = muxer_get_stream_by_id(muxer, params->stream_id))) + return STATUS_NOT_FOUND; + + /* Create sample data buffer. */ + if (!(buffer = gst_buffer_new_and_alloc(sample->size)) + || !gst_buffer_fill(buffer, 0, wg_sample_data(sample), sample->size)) + { + GST_ERROR("Failed to allocate input buffer."); + return STATUS_NO_MEMORY; + } + + GST_INFO("Copied %u bytes from sample %p to buffer %p.", sample->size, sample, buffer); + + /* Set sample properties. */ + if (sample->flags & WG_SAMPLE_FLAG_HAS_PTS) + GST_BUFFER_PTS(buffer) = sample->pts * 100; + if (sample->flags & WG_SAMPLE_FLAG_HAS_DURATION) + GST_BUFFER_DURATION(buffer) = sample->duration * 100; + if (!(sample->flags & WG_SAMPLE_FLAG_SYNC_POINT)) + GST_BUFFER_FLAG_SET(buffer, GST_BUFFER_FLAG_DELTA_UNIT); + if (sample->flags & WG_SAMPLE_FLAG_DISCONTINUITY) + GST_BUFFER_FLAG_SET(buffer, GST_BUFFER_FLAG_DISCONT); + + /* Push sample data buffer to stream src pad. */ + if ((ret = gst_pad_push(stream->my_src, buffer)) < 0) + { + GST_ERROR("Failed to push buffer %p to pad %s, reason %s.", + buffer, gst_pad_get_name(stream->my_src), gst_flow_get_name(ret)); + return STATUS_UNSUCCESSFUL; + } + + return STATUS_SUCCESS; }

1 0

Alex Henrie : devenum: Use CRT allocation functions.
by Alexandre Julliard 08 Nov '23

08 Nov '23

Module: wine Branch: master Commit: 726c5df58feb0e3e579b9eb5ec8bedbe2bc53fe2 URL: https://gitlab.winehq.org/wine/wine/-/commit/726c5df58feb0e3e579b9eb5ec8bed… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:20:15 2023 -0600 devenum: Use CRT allocation functions. --- dlls/devenum/createdevenum.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 30bbf483b21..bc91b235804 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -29,7 +29,6 @@ #include "dsound.h" #include "wine/debug.h" -#include "wine/heap.h" #include "mmddk.h" #include "initguid.h" @@ -87,7 +86,7 @@ static HRESULT register_codec(const GUID *class, const WCHAR *name, if (FAILED(hr)) return hr; - if (!(buffer = heap_alloc((wcslen(L"@device:cm:") + CHARS_IN_GUID + wcslen(name) + 1) * sizeof(WCHAR)))) + if (!(buffer = malloc((wcslen(L"@device:cm:") + CHARS_IN_GUID + wcslen(name) + 1) * sizeof(WCHAR)))) { IParseDisplayName_Release(parser); return E_OUTOFMEMORY; @@ -100,7 +99,7 @@ static HRESULT register_codec(const GUID *class, const WCHAR *name, IParseDisplayName_ParseDisplayName(parser, NULL, buffer, &eaten, &mon); IParseDisplayName_Release(parser); - heap_free(buffer); + free(buffer); IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&propbag); IMoniker_Release(mon); @@ -428,7 +427,7 @@ static void register_legacy_filters(void) len = 0; if (!RegQueryValueExW(classkey, NULL, NULL, &Type, NULL, &len)) { - WCHAR *friendlyname = heap_alloc(len); + WCHAR *friendlyname = malloc(len); if (!friendlyname) { RegCloseKey(classkey); @@ -439,7 +438,7 @@ static void register_legacy_filters(void) hr = register_codec(&CLSID_LegacyAmFilterCategory, wszFilterSubkeyName, &clsid, friendlyname, &prop_bag); - heap_free(friendlyname); + free(friendlyname); } else hr = register_codec(&CLSID_LegacyAmFilterCategory, wszFilterSubkeyName, @@ -482,7 +481,7 @@ static BOOL CALLBACK register_dsound_devices(GUID *guid, const WCHAR *desc, cons if (guid) { - WCHAR *name = heap_alloc(sizeof(defaultW) + wcslen(desc) * sizeof(WCHAR)); + WCHAR *name = malloc(sizeof(defaultW) + wcslen(desc) * sizeof(WCHAR)); if (!name) return FALSE; wcscpy(name, L"DirectSound: "); @@ -490,7 +489,7 @@ static BOOL CALLBACK register_dsound_devices(GUID *guid, const WCHAR *desc, cons hr = register_codec(&CLSID_AudioRendererCategory, name, &CLSID_DSoundRender, name, &prop_bag); - heap_free(name); + free(name); } else hr = register_codec(&CLSID_AudioRendererCategory, defaultW,

1 0

Alex Henrie : wmvcore: Use CRT allocation functions.
by Alexandre Julliard 08 Nov '23

08 Nov '23

Module: wine Branch: master Commit: dfa0c9d28da8f94116b724ef84bd655af3563845 URL: https://gitlab.winehq.org/wine/wine/-/commit/dfa0c9d28da8f94116b724ef84bd65… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 22:21:57 2023 -0600 wmvcore: Use CRT allocation functions. --- dlls/wmvcore/wmvcore_main.c | 5 ++--- dlls/wmvcore/writer.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 016287b1b78..3b61fe13c15 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -27,7 +27,6 @@ #include "wmsdk.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); @@ -146,7 +145,7 @@ static ULONG WINAPI WMProfileManager_Release(IWMProfileManager2 *iface) TRACE("(%p) ref=%ld\n", This, ref); if(!ref) - heap_free(This); + free(This); return ref; } @@ -227,7 +226,7 @@ HRESULT WINAPI WMCreateProfileManager(IWMProfileManager **ret) TRACE("(%p)\n", ret); - profile_mgr = heap_alloc(sizeof(*profile_mgr)); + profile_mgr = malloc(sizeof(*profile_mgr)); if(!profile_mgr) return E_OUTOFMEMORY; diff --git a/dlls/wmvcore/writer.c b/dlls/wmvcore/writer.c index f34e40f0e47..124696f2021 100644 --- a/dlls/wmvcore/writer.c +++ b/dlls/wmvcore/writer.c @@ -20,7 +20,6 @@ #include "wmsdkidl.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); @@ -82,7 +81,7 @@ static ULONG WINAPI WMWriter_Release(IWMWriter *iface) TRACE("(%p) ref=%ld\n", This, ref); if(!ref) - heap_free(This); + free(This); return ref; } @@ -359,7 +358,7 @@ HRESULT WINAPI WMCreateWriter(IUnknown *reserved, IWMWriter **writer) TRACE("(%p %p)\n", reserved, writer); - ret = heap_alloc(sizeof(*ret)); + ret = malloc(sizeof(*ret)); if(!ret) return E_OUTOFMEMORY;

1 0

Alistair Leslie-Hughes : hlink: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 08 Nov '23

08 Nov '23

Module: wine Branch: master Commit: ef51f7b4021b16ce7d56f186e3bf07daeda25982 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef51f7b4021b16ce7d56f186e3bf07… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 8 17:35:27 2023 +1100 hlink: Remove DECLSPEC_HIDDEN usage. --- dlls/hlink/hlink_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hlink/hlink_private.h b/dlls/hlink/hlink_private.h index cf1befdb78f..883e36c0d8e 100644 --- a/dlls/hlink/hlink_private.h +++ b/dlls/hlink/hlink_private.h @@ -27,8 +27,8 @@ #include "ole2.h" #include "hlink.h" -extern HRESULT HLink_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -extern HRESULT HLinkBrowseContext_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; +extern HRESULT HLink_Constructor(IUnknown*,REFIID,void**); +extern HRESULT HLinkBrowseContext_Constructor(IUnknown*,REFIID,void**); static inline LPWSTR hlink_co_strdupW(LPCWSTR str) {

1 0

Alistair Leslie-Hughes : msimtf: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 08 Nov '23

08 Nov '23

Module: wine Branch: master Commit: 83da83ef9872feb1146636df8059895da0576822 URL: https://gitlab.winehq.org/wine/wine/-/commit/83da83ef9872feb1146636df805989… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 8 17:35:27 2023 +1100 msimtf: Remove DECLSPEC_HIDDEN usage. --- dlls/msimtf/activeimmapp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msimtf/activeimmapp.c b/dlls/msimtf/activeimmapp.c index 9d3318bf017..f062ae269c2 100644 --- a/dlls/msimtf/activeimmapp.c +++ b/dlls/msimtf/activeimmapp.c @@ -887,7 +887,7 @@ static const IActiveIMMMessagePumpOwnerVtbl ActiveIMMMessagePumpOwnerVtbl = ActiveIMMMessagePumpOwner_Resume, }; -DECLSPEC_HIDDEN HRESULT ActiveIMMApp_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) +HRESULT ActiveIMMApp_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) { ActiveIMMApp *This; if (pUnkOuter)

1 0